[PATCH v3] msvcrt: Pass wide char caption string to MessageBoxIndirectW.
Alex Henrie
alexhenrie24 at gmail.com
Thu Dec 22 16:06:35 CST 2016
Cc: Piotr Caban <piotr at codeweavers.com>
Cc: Nikolay Sivov <bunglehead at gmail.com>
Fixes https://bugs.winehq.org/show_bug.cgi?id=42057
I figured this would be a good time to get rid of the misleading
Hungarian notation and move the string into the single function that
uses it.
v3: Remove typecast from text variable but leave type of message_format
alone.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/msvcrt/exit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 9ba0891806..2034ddfe7c 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -41,8 +41,6 @@ typedef struct MSVCRT__onexit_table_t
MSVCRT__onexit_t *_end;
} MSVCRT__onexit_table_t;
-static const char szMsgBoxTitle[] = "Wine C++ Runtime Library";
-
extern int MSVCRT_app_type;
extern MSVCRT_wchar_t *MSVCRT__wpgmptr;
@@ -116,6 +114,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess
'%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ',
'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ',
't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0};
+ static const WCHAR title[] =
+ {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0};
MSGBOXPARAMSW msgbox;
MSVCRT_wchar_t text[2048];
@@ -126,8 +126,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess
msgbox.cbSize = sizeof(msgbox);
msgbox.hwndOwner = GetActiveWindow();
msgbox.hInstance = 0;
- msgbox.lpszText = (LPCWSTR)text;
- msgbox.lpszCaption = (LPCWSTR)szMsgBoxTitle;
+ msgbox.lpszText = text;
+ msgbox.lpszCaption = title;
msgbox.dwStyle = MB_OKCANCEL|MB_ICONERROR;
msgbox.lpszIcon = NULL;
msgbox.dwContextHelpId = 0;
--
2.11.0
More information about the wine-patches
mailing list