DLLLauncherMain print to console instead of opening window on fatal error

rkirsling · rkirsling · commit cd83ddee18bf · 2020-04-06T06:02:06.000Z
https://bugs.webkit.org/show_bug.cgi?id=206537 Reviewed by Fujii Hironori. Source/JavaScriptCore: * shell/DLLLauncherMain.cpp: (fatalError): Tools: * win/DLLLauncher/DLLLauncherMain.cpp: (fatalError): Canonical link: https://commits.webkit.org/222956@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2020-04-05  Gus Caplan  <me@gus.host> and Ross Kirsling  <ross.kirsling@sony.com>
+
+        DLLLauncherMain print to console instead of opening window on fatal error
+        https://bugs.webkit.org/show_bug.cgi?id=206537
+
+        Reviewed by Fujii Hironori.
+
+        * shell/DLLLauncherMain.cpp:
+        (fatalError):
+
 2020-04-05  Ross Kirsling  <ross.kirsling@sony.com>
 
         JSC shell shouldn't treat NUL as a terminator when printing a JS string
diff --git a/Source/JavaScriptCore/shell/DLLLauncherMain.cpp b/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
@@ -94,7 +94,11 @@ static bool prependPath(const std::wstring& directoryToPrepend)
 static int fatalError(const std::wstring& programName, const std::wstring& message)
 {
     std::wstring caption = programName + L" can't open.";
+#if USE_CONSOLE_ENTRY_POINT
+    fwprintf(stderr, L"%s\n%s\n", caption.c_str(), message.c_str());
+#else
     ::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);
+#endif
     return 1;
 }
 
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2020-04-05  Gus Caplan  <me@gus.host> and Ross Kirsling  <ross.kirsling@sony.com>
+
+        DLLLauncherMain print to console instead of opening window on fatal error
+        https://bugs.webkit.org/show_bug.cgi?id=206537
+
+        Reviewed by Fujii Hironori.
+
+        * win/DLLLauncher/DLLLauncherMain.cpp:
+        (fatalError):
+
 2020-04-05  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
@@ -96,7 +96,11 @@ static bool prependPath(const wstring& directoryToPrepend)
 static int fatalError(const wstring& programName, const wstring& message)
 {
     wstring caption = programName + L" can't open.";
+#if USE_CONSOLE_ENTRY_POINT
+    fwprintf(stderr, L"%s\n%s\n", caption.c_str(), message.c_str());
+#else
     ::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);
+#endif
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,11 @@ static bool prependPath(const std::wstring& directoryToPrepend)`
`94`	`94`	`static int fatalError(const std::wstring& programName, const std::wstring& message)`
`95`	`95`	`{`
`96`	`96`	`std::wstring caption = programName + L" can't open.";`
	`97`	`+#if USE_CONSOLE_ENTRY_POINT`
	`98`	`+ fwprintf(stderr, L"%s\n%s\n", caption.c_str(), message.c_str());`
	`99`	`+#else`
`97`	`100`	`::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);`
	`101`	`+#endif`
`98`	`102`	`return 1;`
`99`	`103`	`}`
`100`	`104`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ static bool prependPath(const wstring& directoryToPrepend)`
`96`	`96`	`static int fatalError(const wstring& programName, const wstring& message)`
`97`	`97`	`{`
`98`	`98`	`wstring caption = programName + L" can't open.";`
	`99`	`+#if USE_CONSOLE_ENTRY_POINT`
	`100`	`+ fwprintf(stderr, L"%s\n%s\n", caption.c_str(), message.c_str());`
	`101`	`+#else`
`99`	`102`	`::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);`
	`103`	`+#endif`
`100`	`104`	`return 1;`
`101`	`105`	`}`
`102`	`106`