[PATCH 2/2] winedbg: Suppress all message boxes if ShowCrashDialog is disabled.

Zebediah Figura zfigura at codeweavers.com
Tue Jun 19 14:04:53 CDT 2018


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
The only message box shown by this function is the aforementioned
'failed to attach to process' error, but in general the user probably
doesn't want any windows to be shown if ShowCrashDialog is disabled.

 programs/winedbg/crashdlg.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c
index 4e02a4b..5eb3d27 100644
--- a/programs/winedbg/crashdlg.c
+++ b/programs/winedbg/crashdlg.c
@@ -34,13 +34,18 @@
 
 static char *crash_log;
 
-int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UINT uType)
+int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type)
 {
-    WCHAR caption[256];
-    WCHAR text[256];
-    LoadStringW(GetModuleHandleW(NULL), captionId, caption, sizeof(caption)/sizeof(caption[0]));
-    LoadStringW(GetModuleHandleW(NULL), textId, text, sizeof(text)/sizeof(text[0]));
-    return MessageBoxW(hwnd, text, caption, uType);
+    if (DBG_IVAR(ShowCrashDialog))
+    {
+        WCHAR caption[256];
+        WCHAR text[256];
+        LoadStringW(GetModuleHandleW(NULL), captionid, caption, ARRAY_SIZE(caption));
+        LoadStringW(GetModuleHandleW(NULL), textid, text, ARRAY_SIZE(text));
+        return MessageBoxW(hwnd, text, caption, type);
+    }
+
+    return IDCANCEL;
 }
 
 static WCHAR *get_program_name(HANDLE hProcess)
-- 
2.7.4




More information about the wine-devel mailing list