Source/WebKit/win/ChangeLog

112012-01-04 Adam Roben <aroben@apple.com>
22
 3 Add MiniBrowserLauncher to WebKit.sln
 4
 5 It builds just after MiniBrowser.
 6
 7 Part of <http://webkit.org/b/68576> <rdar://problem/10163853> MiniBrowser fails to launch
 8 when double-clicked
 9
 10 Reviewed by NOBODY (OOPS!).
 11
 12 * WebKit.vcproj/WebKit.sln: Added MiniBrowserLauncher.
 13
 142012-01-04 Adam Roben <aroben@apple.com>
 15
316 Add WinLauncherLauncher to WebKit.sln
417
518 It builds just after WinLauncher.

Source/WebKit/win/WebKit.vcproj/WebKit.sln

@@Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncherLauncher", "..\.
163163 {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
164164 EndProjectSection
165165EndProject
 166Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowserLauncher", "..\..\..\..\Tools\MiniBrowser\MiniBrowserLauncher.vcproj", "{7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}"
 167 ProjectSection(ProjectDependencies) = postProject
 168 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}
 169 EndProjectSection
 170EndProject
166171Global
167172 GlobalSection(SolutionConfigurationPlatforms) = preSolution
168173 Debug_All|Win32 = Debug_All|Win32

