[webkit-changes] [104155] trunk

aroben Thu, 05 Jan 2012 06:58:07 -0800

Title: [104155] trunk

Revision: 104155
Author: [email protected]
Date: 2012-01-05 06:57:46 -0800 (Thu, 05 Jan 2012)

Log Message

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
WebKit so that CoreGraphics.dll and friends can be found.

Fixes <http://webkit.org/b/68576> <rdar://problem/10163853> MiniBrowser fails to launch when
double-clicked

Reviewed by Anders Carlsson.

Tools:

* MiniBrowser/MiniBrowser.vcproj:
* MiniBrowser/Configurations/MiniBrowserCommon.vsprops:
Changed to build MiniBrowser.dll instead of MiniBrowser.exe.

* MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops: Added.
* MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops: Added.

* MiniBrowser/MiniBrowserLauncher.vcproj: Copied from Tools/MiniBrowser/MiniBrowser.vcproj
but changed to build the stub launcher.

* MiniBrowser/win/main.cpp: Moved the /manifestdependency code to DLLLauncherMain.cpp, since
it needs to be compiled into the .exe instead of the .dll.
(DllMain): Added. We use this to store the DLL's HINSTANCE.
(dllLauncherEntryPoint): Renamed from _tWinMain. This is what gets called by the
DLLLauncherMain code.

* win/DLLLauncher/DLLLauncherMain.cpp: Moved the /manifestdependency code from MiniBrowser
to here.

Source/WebKit/win:

Add MiniBrowserLauncher to WebKit.sln

It builds just after MiniBrowser.

* WebKit.vcproj/WebKit.sln: Added MiniBrowserLauncher.

Modified Paths

trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops
trunk/Tools/MiniBrowser/MiniBrowser.vcproj
trunk/Tools/MiniBrowser/win/main.cpp
trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp

Added Paths

trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops
trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops
trunk/Tools/MiniBrowser/MiniBrowserLauncher.vcproj

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (104154 => 104155)


--- trunk/Source/WebKit/win/ChangeLog	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Source/WebKit/win/ChangeLog	2012-01-05 14:57:46 UTC (rev 104155)
@@ -1,5 +1,18 @@
 2012-01-04  Adam Roben  <[email protected]>
 
+        Add MiniBrowserLauncher to WebKit.sln
+
+        It builds just after MiniBrowser.
+
+        Part of <http://webkit.org/b/68576> <rdar://problem/10163853> MiniBrowser fails to launch
+        when double-clicked
+
+        Reviewed by Anders Carlsson.
+
+        * WebKit.vcproj/WebKit.sln: Added MiniBrowserLauncher.
+
+2012-01-04  Adam Roben  <[email protected]>
+
         Add WinLauncherLauncher to WebKit.sln
 
         It builds just after WinLauncher.

Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (104154 => 104155)


