From c75be21c001a7ad03b3fcf85adf20b2852e11802 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 20 Jun 2004 12:34:20 +0000 Subject: [PATCH] - Call the "load default cursor" callback. Fixes bug #358. svn path=/trunk/; revision=9753 --- reactos/subsys/win32k/eng/mouse.c | 4 +++- reactos/subsys/win32k/include/callback.h | 3 +++ reactos/subsys/win32k/ntuser/callback.c | 25 +++++++++++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c index 2097bfe27c8..070329475ba 100644 --- a/reactos/subsys/win32k/eng/mouse.c +++ b/reactos/subsys/win32k/eng/mouse.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: mouse.c,v 1.71 2004/05/30 14:01:12 weiden Exp $ +/* $Id: mouse.c,v 1.72 2004/06/20 12:34:17 navaraf Exp $ * * PROJECT: ReactOS kernel * PURPOSE: Mouse @@ -66,6 +66,8 @@ EnableMouse(HDC hDisplayDC) CurInfo->Enabled = (SPS_ACCEPT_EXCLUDE == SurfGDI->PointerStatus || SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus); + + IntLoadDefaultCursors(); ObDereferenceObject(InputWindowStation); } diff --git a/reactos/subsys/win32k/include/callback.h b/reactos/subsys/win32k/include/callback.h index d8194a77440..750619a0b2a 100644 --- a/reactos/subsys/win32k/include/callback.h +++ b/reactos/subsys/win32k/include/callback.h @@ -21,6 +21,9 @@ IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback, HMENU STDCALL IntLoadSysMenuTemplate(); +BOOL STDCALL +IntLoadDefaultCursors(VOID); + LRESULT STDCALL IntCallHookProc(INT HookId, INT Code, diff --git a/reactos/subsys/win32k/ntuser/callback.c b/reactos/subsys/win32k/ntuser/callback.c index 143690fad4c..95823c65abb 100644 --- a/reactos/subsys/win32k/ntuser/callback.c +++ b/reactos/subsys/win32k/ntuser/callback.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: callback.c,v 1.24 2004/06/16 06:09:40 gvg Exp $ +/* $Id: callback.c,v 1.25 2004/06/20 12:34:20 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -231,6 +231,29 @@ IntLoadSysMenuTemplate() return (HMENU)Result; } +BOOL STDCALL +IntLoadDefaultCursors(VOID) +{ + LRESULT Result; + NTSTATUS Status; + PVOID ResultPointer; + ULONG ResultLength; + BOOL DefaultCursor = TRUE; + + ResultPointer = &Result; + ResultLength = sizeof(LRESULT); + Status = NtW32Call(USER32_CALLBACK_LOADDEFAULTCURSORS, + &DefaultCursor, + sizeof(BOOL), + &ResultPointer, + &ResultLength); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + return TRUE; +} + LRESULT STDCALL IntCallHookProc(INT HookId, INT Code,