browser(webkit): print missing dll error to the console (#3214)

microsoft · Jul 29, 2020 · c6180ed · c6180ed
1 parent 10225d1
commit c6180ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER
@@ -1,2 +1,2 @@
-1319
-Changed: [email protected] Fri Jul 24 23:00:52 GMTST 2020
+1320
+Changed: [email protected] Wed Jul 29 21:43:37 GMTST 2020
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
@@ -15721,6 +15721,24 @@ index f83bf7dd57dc481fe365dfe03bf7bd2b6a745fd6..aa646dcf816838da9482405dee380ce4
 +
 +
  } // namespace WTR
+diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
+index 39238ac08dbcab92fb1d053928938a96f154c9b1..64bc9f1458254322dca9005b5e2d2b19bb901386 100644
+--- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp
++++ b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
+@@ -96,11 +96,9 @@ 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
++// Playwright begin
+     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
++// Playwright end
+     return 1;
+ }
+
 diff --git a/Tools/wpe/backends/HeadlessViewBackend.cpp b/Tools/wpe/backends/HeadlessViewBackend.cpp
 index c09b6f39f894943f11b7a453428fab7d6f6e68fb..bc21acb648562ee0380811599b08f7d26c3e706a 100644
 --- a/Tools/wpe/backends/HeadlessViewBackend.cpp
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		1319
		Changed: [email protected] Fri Jul 24 23:00:52 GMTST 2020
		1320
		Changed: [email protected] Wed Jul 29 21:43:37 GMTST 2020