commit 5076dbaabc6b2c749afb059db2cbaaab332b6c90
author Dmitry Timoshkov <dmitry@codeweavers.com> Tue Apr 02 02:36:44 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Apr 02 02:36:44 2002 +0000
tree c17f1ee4e5ad16b31b2a9f7bf3105dc758bc5509
parent 417296c4af174a672b1e90c3f4419bc4aeea3fd3

Convert NULL menu items to separators.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 161fdb3..d867cdc 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -1972,10 +1972,16 @@
 	    if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) {
 		DestroyMenu(mii.hSubMenu);
                 return NULL;
-        }
+	    }
 	    mii.fMask |= MIIM_SUBMENU;
 	    mii.fType |= MF_POPUP;
         }
+	else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR))
+	{
+	    WARN("Converting NULL menu item %04x, type %04x to SEPARATOR\n",
+		mii.wID, mii.fType);
+	    mii.fType |= MF_SEPARATOR;
+	}
 	InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii);
     } while (!(resinfo & MF_END));
     return res;