Issue 2599, 2940 - Fix the presence of correct ATL version

adblockplus.gyp

 {
   'includes': [
     'defaults.gypi',
     'common/common.gypi',
   ],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
   },
@@ skipping 36 matching lines @@
       'src/shared/CriticalSection.h',
       'src/shared/Dictionary.cpp',
       'src/shared/Dictionary.h',
       'src/shared/Utils.cpp',
       'src/shared/Utils.h',
       'src/shared/Version.h',
       'src/shared/MsHTMLUtils.cpp',
       'src/shared/MsHTMLUtils.h',
     ],
     'include_dirs': [
-      '$(ATLDir)/include',
+      '$(ADBLOCKPLUS_ATL)/include',
     ],
   },
 
   {
     'target_name': 'AdblockPlusEngine',
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
       'src/engine/Main.cpp',
       'src/engine/NotificationWindow.cpp',
       'src/engine/NotificationWindow.h',
       'src/engine/Debug.cpp',
       'src/engine/UpdateInstallDialog.cpp',
       'src/engine/Updater.cpp',
       'src/engine/engine.rc',
     ],
     'include_dirs': [
-      '$(ATLDir)/include',
+      '$(ADBLOCKPLUS_ATL)/include',
     ],
     'libraries': [
       '-ladvapi32',
       '-lole32',
       '-luser32',
       '-lshell32',
       '-lshlwapi',
     ],
     'msbuild_toolset': 'v110_xp',
     'msvs_settings': {
       'VCLinkerTool': {
         'DelayLoadDLLs': ['Shell32.dll'],
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib',
+              '$(ADBLOCKPLUS_ATL)/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib/amd64',
+              '$(ADBLOCKPLUS_ATL)/lib/amd64',
             ],
           }
         ]],
       },
     },
   },
 
   {
     'target_name': 'AdblockPlus',
     'type': 'shared_library',
@@ skipping 28 matching lines @@
       'src/plugin/PluginDebug.cpp',
       'src/plugin/PluginDebug.h',
       'src/plugin/PluginDomTraverserBase.h',
       'src/plugin/PluginErrorCodes.h',
       'src/plugin/PluginFilter.cpp',
       'src/plugin/PluginFilter.h',
       'src/plugin/PluginMimeFilterClient.cpp',
       'src/plugin/PluginMimeFilterClient.h',
       'src/plugin/PluginMutex.cpp',
       'src/plugin/PluginMutex.h',
-      'src/plugin/PluginPassthroughObject.h',
       'src/plugin/PluginSettings.cpp',
       'src/plugin/PluginSettings.h',
       'src/plugin/PluginStdAfx.cpp',
       'src/plugin/PluginStdAfx.h',
       'src/plugin/PluginSystem.cpp',
       'src/plugin/PluginSystem.h',
       'src/plugin/PluginTabBase.cpp',
       'src/plugin/PluginTabBase.h',
       'src/plugin/PluginUserSettings.cpp',
       'src/plugin/PluginUserSettings.h',
       'src/plugin/PluginUtil.cpp',
       'src/plugin/PluginUtil.h',
       'src/plugin/PluginWbPassThrough.cpp',
       'src/plugin/PluginWbPassThrough.h',
-      'src/plugin/ProtocolCF.h',
-      'src/plugin/ProtocolCF.inl',
-      'src/plugin/ProtocolImpl.h',
-      'src/plugin/ProtocolImpl.inl',
       'src/plugin/Resource.h',
-      'src/plugin/SinkPolicy.h',
-      'src/plugin/SinkPolicy.inl',
-    ],
-    'include_dirs': [
-      '$(ATLDir)/include',
+      'src/plugin/passthroughapp/PassthroughObject.h',
+      'src/plugin/passthroughapp/ProtocolCF.h',
+      'src/plugin/passthroughapp/ProtocolCF.inl',
+      'src/plugin/passthroughapp/ProtocolImpl.h',
+      'src/plugin/passthroughapp/ProtocolImpl.inl',
+      'src/plugin/passthroughapp/SinkPolicy.h',
+      'src/plugin/passthroughapp/SinkPolicy.inl',
+    ],
+    'include_dirs': [
+      '$(ADBLOCKPLUS_ATL)/include',
     ],
     # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
     # That Is Brought into a Process" on the link here:
     # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85%29.aspx#using_manifests
     'defines': ['ISOLATION_AWARE_ENABLED'],
     'libraries': [
       '-lwinhttp',
       '-lshell32',
       '-lComctl32',
       '-lGdi32',
     ],
     'msvs_settings': {
       'VCLinkerTool': {
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib',
+              '$(ADBLOCKPLUS_ATL)/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib/amd64',
+              '$(ADBLOCKPLUS_ATL)/lib/amd64',
             ],
           }
         ]],
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
   },
 
   {
     'target_name': 'tests',
@@ skipping 26 matching lines @@
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
       'libadblockplus/third_party/googletest.gyp:googletest_main',
     ],
     'sources': [
       'src/plugin/PluginUserSettings.cpp',
       'src/plugin/PluginUserSettings.h',
       'test/plugin/UserSettingsTest.cpp',
+      'src/plugin/PluginUtil.h',
+      'test/plugin/UtilTest.cpp',
       #
       # required only for linking
       #
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/ATL_Deprecate.cpp',
       'src/plugin/NotificationMessage.cpp',
       'src/plugin/Plugin.cpp',
       'src/plugin/PluginClientBase.cpp',
       'src/plugin/PluginClientFactory.cpp',
       'src/plugin/PluginClass.cpp',
       'src/plugin/PluginDebug.cpp',
       'src/plugin/PluginFilter.cpp',
       'src/plugin/PluginMimeFilterClient.cpp',
       'src/plugin/PluginMutex.cpp',
       'src/plugin/PluginSettings.cpp',
       'src/plugin/PluginSystem.cpp',
       'src/plugin/PluginTabBase.cpp',
       'src/plugin/PluginUtil.cpp',
       'src/plugin/PluginWbPassthrough.cpp',
     ],
     'include_dirs': [
-      '$(ATLDir)/include',
+      '$(ADBLOCKPLUS_ATL)/include',
     ],
     'defines': [
       'WINVER=0x0501',
       'PRODUCT_ADBLOCKPLUS'
     ],
     'link_settings': {
       'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1', # Console
         'EntryPointSymbol': 'mainCRTStartup',
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib',
+              '$(ADBLOCKPLUS_ATL)/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(ATLDir)/lib/amd64',
+              '$(ADBLOCKPLUS_ATL)/lib/amd64',
             ],
           }
         ]],
       },
     },
   }]
 }