Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /////////////////////////// |
michael@0 | 2 | // |
michael@0 | 3 | // Version |
michael@0 | 4 | // |
michael@0 | 5 | #include <windows.h> |
michael@0 | 6 | |
michael@0 | 7 | #include <stl/_stlport_version.h> |
michael@0 | 8 | |
michael@0 | 9 | /* On some evc3/evc4 targets the windows.h doesn't include winver.h or doesn't |
michael@0 | 10 | * define needed file version flags, so we redefine them here. |
michael@0 | 11 | */ |
michael@0 | 12 | #ifndef VS_FF_DEBUG |
michael@0 | 13 | # define VS_FF_DEBUG 0x00000001L |
michael@0 | 14 | #endif |
michael@0 | 15 | |
michael@0 | 16 | #ifndef VOS__WINDOWS32 |
michael@0 | 17 | # define VOS__WINDOWS32 0x00000004L |
michael@0 | 18 | #endif |
michael@0 | 19 | |
michael@0 | 20 | #ifndef VFT_DLL |
michael@0 | 21 | # define VFT_DLL 0x00000002L |
michael@0 | 22 | #endif |
michael@0 | 23 | |
michael@0 | 24 | #ifndef VFT2_UNKNOWN |
michael@0 | 25 | # define VFT2_UNKNOWN 0x00000000L |
michael@0 | 26 | #endif |
michael@0 | 27 | |
michael@0 | 28 | #define STRINGIZE(X) STRINGIZE_AUX(X) |
michael@0 | 29 | #define STRINGIZE_AUX(X) #X |
michael@0 | 30 | |
michael@0 | 31 | #define VERSION_ID _STLPORT_MAJOR, _STLPORT_MINOR, _STLPORT_PATCHLEVEL, 0 |
michael@0 | 32 | #if !defined (__BORLANDC__) |
michael@0 | 33 | # define VERSION_STR STRINGIZE(_STLPORT_MAJOR._STLPORT_MINOR._STLPORT_PATCHLEVEL) |
michael@0 | 34 | #else |
michael@0 | 35 | /* Borland precompiler happen weird character when trying to transform a |
michael@0 | 36 | * macro containing 0 in a character string so we use a workaround for this |
michael@0 | 37 | * value. We do not check the major version that will never be 0 again. |
michael@0 | 38 | */ |
michael@0 | 39 | # if (_STLPORT_MINOR == 0) |
michael@0 | 40 | # define _STLP_MINOR "0" |
michael@0 | 41 | # else |
michael@0 | 42 | # define _STLP_MINOR STRINGIZE(_STLPORT_MINOR) |
michael@0 | 43 | # endif |
michael@0 | 44 | # if (_STLPORT_PATCHLEVEL == 0) |
michael@0 | 45 | # define _STLP_PATCH "0" |
michael@0 | 46 | # else |
michael@0 | 47 | # define _STLP_PATCH STRINGIZE(_STLPORT_PATCHLEVEL) |
michael@0 | 48 | # endif |
michael@0 | 49 | # define VERSION_STR STRINGIZE(_STLPORT_MAJOR) "." _STLP_MINOR "." _STLP_PATCH "\0" |
michael@0 | 50 | #endif |
michael@0 | 51 | |
michael@0 | 52 | #if defined (__GNUC__) |
michael@0 | 53 | # define LIB_MOTIF "libstlport" |
michael@0 | 54 | #else |
michael@0 | 55 | # define LIB_MOTIF "stlport" |
michael@0 | 56 | #endif |
michael@0 | 57 | #define DLLNAME LIB_MOTIF "." STRINGIZE(_STLPORT_MAJOR) "." STRINGIZE(_STLPORT_MINOR) ".dll\0" |
michael@0 | 58 | #define DLLNAME2(buildstr) LIB_MOTIF "" STRINGIZE(buildstr) "." STRINGIZE(_STLPORT_MAJOR) "." STRINGIZE(_STLPORT_MINOR) ".dll\0" |
michael@0 | 59 | |
michael@0 | 60 | VS_VERSION_INFO VERSIONINFO |
michael@0 | 61 | FILEVERSION VERSION_ID |
michael@0 | 62 | PRODUCTVERSION VERSION_ID |
michael@0 | 63 | FILEFLAGSMASK 0x3fL |
michael@0 | 64 | |
michael@0 | 65 | FILEFLAGS VS_FF_DEBUG |
michael@0 | 66 | |
michael@0 | 67 | FILEOS VOS__WINDOWS32 |
michael@0 | 68 | FILETYPE VFT_DLL |
michael@0 | 69 | FILESUBTYPE VFT2_UNKNOWN |
michael@0 | 70 | BEGIN |
michael@0 | 71 | BLOCK "StringFileInfo" |
michael@0 | 72 | BEGIN |
michael@0 | 73 | BLOCK "040904B0" |
michael@0 | 74 | BEGIN |
michael@0 | 75 | VALUE "CompanyName", "STLport Consulting, Inc.\0" |
michael@0 | 76 | VALUE "FileDescription", "STLport\0" |
michael@0 | 77 | VALUE "FileVersion", VERSION_STR |
michael@0 | 78 | VALUE "InternalName", "STLPORT.DLL\0" |
michael@0 | 79 | VALUE "LegalCopyright", "Copyright (C) Boris Fomitchev\0" |
michael@0 | 80 | #if !defined (BUILD) |
michael@0 | 81 | VALUE "OriginalFilename", DLLNAME |
michael@0 | 82 | #else |
michael@0 | 83 | VALUE "OriginalFilename", DLLNAME2(BUILD) |
michael@0 | 84 | #endif |
michael@0 | 85 | VALUE "ProductName", "STLport Standard ANSI C++ Library\0" |
michael@0 | 86 | VALUE "ProductVersion", VERSION_STR |
michael@0 | 87 | #if defined (BUILD_INFOS) |
michael@0 | 88 | VALUE "SpecialBuild", STRINGIZE(COMP) " " STRINGIZE(BUILD_INFOS) "\0" |
michael@0 | 89 | #endif |
michael@0 | 90 | END |
michael@0 | 91 | END |
michael@0 | 92 | BLOCK "VarFileInfo" |
michael@0 | 93 | BEGIN |
michael@0 | 94 | VALUE "Translation", 0x409, 1200 |
michael@0 | 95 | END |
michael@0 | 96 | END |