From 832463b116eeb4c0a06f33e76254804d4df79418 Mon Sep 17 00:00:00 2001 From: Richard Campbell Date: Fri, 23 May 2003 16:44:12 +0000 Subject: [PATCH] Implement GetDesktopWindow() svn path=/trunk/; revision=4743 --- reactos/iface/addsys/w32ksvc.db | 1 + reactos/include/win32k/ntuser.h | 2 ++ reactos/lib/user32/windows/window.c | 5 ++--- reactos/subsys/win32k/include/window.h | 1 - reactos/subsys/win32k/ntuser/window.c | 7 ++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/reactos/iface/addsys/w32ksvc.db b/reactos/iface/addsys/w32ksvc.db index b7ccd6139d9..0f74f0a0d75 100644 --- a/reactos/iface/addsys/w32ksvc.db +++ b/reactos/iface/addsys/w32ksvc.db @@ -542,5 +542,6 @@ NtUserWaitMessage 0 NtUserWin32PoolAllocationStats 6 NtUserWindowFromPoint 2 NtUserYieldTask 0 +NtUserGetDesktopWindow 0 # ReactOS only system calls NtUserAcquireOrReleaseInputOwnership 1 diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h index 276e025b213..35d4f277aba 100644 --- a/reactos/include/win32k/ntuser.h +++ b/reactos/include/win32k/ntuser.h @@ -17,6 +17,8 @@ HANDLE STDCALL NtUserGetProp(HWND hWnd, ATOM Atom); BOOL STDCALL NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); +HWND STDCALL +NtUserGetDesktopWindow(); NTSTATUS STDCALL diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c index 2c1dd328545..56fd852c067 100644 --- a/reactos/lib/user32/windows/window.c +++ b/reactos/lib/user32/windows/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.33 2003/05/19 20:11:17 gvg Exp $ +/* $Id: window.c,v 1.34 2003/05/23 16:44:12 rcampbell Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -723,8 +723,7 @@ GetClientRect(HWND hWnd, LPRECT lpRect) HWND STDCALL GetDesktopWindow(VOID) { - UNIMPLEMENTED; - return (HWND)0; + return NtUserGetDesktopWindow(); } HWND STDCALL diff --git a/reactos/subsys/win32k/include/window.h b/reactos/subsys/win32k/include/window.h index 0ecd484bb9e..16d8567e11a 100644 --- a/reactos/subsys/win32k/include/window.h +++ b/reactos/subsys/win32k/include/window.h @@ -108,7 +108,6 @@ BOOL FASTCALL W32kIsChildWindow (HWND Parent, HWND Child); HWND FASTCALL W32kGetDesktopWindow (VOID); HWND FASTCALL W32kGetFocusWindow (VOID); VOID FASTCALL W32kSetFocusWindow (HWND hWnd); - #endif /* __WIN32K_WINDOW_H */ /* EOF */ diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c index 81761d468cc..b6e39d35202 100644 --- a/reactos/subsys/win32k/ntuser/window.c +++ b/reactos/subsys/win32k/ntuser/window.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: window.c,v 1.45 2003/05/18 17:16:17 ea Exp $ +/* $Id: window.c,v 1.46 2003/05/23 16:44:12 rcampbell Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -1389,4 +1389,9 @@ NtUserWindowFromPoint(DWORD Unknown0, return 0; } +HWND STDCALL +NtUserGetDesktopWindow() +{ + return W32kGetDesktopWindow(); +} /* EOF */