[CMAKE]

[reactos.git] / subsystems / win32 / win32k / ntuser / ntuser.c

diff --git a/subsystems/win32/win32k/ntuser/ntuser.c b/subsystems/win32/win32k/ntuser/ntuser.c
index 47ce355..d28aa33 100644 (file)
--- a/subsystems/win32/win32k/ntuser/ntuser.c
+++ b/subsystems/win32/win32k/ntuser/ntuser.c
@@ -9,7 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <w32k.h>
+#include <win32k.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -53,8 +53,10 @@ InitUserAtoms(VOID)
 
 /* FUNCTIONS *****************************************************************/
 
-
-NTSTATUS FASTCALL InitUserImpl(VOID)
+INIT_FUNCTION
+NTSTATUS
+NTAPI
+InitUserImpl(VOID)
 {
    NTSTATUS Status;
 
@@ -80,8 +82,9 @@ NTSTATUS FASTCALL InitUserImpl(VOID)
    return STATUS_SUCCESS;
 }
 
-BOOL
-InitVideo(ULONG);
+NTSTATUS
+NTAPI
+InitVideo();
 
 NTSTATUS
 NTAPI
@@ -94,8 +97,11 @@ UserInitialize(
 // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA)
 // Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations"
 // Create Event for Diconnect Desktop.
-    InitVideo(0);
-// Initialize Video.
+
+    /* Initialize Video. */
+    Status = InitVideo();
+    if (!NT_SUCCESS(Status)) return Status;
+
 // {
 //     DrvInitConsole.
 //     DrvChangeDisplaySettings.
@@ -109,7 +115,7 @@ UserInitialize(
    
 //    Callback to User32 Client Thread Setup
 
-    Status = co_IntClientThreadSetup();
+    co_IntClientThreadSetup();
 
 // }
 // Set Global SERVERINFO Error flags.
@@ -117,6 +123,8 @@ UserInitialize(
 
     NtUserUpdatePerUserSystemParameters(0, TRUE);
 
+    CsrInit();
+
     return STATUS_SUCCESS;
 }