From 5aeda067d0a63cd95f333668fd5c7a374f5fe9cb Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 8 Feb 2008 01:45:54 +0000 Subject: [PATCH] patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): remove obsolete syscalls NtUserGetDesktopWindow and NtUserGetParent svn path=/trunk/; revision=32203 --- reactos/include/reactos/win32k/ntuser.h | 6 -- .../subsystems/win32/win32k/ntuser/window.c | 66 ------------------- reactos/subsystems/win32/win32k/w32ksvc.db | 20 +++--- 3 files changed, 8 insertions(+), 84 deletions(-) diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index 9426b06da94..7220dea4167 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -476,9 +476,6 @@ NtUserGetProp(HWND hWnd, ATOM Atom); BOOL NTAPI NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); -HWND NTAPI -NtUserGetDesktopWindow(); - NTSTATUS NTAPI NtUserAcquireOrReleaseInputOwnership( @@ -2544,9 +2541,6 @@ NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); DWORD NTAPI NtUserGetQueueStatus(BOOL ClearChanges); -HWND NTAPI -NtUserGetParent(HWND hWnd); - HWND NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index 30ac6ff9d25..507fd62bd4f 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -2962,26 +2962,6 @@ CLEANUP: } -/* - * @implemented - */ -HWND STDCALL -NtUserGetDesktopWindow() -{ - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetDesktopWindow\n"); - UserEnterShared(); - - RETURN( IntGetDesktopWindow()); - -CLEANUP: - DPRINT("Leave NtUserGetDesktopWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - /* * @unimplemented */ @@ -3051,52 +3031,6 @@ CLEANUP: } -/* - * NtUserGetParent - * - * The NtUserGetParent function retrieves a handle to the specified window's - * parent or owner. - * - * Remarks - * Note that, despite its name, this function can return an owner window - * instead of a parent window. - * - * Status - * @implemented - */ - -HWND STDCALL -NtUserGetParent(HWND hWnd) -{ - PWINDOW_OBJECT Wnd, WndParent; - HWND hWndParent = NULL; - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetParent\n"); - UserEnterExclusive(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN( NULL); - } - - WndParent = IntGetParent(Wnd); - if (WndParent) - { - hWndParent = WndParent->hSelf; - } - - RETURN( hWndParent); - -CLEANUP: - DPRINT("Leave NtUserGetParent, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - - - HWND FASTCALL co_UserSetParent(HWND hWndChild, HWND hWndNewParent) { diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index 45980f23f5b..a1762a75f79 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -680,8 +680,10 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiStretchDIBits 13 +NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 +NtUserDereferenceWndProcHandle 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 @@ -689,16 +691,22 @@ NtUserGetClassLong 3 NtUserGetClientOrigin 2 NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 +NtUserGetLastActivePopup 1 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetProp 2 +NtUserGetQueueStatus 1 NtUserGetScrollInfo 3 +NtUserGetShellWindow 0 NtUserGetSystemMetrics 1 +NtUserGetWindow 2 NtUserGetWindowLong 3 NtUserGetWindowRect 2 +NtUserGetWindowThreadProcessId 2 NtUserInsertMenuItem 4 NtUserKillSystemTimer 2 +NtUserManualGuiCheck 1 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 @@ -711,21 +719,9 @@ NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtUserGetDesktopWindow 0 NtGdiAddFontResource 2 NtGdiCreateDIBitmap 6 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -# -# ReactOS only system calls -NtUserAcquireOrReleaseInputOwnership 1 -NtUserGetWindowThreadProcessId 2 -NtUserGetQueueStatus 1 -NtUserGetParent 1 -NtUserGetWindow 2 -NtUserGetLastActivePopup 1 -NtUserGetShellWindow 0 -NtUserDereferenceWndProcHandle 2 -NtUserManualGuiCheck 1