[User32]

[reactos.git] / reactos / win32ss / user / user32 / windows / menu.c

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index 6ec7c85..8241379 100644 (file)
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -107,8 +107,8 @@ const struct builtin_class_descr POPUPMENU_builtin_class =
 {
     WC_MENU,                     /* name */
     CS_SAVEBITS | CS_DBLCLKS,                  /* style  */
-    (WNDPROC) NULL,                            /* FIXME - procA */
-    (WNDPROC) PopupMenuWndProcW,               /* FIXME - procW */
+    NULL,                                      /* FIXME - procA */
+    PopupMenuWndProcW,                         /* FIXME - procW */
     sizeof(MENUINFO *),                        /* extra */
     (LPCWSTR) IDC_ARROW,                       /* cursor */
     (HBRUSH)(COLOR_MENU + 1)                   /* brush */
@@ -295,12 +295,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu,
          {                                         // Very strange this fixes a wine test with a crash.
                 if(lpmii->dwTypeData && lpmii->cch && !(GdiValidateHandle((HGDIOBJ)lpmii->dwTypeData)) )
                 {
-                    lpmii->cch = 0;
                     if( unicode)
                         *((WCHAR *)lpmii->dwTypeData) = 0;
                     else
                         *((CHAR *)lpmii->dwTypeData) = 0;
                 }
+                lpmii->cch = 0;
          }
          else
          {
@@ -4586,11 +4586,10 @@ CheckMenuItem(HMENU hmenu,
              UINT uIDCheckItem,
              UINT uCheck)
 {
-  PMENU pMenu;
   PITEM item;
   DWORD Ret;
 
-  if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU)))
+  if (!ValidateHandle(hmenu, TYPE_MENU))
      return -1;
 
   if (!(item = MENU_FindItem( &hmenu, &uIDCheckItem, uCheck ))) return -1;