Changeset 1612 for trunk/src/user32/winmenu.cpp

Timestamp:

Nov 5, 1999, 1:54:11 PM (26 years ago)

Author:

sandervl

Message:

InsertMenu & msg translation fixes

File:

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

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.13 1999-11-03 18:16:19 phaller Exp $ */
+/* $Id: winmenu.cpp,v 1.14 1999-11-05 12:54:11 sandervl Exp $ */
 
 /*
@@ -725 +725 @@
               LPCSTR, str)
 {
-    dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    if(!str || *str == NULL) {
+    if(IS_STRING_ITEM(flags) && HIWORD(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));
+
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    if(IS_STRING_ITEM(flags) && (!str || *str == NULL)) {
         flags |= MF_SEPARATOR;
     }