Changeset 2350 for trunk/src/user32

Timestamp:

Jan 7, 2000, 1:24:34 AM (26 years ago)

Author:

sandervl

Message:

GetMenuStringA bugfix

Location:

trunk/src/user32

Files:

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

trunk/src/user32/new/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.9 2000-01-04 19:53:45 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.10 2000-01-07 00:24:34 sandervl Exp $ */
 
 /*
@@ -415 +415 @@
 ODINFUNCTION5(int,   GetMenuStringA,
               HMENU, hMenu,
-              UINT,  arg2,
-              LPSTR, arg3,
-              int,   arg4,
-              UINT,  arg5)
-{
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    return O32_GetMenuString(hMenu, arg2, arg3, arg4, arg5);
+              UINT,  idItem,
+              LPSTR, lpsz,
+              int,   cchMax,
+              UINT,  fuFlags)
+{
+ int rc, nritems;
+
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(!lpsz || !cchMax) {//determine menu string length
+        char menustr[256];
+        rc = O32_GetMenuString(hMenu, idItem, menustr, sizeof(menustr), fuFlags);
+        //SvL: Open32 returns the wrong error
+        return (rc == -1) ? 0 : rc;
+    }
+    rc = O32_GetMenuString(hMenu, idItem, lpsz, cchMax, fuFlags);
+    //SvL: Open32 returns the wrong error
+    return (rc == -1) ? 0 : rc;
 }
 //******************************************************************************

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.20 2000-01-04 19:50:51 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.21 2000-01-07 00:24:34 sandervl Exp $ */
 
 /*
@@ -415 +415 @@
 ODINFUNCTION5(int,   GetMenuStringA,
               HMENU, hMenu,
-              UINT,  arg2,
-              LPSTR, arg3,
-              int,   arg4,
-              UINT,  arg5)
-{
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    return O32_GetMenuString(hMenu, arg2, arg3, arg4, arg5);
+              UINT,  idItem,
+              LPSTR, lpsz,
+              int,   cchMax,
+              UINT,  fuFlags)
+{
+ int rc, nritems;
+
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(!lpsz || !cchMax) {//determine menu string length
+        char menustr[256];
+        rc = O32_GetMenuString(hMenu, idItem, menustr, sizeof(menustr), fuFlags);
+        //SvL: Open32 returns the wrong error
+        return (rc == -1) ? 0 : rc;
+    }
+    rc = O32_GetMenuString(hMenu, idItem, lpsz, cchMax, fuFlags);
+    //SvL: Open32 returns the wrong error
+    return (rc == -1) ? 0 : rc;
 }
 //******************************************************************************