fixed the definition of User32SetupDefaultCursors()

svn path=/trunk/; revision=5911

diff --git a/reactos/include/user32/callback.h b/reactos/include/user32/callback.h
index b45e56c..4c1fb28 100644 (file)
--- a/reactos/include/user32/callback.h
+++ b/reactos/include/user32/callback.h
@@ -123,5 +123,7 @@ NTSTATUS STDCALL
 User32SendSTYLECHANGEDMessageForKernel(PVOID Arguments, ULONG ArgumentLength);
 NTSTATUS STDCALL
 User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength);
+NTSTATUS STDCALL
+User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength);
 
 #endif /* __INCLUDE_USER32_CALLBACK_H */

diff --git a/reactos/lib/user32/include/user32.h b/reactos/lib/user32/include/user32.h
index c4921fb..1aceca3 100644 (file)
--- a/reactos/lib/user32/include/user32.h
+++ b/reactos/lib/user32/include/user32.h
@@ -16,5 +16,3 @@ PUSER32_THREAD_DATA User32GetThreadData();
 
 VOID DeleteFrameBrushes(VOID);
 
-BOOL FASTCALL
-User32SetupDefaultCursors(void);

diff --git a/reactos/lib/user32/windows/cursor.c b/reactos/lib/user32/windows/cursor.c
index c57a93f..245d869 100644 (file)
--- a/reactos/lib/user32/windows/cursor.c
+++ b/reactos/lib/user32/windows/cursor.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: 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
  * FILE:            lib/user32/windows/cursor.c
@@ -36,11 +36,10 @@
 /* INTERNAL ******************************************************************/
 
 /* This callback routine is called directly after switching to gui mode */
-BOOL FASTCALL
-User32SetupDefaultCursors(void)
+NTSTATUS STDCALL
+User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength)
 {
   LRESULT Result = TRUE;
-  
   /* FIXME load system cursor scheme */
   
   return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS));

diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsys/win32k/ntuser/winsta.c
index 2845cd9..e6c20be 100644 (file)
--- a/reactos/subsys/win32k/ntuser/winsta.c
+++ b/reactos/subsys/win32k/ntuser/winsta.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: 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
  * PROJECT:          ReactOS kernel
@@ -46,6 +46,7 @@
 #include <include/window.h>
 #include <include/error.h>
 #include <include/mouse.h>
+#include <include/callback.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -942,6 +943,8 @@ IntInitializeDesktopGraphics(VOID)
 {
   ScreenDeviceContext = NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL);
   GDIOBJ_MarkObjectGlobal(ScreenDeviceContext);
+  /* not the best place to load the cursors but it's good for now */
+  IntLoadDefaultCursors();
   EnableMouse(ScreenDeviceContext);
   NtUserAcquireOrReleaseInputOwnership(FALSE);
 }