mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[Win32k]
- Goodbye to menu ntuser bad functions. svn path=/trunk/; revision=63028
This commit is contained in:
parent
9e6fb311ed
commit
ce150eca7b
|
@ -3390,21 +3390,6 @@ typedef struct tagKMDDELPARAM
|
|||
#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 @@ typedef struct tagROSMENUINFO
|
|||
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 @@ typedef struct tagROSMENUITEMINFO
|
|||
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(
|
||||
|
|
|
@ -2724,139 +2724,4 @@ CLEANUP:
|
|||
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 */
|
||||
|
|
|
@ -681,11 +681,7 @@ NtGdiGetFontFamilyInfo 4
|
|||
NtGdiOffsetViewportOrgEx 4
|
||||
NtGdiOffsetWindowOrgEx 4
|
||||
#
|
||||
NtUserBuildMenuItemList 4
|
||||
NtUserGetMenuDefaultItem 3
|
||||
NtUserGetMonitorInfo 2
|
||||
NtUserMenuInfo 3
|
||||
NtUserMenuItemInfo 5
|
||||
NtUserMonitorFromPoint 3
|
||||
NtUserMonitorFromRect 2
|
||||
NtUserMonitorFromWindow 2
|
||||
|
|
|
@ -688,11 +688,7 @@ SVC_(GdiGetFontFamilyInfo, 4)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue