[ros-diffs] [jimtabor] 63028: [Win32k] - Goodbye to menu ntuser bad functions.

Author: jimtabor
Date: Mon Apr 28 05:54:43 2014
New Revision: 63028

URL: http://svn.reactos.org/svn/reactos?rev=63028&view=rev
Log:
[Win32k]
- Goodbye to menu ntuser bad functions.

Modified:
    trunk/reactos/win32ss/include/ntuser.h
    trunk/reactos/win32ss/user/ntuser/menu.c
    trunk/reactos/win32ss/w32ksvc.db
    trunk/reactos/win32ss/w32ksvc.h

Modified: trunk/reactos/win32ss/include/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r…
==============================================================================
--- trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] Mon Apr 28 05:54:43 2014
@@ -3390,21 +3390,6 @@
 #define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE  0x1004
 #define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005
 
-DWORD
-NTAPI
-NtUserBuildMenuItemList(
- HMENU hMenu,
- PVOID Buffer,
- ULONG nBufSize,
- DWORD Reserved);
-
-UINT
-NTAPI
-NtUserGetMenuDefaultItem(
-  HMENU hMenu,
-  UINT fByPos,
-  UINT gmdiFlags);
-
 BOOL
 NTAPI
 NtUserGetMonitorInfo(
@@ -3443,14 +3428,6 @@
     BOOL TimeToHide;    /* Request hiding when receiving a second click in the top-level
menu item */
 } ROSMENUINFO, *PROSMENUINFO;
 
-BOOL
-NTAPI
-NtUserMenuInfo(
- HMENU hmenu,
- PROSMENUINFO lpmi,
- BOOL fsog
-);
-
 typedef struct tagROSMENUITEMINFO
 {
     /* ----------- MENUITEMINFOW ----------- */
@@ -3473,16 +3450,6 @@
     SIZE maxBmpSize;   /* Maximum size of the bitmap items in MIIM_BITMAP state */
 } ROSMENUITEMINFO, *PROSMENUITEMINFO;
 
-BOOL
-NTAPI
-NtUserMenuItemInfo(
- HMENU hMenu,
- UINT uItem,
- BOOL fByPosition,
- PROSMENUITEMINFO lpmii,
- BOOL fsog
-);
-
 HMONITOR
 NTAPI
 NtUserMonitorFromPoint(

Modified: trunk/reactos/win32ss/user/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] Mon Apr 28 05:54:43 2014
@@ -2724,139 +2724,4 @@
    END_CLEANUP;
 }
 
-////// ReactOS NtUserBad is unpluged!
-
-DWORD
-APIENTRY
-NtUserBuildMenuItemList(
-   HMENU hMenu,
-   VOID* Buffer,
-   ULONG nBufSize,
-   DWORD Reserved)
-{
-/*   DWORD res = -1;
-   PMENU Menu;
-   DECLARE_RETURN(DWORD);
-
-   TRACE("Enter NtUserBuildMenuItemList\n");
-   UserEnterExclusive();
-
-   if(!(Menu = UserGetMenuObject(hMenu)))
-   {
-      RETURN( (DWORD)-1);
-   }
-
-   if(Buffer)
-   {
-      res = IntBuildMenuItemList(Menu, Buffer, nBufSize);
-   }
-   else
-   {
-      res = Menu->cItems;
-   }
-
-   RETURN( res);
-
-CLEANUP:
-   TRACE("Leave NtUserBuildMenuItemList, ret=%lu\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-*/
-   STUB
-
-   return 0;
-}
-
-UINT APIENTRY
-NtUserGetMenuDefaultItem(
-   HMENU hMenu,
-   UINT fByPos,
-   UINT gmdiFlags)
-{
-/*   PMENU Menu;
-   DWORD gismc = 0;
-   DECLARE_RETURN(UINT);
-
-   TRACE("Enter NtUserGetMenuDefaultItem\n");
-   UserEnterExclusive();
-
-   if(!(Menu = UserGetMenuObject(hMenu)))
-   {
-      RETURN(-1);
-   }
-
-   RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc));
-
-CLEANUP:
-   TRACE("Leave NtUserGetMenuDefaultItem, ret=%u\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-*/
-   STUB
-
-   return 0;
-}
-
-BOOL
-APIENTRY
-NtUserMenuInfo(
-   HMENU hMenu,
-   PROSMENUINFO UnsafeMenuInfo,
-   BOOL SetOrGet)
-{
-/*   PMENU Menu;
-   DECLARE_RETURN(BOOL);
-
-   TRACE("Enter NtUserMenuInfo\n");
-   UserEnterShared();
-
-   if (!(Menu = UserGetMenuObject(hMenu)))
-   {
-      RETURN(FALSE);
-   }
-
-   RETURN(UserMenuInfo(Menu, UnsafeMenuInfo, SetOrGet));
-
-CLEANUP:
-   TRACE("Leave NtUserMenuInfo, ret=%i\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-*/
-   STUB
-
-   return 0;
-}
-
-BOOL
-APIENTRY
-NtUserMenuItemInfo(
-   HMENU hMenu,
-   UINT Item,
-   BOOL ByPosition,
-   PROSMENUITEMINFO UnsafeItemInfo,
-   BOOL SetOrGet)
-{
-/*   PMENU Menu;
-   DECLARE_RETURN(BOOL);
-
-   TRACE("Enter NtUserMenuItemInfo\n");
-   UserEnterExclusive();
-
-   if (!(Menu = UserGetMenuObject(hMenu)))
-   {
-      RETURN(FALSE);
-   }
-
-   RETURN( UserMenuItemInfo(Menu, Item, ByPosition, UnsafeItemInfo, SetOrGet));
-
-CLEANUP:
-   TRACE("Leave NtUserMenuItemInfo, ret=%i\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-*/
-   STUB
-
-   return 0;
-}
-
 /* EOF */

Modified: trunk/reactos/win32ss/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=630…
==============================================================================
--- trunk/reactos/win32ss/w32ksvc.db	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/w32ksvc.db	[iso-8859-1] Mon Apr 28 05:54:43 2014
@@ -681,11 +681,7 @@
 NtGdiOffsetViewportOrgEx                4
 NtGdiOffsetWindowOrgEx                  4
 #
-NtUserBuildMenuItemList                 4
-NtUserGetMenuDefaultItem                3
 NtUserGetMonitorInfo                    2
-NtUserMenuInfo                          3
-NtUserMenuItemInfo                      5
 NtUserMonitorFromPoint                  3
 NtUserMonitorFromRect                   2
 NtUserMonitorFromWindow                 2

Modified: trunk/reactos/win32ss/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6302…
==============================================================================
--- trunk/reactos/win32ss/w32ksvc.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/w32ksvc.h	[iso-8859-1] Mon Apr 28 05:54:43 2014
@@ -688,11 +688,7 @@
 SVC_(GdiOffsetViewportOrgEx, 4)
 SVC_(GdiOffsetWindowOrgEx, 4)
 
-SVC_(UserBuildMenuItemList, 4)
-SVC_(UserGetMenuDefaultItem, 3)
 SVC_(UserGetMonitorInfo, 2)
-SVC_(UserMenuInfo, 3)
-SVC_(UserMenuItemInfo, 5)
 SVC_(UserMonitorFromPoint, 3)
 SVC_(UserMonitorFromRect, 2)
 SVC_(UserMonitorFromWindow, 2)