Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit cd83dde

Browse filesBrowse files
committed
DLLLauncherMain print to console instead of opening window on fatal error
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
1 parent 845065d commit cd83dde
Copy full SHA for cd83dde

4 files changed

+28Lines changed: 28 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Source/JavaScriptCore/ChangeLog‎

Copy file name to clipboardExpand all lines: Source/JavaScriptCore/ChangeLog
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-04-05 Gus Caplan <me@gus.host> and Ross Kirsling <ross.kirsling@sony.com>
2+
3+
DLLLauncherMain print to console instead of opening window on fatal error
4+
https://bugs.webkit.org/show_bug.cgi?id=206537
5+
6+
Reviewed by Fujii Hironori.
7+
8+
* shell/DLLLauncherMain.cpp:
9+
(fatalError):
10+
111
2020-04-05 Ross Kirsling <ross.kirsling@sony.com>
212

313
JSC shell shouldn't treat NUL as a terminator when printing a JS string
Collapse file

‎Source/JavaScriptCore/shell/DLLLauncherMain.cpp‎

Copy file name to clipboardExpand all lines: Source/JavaScriptCore/shell/DLLLauncherMain.cpp
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ static bool prependPath(const std::wstring& directoryToPrepend)
9494
static int fatalError(const std::wstring& programName, const std::wstring& message)
9595
{
9696
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
97100
::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);
101+
#endif
98102
return 1;
99103
}
100104

Collapse file

‎Tools/ChangeLog‎

Copy file name to clipboardExpand all lines: Tools/ChangeLog
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-04-05 Gus Caplan <me@gus.host> and Ross Kirsling <ross.kirsling@sony.com>
2+
3+
DLLLauncherMain print to console instead of opening window on fatal error
4+
https://bugs.webkit.org/show_bug.cgi?id=206537
5+
6+
Reviewed by Fujii Hironori.
7+
8+
* win/DLLLauncher/DLLLauncherMain.cpp:
9+
(fatalError):
10+
111
2020-04-05 Don Olmstead <don.olmstead@sony.com>
212

313
[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
Collapse file

‎Tools/win/DLLLauncher/DLLLauncherMain.cpp‎

Copy file name to clipboardExpand all lines: Tools/win/DLLLauncher/DLLLauncherMain.cpp
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ static bool prependPath(const wstring& directoryToPrepend)
9696
static int fatalError(const wstring& programName, const wstring& message)
9797
{
9898
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
99102
::MessageBoxW(0, message.c_str(), caption.c_str(), MB_ICONERROR);
103+
#endif
100104
return 1;
101105
}
102106

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.