Changeset 158302 in webkit

Timestamp:

Oct 30, 2013, 12:10:47 PM (12 years ago)

Author:

Patrick Gansterer

Message:

[WIN] Add executable entry points to DRT and WinLauncher
​https://bugs.webkit.org/show_bug.cgi?id=121837

Reviewed by Brent Fulgham.

This allows to compile and run the executables without DLLLauncher.

• DumpRenderTree/win/DumpRenderTree.cpp:

(main):
(dllLauncherEntryPoint):

• WinLauncher/WinLauncher.cpp:

(wWinMain):
(dllLauncherEntryPoint):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/DumpRenderTree.cpp (modified) (2 diffs)
• WinLauncher/WinLauncher.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-10-30  Patrick Gansterer  <paroga@webkit.org>
+
+        [WIN] Add executable entry points to DRT and WinLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=121837
+
+        Reviewed by Brent Fulgham.
+
+        This allows to compile and run the executables without DLLLauncher.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (main):
+        (dllLauncherEntryPoint):
+        * WinLauncher/WinLauncher.cpp:
+        (wWinMain):
+        (dllLauncherEntryPoint):
+
 2013-10-30  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -1307 +1307 @@
 }
 
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+int main(int argc, const char* argv[])
 {
     // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
@@ -1470 +1470 @@
     return 0;
 }
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+{
+    return main(argc, argv);
+}

trunk/Tools/WinLauncher/WinLauncher.cpp

@@ -451 +451 @@
 }
 
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE, HINSTANCE, LPTSTR, int nCmdShow)
+int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
 {
 #ifdef _CRTDBG_MAP_ALLOC
@@ -1006 +1006 @@
     SetFocus(gViewWindow);
 }
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
+{
+    return wWinMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
+}