From 86691d3afede1cb6c521049ded3dcf52c101ed1a Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sat, 1 Nov 2008 14:31:54 +0000
Subject: [PATCH] - Update NtUserInitialize and show where it belongs.

svn path=/trunk/; revision=37130
---
 reactos/include/reactos/win32k/ntuser.h                |  8 ++++----
 reactos/subsystems/win32/csrss/win32csr/dllmain.c      |  3 +++
 reactos/subsystems/win32/csrss/win32csr/w32csr.h       |  5 +++++
 .../subsystems/win32/csrss/win32csr/win32csr.rbuild    |  1 +
 reactos/subsystems/win32/win32k/ntuser/ntstubs.c       | 10 +++++-----
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index 0a5edacdeff..6b5d5a34c4e 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -1724,12 +1724,12 @@ NtUserImpersonateDdeClientWindow(
   HWND hWndClient,
   HWND hWndServer);
 
-DWORD
+NTSTATUS
 NTAPI
 NtUserInitialize(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3);
+  DWORD   dwWinVersion,
+  HANDLE  hPowerRequestEvent,
+  HANDLE  hMediaRequestEvent);
 
 NTSTATUS
 NTAPI
diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
index 554c7a75afb..1006de6141e 100644
--- a/reactos/subsystems/win32/csrss/win32csr/dllmain.c
+++ b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
@@ -586,9 +586,12 @@ Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
                        PCSRSS_EXPORTED_FUNCS Exports,
                        HANDLE CsrssApiHeap)
 {
+  NTSTATUS Status;
   CsrExports = *Exports;
   Win32CsrApiHeap = CsrssApiHeap;
 
+  Status = NtUserInitialize(0 ,NULL, NULL);
+
   PrivateCsrssManualGuiCheck(0);
   CsrInitConsoleSupport();
 
diff --git a/reactos/subsystems/win32/csrss/win32csr/w32csr.h b/reactos/subsystems/win32/csrss/win32csr/w32csr.h
index f7b9aaada52..f6f0f4e649c 100644
--- a/reactos/subsystems/win32/csrss/win32csr/w32csr.h
+++ b/reactos/subsystems/win32/csrss/win32csr/w32csr.h
@@ -22,6 +22,11 @@
 #include "tuiconsole.h"
 #include <win32csr.h>
 
+/* Public Win32K Headers */
+#include <win32k/ntusrtyp.h>
+#include <win32k/ntuser.h>
+#include <win32k/callback.h>
+
 #include <tchar.h>
 #include <wchar.h>
 #include <cpl.h>
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
index 89abac4ca6a..e0033909c66 100644
--- a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
+++ b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
@@ -13,6 +13,7 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
+        <library>win32ksys</library>
 	<library>psapi</library>
 	<library>msvcrt</library>
 	<library>psapi</library>
diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
index 50d84e36e12..8ca98102593 100644
--- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
+++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
@@ -805,15 +805,15 @@ NtUserHardErrorControl(
     return 0;
 }
 
-DWORD
+NTSTATUS
 NTAPI
 NtUserInitialize(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3)
+  DWORD   dwWinVersion,
+  HANDLE  hPowerRequestEvent,
+  HANDLE  hMediaRequestEvent)
 {
     UNIMPLEMENTED;
-    return 0;
+    return STATUS_SUCCESS;
 }
 
 DWORD