From 46c80c887646e5921e3c022cfd85f047a6d311c1 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 11 Nov 2002 19:52:33 +0000
Subject: [PATCH] Fix copy/paste bug. Make MessageBox without an icon look
 better.

---
 windows/msgbox.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/windows/msgbox.c b/windows/msgbox.c
index 3e84a6a6bc7..f9ee460dc99 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -70,7 +70,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
        }
        else
        {
-           if (LoadStringW(0, IDS_ERROR, buf, 256))
+           if (LoadStringW(GetModuleHandleA("user32.dll"), IDS_ERROR, buf, 256))
                SetWindowTextW(hwnd, buf);
        }
     }
@@ -158,6 +158,11 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
     /* Get the icon height */
     GetWindowRect(GetDlgItem(hwnd, MSGBOX_IDICON), &rect);
     MapWindowPoints(0, hwnd, (LPPOINT)&rect, 2);
+    if (!(lpmb->dwStyle & MB_ICONMASK))
+    {
+        rect.bottom = rect.top;
+        rect.right = rect.left;
+    }
     iheight = rect.bottom - rect.top;
     ileft = rect.left;
     iwidth = rect.right - ileft;
@@ -198,7 +203,8 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
     DrawTextW( hdc, lpszText, -1, &rect,
 	       DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT);
     /* Min text width corresponds to space for the buttons */
-    tleft = 2 * ileft + iwidth;
+    tleft = ileft;
+    if (iwidth) tleft += ileft + iwidth;
     twidth = max((bw + bspace) * buttons + bspace - tleft, rect.right);
     theight = rect.bottom;
 
@@ -407,7 +413,7 @@ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
     if (HIWORD(msgbox->lpszIcon))
         RtlCreateUnicodeStringFromAsciiz(&iconW, msgbox->lpszIcon);
     else
-        captionW.Buffer = (LPWSTR)msgbox->lpszIcon;
+        iconW.Buffer = (LPWSTR)msgbox->lpszIcon;
 
     msgboxW.cbSize = sizeof(msgboxW);
     msgboxW.hwndOwner = msgbox->hwndOwner;