comctl32: fixed some incorrect memory frees in status.c

Gunnar Dalsnes hardon at online.no
Mon Dec 13 21:12:33 CST 2004


comctl32->status.c->STATUSBAR_SetTextT:
-ntext wasn't freed on return if text was unicode
-part->text was allways freed, but if the previous style was 
SBT_OWNERDRAW, part->text would contain 32bit data (not a buffer ptr.)
-------------- next part --------------
Index: status.c
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/comctl32/status.c,v
retrieving revision 1.7
diff -u -r1.7 status.c
--- status.c	5 Dec 2004 23:09:27 -0000	1.7
+++ status.c	14 Dec 2004 00:58:03 -0000
@@ -650,6 +650,7 @@
 {
     STATUSWINDOWPART *part=NULL;
     BOOL changed = FALSE;
+    WORD oldStyle;
 
     if (style & SBT_OWNERDRAW) {
          TRACE("part %d, text %p\n",nPart,text);
@@ -671,6 +672,7 @@
     if (part->style != style)
 	changed = TRUE;
 
+    oldStyle = part->style;
     part->style = style;
     if (style & SBT_OWNERDRAW) {
 	if (part->text == text)
@@ -694,7 +696,7 @@
 	/* check if text is unchanged -> no need to redraw */
 	if (text) {
 	    if (!changed && part->text && !lstrcmpW(ntext, part->text)) {
-		if (!isW) Free(ntext);
+		Free(ntext);
 		return TRUE;
 	    }
 	} else {
@@ -702,7 +704,7 @@
 		return TRUE;
 	}
 
-	if (part->text)
+	if (part->text && !(oldStyle & SBT_OWNERDRAW))
 	    Free (part->text);
 	part->text = ntext;
     }


More information about the wine-patches mailing list