Revert sdk 6.1 upgrade changes.

TBR=nsylvain

Review URL: http://codereview.chromium.org/17021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7501 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 53 insertions, 43 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 5e4be8a..1b70f11 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_win2008_6_1/files'
+platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/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.1')
+      msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0')
 
 windows_env.Replace(
     CSCRIPT = 'c:\\Windows\\System32\\cscript',
 
-    PLATFORMSDK_6_1 = platform_sdk_path,
+    PLATFORMSDK_VISTA = 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 389ae35..547f73a 100644
--- a/build/internal/essential.scons
+++ b/build/internal/essential.scons
@@ -46,7 +46,8 @@ if env.Bit('windows'):
           ('_HAS_TR1', 0),
       ],
       CPPPATH = [
-          '$PLATFORMSDK_6_1/Include',
+          '$PLATFORMSDK_VISTA/Include',
+          '$PLATFORMSDK_VISTA/VC/INCLUDE',
           '$VISUAL_STUDIO/VC/atlmfc/include',
       ],
       CCFLAGS = [
@@ -75,7 +76,8 @@ if env.Bit('windows'):
           '/wd4819',
       ],
       LIBPATH = [
-          '$PLATFORMSDK_6_1/Lib',
+          '$PLATFORMSDK_VISTA/Lib',
+          '$PLATFORMSDK_VISTA/VC/LIB',
           '$VISUAL_STUDIO/VC/atlmfc/lib',
       ],
       LIBS = [
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops
index 2fcc472..0537f85 100644
--- a/build/internal/essential.vsprops
+++ b/build/internal/essential.vsprops
@@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="SDK"
-		Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files"
+		Value="$(SolutionDir)..\third_party\platformsdk_vista_6_0\files"
 	/>
 	<UserMacro
 		Name="SDKIncludes"
diff --git a/chrome/app/chrome.dll.deps b/chrome/app/chrome.dll.deps
index 34a1a70..5ff37e0 100644
--- a/chrome/app/chrome.dll.deps
+++ b/chrome/app/chrome.dll.deps
@@ -1,32 +1,31 @@
-# List of chrome.dll's dependencies.

-

-dependents = [

-  'KERNEL32.dll',

-  'USER32.dll',

-  'ADVAPI32.dll',

-  'WINMM.dll',

-  'COMCTL32.dll',

-  'SHLWAPI.dll',

-  'GDI32.dll',

-  'SHELL32.dll',

-  'VERSION.dll',

-  'USP10.dll',

-  'ole32.dll',

-  'OLEAUT32.dll',

-  'OLEACC.dll',

-  'secur32.dll',

-]

-

-delay_loaded = [

-  'CRYPTUI.dll',

-  'IMM32.dll',

-  'CRYPT32.dll',

-  'WINHTTP.dll',

-  'WININET.dll',

-  'WS2_32.dll',

-  'PSAPI.DLL',

-  'dwmapi.dll',

-  'COMDLG32.dll',

-  'urlmon.dll',

-  't2embed.dll',

-]

+# List of chrome.dll's dependencies.
+
+dependents = [
+  'KERNEL32.dll',
+  'USER32.dll',
+  'ADVAPI32.dll',
+  'WINMM.dll',
+  'COMCTL32.dll',
+  'SHLWAPI.dll',
+  'GDI32.dll',
+  'SHELL32.dll',
+  'VERSION.dll',
+  'USP10.dll',
+  'ole32.dll',
+  'OLEAUT32.dll',
+  'OLEACC.dll',
+  'secur32.dll',
+]
+
+delay_loaded = [
+  'CRYPTUI.dll',
+  'IMM32.dll',
+  'CRYPT32.dll',
+  'WINHTTP.dll',
+  'WININET.dll',
+  'WS2_32.dll',
+  'PSAPI.DLL',
+  'dwmapi.dll',
+  'COMDLG32.dll',
+  'urlmon.dll',
+]
diff --git a/sandbox/wow_helper/wow_helper.vcproj b/sandbox/wow_helper/wow_helper.vcproj
index 5482fbd..7a2d8c6 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_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
+				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"
 				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_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
+				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"
 				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 3c014d0..64ad966 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_win2008_6_1/) {
+      if ($filename =~ m/platformsdk_vista_6_0/) {
         next;
       }
       if ($location_blame eq "") {
diff --git a/tools/purify/purify_message.py b/tools/purify/purify_message.py
index 9ff107f..be1b58d 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_win2008.*'), 
+  pat_file_elide = (re.compile('.*platformsdk_vista.*'), 
                     re.compile('.*.(dll|DLL)$'),
                     # bug 1069902
                     re.compile('webkit/pending/wtf/fastmalloc\.h'),
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 517f170..09cc470 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -894,6 +894,7 @@ if env.Bit('windows'):
     '$WEBCORE_DIR/platform/graphics/chromium/ThemeHelperChromiumWin.cpp',
     '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelper.cpp',
     '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelperTextRun.cpp',
+    '$WEBCORE_DIR/platform/graphics/opentype/OpenTypeUtilities.cpp',
   ])
 
 if env.Bit('linux'):
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 8a37fd6..91417b1 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1615,6 +1615,14 @@
 						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelperTextRun.h"
 						>
 					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.h"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="skia"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index 6b8eed2..fe8229c 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
 	/>
 </VisualStudioPropertySheet>