Diff
Modified: trunk/Source/WebKit/win/ChangeLog (104156 => 104157)
--- trunk/Source/WebKit/win/ChangeLog 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Source/WebKit/win/ChangeLog 2012-01-05 14:59:24 UTC (rev 104157)
@@ -1,5 +1,17 @@
2012-01-04 Adam Roben <[email protected]>
+ Add ImageDiffLauncher to WebKit.sln
+
+ It builds just after ImageDiff.
+
+ Part of <http://webkit.org/b/75572> ImageDiff.exe can't be run without first munging PATH
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit.vcproj/WebKit.sln:
+
+2012-01-04 Adam Roben <[email protected]>
+
Add MiniBrowserLauncher to WebKit.sln
It builds just after MiniBrowser.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (104156 => 104157)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-01-05 14:59:24 UTC (rev 104157)
@@ -150,7 +150,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreTestSupport", "..\..\..\WebCore\WebCore.vcproj\WebCoreTestSupport.vcproj", "{83414B15-1C0D-490B-990E-03F4D49170E4}"
ProjectSection(ProjectDependencies) = postProject
- {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\..\_javascript_Core\_javascript_Core.vcproj\testRegExp\testRegExp.vcproj", "{14C94979-1ED3-4E1D-9B55-A80FCF4677D0}"
@@ -168,6 +168,11 @@
{1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\..\..\..\Tools\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"
+ ProjectSection(ProjectDependencies) = postProject
+ {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_All|Win32 = Debug_All|Win32
@@ -560,6 +565,18 @@
{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release|Win32.ActiveCfg = Release|Win32
{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release|Win32.Build.0 = Release|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|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 = Production|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -597,5 +614,6 @@
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{767B10FB-76C1-44D0-8005-85ED7F9AA5E4} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
+ {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
EndGlobalSection
EndGlobal
Modified: trunk/Tools/ChangeLog (104156 => 104157)
--- trunk/Tools/ChangeLog 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Tools/ChangeLog 2012-01-05 14:59:24 UTC (rev 104157)
@@ -1,5 +1,42 @@
2012-01-04 Adam Roben <[email protected]>
+ Turn ImageDiff into a stub .exe launcher and a .dll that contains all the real code
+
+ This allows us to add the Apple Application Support directory to PATH before trying to load
+ WebKit so that CoreGraphics.dll and friends can be found.
+
+ Fixes <http://webkit.org/b/75572> ImageDiff.exe can't be run without first munging PATH
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/win/ImageDiff.vcproj:
+ * DumpRenderTree/win/ImageDiffCommon.vsprops:
+ Changed to build ImageDiff.dll instead of ImageDiff.exe.
+
+ * DumpRenderTree/win/ImageDiffLauncher.vcproj: Copied from
+ Tools/DumpRenderTree/win/ImageDiff.vcproj but changed to build the stub launcher.
+
+ * DumpRenderTree/win/ImageDiffLauncherCommon.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherDebug.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherDebugAll.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherDebugCairoCFLite.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherProduction.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherRelease.vsprops: Added.
+ * DumpRenderTree/win/ImageDiffLauncherReleaseCairoCFLite.vsprops: Added.
+
+ * DumpRenderTree/win/ImageDiffWin.cpp: Added.
+ (dllLauncherEntryPoint): This function is called by the stub launcher and just calls through
+ to main.
+
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (main):
+ (wWinMain):
+ Added support for launching console programs. When USE_CONSOLE_ENTRY_POINT is defined, the
+ stub launcher acts as a console program and calls a console version of
+ dllLauncherEntryPoint.
+
+2012-01-04 Adam Roben <[email protected]>
+
Turn MiniBrowser into a stub .exe launcher and a .dll that contains all the real code
This allows us to add the Apple Application Support directory to PATH before trying to load
Modified: trunk/Tools/DumpRenderTree/win/ImageDiff.vcproj (104156 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiff.vcproj 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Tools/DumpRenderTree/win/ImageDiff.vcproj 2012-01-05 14:59:24 UTC (rev 104157)
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffDebug.vsprops"
CharacterSet="2"
>
@@ -77,7 +77,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffRelease.vsprops"
CharacterSet="2"
>
@@ -138,7 +138,7 @@
</Configuration>
<Configuration
Name="Debug_All|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffDebugAll.vsprops"
CharacterSet="2"
>
@@ -200,7 +200,7 @@
<Configuration
Name="Debug_Cairo_CFLite|Win32"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffDebugCairoCFLite.vsprops"
CharacterSet="2"
>
@@ -261,7 +261,7 @@
</Configuration>
<Configuration
Name="Production|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffProduction.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -323,7 +323,7 @@
</Configuration>
<Configuration
Name="Release_Cairo_CFLite|Win32"
- ConfigurationType="1"
+ ConfigurationType="2"
InheritedPropertySheets=".\ImageDiffReleaseCairoCFLite.vsprops"
CharacterSet="2"
>
@@ -442,6 +442,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\ImageDiffWin.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops (104156 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffCommon.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -13,6 +13,7 @@
Name="VCLinkerTool"
AdditionalOptions="/NXCOMPAT"
AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
+ OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
SubSystem="1"
/>
</VisualStudioPropertySheet>
Copied: trunk/Tools/DumpRenderTree/win/ImageDiffLauncher.vcproj (from rev 104155, trunk/Tools/DumpRenderTree/win/ImageDiff.vcproj) (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncher.vcproj (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncher.vcproj 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncher"
+ ProjectGUID="{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"
+ RootNamespace="ImageDiffLauncher"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherDebug.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherRelease.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Cairo_CFLite|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherDebugCairoCFLite.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_All|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherDebugAll.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Production|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherProduction.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Cairo_CFLite|Win32"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\ImageDiffLauncherReleaseCairoCFLite.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\win\DLLLauncher\DLLLauncherMain.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherCommon.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherCommon.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherCommon.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherCommon"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="USE_CONSOLE_ENTRY_POINT"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="shlwapi.lib"
+ OutputFile="$(OutDir)\ImageDiff$(WebKitConfigSuffix).exe"
+ ProgramDatabaseFile="$(TargetDir)$(TargetName)Launcher.pdb"
+ SubSystem="1"
+ />
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebug.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebug.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebug.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherDebug"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\ImageDiffLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugAll.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugAll.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugAll.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherDebugAll"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\ImageDiffLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugCairoCFLite.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugCairoCFLite.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherDebugCairoCFLite.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffDebugCairoCFLite"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherProduction.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherProduction.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherProduction.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherProduction"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\ImageDiffLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherRelease.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherRelease.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherRelease.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherRelease"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\ImageDiffLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffLauncherReleaseCairoCFLite.vsprops (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffLauncherReleaseCairoCFLite.vsprops (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffLauncherReleaseCairoCFLite.vsprops 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ImageDiffLauncherReleaseCairoCFLite"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\ImageDiffLauncherCommon.vsprops"
+ >
+</VisualStudioPropertySheet>
Added: trunk/Tools/DumpRenderTree/win/ImageDiffWin.cpp (0 => 104157)
--- trunk/Tools/DumpRenderTree/win/ImageDiffWin.cpp (rev 0)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffWin.cpp 2012-01-05 14:59:24 UTC (rev 104157)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <windows.h>
+
+int main(int argc, const char* argv[]);
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+{
+ return main(argc, argv);
+}
Property changes on: trunk/Tools/DumpRenderTree/win/ImageDiffWin.cpp
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (104156 => 104157)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2012-01-05 14:58:36 UTC (rev 104156)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2012-01-05 14:59:24 UTC (rev 104157)
@@ -27,6 +27,8 @@
// will set PATH so that Apple Application Support DLLs can be found, then will load foo.dll and
// call its dllLauncherEntryPoint function, which should be declared like so:
// extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstCmdLine, int nCmdShow);
+// If USE_CONSOLE_ENTRY_POINT is defined, this function will be called instead:
+// extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[]);
#include <shlwapi.h>
#include <string>
@@ -121,7 +123,11 @@
return 1;
}
+#if USE_CONSOLE_ENTRY_POINT
+int main(int argc, const char* argv[])
+#else
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
+#endif
{
enableTerminationOnHeapCorruption();
@@ -150,10 +156,21 @@
if (!module)
return fatalError(programName, L"::LoadLibraryW failed.");
+#if USE_CONSOLE_ENTRY_POINT
+ typedef int (WINAPI*EntryPoint)(int, const char*[]);
+ const char* entryPointName = "_dllLauncherEntryPoint@8";
+#else
typedef int (WINAPI*EntryPoint)(HINSTANCE, HINSTANCE, LPWSTR, int);
- EntryPoint entryPoint = reinterpret_cast<EntryPoint>(::GetProcAddress(module, "_dllLauncherEntryPoint@16"));
+ const char* entryPointName = "_dllLauncherEntryPoint@16";
+#endif
+
+ EntryPoint entryPoint = reinterpret_cast<EntryPoint>(::GetProcAddress(module, entryPointName));
if (!entryPoint)
return fatalError(programName, L"Failed to find dllLauncherEntryPoint function.");
+#if USE_CONSOLE_ENTRY_POINT
+ return entryPoint(argc, argv);
+#else
return entryPoint(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
+#endif
}
