Changeset 2106 for trunk/src

Timestamp:

Dec 18, 1999, 3:31:15 PM (26 years ago)

Author:

sandervl

Message:

SetMenuItemInfoA bugfix

File:

• trunk/src/user32/winmenu.cpp (modified) (5 diffs)

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.18 1999-12-16 00:11:49 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.19 1999-12-18 14:31:15 sandervl Exp $ */
 
 /*
@@ -725 +725 @@
 {
     if(IS_STRING_ITEM(flags) && HIWORD(str)) {
-         dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
+         dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
     }
     else dprintf(("USER32: InsertMenuA %x %d %x %d %x", hMenu, pos, flags, id, str));
@@ -1072 +1072 @@
  *             extended error information, use the GetLastError function.
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
@@ -1106 +1106 @@
               const MENUITEMINFOA*, lpmii)
 {
+ DWORD dwType;
+ BOOL rc;
+
     dprintf(("USER32:InsertMenuItemA (%08xh,%08xh,%u,%08x) not correctly implemented.\n",
          hMenu,
@@ -1113 +1116 @@
 
     if(fByPosition) {
-            return ODIN_InsertMenuA(hMenu, uItem, lpmii->fType | MF_BYPOSITION, (lpmii->fType & MF_POPUP) ? lpmii->hSubMenu : lpmii->wID, lpmii->dwTypeData);
-    }
-    else    return ODIN_InsertMenuA(hMenu, uItem, lpmii->fType | MF_BYCOMMAND, (lpmii->fType & MF_POPUP) ? lpmii->hSubMenu : lpmii->wID, lpmii->dwTypeData);
+            dwType = lpmii->fType | MF_BYPOSITION;
+    }
+    else    dwType = lpmii->fType | MF_BYCOMMAND;
+
+    if(lpmii->fMask & MIIM_SUBMENU && lpmii->hSubMenu) {
+        rc &= ODIN_InsertMenuA(hMenu, uItem, dwType | MF_POPUP, lpmii->hSubMenu, lpmii->dwTypeData);
+    }
+    else
+    if(lpmii->fMask & MIIM_ID) {
+        rc = ODIN_InsertMenuA(hMenu, uItem, dwType, lpmii->wID, lpmii->dwTypeData);
+    }
+    if(lpmii->fMask & MIIM_STATE) {
+    //TODO
+    }
+    return rc;
 }