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

Timestamp:

Oct 28, 1999, 9:09:17 PM (26 years ago)

Author:

sandervl

Message:

EB's bugfixes

File:

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

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.11 1999-10-26 11:14:52 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.12 1999-10-28 19:09:17 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 HMENU ODIN_INTERNAL ODIN_CreatePopupMenu(void);
 BOOL  ODIN_INTERNAL ODIN_DestroyMenu(HMENU);
-
 
 //@@@PH: experiment with WINE LoadMenuIndirect code
@@ -655 +654 @@
     }
 
-    if(HIWORD(arg5) != 0)
+    if(IS_STRING_ITEM(arg3) && HIWORD(arg5) != 0)
       astring = UnicodeToAsciiString((LPWSTR)arg5);
     else
@@ -661 +660 @@
 
     rc = ODIN_ModifyMenuA(hMenu, arg2, arg3, arg4, astring);
-    if(HIWORD(arg5) != 0)
+    if(IS_STRING_ITEM(arg3) && HIWORD(arg5) != 0)
       FreeAsciiString(astring);
 
@@ -748 +747 @@
  char *astring = NULL;
 
-    if(HIWORD(arg5) != 0)
+    if(IS_STRING_ITEM(arg3) && HIWORD(arg5) != 0)
       astring = UnicodeToAsciiString((LPWSTR)arg5);
     else
@@ -755 +754 @@
     rc = ODIN_InsertMenuA(hMenu, arg2, arg3, arg4, astring);
 
-    if(HIWORD(arg5) != 0)
+    if(IS_STRING_ITEM(arg3) && HIWORD(arg5) != 0)
       FreeAsciiString(astring);