Changeset 2363 for trunk/src

Timestamp:

Jan 8, 2000, 1:06:53 PM (26 years ago)

Author:

sandervl

Message:

ModifyMenuA bugfix (changing menu ids didn't work)

Location:

trunk/src/user32

Files:

• new/winmenu.cpp (modified) (5 diffs)
• winmenu.cpp (modified) (5 diffs)

trunk/src/user32/new/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.10 2000-01-07 00:24:34 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.11 2000-01-08 12:06:53 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 HMENU ODIN_INTERNAL ODIN_CreatePopupMenu(void);
 BOOL  ODIN_INTERNAL ODIN_DestroyMenu(HMENU);
+BOOL  ODIN_INTERNAL ODIN_DeleteMenu(HMENU, UINT, UINT);
 
 //@@@PH: experiment with WINE LoadMenuIndirect code
@@ -633 +634 @@
 ODINFUNCTION5(BOOL, ModifyMenuA,
               HMENU, hMenu,
-              UINT, arg2,
-              UINT, arg3,
-              UINT, arg4,
-              LPCSTR, arg5)
-{
-    dprintf(("USER32:  OS2ModifyMenuA\n"));
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-    return O32_ModifyMenu(hMenu, arg2, arg3, arg4, arg5);
+              UINT, uItem,
+              UINT, fuFlags,
+              UINT, idNewItem,
+              LPCSTR, lpszNewItem)
+{
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(IS_STRING_ITEM(fuFlags) && HIWORD(lpszNewItem) != 0) {
+        dprintf(("ModifyMenuA %s", lpszNewItem));
+    }
+
+    if(((fuFlags & (MF_BYCOMMAND|MF_BYPOSITION|MF_POPUP)) == MF_BYCOMMAND) && uItem != idNewItem) {
+        DWORD pos = OSLibGetMenuItemPos(hMenu, uItem);
+        ODIN_DeleteMenu(hMenu, uItem, MF_BYCOMMAND);
+        return ODIN_InsertMenuA(hMenu, pos, fuFlags | MF_BYPOSITION, idNewItem, lpszNewItem);
+    }
+    return O32_ModifyMenu(hMenu, uItem, fuFlags, idNewItem, lpszNewItem);
 }
 //******************************************************************************
@@ -682 +691 @@
               UINT, arg3)
 {
-    dprintf(("USER32:  OS2RemoveMenu\n"));
     if(hMenu == 0)
     {
@@ -698 +706 @@
               UINT, arg3)
 {
-    dprintf(("USER32:  OS2DeleteMenu\n"));
     if(hMenu == 0)
     {

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.21 2000-01-07 00:24:34 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.22 2000-01-08 12:05:57 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 HMENU ODIN_INTERNAL ODIN_CreatePopupMenu(void);
 BOOL  ODIN_INTERNAL ODIN_DestroyMenu(HMENU);
+BOOL  ODIN_INTERNAL ODIN_DeleteMenu(HMENU, UINT, UINT);
 
 //@@@PH: experiment with WINE LoadMenuIndirect code
@@ -633 +634 @@
 ODINFUNCTION5(BOOL, ModifyMenuA,
               HMENU, hMenu,
-              UINT, arg2,
-              UINT, arg3,
-              UINT, arg4,
-              LPCSTR, arg5)
-{
-    dprintf(("USER32:  OS2ModifyMenuA\n"));
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-    return O32_ModifyMenu(hMenu, arg2, arg3, arg4, arg5);
+              UINT, uItem,
+              UINT, fuFlags,
+              UINT, idNewItem,
+              LPCSTR, lpszNewItem)
+{
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(IS_STRING_ITEM(fuFlags) && HIWORD(lpszNewItem) != 0) {
+        dprintf(("ModifyMenuA %s", lpszNewItem));
+    }
+
+    if(((fuFlags & (MF_BYCOMMAND|MF_BYPOSITION|MF_POPUP)) == MF_BYCOMMAND) && uItem != idNewItem) {
+        DWORD pos = OSLibGetMenuItemPos(hMenu, uItem);
+        ODIN_DeleteMenu(hMenu, uItem, MF_BYCOMMAND);
+        return ODIN_InsertMenuA(hMenu, pos, fuFlags | MF_BYPOSITION, idNewItem, lpszNewItem);
+    }
+    return O32_ModifyMenu(hMenu, uItem, fuFlags, idNewItem, lpszNewItem);
 }
 //******************************************************************************
@@ -682 +691 @@
               UINT, arg3)
 {
-    dprintf(("USER32:  OS2RemoveMenu\n"));
     if(hMenu == 0)
     {
@@ -698 +706 @@
               UINT, arg3)
 {
-    dprintf(("USER32:  OS2DeleteMenu\n"));
     if(hMenu == 0)
     {