Merge back commit from winehq

svn path=/trunk/; revision=13187

diff --git a/reactos/lib/comctl32/status.c b/reactos/lib/comctl32/status.c
index 0685646..4ee0b9c 100644 (file)
--- a/reactos/lib/comctl32/status.c
+++ b/reactos/lib/comctl32/status.c
@@ -650,7 +650,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
 {\r
     STATUSWINDOWPART *part=NULL;\r
     BOOL changed = FALSE;\r
-    WORD oldStyle;\r
+    INT oldStyle;\r
 \r
     if (style & SBT_OWNERDRAW) {\r
          TRACE("part %d, text %p\n",nPart,text);\r
@@ -675,9 +675,12 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
     oldStyle = part->style;\r
     part->style = style;\r
     if (style & SBT_OWNERDRAW) {\r
-       if (part->text == text)\r
-           return TRUE;\r
-       part->text = (LPWSTR)text;\r
+        if (!(oldStyle & SBT_OWNERDRAW)) {\r
+            if (part->text)\r
+                Free (part->text);\r
+        } else if (part->text == text)\r
+            return TRUE;\r
+        part->text = (LPWSTR)text;\r
     } else {\r
        LPWSTR ntext;\r
 \r