WinDDK ATL and MSVC express compatability

chrome/installer/mini_installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
   },
   'conditions': [
@@ skipping 40 matching lines @@
             'AdditionalLibraryDirectories': [
               '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
               '<(PRODUCT_DIR)/lib'
             ],
             'DelayLoadDLLs': [],
             'EntryPointSymbol': 'MainEntryPoint',
             'GenerateMapFile': 'true',
             'IgnoreAllDefaultLibraries': 'true',
             'OptimizeForWindows98': '1',
             'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+            'AdditionalDependencies': [
+              'shlwapi.lib',
+              'setupapi.lib',
+            ],
             'conditions': [
               ['MSVS_VERSION=="2010"', {
                 'AdditionalDependencies': [
                   # These two object files are included in Visual Studio 2008
-                  # but not 2010.
+                  # but not 2010. This pulls in the 2008/vc9 crt obj files,
+                  # assuming the user has both retail 2008 and 2010 installed.
                   # TODO(bradnelson):
                   # http://code.google.com/p/chromium/issues/detail?id=72885
                   '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
                       'crt\\src\\intel\\mt_lib\\memset.obj"',
                   '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
                       'crt\\src\\intel\\mt_lib\\P4_memset.obj"',
                 ],
-              },{
+              }],
+              ['MSVS_VERSION!="2010" and msvs_express==0', {
                 'AdditionalDependencies': [
                   '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
                   '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
                 ],
               }],
             ],
           },
           'VCManifestTool': {
             'AdditionalManifestFiles': [
               '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
@@ skipping 151 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: