Changeset 21356 for trunk/src/user32/menu.c

Timestamp:

Feb 21, 2010, 5:33:53 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/user32/menu.c (modified) (7 diffs)

trunk/src/user32/menu.c

@@ -395 +395 @@
     HMENU hMenu;
 
-    if ((hMenu = CreateMenu()))
+    if ((hMenu = CreateMenu()) != 0)
     {
     POPUPMENU *menu = MENU_GetMenu(hMenu);
@@ -411 +411 @@
             menu->items[0].fType = MF_SYSMENU | MF_POPUP;
             menu->items[0].fState = 0;
-            if ((menu = MENU_GetMenu(hPopupMenu))) menu->wFlags |= MF_SYSMENU;
+            if ((menu = MENU_GetMenu(hPopupMenu)) != 0) menu->wFlags |= MF_SYSMENU;
 
         TRACE("GetSysMenu hMenu=%04x (%04x)\n", hMenu, hPopupMenu );
@@ -3573 +3573 @@
     MENUITEM * lpmi;
 
-    if (!(lpmi = MENU_FindItem(&hMenu,&nPos,MF_BYPOSITION))) return -1;
+    if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return -1;
     if (lpmi->fType & MF_POPUP) return -1;
     return lpmi->wID;
@@ -4413 +4413 @@
     else if (unicode)
     {
-        if ((menu->text = HeapAlloc( GetProcessHeap(), 0, (strlenW(text)+1) * sizeof(WCHAR) )))
+        if ((menu->text = HeapAlloc( GetProcessHeap(), 0, (strlenW(text)+1) * sizeof(WCHAR) )) != NULL)
             strcpyW( menu->text, text );
     }
@@ -4420 +4420 @@
         LPCSTR str = (LPCSTR)text;
         int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
-        if ((menu->text = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
+        if ((menu->text = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )) != NULL)
             MultiByteToWideChar( CP_ACP, 0, str, -1, menu->text, len );
     }
@@ -4817 +4817 @@
     TRACE("(0x%04x 0x%08lx)\n", hMenu, dwContextHelpID);
 
-    if ((menu = MENU_GetMenu(hMenu)))
+    if ((menu = MENU_GetMenu(hMenu)) != 0)
     {
     menu->dwContextHelpID = dwContextHelpID;
@@ -4834 +4834 @@
     TRACE("(0x%04x)\n", hMenu);
 
-    if ((menu = MENU_GetMenu(hMenu)))
+    if ((menu = MENU_GetMenu(hMenu)) != 0)
     {
     return menu->dwContextHelpID;