[ros-diffs] [navaraf] 16144: Compile CSRSS and WIN32CSR with NDK headers.

Compile CSRSS and WIN32CSR with NDK headers.
Modified: trunk/reactos/subsys/csrss/api/handle.c
Modified: trunk/reactos/subsys/csrss/api/process.c
Modified: trunk/reactos/subsys/csrss/api/user.c
Modified: trunk/reactos/subsys/csrss/api/wapi.c
Modified: trunk/reactos/subsys/csrss/csrss.c
Modified: trunk/reactos/subsys/csrss/include/api.h
Modified: trunk/reactos/subsys/csrss/init.c
Modified: trunk/reactos/subsys/csrss/print.c
Modified: trunk/reactos/subsys/csrss/video.c
Modified: trunk/reactos/subsys/csrss/win32csr/conio.c
Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c
Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c
  _____  

Modified: trunk/reactos/subsys/csrss/api/handle.c
--- trunk/reactos/subsys/csrss/api/handle.c	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/api/handle.c	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -9,9 +9,10 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #include "api.h"
 
 #define NDEBUG
  _____  

Modified: trunk/reactos/subsys/csrss/api/process.c
--- trunk/reactos/subsys/csrss/api/process.c	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/api/process.c	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -9,9 +9,10 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #include "api.h"
 #include "conio.h"
 
  _____  

Modified: trunk/reactos/subsys/csrss/api/user.c
--- trunk/reactos/subsys/csrss/api/user.c	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/api/user.c	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -9,11 +9,11 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <ddk/ntddk.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
-#include <csrss/csrss.h>
 #include "api.h"
-#include <ntdll/rtl.h>
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/csrss/api/wapi.c
--- trunk/reactos/subsys/csrss/api/wapi.c	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/api/wapi.c	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -10,18 +10,16 @@

 
 /* INCLUDES
******************************************************************/
 
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
+#include <ndk/ntndk.h>
+#include <rosrtl/thread.h>
 
+#include "api.h"
 
-
 #define NDEBUG
 #include <debug.h>
 
-#include "api.h"
-
 /* GLOBALS
*******************************************************************/
 
 HANDLE CsrssApiHeap = (HANDLE) 0;
  _____  

Modified: trunk/reactos/subsys/csrss/csrss.c
--- trunk/reactos/subsys/csrss/csrss.c	2005-06-20 08:31:48 UTC (rev
16143)
+++ trunk/reactos/subsys/csrss/csrss.c	2005-06-20 11:56:10 UTC (rev
16144)
@@ -31,8 +31,10 @@

  * 		First standalone run under ReactOS (it
  * 		actually does nothing but running).
  */
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <csrss/csrss.h>
 #include <rosrtl/string.h>
 #include <reactos/buildno.h>
  _____  

Modified: trunk/reactos/subsys/csrss/include/api.h
--- trunk/reactos/subsys/csrss/include/api.h	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/include/api.h	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -9,7 +9,8 @@

 #ifndef API_H_INCLUDED
 #define API_H_INCLUDED
 
-#include <ntos.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #include <csrss/csrss.h>
 
  _____  

Modified: trunk/reactos/subsys/csrss/init.c
--- trunk/reactos/subsys/csrss/init.c	2005-06-20 08:31:48 UTC (rev
16143)
+++ trunk/reactos/subsys/csrss/init.c	2005-06-20 11:56:10 UTC (rev
16144)
@@ -10,12 +10,12 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <ntdll/csr.h>
 #include <ntdll/rtl.h>
 #include <ntdll/ldr.h>
-#include <win32k/win32k.h>
 #include <rosrtl/string.h>
 #include <sm/helper.h>
 