@@Global
543548 {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
544549 {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
545550 {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
 551 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
 552 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_All|Win32.Build.0 = Debug_All|Win32
 553 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
 554 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
 555 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug|Win32.ActiveCfg = Debug|Win32
 556 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Debug|Win32.Build.0 = Debug|Win32
 557 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Production|Win32.ActiveCfg = Production|Win32
 558 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Production|Win32.Build.0 = Production|Win32
 559 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 560 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
 561 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release|Win32.ActiveCfg = Release|Win32
 562 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D}.Release|Win32.Build.0 = Release|Win32
546563 EndGlobalSection
547564 GlobalSection(SolutionProperties) = preSolution
548565 HideSolutionNode = FALSE

@@Global
579596 {B0101604-B483-4F8C-9C51-90B46A2B1CD3} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
580597 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
581598 {767B10FB-76C1-44D0-8005-85ED7F9AA5E4} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
 599 {7AF4EBFB-CCBC-448F-A36A-8210E08D6A7D} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
582600 EndGlobalSection
583601EndGlobal

Tools/ChangeLog

112012-01-04 Adam Roben <aroben@apple.com>
22
 3 Turn MiniBrowser into a stub .exe launcher and a .dll that contains all the real code
 4
 5 This allows us to add the Apple Application Support directory to PATH before trying to load
 6 WebKit so that CoreGraphics.dll and friends can be found.
 7
 8 Fixes <http://webkit.org/b/68576> <rdar://problem/10163853> MiniBrowser fails to launch when
 9 double-clicked
 10
 11 Reviewed by NOBODY (OOPS!).
 12
 13 * MiniBrowser/MiniBrowser.vcproj:
 14 * MiniBrowser/Configurations/MiniBrowserCommon.vsprops:
 15 Changed to build MiniBrowser.dll instead of MiniBrowser.exe.
 16
 17 * MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops: Added.
 18 * MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops: Added.
 19 * MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops: Added.
 20 * MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops: Added.
 21 * MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops: Added.
 22 * MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops: Added.
 23 * MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops: Added.
 24
 25 * MiniBrowser/MiniBrowserLauncher.vcproj: Copied from Tools/MiniBrowser/MiniBrowser.vcproj
 26 but changed to build the stub launcher.
 27
 28 * MiniBrowser/win/main.cpp: Moved the /manifestdependency code to DLLLauncherMain.cpp, since
 29 it needs to be compiled into the .exe instead of the .dll.
 30 (DllMain): Added. We use this to store the DLL's HINSTANCE.
 31 (dllLauncherEntryPoint): Renamed from _tWinMain. This is what gets called by the
 32 DLLLauncherMain code.
 33
 34 * win/DLLLauncher/DLLLauncherMain.cpp: Moved the /manifestdependency code from MiniBrowser
 35 to here.
 36
 372012-01-04 Adam Roben <aroben@apple.com>
 38
339 Make WinLauncher's window frame respond to clicks/drags again
440
541 Fixes <http://webkit.org/b/75562> REGRESSION (r84990): Can't drag WinLauncher by its title

Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops

99 AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;"
1010 UsePrecompiledHeader="2"
1111 />
 12 <Tool
 13 Name="VCLinkerTool"
 14 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
 15 />
1216</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherCommon"
 6 >
 7 <Tool
 8 Name="VCLinkerTool"
 9 AdditionalDependencies="shlwapi.lib"
 10 OutputFile="$(OutDir)\MiniBrowser$(WebKitConfigSuffix).exe"
 11 ProgramDatabaseFile="$(TargetDir)$(TargetName)Launcher.pdb"
 12 />
 13</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherDebug"
 6 InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\MiniBrowserLauncherCommon.vsprops"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherDebugAll"
 6 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"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserDebugCairoCFLite"
 6 InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherProduction"
 6 InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\MiniBrowserLauncherCommon.vsprops"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherRelease"
 6 InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\MiniBrowserLauncherCommon.vsprops"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops

 1<?xml version="1.0" encoding="Windows-1252"?>
 2<VisualStudioPropertySheet
 3 ProjectType="Visual C++"
 4 Version="8.00"
 5 Name="MiniBrowserLauncherReleaseCairoCFLite"
 6 InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\MiniBrowserLauncherCommon.vsprops"
 7 >
 8</VisualStudioPropertySheet>

Tools/MiniBrowser/MiniBrowser.vcproj

1717 <Configurations>
1818 <Configuration
1919 Name="Debug|Win32"
20  ConfigurationType="1"
 20 ConfigurationType="2"
2121 InheritedPropertySheets=".\Configurations\MiniBrowserDebug.vsprops"
2222 UseOfATL="1"
2323 CharacterSet="1"

7979 </Configuration>
8080 <Configuration
8181 Name="Release|Win32"
82  ConfigurationType="1"
 82 ConfigurationType="2"
8383 InheritedPropertySheets=".\Configurations\MiniBrowserRelease.vsprops"
8484 UseOfATL="1"
8585 CharacterSet="1"

141141 </Configuration>
142142 <Configuration
143143 Name="Debug_All|Win32"
144  ConfigurationType="1"
 144 ConfigurationType="2"
145145 InheritedPropertySheets=".\Configurations\MiniBrowserDebugAll.vsprops"
146146 UseOfATL="1"
147147 CharacterSet="1"

203203 </Configuration>
204204 <Configuration
205205 Name="Debug_Cairo_CFLite|Win32"
206  ConfigurationType="1"
 206 ConfigurationType="2"
207207 InheritedPropertySheets=".\Configurations\MiniBrowserDebugCairoCFLite.vsprops"
208208 UseOfATL="1"
209209 CharacterSet="1"

265265 </Configuration>
266266 <Configuration
267267 Name="Release_Cairo_CFLite|Win32"
268  ConfigurationType="1"
 268 ConfigurationType="2"
269269 InheritedPropertySheets=".\Configurations\MiniBrowserReleaseCairoCFLite.vsprops"
270270 UseOfATL="1"
271271 CharacterSet="1"

327327 </Configuration>
328328 <Configuration
329329 Name="Production|Win32"
330  ConfigurationType="1"
 330 ConfigurationType="2"
331331 InheritedPropertySheets=".\Configurations\MiniBrowserProduction.vsprops"
332332 UseOfATL="1"
333333 CharacterSet="1"

Tools/MiniBrowser/win/main.cpp

2929#include "MiniBrowser.h"
3030#include <string>
3131
32 #if defined _M_IX86
33 #define PROCESSORARCHITECTURE "x86"
34 #elif defined _M_IA64
35 #define PROCESSORARCHITECTURE "ia64"
36 #elif defined _M_X64
37 #define PROCESSORARCHITECTURE "amd64"
38 #else
39 #define PROCESSORARCHITECTURE "*"
40 #endif
41 
42 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
43 
4432static bool shouldTranslateMessage(const MSG& msg)
4533{
4634 // Only these four messages are actually translated by ::TranslateMessage or ::TranslateAccelerator.

@@static bool shouldTranslateMessage(const MSG& msg)
5745 return wcscmp(className, L"WebKit2WebViewWindowClass");
5846}
5947
60 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
 48BOOL WINAPI DllMain(HINSTANCE dllInstance, DWORD reason, LPVOID)
6149{
62  MiniBrowser::shared().initialize(hInstance);
 50 if (reason == DLL_PROCESS_ATTACH)
 51 MiniBrowser::shared().initialize(dllInstance);
6352
 53 return TRUE;
 54}
 55
 56extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
 57{
6458 // Create and show our initial window.
6559 MiniBrowser::shared().createNewWindow();
6660

Tools/win/DLLLauncher/DLLLauncherMain.cpp

3535
3636using namespace std;
3737
 38#if defined _M_IX86
 39#define PROCESSORARCHITECTURE "x86"
 40#elif defined _M_IA64
 41#define PROCESSORARCHITECTURE "ia64"
 42#elif defined _M_X64
 43#define PROCESSORARCHITECTURE "amd64"
 44#else
 45#define PROCESSORARCHITECTURE "*"
 46#endif
 47
 48#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
 49
3850static void enableTerminationOnHeapCorruption()
3951{
4052 // Enable termination on heap corruption on OSes that support it (Vista and XPSP3).