diff options
| -rw-r--r-- | build/SConscript.main | 6 | ||||
| -rw-r--r-- | build/internal/essential.scons | 6 | ||||
| -rw-r--r-- | build/internal/essential.vsprops | 2 | ||||
| -rw-r--r-- | chrome/app/chrome.dll.deps | 1 | ||||
| -rw-r--r-- | sandbox/wow_helper/wow_helper.vcproj | 4 | ||||
| -rw-r--r-- | tools/memory_watcher/scripts/memtrace.pl | 2 | ||||
| -rw-r--r-- | tools/purify/purify_message.py | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 1b70f11..5e4be8a 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -269,16 +269,16 @@ else: visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' # If side-by-side platform sdk is not available try local copy. -platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files' +platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/files' if (root_env['PLATFORM'] in ['win32', 'cygwin'] and not os.path.exists(windows_env.subst(platform_sdk_path))): platform_sdk_path = ( - msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0') + msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1') windows_env.Replace( CSCRIPT = 'c:\\Windows\\System32\\cscript', - PLATFORMSDK_VISTA = platform_sdk_path, + PLATFORMSDK_6_1 = platform_sdk_path, VISUAL_STUDIO = visual_studio_path, CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 547f73a..389ae35 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -46,8 +46,7 @@ if env.Bit('windows'): ('_HAS_TR1', 0), ], CPPPATH = [ - '$PLATFORMSDK_VISTA/Include', - '$PLATFORMSDK_VISTA/VC/INCLUDE', + '$PLATFORMSDK_6_1/Include', '$VISUAL_STUDIO/VC/atlmfc/include', ], CCFLAGS = [ @@ -76,8 +75,7 @@ if env.Bit('windows'): '/wd4819', ], LIBPATH = [ - '$PLATFORMSDK_VISTA/Lib', - '$PLATFORMSDK_VISTA/VC/LIB', + '$PLATFORMSDK_6_1/Lib', '$VISUAL_STUDIO/VC/atlmfc/lib', ], LIBS = [ diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops index 0537f85..2fcc472 100644 --- a/build/internal/essential.vsprops +++ b/build/internal/essential.vsprops @@ -56,7 +56,7 @@ /> <UserMacro Name="SDK" - Value="$(SolutionDir)..\third_party\platformsdk_vista_6_0\files" + Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files" /> <UserMacro Name="SDKIncludes" diff --git a/chrome/app/chrome.dll.deps b/chrome/app/chrome.dll.deps index e493f2b..34a1a70 100644 --- a/chrome/app/chrome.dll.deps +++ b/chrome/app/chrome.dll.deps @@ -28,4 +28,5 @@ delay_loaded = [ 'dwmapi.dll',
'COMDLG32.dll',
'urlmon.dll',
+ 't2embed.dll',
]
diff --git a/sandbox/wow_helper/wow_helper.vcproj b/sandbox/wow_helper/wow_helper.vcproj index 7a2d8c6..5482fbd 100644 --- a/sandbox/wow_helper/wow_helper.vcproj +++ b/sandbox/wow_helper/wow_helper.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include" + AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include" PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="0" @@ -120,7 +120,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include" + AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include" PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;NDEBUG" RuntimeLibrary="0" BufferSecurityCheck="false" diff --git a/tools/memory_watcher/scripts/memtrace.pl b/tools/memory_watcher/scripts/memtrace.pl index 64ad966..3c014d0 100644 --- a/tools/memory_watcher/scripts/memtrace.pl +++ b/tools/memory_watcher/scripts/memtrace.pl @@ -101,7 +101,7 @@ sub process_raw($) { if ($filename =~ m/microsoft visual studio 8/) { next; } - if ($filename =~ m/platformsdk_vista_6_0/) { + if ($filename =~ m/platformsdk_win2008_6_1/) { next; } if ($location_blame eq "") { diff --git a/tools/purify/purify_message.py b/tools/purify/purify_message.py index be1b58d..9ff107f 100644 --- a/tools/purify/purify_message.py +++ b/tools/purify/purify_message.py @@ -117,7 +117,7 @@ class Stack: # if functions match the following, elide them from the stack pat_func_elide = (re.compile('^std::'), re.compile('^new\(')) # if files match the following, elide them from the stack - pat_file_elide = (re.compile('.*platformsdk_vista.*'), + pat_file_elide = (re.compile('.*platformsdk_win2008.*'), re.compile('.*.(dll|DLL)$'), # bug 1069902 re.compile('webkit/pending/wtf/fastmalloc\.h'), |