From: Kamil Hornicek <kamil.hornicek@reactos.org>
Date: Tue, 28 Oct 2014 21:38:26 +0000 (+0000)
Subject: [WIN32K]
X-Git-Tag: backups/tcpip_revolution@71025~194
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b71df11be97d578a1f20a0cb5f264c0441b8ea8e;hp=6417d36a41ec2098debc6054558cc498f8d95e0d

[WIN32K]
- addendum to revision 64877 which slightly changed UserDrawCaption's logic
- fixes window title being drawn over the icon

svn path=/trunk/; revision=65087
---

diff --git a/reactos/win32ss/user/ntuser/painting.c b/reactos/win32ss/user/ntuser/painting.c
index c6335fb800b..3b1d693edc2 100644
--- a/reactos/win32ss/user/ntuser/painting.c
+++ b/reactos/win32ss/user/ntuser/painting.c
@@ -2143,9 +2143,13 @@ BOOL UserDrawCaption(
          UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL);
          UserDereferenceObject(pIcon);
       }
+      else
+      {
+          HasIcon = FALSE;
+      }
    }
 
-   if (hIcon)
+   if (HasIcon)
       Rect.left += Rect.bottom - Rect.top;
 
    if((uFlags & DC_TEXT))