TestWebKitAPI, record-memory and gtest-md projects and property sheets for VS2010.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2013 21:29:59 +0000 (21:29 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Feb 2013 21:29:59 +0000 (21:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=107034

Reviewed by Brent Fulgham.

* TestWebKitAPI/TestWebKitAPI.vcxproj: Added.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: Added.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters: Added.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPostBuild.cmd: Copied from Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd: Copied from Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd.
* win/record-memory: Added.
* win/record-memory/main.cpp: Copied from Tools/record-memory-win/main.cpp.
* win/record-memory/record-memory.vcxproj: Added.
* win/record-memory/record-memory.vcxproj.filters: Added.
* win/record-memory/record-memoryCommon.props: Added.
* win/record-memory/record-memoryDebug.props: Added.
* win/record-memory/record-memoryRelease.props: Added.
* gtest/msvc/gtest-md.vcxproj: Added.
* gtest/msvc/gtest-md.vcxproj.filters: Added.
* WebKit.vcxproj/WebKit.sln:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/msvc/gtest-md.vcxproj [new file with mode: 0644]
Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.sln
Tools/ChangeLog
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj [new file with mode: 0644]
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters [new file with mode: 0644]
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPostBuild.cmd [new file with mode: 0644]
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd [new file with mode: 0644]
Tools/win/record-memory/main.cpp [new file with mode: 0644]
Tools/win/record-memory/record-memory.vcxproj [new file with mode: 0644]
Tools/win/record-memory/record-memory.vcxproj.filters [new file with mode: 0644]
Tools/win/record-memory/record-memoryCommon.props [new file with mode: 0644]
Tools/win/record-memory/record-memoryDebug.props [new file with mode: 0644]
Tools/win/record-memory/record-memoryRelease.props [new file with mode: 0644]

index 1e0bee6..58f962e 100644 (file)
@@ -1,3 +1,13 @@
+2013-02-12  Roger Fong  <roger_fong@apple.com>
+
+        Add gtest-md VS2010 project files.
+        https://bugs.webkit.org/show_bug.cgi?id=107034.
+
+        Reviewed by Brent Fulgham.
+
+        * gtest/msvc/gtest-md.vcxproj: Added.
+        * gtest/msvc/gtest-md.vcxproj.filters: Added.
+
 2013-02-05  Simon Hausmann  <simon.hausmann@digia.com>
 
         [Qt] Compile WTF tests of TestWebKitAPI
diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
new file mode 100644 (file)
index 0000000..d1c6314
--- /dev/null
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}</ProjectGuid>\r
+    <RootNamespace>gtest-md</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtest</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)gtest.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Lib />\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\gtest-death-test.cc" />\r
+    <ClCompile Include="..\src\gtest-filepath.cc" />\r
+    <ClCompile Include="..\src\gtest-port.cc" />\r
+    <ClCompile Include="..\src\gtest-test-part.cc" />\r
+    <ClCompile Include="..\src\gtest-typed-test.cc" />\r
+    <ClCompile Include="..\src\gtest.cc" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-death-test-internal.h" />\r
+    <ClInclude Include="..\include\gtest\gtest-death-test.h" />\r
+    <ClInclude Include="..\include\gtest\internal\gtest-filepath.h" />\r
+    <ClInclude Include="..\src\gtest-internal-inl.h" />\r
+    <ClInclude Include="..\include\gtest\internal\gtest-internal.h" />\r
+    <ClInclude Include="..\include\gtest\gtest-message.h" />\r
+    <ClInclude Include="..\include\gtest\internal\gtest-port.h" />\r
+    <ClInclude Include="..\include\gtest\gtest-spi.h" />\r
+    <ClInclude Include="..\include\gtest\internal\gtest-string.h" />\r
+    <ClInclude Include="..\include\gtest\gtest.h" />\r
+    <ClInclude Include="..\include\gtest\gtest_pred_impl.h" />\r
+    <ClInclude Include="..\include\gtest\gtest_prod.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters
new file mode 100644 (file)
index 0000000..fdf2b2a
--- /dev/null
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\gtest-death-test.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\gtest-filepath.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\gtest-port.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\gtest-test-part.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\gtest-typed-test.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\gtest.cc">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-death-test-internal.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest-death-test.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-filepath.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\gtest-internal-inl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-internal.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest-message.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-port.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest-spi.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\internal\gtest-string.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest_pred_impl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\gtest\gtest_prod.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
index 786407f..9633ffa 100644 (file)
@@ -1,5 +1,14 @@
 2013-02-12  Roger Fong  <roger_fong@apple.com>
 
