fixed the definition of User32SetupDefaultCursors()

svn path=/trunk/; revision=5911
This commit is contained in:
Thomas Bluemel 2003-08-29 08:46:20 +00:00
parent 502394d4ce
commit 12c2e7f892
4 changed files with 9 additions and 7 deletions

View file

@ -123,5 +123,7 @@ NTSTATUS STDCALL
User32SendSTYLECHANGEDMessageForKernel(PVOID Arguments, ULONG ArgumentLength); User32SendSTYLECHANGEDMessageForKernel(PVOID Arguments, ULONG ArgumentLength);
NTSTATUS STDCALL NTSTATUS STDCALL
User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength); User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength);
NTSTATUS STDCALL
User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength);
#endif /* __INCLUDE_USER32_CALLBACK_H */ #endif /* __INCLUDE_USER32_CALLBACK_H */

View file

@ -16,5 +16,3 @@ PUSER32_THREAD_DATA User32GetThreadData();
VOID DeleteFrameBrushes(VOID); VOID DeleteFrameBrushes(VOID);
BOOL FASTCALL
User32SetupDefaultCursors(void);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: cursor.c,v 1.11 2003/08/29 00:24:42 weiden Exp $ /* $Id: cursor.c,v 1.12 2003/08/29 08:46:20 weiden Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/cursor.c * FILE: lib/user32/windows/cursor.c
@ -36,11 +36,10 @@
/* INTERNAL ******************************************************************/ /* INTERNAL ******************************************************************/
/* This callback routine is called directly after switching to gui mode */ /* This callback routine is called directly after switching to gui mode */
BOOL FASTCALL NTSTATUS STDCALL
User32SetupDefaultCursors(void) User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength)
{ {
LRESULT Result = TRUE; LRESULT Result = TRUE;
/* FIXME load system cursor scheme */ /* FIXME load system cursor scheme */
return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS));

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winsta.c,v 1.32 2003/08/28 16:33:22 weiden Exp $ /* $Id: winsta.c,v 1.33 2003/08/29 08:46:20 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -46,6 +46,7 @@
#include <include/window.h> #include <include/window.h>
#include <include/error.h> #include <include/error.h>
#include <include/mouse.h> #include <include/mouse.h>
#include <include/callback.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -942,6 +943,8 @@ IntInitializeDesktopGraphics(VOID)
{ {
ScreenDeviceContext = NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL); ScreenDeviceContext = NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL);
GDIOBJ_MarkObjectGlobal(ScreenDeviceContext); GDIOBJ_MarkObjectGlobal(ScreenDeviceContext);
/* not the best place to load the cursors but it's good for now */
IntLoadDefaultCursors();
EnableMouse(ScreenDeviceContext); EnableMouse(ScreenDeviceContext);
NtUserAcquireOrReleaseInputOwnership(FALSE); NtUserAcquireOrReleaseInputOwnership(FALSE);
} }