Fix WS_SYSMENU+WS_EX_DLGMODALFRAME bug.

Fixes Messagebox broblem and some others.

svn path=/trunk/; revision=24071

diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c
index 35ca363..09e371d 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/painting.c
+++ b/reactos/subsystems/win32/win32k/ntuser/painting.c
@@ -1531,7 +1531,8 @@ BOOL UserDrawCaption(
    VCenter = (lpRc->bottom - lpRc->top) / 2;
    Padding = VCenter - (Height / 2);
    HasIcon = (uFlags & DC_ICON) && (pWnd->Style & WS_SYSMENU) 
-      && !(uFlags & DC_SMALLCAP);
+      && !(uFlags & DC_SMALLCAP) && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME) 
+      && !(pWnd->ExStyle & WS_EX_TOOLWINDOW);
    IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding;
 
    r.left = Padding;