--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln	2012-01-05 14:57:46 UTC (rev 104155)
@@ -163,6 +163,11 @@
 		{114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowserLauncher", "..\..\..\..\Tools\MiniBrowser\MiniBrowserLauncher.vcproj", "{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_All|Win32 = Debug_All|Win32
@@ -543,6 +548,18 @@
 		{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
 		{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
 		{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_All|Win32.Build.0 = Debug_All|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug|Win32.Build.0 = Debug|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Production|Win32.ActiveCfg = Production|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Production|Win32.Build.0 = Production|Win32
+		{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -579,5 +596,6 @@
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
 		{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}
 	EndGlobalSection
 EndGlobal

Modified: trunk/Tools/ChangeLog (104154 => 104155)


--- trunk/Tools/ChangeLog	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Tools/ChangeLog	2012-01-05 14:57:46 UTC (rev 104155)
@@ -1,5 +1,41 @@
 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
+        WebKit so that CoreGraphics.dll and friends can be found.
+
+        Fixes <http://webkit.org/b/68576> <rdar://problem/10163853> MiniBrowser fails to launch when
+        double-clicked
+
+        Reviewed by Anders Carlsson.
+
+        * MiniBrowser/MiniBrowser.vcproj:
+        * MiniBrowser/Configurations/MiniBrowserCommon.vsprops:
+        Changed to build MiniBrowser.dll instead of MiniBrowser.exe.
+
+        * MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops: Added.
+        * MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops: Added.
+
+        * MiniBrowser/MiniBrowserLauncher.vcproj: Copied from Tools/MiniBrowser/MiniBrowser.vcproj
+        but changed to build the stub launcher.
+
+        * MiniBrowser/win/main.cpp: Moved the /manifestdependency code to DLLLauncherMain.cpp, since
+        it needs to be compiled into the .exe instead of the .dll.
+        (DllMain): Added. We use this to store the DLL's HINSTANCE.
+        (dllLauncherEntryPoint): Renamed from _tWinMain. This is what gets called by the
+        DLLLauncherMain code.
+
+        * win/DLLLauncher/DLLLauncherMain.cpp: Moved the /manifestdependency code from MiniBrowser
+        to here.
+
+2012-01-04  Adam Roben  <[email protected]>
+
         Make WinLauncher's window frame respond to clicks/drags again
 
         Fixes <http://webkit.org/b/75562> REGRESSION (r84990): Can't drag WinLauncher by its title

Modified: trunk/Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops (104154 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -9,4 +9,8 @@
 		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;"
 		UsePrecompiledHeader="2"
 	/>
+	<Tool
+		Name="VCLinkerTool"
+		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
+	/>
 </VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherCommon"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="shlwapi.lib"
+		OutputFile="$(OutDir)\MiniBrowser$(WebKitConfigSuffix).exe"
+		ProgramDatabaseFile="$(TargetDir)$(TargetName)Launcher.pdb"
+	/>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherDebug"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\MiniBrowserLauncherCommon.vsprops"
+	>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherDebugAll"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\MiniBrowserLauncherCommon.vsprops"
+	>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserDebugCairoCFLite"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
+	>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherProduction"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\MiniBrowserLauncherCommon.vsprops"
+	>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherRelease"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\MiniBrowserLauncherCommon.vsprops"
+	>
+</VisualStudioPropertySheet>

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops (0 => 104155)


--- trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops	                        (rev 0)
+++ trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncherReleaseCairoCFLite"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\MiniBrowserLauncherCommon.vsprops"
+	>
+</VisualStudioPropertySheet>

Modified: trunk/Tools/MiniBrowser/MiniBrowser.vcproj (104154 => 104155)


--- trunk/Tools/MiniBrowser/MiniBrowser.vcproj	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Tools/MiniBrowser/MiniBrowser.vcproj	2012-01-05 14:57:46 UTC (rev 104155)
@@ -17,7 +17,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserDebug.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -79,7 +79,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserRelease.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -141,7 +141,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_All|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserDebugAll.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -203,7 +203,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserDebugCairoCFLite.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -265,7 +265,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserReleaseCairoCFLite.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -327,7 +327,7 @@
 		</Configuration>
 		<Configuration
 			Name="Production|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\Configurations\MiniBrowserProduction.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"

Copied: trunk/Tools/MiniBrowser/MiniBrowserLauncher.vcproj (from rev 104154, trunk/Tools/MiniBrowser/MiniBrowser.vcproj) (0 => 104155)


--- trunk/Tools/MiniBrowser/MiniBrowserLauncher.vcproj	                        (rev 0)
+++ trunk/Tools/MiniBrowser/MiniBrowserLauncher.vcproj	2012-01-05 14:57:46 UTC (rev 104155)
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MiniBrowserLauncher"
+	ProjectGUID="{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}"
+	RootNamespace="MiniBrowserLauncher"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Configurations\MiniBrowserLauncherDebug.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=".\Configurations\MiniBrowserLauncherRelease.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=".\Configurations\MiniBrowserLauncherDebugCairoCFLite.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=".\Configurations\MiniBrowserLauncherDebugAll.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=".\Configurations\MiniBrowserLauncherProduction.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=".\Configurations\MiniBrowserLauncherReleaseCairoCFLite.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>

Modified: trunk/Tools/MiniBrowser/win/main.cpp (104154 => 104155)


--- trunk/Tools/MiniBrowser/win/main.cpp	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Tools/MiniBrowser/win/main.cpp	2012-01-05 14:57:46 UTC (rev 104155)
@@ -29,18 +29,6 @@
 #include "MiniBrowser.h"
 #include <string>
 
-#if defined _M_IX86
-#define PROCESSORARCHITECTURE "x86"
-#elif defined _M_IA64
-#define PROCESSORARCHITECTURE "ia64"
-#elif defined _M_X64
-#define PROCESSORARCHITECTURE "amd64"
-#else
-#define PROCESSORARCHITECTURE "*"
-#endif
-
-#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
 static bool shouldTranslateMessage(const MSG& msg)
 {
     // Only these four messages are actually translated by ::TranslateMessage or ::TranslateAccelerator.
@@ -57,10 +45,16 @@
     return wcscmp(className, L"WebKit2WebViewWindowClass");
 }
 
-int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
+BOOL WINAPI DllMain(HINSTANCE dllInstance, DWORD reason, LPVOID)
 {
-    MiniBrowser::shared().initialize(hInstance);
+    if (reason == DLL_PROCESS_ATTACH)
+        MiniBrowser::shared().initialize(dllInstance);
 
+    return TRUE;
+}
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
+{
     // Create and show our initial window.
     MiniBrowser::shared().createNewWindow();

Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (104154 => 104155)


--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp	2012-01-05 14:56:15 UTC (rev 104154)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp	2012-01-05 14:57:46 UTC (rev 104155)
@@ -35,6 +35,18 @@
 
 using namespace std;
 
+#if defined _M_IX86
+#define PROCESSORARCHITECTURE "x86"
+#elif defined _M_IA64
+#define PROCESSORARCHITECTURE "ia64"
+#elif defined _M_X64
+#define PROCESSORARCHITECTURE "amd64"
+#else
+#define PROCESSORARCHITECTURE "*"
+#endif
+
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
+
 static void enableTerminationOnHeapCorruption()
 {
     // Enable termination on heap corruption on OSes that support it (Vista and XPSP3).

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [104155] trunk

Log Message

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (104154 => 104155)

Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (104154 => 104155)

Modified: trunk/Tools/ChangeLog (104154 => 104155)

Modified: trunk/Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops (104154 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops (0 => 104155)

Added: trunk/Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops (0 => 104155)

Modified: trunk/Tools/MiniBrowser/MiniBrowser.vcproj (104154 => 104155)

Copied: trunk/Tools/MiniBrowser/MiniBrowserLauncher.vcproj (from rev 104154, trunk/Tools/MiniBrowser/MiniBrowser.vcproj) (0 => 104155)

Modified: trunk/Tools/MiniBrowser/win/main.cpp (104154 => 104155)

Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (104154 => 104155)

Reply via email to