Title: [158302] trunk/Tools
- Revision
- 158302
- Author
- par...@webkit.org
- Date
- 2013-10-30 12:10:47 -0700 (Wed, 30 Oct 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (158301 => 158302)
--- trunk/Tools/ChangeLog 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/ChangeLog 2013-10-30 19:10:47 UTC (rev 158302)
@@ -1,3 +1,19 @@
+2013-10-30 Patrick Gansterer <par...@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 <fpi...@apple.com>
run-jsc-stress-tests should handle ".." in paths and "slow!" in cmd's
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (158301 => 158302)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-10-30 19:10:47 UTC (rev 158302)
@@ -1306,7 +1306,7 @@
return EXCEPTION_CONTINUE_SEARCH;
}
-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
// testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
@@ -1469,3 +1469,8 @@
return 0;
}
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+{
+ return main(argc, argv);
+}
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (158301 => 158302)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2013-10-30 19:10:47 UTC (rev 158302)
@@ -450,7 +450,7 @@
}
}
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE, HINSTANCE, LPTSTR, int nCmdShow)
+int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
{
#ifdef _CRTDBG_MAP_ALLOC
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
@@ -1005,3 +1005,8 @@
SetFocus(gViewWindow);
}
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
+{
+ return wWinMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
