- Win32k: Removed NtUserCreateMenu replacing it with NtUserCallNoParam.

svn path=/trunk/; revision=29092

reactos/dll/win32/user32/windows/menu.c

@@ -3899,7 +3899,7 @@ HMENU STDCALL
 CreateMenu(VOID)
 {
   MenuLoadBitmaps();
-  return NtUserCreateMenu(FALSE);
+  return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENU);
 }
 
 
@@ -3910,7 +3910,7 @@ HMENU STDCALL
 CreatePopupMenu(VOID)
 {
   MenuLoadBitmaps();
-  return NtUserCreateMenu(TRUE);
+  return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENUPOPUP);
 }
 
 

reactos/include/reactos/win32k/ntuser.h

@@ -106,10 +106,6 @@ NtUserCheckMenuItem(
   UINT uIDCheckItem,
   UINT uCheck);
 
-HMENU
-NTAPI
-NtUserCreateMenu(BOOL PopupMenu);
-
 BOOL
 NTAPI
 NtUserDeleteMenu(
@@ -440,6 +436,8 @@ NtUserCallNextHookEx(
   WPARAM wParam,
   LPARAM lParam);
 
+#define NOPARAM_ROUTINE_CREATEMENU            0x0
+#define NOPARAM_ROUTINE_CREATEMENUPOPUP       0x1
 #define NOPARAM_ROUTINE_MSQCLEARWAKEMASK      0x3
 #define NOPARAM_ROUTINE_REGISTER_PRIMITIVE	  0xffff0001 /* Private ROS */
 #define NOPARAM_ROUTINE_DESTROY_CARET         0xffff0002

reactos/subsystems/win32/win32k/ntuser/menu.c

@@ -1482,23 +1482,6 @@ HMENU FASTCALL UserCreateMenu(BOOL PopupMenu)
    return (HMENU)Handle;
 }
 
-HMENU STDCALL
-NtUserCreateMenu(BOOL PopupMenu)
-{
-   DECLARE_RETURN(HMENU);
-
-   DPRINT("Enter NtUserCreateMenu\n");
-   UserEnterExclusive();
-
-   RETURN(UserCreateMenu(PopupMenu));
-
-CLEANUP:
-   DPRINT("Leave NtUserCreateMenu, ret=%i\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-}
-
-
 
 /*
  * @implemented

reactos/subsystems/win32/win32k/ntuser/misc.c

@@ -86,6 +86,14 @@ NtUserCallNoParam(DWORD Routine)
 
    switch(Routine)
    {
+      case NOPARAM_ROUTINE_CREATEMENU:
+         Result = (DWORD)UserCreateMenu(FALSE);
+         break;
+
+      case NOPARAM_ROUTINE_CREATEMENUPOPUP:
+         Result = (DWORD)UserCreateMenu(TRUE);
+         break;
+
       case NOPARAM_ROUTINE_DESTROY_CARET:
          Result = (DWORD)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread);
          break;

reactos/subsystems/win32/win32k/ntuser/window.c

@@ -4730,29 +4730,29 @@ NtUserValidateHandleSecure(
        }
        case otCursorIcon:
        {
-          PCURICON_OBJECT Cursor;
-          if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE;
-          return FALSE;
+         PCURICON_OBJECT Cursor;
+         if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE;
+         return FALSE;
        }
        case otHook:
        {
-          PHOOK Hook;
-          if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE;
-          return FALSE;
+         PHOOK Hook;
+         if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE;
+         return FALSE;
        }
        case otMonitor:
        {
-          PMONITOR_OBJECT Monitor;
-          if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE;
-          return FALSE;
+         PMONITOR_OBJECT Monitor;
+         if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE;
+         return FALSE;
        }
        case otCallProc:
        {
-           WNDPROC_INFO Proc;
-           return UserGetCallProcInfo( handle, &Proc );
+         WNDPROC_INFO Proc;
+         return UserGetCallProcInfo( handle, &Proc );
        }
        default:
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
+         SetLastWin32Error(ERROR_INVALID_HANDLE);
      }
    }
    else

reactos/subsystems/win32/win32k/w32ksvc.db

@@ -709,7 +709,6 @@ NtGdiTranslateCharsetInfo               3
 NtGdiUpdateICMRegKey                    4
 NtUserBuildMenuItemList                 4
 NtUserCreateCursorIconHandle            2
-NtUserCreateMenu                        1
 NtUserDestroyCursorIcon                 2
 NtUserEnumClipboardFormats              1 
 NtUserGetActiveWindow                   0