commit 2482ef33394441364b8ab4c80408b8632400346e
author Gerard Patel <gerard.patel@asi.fr> Mon Mar 19 19:16:21 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 19 19:16:21 2001 +0000
tree 3531c94ba91e401cfbaf0e506d47f4b0e3efb4e9
parent 1859dde8e977b44eda0c8c51a946c6a1601586d7

Fix system menu crash by ensuring that item->text is not null when
MF_TEXT set.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 2bb0c5d..c094f2a 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -865,8 +865,8 @@
     }
     
 
-    /* If we get here, then it must be a text item */
-    if (IS_STRING_ITEM( lpitem->fType ))
+    /* it must be a text item - unless it's the system menu */
+    if (!(lpitem->fType & MF_SYSMENU) && IS_STRING_ITEM( lpitem->fType ))
     {   SIZE size;
 
 	GetTextExtentPoint32W(hdc, lpitem->text,  strlenW(lpitem->text), &size);
@@ -1852,6 +1852,7 @@
     LPWSTR prevText = IS_STRING_ITEM(item->fType) ? item->text : NULL;
 
     debug_print_menuitem("MENU_SetItemData from: ", item, "");
+    TRACE("flags=%x str=%p\n", flags, str);
 
     if (IS_STRING_ITEM(flags))
     {
@@ -4511,6 +4512,8 @@
 {
     if (!menu) return FALSE;
 
+    debug_print_menuitem("MENU_SetItemInfo_common from: ", menu, "");
+
     if (lpmii->fMask & MIIM_TYPE ) {
 	/* Get rid of old string.  */
 	if ( IS_STRING_ITEM(menu->fType) && menu->text) {
@@ -4524,11 +4527,15 @@
 
 	menu->text = lpmii->dwTypeData;
 
-	if (IS_STRING_ITEM(menu->fType) && menu->text) {
-	    if (unicode)
-		menu->text = HEAP_strdupW(GetProcessHeap(), 0,  lpmii->dwTypeData);
-	    else
-		menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR)lpmii->dwTypeData);
+       if (IS_STRING_ITEM(menu->fType)) {
+            if (menu->text) {
+                if (unicode)
+                   menu->text = HEAP_strdupW(GetProcessHeap(), 0,  lpmii->dwTypeData);
+                else
+                   menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR)lpmii->dwTypeData);
+                }
+            else
+                menu->fType |= MF_SEPARATOR;
 	}
     }
 
@@ -4540,16 +4547,22 @@
 	}
 	menu->fType &= ~MENU_ITEM_TYPE(menu->fType);
 	menu->fType |= MENU_ITEM_TYPE(lpmii->fType);
+        if ( IS_STRING_ITEM(menu->fType) && !menu->text )
+            menu->fType |= MF_SEPARATOR;
     }
 
     if (lpmii->fMask & MIIM_STRING ) {
 	/* free the string when used */
 	if ( IS_STRING_ITEM(menu->fType) && menu->text) {
 	    HeapFree(GetProcessHeap(), 0, menu->text);
-	    if (unicode)
-		menu->text = HEAP_strdupW(GetProcessHeap(), 0,  lpmii->dwTypeData);
-	    else
-		menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR) lpmii->dwTypeData);
+            if (lpmii->dwTypeData) {
+	        if (unicode)
+		    menu->text = HEAP_strdupW(GetProcessHeap(), 0,  lpmii->dwTypeData);
+	        else
+		    menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR) lpmii->dwTypeData);
+            }
+            else
+                menu->fType |= MF_SEPARATOR;
 	}
     }
 
@@ -4589,7 +4602,7 @@
     if (lpmii->fMask & MIIM_DATA)
 	menu->dwItemData = lpmii->dwItemData;
 
-    debug_print_menuitem("SetMenuItemInfo_common: ", menu, "");
+    debug_print_menuitem("SetMenuItemInfo_common to : ", menu, "");
     return TRUE;
 }