[ros-diffs] [jimtabor] 37130: - Update NtUserInitialize and show where it belongs.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Sat Nov  1 09:31:54 2008
New Revision: 37130

URL: http://svn.reactos.org/svn/reactos?rev=37130&view=rev
Log:
- Update NtUserInitialize and show where it belongs.

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c
    trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h
    trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
    trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=37130&r1=37129&r2=37130&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Nov  1 09:31:54 2008
@@ -1724,12 +1724,12 @@
   HWND hWndClient,
   HWND hWndServer);
 
-DWORD
+NTSTATUS
 NTAPI
 NtUserInitialize(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3);
+  DWORD   dwWinVersion,
+  HANDLE  hPowerRequestEvent,
+  HANDLE  hMediaRequestEvent);
 
 NTSTATUS
 NTAPI

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c?rev=37130&r1=37129&r2=37130&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Nov  1 09:31:54 2008
@@ -586,8 +586,11 @@
                        PCSRSS_EXPORTED_FUNCS Exports,
                        HANDLE CsrssApiHeap)
 {
+  NTSTATUS Status;
   CsrExports = *Exports;
   Win32CsrApiHeap = CsrssApiHeap;
+
+  Status = NtUserInitialize(0 ,NULL, NULL);
 
   PrivateCsrssManualGuiCheck(0);
   CsrInitConsoleSupport();

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h?rev=37130&r1=37129&r2=37130&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Sat Nov  1 09:31:54 2008
@@ -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>

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild?rev=37130&r1=37129&r2=37130&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Nov  1 09:31:54 2008
@@ -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>

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c?rev=37130&r1=37129&r2=37130&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Nov  1 09:31:54 2008
@@ -805,15 +805,15 @@
     return 0;
 }
 
-DWORD
+NTSTATUS
 NTAPI
 NtUserInitialize(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3)
-{
-    UNIMPLEMENTED;
-    return 0;
+  DWORD   dwWinVersion,
+  HANDLE  hPowerRequestEvent,
+  HANDLE  hMediaRequestEvent)
+{
+    UNIMPLEMENTED;
+    return STATUS_SUCCESS;
 }
 
 DWORD