Turn MiniBrowser into a stub .exe launcher and a .dll that contains all the real...
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Jan 2012 14:57:46 +0000 (14:57 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Jan 2012 14:57:46 +0000 (14:57 +0000)
commit67845152a9d6ac74867565dc349196be115b60e0
tree6da56cb73bcac25531952b5bd9cb8b5fcb2c203e
parentb7809119ce29d569a8cf9d8ca282fd6ef64aeffc
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104155 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebKit.vcproj/WebKit.sln
Tools/ChangeLog
Tools/MiniBrowser/Configurations/MiniBrowserCommon.vsprops
Tools/MiniBrowser/Configurations/MiniBrowserLauncherCommon.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebug.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugAll.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherProduction.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherRelease.vsprops [new file with mode: 0644]
Tools/MiniBrowser/Configurations/MiniBrowserLauncherReleaseCairoCFLite.vsprops [new file with mode: 0644]
Tools/MiniBrowser/MiniBrowser.vcproj
Tools/MiniBrowser/MiniBrowserLauncher.vcproj [new file with mode: 0644]
Tools/MiniBrowser/win/main.cpp
Tools/win/DLLLauncher/DLLLauncherMain.cpp