Enhanced Protected Mode support

adblockplus.gyp

 {
   'includes': ['defaults.gypi'],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
     'shared_files': [
       'src/shared/AutoHandle.cpp',
       'src/shared/Communication.cpp',
       'src/shared/Dictionary.cpp',
@@ skipping 54 matching lines @@
     },
   },
 
   {
     'target_name': 'AdblockPlus',
     'type': 'shared_library',
     'sources': [
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/AdblockPlusTab.cpp',
-      'src/plugin/NotificationMessage.cpp',
       'src/plugin/Plugin.cpp',
       'src/plugin/PluginClass.cpp',
       'src/plugin/PluginClientBase.cpp',
       'src/plugin/PluginClientFactory.cpp',
       'src/plugin/PluginDebug.cpp',
       'src/plugin/PluginFilter.cpp',
       'src/plugin/PluginMimeFilterClient.cpp',
       'src/plugin/PluginMutex.cpp',
       'src/plugin/PluginSettings.cpp',
       'src/plugin/PluginStdAfx.cpp',
       'src/plugin/PluginSystem.cpp',
       'src/plugin/PluginTabBase.cpp',
       'src/plugin/PluginUserSettings.cpp',
       'src/plugin/PluginUtil.cpp',
       'src/plugin/PluginWbPassThrough.cpp',
       'src/plugin/AdblockPlus.def',
       'src/plugin/AdblockPlus.idl',
       'src/plugin/AdblockPlus.rc',
       'src/plugin/AdblockPlus.rgs',
       '<@(shared_files)',
     ],
     'include_dirs': [
       '$(WindowsSDK_IncludePath)',
       '$(VCInstallDir)atlmfc/include',
       '$(WINDDKDIR)/inc/atl71',
     ],
-    'defines': ['PRODUCT_ADBLOCKPLUS', 'ISOLATION_AWARE_ENABLED'],
+    'defines': ['PRODUCT_ADBLOCKPLUS'],
     'libraries': [
       '-latlthunk',
       '-lwinhttp',
       '-lshell32',
-      '-lComctl32',
     ],
     'configurations': {
       # 'libraries' is not allowed under 'configurations' :-(
       'Debug': {
         'msvs_settings': {
           'VCLinkerTool': {
             'AdditionalDependencies': ['atlsd.lib'],
           },
         },
       },
@@ skipping 10 matching lines @@
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
               '$(VCInstallDir)atlmfc/lib',
               '$(WindowsSDK_LibraryPath_x86)',
               '$(WINDDKDIR)/lib/ATL/i386',
             ],
           }, {
             'AdditionalLibraryDirectories': [
               '$(VCInstallDir)atlmfc/lib/amd64',
+              '$(WindowsSDK_LibraryPath_x64)',
               '$(WINDDKDIR)/lib/ATL/amd64',

[Wladimir Palant, 2013/09/16 13:45:07]

Nit: probably makes sense to have the order of entries the same for ia32 and
x64, meaning WINDDKDIR at the last entry.

-              '$(WindowsSDK_LibraryPath_x64)',
             ],
           }
         ]],
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
   },
 
   {
     'target_name': 'tests',
@@ skipping 11 matching lines @@
       'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
   }]
 }