@@ -423,15 +423,15 @@
 	if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0]))
 	{
 		WCHAR                      ImagePath [MAX_PATH + 1] =
{0};
-		SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo;
+		UNICODE_STRING             ModuleName;
 
 		wcscpy (ImagePath, L"\\??\\");
 		wcscat (ImagePath, Data);
-		RtlZeroMemory (& ImageInfo, sizeof ImageInfo);
-		RtlInitUnicodeString (& ImageInfo.ModuleName,
ImagePath);
-		Status = NtSetSystemInformation(SystemLoadAndCallImage,
-						& ImageInfo,
-						sizeof ImageInfo);
+		RtlInitUnicodeString (& ModuleName, ImagePath);
+		Status = NtSetSystemInformation(/* FIXME:
SystemLoadAndCallImage */
+
SystemExtendServiceTableInformation,
+						& ModuleName,
+						sizeof ModuleName);
 		if(!NT_SUCCESS(Status))
 		{
 			DPRINT("WIN: %s: loading Kmode failed
(Status=0x%08lx)\n",
  _____  

Modified: trunk/reactos/subsys/csrss/print.c
--- trunk/reactos/subsys/csrss/print.c	2005-06-20 08:31:48 UTC (rev
16143)
+++ trunk/reactos/subsys/csrss/print.c	2005-06-20 11:56:10 UTC (rev
16144)
@@ -27,9 +27,10 @@

  * 		Compiled successfully with egcs 1.1.2
  */
 
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntos.h>
 
 VOID STDCALL DisplayString(LPCWSTR lpwString)
 {
  _____  

Modified: trunk/reactos/subsys/csrss/video.c
--- trunk/reactos/subsys/csrss/video.c	2005-06-20 08:31:48 UTC (rev
16143)
+++ trunk/reactos/subsys/csrss/video.c	2005-06-20 11:56:10 UTC (rev
16144)
@@ -4,8 +4,8 @@

  */
 
 #include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntapi.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <rosrtl/string.h>
 
 ULONG
  _____  

Modified: trunk/reactos/subsys/csrss/win32csr/conio.c
--- trunk/reactos/subsys/csrss/win32csr/conio.c	2005-06-20 08:31:48 UTC
(rev 16143)
+++ trunk/reactos/subsys/csrss/win32csr/conio.c	2005-06-20 11:56:10 UTC
(rev 16144)
@@ -8,15 +8,15 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <string.h>
 #include <windows.h>
-
-#include <csrss/csrss.h>
-#include <ntdll/rtl.h>
-#include <ntdll/ldr.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <ddk/ntddblue.h>
 #include <rosrtl/string.h>
 #include <rosrtl/minmax.h>
+
+#include <string.h>
+
 #include "api.h"
 #include "conio.h"
 #include "desktopbg.h"
  _____  

Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c
--- trunk/reactos/subsys/csrss/win32csr/desktopbg.c	2005-06-20
08:31:48 UTC (rev 16143)
+++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c	2005-06-20
11:56:10 UTC (rev 16144)
@@ -7,20 +7,9 @@

  * ReactOS Operating System
  */
 
-/*
- * There is a problem with size of LPC_MESSAGE structure. In the old
ReactOS
- * headers it doesn't contain the data field and so it has a different
size.
- * We must use this workaround to get our Data field 0-sized.
- */
-
-#include <windef.h>
-#include <winnt.h>
-#undef ANYSIZE_ARRAY
-#define ANYSIZE_ARRAY 0
-#include <ddk/ntapi.h>
-
 #include <windows.h>
-#include <csrss/csrss.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #include "api.h"
 #include "desktopbg.h"
  _____  

Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c
--- trunk/reactos/subsys/csrss/win32csr/exitros.c	2005-06-20
08:31:48 UTC (rev 16143)
+++ trunk/reactos/subsys/csrss/win32csr/exitros.c	2005-06-20
11:56:10 UTC (rev 16144)
@@ -9,7 +9,10 @@

 /* INCLUDES
******************************************************************/
 
 #include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <reactos/winlogon.h>
+
 #include "api.h"
 #include "win32csr.h"