MessageBoxIndirectA() should check whether the MB_USERICON bit is set

to prevent an exception.

MessageBoxIndirectA() should check whether the MB_USERICON bit is set
130197b8 · Thomas Weidenmueller · Alexandre Julliard · 3e2af5d0 · 130197b8
Commit 130197b8 authored Dec 14, 2004 by Thomas Weidenmueller Committed by Alexandre Julliard Dec 14, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

msgbox.c windows/msgbox.c +9 -3

No files found.
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -427,10 +427,16 @@ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
        RtlCreateUnicodeStringFromAsciiz(&captionW, msgbox->lpszCaption);
    else
        captionW.Buffer = (LPWSTR)msgbox->lpszCaption;
-    if (HIWORD(msgbox->lpszIcon))
-        RtlCreateUnicodeStringFromAsciiz(&iconW, msgbox->lpszIcon);
+
+    if (msgbox->dwStyle & MB_USERICON)
+    {
+        if (HIWORD(msgbox->lpszIcon))
+            RtlCreateUnicodeStringFromAsciiz(&iconW, msgbox->lpszIcon);
+        else
+            iconW.Buffer = (LPWSTR)msgbox->lpszIcon;
+    }
    else
-        iconW.Buffer = (LPWSTR)msgbox->lpszIcon;
+        iconW.Buffer = NULL;

    msgboxW.cbSize = sizeof(msgboxW);
    msgboxW.hwndOwner = msgbox->hwndOwner;