+        Add TestWebKitAPI, gtest-md and record-memory projects to VS2010 WebKit solution.
+        https://bugs.webkit.org/show_bug.cgi?id=107034.
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/WebKit.sln:
+
+2013-02-12  Roger Fong  <roger_fong@apple.com>
+
         Unreviewed. Build fix for VS2010 WebKit solution.
 
         * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
index 9764741..d90b5f2 100644 (file)
@@ -141,328 +141,149 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTreeLauncher", ".
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
        EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{6993F96C-409A-4FDC-A0BA-B40D5060B07C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "APITest Projects", "APITest Projects", "{68A7C287-F9C4-4A31-9B49-995E64CAC100}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandAlone Projects", "StandAlone Projects", "{74E05245-682B-4D12-98AD-BFC64C9C14CE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "..\..\ThirdParty\gtest\msvc\gtest-md.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5} = {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "..\..\..\Tools\TestWebKitAPI\TestWebKitAPI.vcxproj\TestWebKitAPI.vcxproj", "{AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "record-memory", "..\..\..\Tools\win\record-memory\record-memory.vcxproj", "{F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}"
+       ProjectSection(ProjectDependencies) = postProject
+               {2974EA02-840B-4995-8719-8920A61006F1} = {2974EA02-840B-4995-8719-8920A61006F1}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug_All|Win32 = Debug_All|Win32
-               Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32
                Debug|Win32 = Debug|Win32
-               Production|Win32 = Production|Win32
-               Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32
                Release|Win32 = Release|Win32
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug_All|Win32.Build.0 = Debug|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.ActiveCfg = Debug|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.Build.0 = Debug|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.ActiveCfg = Release|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.Build.0 = Release|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.ActiveCfg = Release|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.Build.0 = Release|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_All|Win32.Build.0 = Debug|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Release|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Release|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_All|Win32.Build.0 = Debug|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Release|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Release|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_All|Win32.Build.0 = Debug|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Release|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Release|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_All|Win32.Build.0 = Debug|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Release|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Release|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_All|Win32.Build.0 = Debug|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Release|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Release|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.Build.0 = Debug|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.ActiveCfg = Release|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.Build.0 = Release|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug_All|Win32.Build.0 = Debug|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.ActiveCfg = Debug|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.Build.0 = Debug|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.ActiveCfg = Release|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.Build.0 = Release|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.ActiveCfg = Release|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.Build.0 = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.Build.0 = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.ActiveCfg = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.Build.0 = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.Build.0 = Debug|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.ActiveCfg = Release|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.Build.0 = Release|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_All|Win32.Build.0 = Debug|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Release|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Release|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_All|Win32.Build.0 = Debug|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Release|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Release|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_All|Win32.Build.0 = Debug|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.ActiveCfg = Debug|Win32
                {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.Build.0 = Debug|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.ActiveCfg = Release|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.Build.0 = Release|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.ActiveCfg = Release|Win32
                {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.Build.0 = Release|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_All|Win32.Build.0 = Debug|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.ActiveCfg = Debug|Win32
                {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.Build.0 = Debug|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.ActiveCfg = Release|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.Build.0 = Release|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.ActiveCfg = Release|Win32
                {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.Build.0 = Release|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_All|Win32.Build.0 = Debug|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.ActiveCfg = Debug|Win32
                {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.Build.0 = Debug|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.ActiveCfg = Release|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.Build.0 = Release|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.ActiveCfg = Release|Win32
                {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.Build.0 = Release|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug_All|Win32.Build.0 = Debug|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.ActiveCfg = Debug|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.Build.0 = Debug|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.ActiveCfg = Release|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.Build.0 = Release|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {0F837117-8C0B-4596-A373-A37E14A01223}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.ActiveCfg = Release|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.Build.0 = Release|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug_All|Win32.Build.0 = Debug|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.ActiveCfg = Debug|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.Build.0 = Debug|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.ActiveCfg = Release|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.Build.0 = Release|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.ActiveCfg = Release|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.Build.0 = Release|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug_All|Win32.Build.0 = Debug|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug|Win32.ActiveCfg = Debug|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Debug|Win32.Build.0 = Debug|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Production|Win32.ActiveCfg = Release|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Production|Win32.Build.0 = Release|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.ActiveCfg = Release|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.Build.0 = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.Build.0 = Debug|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.ActiveCfg = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.Build.0 = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.Build.0 = Debug|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.ActiveCfg = Debug|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.Build.0 = Debug|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.ActiveCfg = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.Build.0 = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug_All|Win32.Build.0 = Debug|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug|Win32.ActiveCfg = Debug|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug|Win32.Build.0 = Debug|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Production|Win32.ActiveCfg = Release|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Production|Win32.Build.0 = Release|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {83414B15-1C0D-490B-990E-03F4D49170E4}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Release|Win32.ActiveCfg = Release|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Release|Win32.Build.0 = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.ActiveCfg = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.ActiveCfg = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.Build.0 = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.Build.0 = Debug|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.ActiveCfg = Debug|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.ActiveCfg = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.Build.0 = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_All|Win32.ActiveCfg = Debug|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_All|Win32.Build.0 = Debug|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.ActiveCfg = Debug|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.Build.0 = Debug|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.ActiveCfg = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.Build.0 = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.ActiveCfg = Release|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.Build.0 = Release|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.Build.0 = Debug|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.ActiveCfg = Release|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.Build.0 = Release|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug|Win32.Build.0 = Debug|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release|Win32.ActiveCfg = Release|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release|Win32.Build.0 = Release|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug|Win32.Build.0 = Debug|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release|Win32.ActiveCfg = Release|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -494,5 +315,12 @@ Global
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {3D4C8B23-9375-4A7C-869C-7CC262C42F9F}
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {3D4C8B23-9375-4A7C-869C-7CC262C42F9F}
                {2974EA02-840B-4995-8719-8920A61006F1} = {3D4C8B23-9375-4A7C-869C-7CC262C42F9F}
+               {20A8616C-E56B-4649-A910-8E97751DE145} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
+               {3D4C8B23-9375-4A7C-869C-7CC262C42F9F} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
+               {68A7C287-F9C4-4A31-9B49-995E64CAC100} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
+               {74E05245-682B-4D12-98AD-BFC64C9C14CE} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D} = {68A7C287-F9C4-4A31-9B49-995E64CAC100}
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} = {68A7C287-F9C4-4A31-9B49-995E64CAC100}
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5} = {74E05245-682B-4D12-98AD-BFC64C9C14CE}
        EndGlobalSection
 EndGlobal
index 83e9dd5..621158b 100644 (file)
@@ -1,3 +1,23 @@
+2013-02-12  Roger Fong  <roger_fong@apple.com>
+
+        TestWebKitAPI and record-memory projects and property sheets for VS2010.
+        https://bugs.webkit.org/show_bug.cgi?id=107034
+
+        Reviewed by Brent Fulgham.
+
+        * TestWebKitAPI/TestWebKitAPI.vcxproj: Added.
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: Added.
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters: Added.
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPostBuild.cmd: Copied from Tools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd.
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd: Copied from Tools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd.
+        * win/record-memory: Added.
+        * win/record-memory/main.cpp: Copied from Tools/record-memory-win/main.cpp.
+        * win/record-memory/record-memory.vcxproj: Added.
+        * win/record-memory/record-memory.vcxproj.filters: Added.
+        * win/record-memory/record-memoryCommon.props: Added.
+        * win/record-memory/record-memoryDebug.props: Added.
+        * win/record-memory/record-memoryRelease.props: Added.
+
 2013-02-13  Tommy Widenflycht  <tommyw@google.com>
 
         MediaStream API: Use the source id when creating new tracks
diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
new file mode 100644 (file)
index 0000000..32e6d89
--- /dev/null
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>TestWebKitAPI</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="TestWebKitAPIDebug.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="TestWebKitAPIRelease.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <Link />\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <Link />\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\Test.h" />\r
+    <ClInclude Include="..\TestsController.h" />\r
+    <ClInclude Include="..\win\HostWindow.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\TestsController.cpp" />\r
+    <ClCompile Include="..\Tests\WebCore\LayoutUnit.cpp" />\r
+    <ClCompile Include="..\Tests\WebCore\win\BitmapImage.cpp" />\r
+    <ClCompile Include="..\Tests\WebKit\win\WebViewDestruction.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\cf\RetainPtr.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\cf\RetainPtrHashing.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\CheckedArithmeticOperations.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\Functional.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\HashMap.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\MathExtras.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\MediaTime.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\SaturatedArithmeticOperations.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\StringOperators.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\Vector.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\VectorBasic.cpp" />\r
+    <ClCompile Include="..\Tests\WTF\VectorReverse.cpp" />\r
+    <ClCompile Include="..\win\HostWindow.cpp" />\r
+    <ClCompile Include="..\win\main.cpp" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters
new file mode 100644 (file)
index 0000000..abdfb95
--- /dev/null
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Tests">\r
+      <UniqueIdentifier>{80b7e5c5-5c50-4363-ae7b-a0956e6a688d}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="win">\r
+      <UniqueIdentifier>{e0b41579-994a-4d5e-9c2a-2ec14cd0c606}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Tests\WTF">\r
+      <UniqueIdentifier>{87f2c8f6-8710-4785-a918-2aec42c9f1d3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Tests\WebCore">\r
+      <UniqueIdentifier>{77db1e64-3c2d-4de3-adc1-860d4ea1c3c2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Tests\WebKit">\r
+      <UniqueIdentifier>{f8236406-78aa-4c83-b393-b060b09405a3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Tests\WTF\cf">\r
+      <UniqueIdentifier>{909ce22a-2223-4afa-af44-2d0153f13cc6}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\Test.h" />\r
+    <ClInclude Include="..\TestsController.h" />\r
+    <ClInclude Include="..\win\HostWindow.h">\r
+      <Filter>win</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\TestsController.cpp" />\r
+    <ClCompile Include="..\win\HostWindow.cpp">\r
+      <Filter>win</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win\main.cpp">\r
+      <Filter>win</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WebCore\win\BitmapImage.cpp">\r
+      <Filter>Tests\WebCore</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WebCore\LayoutUnit.cpp">\r
+      <Filter>Tests\WebCore</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WebKit\win\WebViewDestruction.cpp">\r
+      <Filter>Tests\WebKit</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\CheckedArithmeticOperations.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\Functional.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\HashMap.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\MathExtras.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\MediaTime.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\SaturatedArithmeticOperations.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\StringOperators.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\Vector.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\VectorBasic.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\VectorReverse.cpp">\r
+      <Filter>Tests\WTF</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\cf\RetainPtr.cpp">\r
+      <Filter>Tests\WTF\cf</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Tests\WTF\cf\RetainPtrHashing.cpp">\r
+      <Filter>Tests\WTF\cf</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPostBuild.cmd b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPostBuild.cmd
new file mode 100644 (file)
index 0000000..26707ca
--- /dev/null
@@ -0,0 +1 @@
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd
new file mode 100644 (file)
index 0000000..a770776
--- /dev/null
@@ -0,0 +1,6 @@
+%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+cmd /c
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if errorlevel 1 exit 1
+echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Tools/win/record-memory/main.cpp b/Tools/win/record-memory/main.cpp
new file mode 100644 (file)
index 0000000..934f101
--- /dev/null
@@ -0,0 +1,213 @@
+#include <windows.h>\r
+#include <assert.h>\r
+#include <psapi.h>\r
+#include <stdio.h>\r
+#include <tchar.h>\r
+#include <time.h>\r
+#include <tlhelp32.h>\r
+#include "Shlwapi.h"\r
+\r
+#pragma comment(lib, "psapi.lib")\r
+#pragma comment(lib, "shlwapi.lib")\r
+\r
+int gQueryInterval = 5; // seconds\r
+time_t gDuration = 0;   // seconds\r
+LPTSTR gCommandLine;\r
+\r
+HRESULT ProcessArgs(int argc, TCHAR *argv[]);\r
+HRESULT PrintUsage();\r
+void UseImage(void (functionForQueryType(HANDLE)));\r
+void QueryContinuously(HANDLE hProcess);\r
+int EvalProcesses(HANDLE hProcess);\r
+time_t ElapsedTime(time_t startTime);\r
+\r
+int __cdecl _tmain (int argc, TCHAR *argv[])\r
+{\r
+    HRESULT result = ProcessArgs(argc, argv);\r
+    if (FAILED(result))\r
+        return result;\r
+\r
+    UseImage(QueryContinuously);\r
+    return S_OK;\r
+}\r
+\r
+HRESULT ProcessArgs(int argc, TCHAR *argv[])\r
+{\r
+    LPTSTR argument;\r
+    for( int count = 1; count < argc; count++ ) {\r
+        argument = argv[count] ;\r
+        if (wcsstr(argument, _T("-h")) || wcsstr(argument, _T("--help")))\r
+            return PrintUsage();\r
+        else if (wcsstr(argument, _T("--exe"))) {\r
+            gCommandLine = argv[++count];\r
+        } else if (wcsstr(argument, _T("-i")) || \r
+            wcsstr(argument, _T("--interval"))) {\r
+            gQueryInterval = _wtoi(argv[++count]);\r
+            if (gQueryInterval < 1) {\r
+                printf("ERROR: invalid interval\n");\r
+                return E_INVALIDARG;\r
+            }\r
+        } else if (wcsstr(argument, _T("-d")) ||\r
+            wcsstr(argument, _T("--duration"))) {\r
+            gDuration = _wtoi(argv[++count]);\r
+            if (gDuration < 1) {\r
+                printf("ERROR: invalid duration\n");\r
+                return E_INVALIDARG;\r
+            }\r
+        } else {\r
+            _tprintf(_T("ERROR: unrecognized argument \"%s\"\n"), (LPCTSTR)argument);\r
+            return PrintUsage();\r
+        }\r
+    }\r
+    if (argc < 2 || !wcslen(gCommandLine) ) {\r
+        printf("ERROR: executable path is required\n");\r
+        return PrintUsage();\r
+    }\r
+    return S_OK;\r
+}\r
+\r
+HRESULT PrintUsage()\r
+{\r
+    printf("record-memory-win --exe EXE_PATH\n");\r
+    printf("    Launch an executable and print the memory usage (in Private Bytes)\n");\r
+    printf("    of the process.\n\n");\r
+    printf("Usage:\n");\r
+    printf("-h [--help]         : Print usage\n");\r
+    printf("--exe arg           : Launch specified image.  Required\n");\r
+    printf("-i [--interval] arg : Print memory usage every arg seconds.  Default: 5 seconds\n");\r
+    printf("-d [--duration] arg : Run for up to arg seconds.  Default: no limit\n\n");\r
+    printf("Examples:\n");\r
+    printf("    record-memory-win --exe \"C:\\Program Files\\Safari\\Safari.exe /newprocess\"\n");\r
+    printf("    record-memory-win --exe \"Safari.exe /newprocess\" -i 10 -d 7200\n");\r
+    printf("    NOTE: Close all other browser intances to ensure launching in a new process\n");\r
+    printf("          Or, pass the /newprocess (or equivalent) argument to the browser\n");\r
+    return E_FAIL;\r
+}\r
+\r
+unsigned int getMemoryInfo(DWORD processID)\r
+{\r
+    unsigned int memInfo = 0;\r
+    HANDLE hProcess;\r
+    PROCESS_MEMORY_COUNTERS_EX pmc;\r
+\r
+    hProcess = OpenProcess(  PROCESS_QUERY_INFORMATION |\r
+                                    PROCESS_VM_READ,\r
+                                    FALSE, processID );\r
+    if (NULL == hProcess)\r
+        return 0;\r
+\r
+    if (GetProcessMemoryInfo( hProcess, (PPROCESS_MEMORY_COUNTERS)&pmc, sizeof(pmc))) {\r
+        memInfo = (pmc.PrivateUsage);\r
+    }\r
+\r
+    CloseHandle( hProcess );\r
+    return memInfo;\r
+}\r
+\r
+void printProcessInfo(DWORD processID)\r
+{\r
+    TCHAR szProcessName[MAX_PATH] = TEXT("<unknown>");\r
+   \r
+    // Get a handle to the process.\r
+    HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |\r
+                                   PROCESS_VM_READ,\r
+                                   FALSE, processID );\r
+\r
+    // Get the process name.\r
+    if (NULL != hProcess) {\r
+        HMODULE hMod;       // An array that receives the list of module handles.\r
+        DWORD cbNeeded;     //The number of bytes required to store all module handles in the Module array\r
+\r
+        if (EnumProcessModules(hProcess, &hMod, sizeof(hMod), &cbNeeded)) {\r
+            GetModuleBaseName(hProcess, hMod, szProcessName, \r
+                               sizeof(szProcessName)/sizeof(TCHAR));\r
+        }\r
+    }\r
+\r
+    // Print the process name and identifier of matching strings, ignoring case\r
+    _tprintf(TEXT("%s  (PID: %u)\n"), szProcessName, processID);\r
+    \r
+    // Release the handle to the process.\r
+    CloseHandle( hProcess );\r
+}\r
+\r
+int evalProcesses(HANDLE hProcess)\r
+{\r
+    if (NULL == hProcess)\r
+        return 0;\r
+\r
+    unsigned int totalMemUsage = 0;\r
+    DWORD processID = GetProcessId(hProcess);\r
+  \r
+    HANDLE hProcessSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
+\r
+    PROCESSENTRY32 processEntry = { 0 };\r
+    processEntry.dwSize = sizeof(PROCESSENTRY32);\r
+\r
+    // Retrieves information about the first process encountered in a system snapshot\r
+    if(Process32First(hProcessSnapshot, &processEntry)) {\r
+        do {\r
+            // if th32processID = processID, we are the parent process!  \r
+            // if th32ParentProcessID = processID, we are a child process!\r
+            if ((processEntry.th32ProcessID == processID) || (processEntry.th32ParentProcessID == processID)) {\r
+                unsigned int procMemUsage = 0;\r
+                // Record parent process memory\r
+                procMemUsage = getMemoryInfo(processEntry.th32ProcessID);\r
+                totalMemUsage += procMemUsage;\r
+            }\r
+          // Retrieves information about the next process recorded in a system snapshot.   \r
+        } while(Process32Next(hProcessSnapshot, &processEntry));\r
+    }\r
+\r
+    CloseHandle(hProcessSnapshot);\r
+    return totalMemUsage;\r
+}\r
+\r
+\r
+void UseImage(void (functionForQueryType(HANDLE)))\r
+{\r
+    STARTUPINFO si = {0};\r
+    si.cb = sizeof(STARTUPINFO);\r
+    PROCESS_INFORMATION pi = {0};\r
+\r
+    // Start the child process. \r
+    if(!CreateProcess( NULL,   // No module name (use command line)\r
+        gCommandLine,        // Command line\r
+        NULL,           // Process handle not inheritable\r
+        NULL,           // Thread handle not inheritable\r
+        FALSE,          // Set handle inheritance to FALSE\r
+        0,              // No creation flags\r
+        NULL,           // Use parent's environment block\r
+        NULL,           // Use parent's starting directory \r
+        &si,            // Pointer to STARTUPINFO structure\r
+        &pi ))          // Pointer to PROCESS_INFORMATION structure\r
+        printf("CreateProcess failed (%d)\n", GetLastError());\r
+    else {\r
+        printf("Created process with id: %d\n", pi.dwProcessId);\r
+        functionForQueryType(pi.hProcess);\r
+        // Close process and thread handles. \r
+        CloseHandle( pi.hProcess );\r
+        CloseHandle( pi.hThread );\r
+    }\r
+}\r
+\r
+void QueryContinuously(HANDLE hProcess)\r
+{\r
+    Sleep(2000); // give the process some time to launch\r
+    bool pastDuration = false;\r
+    time_t startTime = time(NULL);\r
+    unsigned int memUsage = evalProcesses(hProcess);\r
+    while(memUsage && !pastDuration) {\r
+        printf( "%u\n", memUsage );\r
+        Sleep(gQueryInterval*1000);\r
+        memUsage = evalProcesses(hProcess);\r
+        pastDuration = gDuration > 0 ? ElapsedTime(startTime) > gDuration : false;\r
+    } \r
+}\r
+\r
+// returns elapsed time in seconds\r
+time_t ElapsedTime(time_t startTime)\r
+{\r
+    time_t currentTime = time(NULL);\r
+    return currentTime - startTime;\r
+}\r
diff --git a/Tools/win/record-memory/record-memory.vcxproj b/Tools/win/record-memory/record-memory.vcxproj
new file mode 100644 (file)
index 0000000..a9fe558
--- /dev/null
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>recordmemory</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="record-memoryDebug.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="record-memoryRelease.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <Link />\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <Link />\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="main.cpp" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Tools/win/record-memory/record-memory.vcxproj.filters b/Tools/win/record-memory/record-memory.vcxproj.filters
new file mode 100644 (file)
index 0000000..1d7e58f
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClCompile Include="main.cpp" />\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Tools/win/record-memory/record-memoryCommon.props b/Tools/win/record-memory/record-memoryCommon.props
new file mode 100644 (file)
index 0000000..91d1ad1
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup />\r
+  <ItemDefinitionGroup>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+    </Link>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file
diff --git a/Tools/win/record-memory/record-memoryDebug.props b/Tools/win/record-memory/record-memoryDebug.props
new file mode 100644 (file)
index 0000000..5061a80
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="record-memoryCommon.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup />\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file
diff --git a/Tools/win/record-memory/record-memoryRelease.props b/Tools/win/record-memory/record-memoryRelease.props
new file mode 100644 (file)
index 0000000..40703d8
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="record-memoryCommon.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup />\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file