[ros-diffs] [ion] 16277: make lsass, win32k and vbe/xbox miniports use ndk instead of old headers

make lsass, win32k and vbe/xbox miniports use ndk instead of old headers
Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h
Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
Modified: trunk/reactos/subsys/system/lsass/lsass.c
Modified: trunk/reactos/subsys/win32k/ldr/loader.c
  _____  

Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.h	2005-06-26
04:50:07 UTC (rev 16276)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h	2005-06-26
05:04:12 UTC (rev 16277)
@@ -27,7 +27,6 @@

 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
-#include <ddk/ntapi.h>
 
 /*
  * Compile-time define to get VBE 1.2 support. The implementation
  _____  

Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
--- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
2005-06-26 04:50:07 UTC (rev 16276)
+++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
2005-06-26 05:04:12 UTC (rev 16277)
@@ -366,7 +366,7 @@

 
sizeof(SYSTEM_BASIC_INFORMATION),
                                           &Length)))
     {
-      FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPage *
PAGE_SIZE;
+      FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber *
PAGE_SIZE;
     }
   else
     {
  _____  

Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
--- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
2005-06-26 04:50:07 UTC (rev 16276)
+++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
2005-06-26 05:04:12 UTC (rev 16277)
@@ -28,7 +28,7 @@

 #include <ddk/miniport.h>
 #include <ddk/video.h>
 #include <ddk/ntddvdeo.h>
-#include <ddk/ntapi.h>
+#include <ndk/ntndk.h>
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/lsass/lsass.c
--- trunk/reactos/subsys/system/lsass/lsass.c	2005-06-26 04:50:07 UTC
(rev 16276)
+++ trunk/reactos/subsys/system/lsass/lsass.c	2005-06-26 05:04:12 UTC
(rev 16277)
@@ -26,9 +26,9 @@

  * 	19990704 (Emanuele Aliberti)
  * 		Compiled successfully with egcs 1.1.2
  */
-#include <ddk/ntddk.h>
 #include <windows.h>
-#include <ddk/ntapi.h>
+#include NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <lsass/lsasrv.h>
 
 #define NDEBUG
  _____  

Modified: trunk/reactos/subsys/win32k/ldr/loader.c
--- trunk/reactos/subsys/win32k/ldr/loader.c	2005-06-26 04:50:07 UTC
(rev 16276)
+++ trunk/reactos/subsys/win32k/ldr/loader.c	2005-06-26 05:04:12 UTC
(rev 16277)
@@ -19,21 +19,11 @@

 /* $Id$
  *
  */
+#include <w32k.h>
 
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <ddk/ntapi.h>
-
 #define NDEBUG
 #include <debug.h>
 
-#ifdef __USE_W32API
-PIMAGE_NT_HEADERS STDCALL
-RtlImageNtHeader(PVOID);
-PVOID STDCALL
-RtlImageDirectoryEntryToData(PVOID,BOOLEAN,ULONG,PULONG);
-#endif
-
 /*
  * Blatantly stolen from ldr/utils.c in ntdll.  I can't link ntdll from
  * here, though.
@@ -198,14 +188,14 @@
 STDCALL
 EngLoadImage (LPWSTR DriverName)
 {
-  SYSTEM_LOAD_IMAGE GdiDriverInfo;
+  SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo;
   NTSTATUS Status;
 
-  RtlInitUnicodeString(&GdiDriverInfo.ModuleName, DriverName);
-  Status = ZwSetSystemInformation(SystemLoadImage, &GdiDriverInfo,
sizeof(SYSTEM_LOAD_IMAGE));
+  RtlInitUnicodeString(&GdiDriverInfo.DriverName, DriverName);
+  Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation,
&GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION));
   if (!NT_SUCCESS(Status)) return NULL;
 
-  return (HANDLE)GdiDriverInfo.ModuleBase;
+  return (HANDLE)GdiDriverInfo.ImageAddress;
 }
 
 
@@ -216,16 +206,16 @@
 STDCALL
 EngLoadModule(LPWSTR ModuleName)
 {
-  SYSTEM_LOAD_IMAGE GdiDriverInfo;
+  SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo;
   NTSTATUS Status;
 
   // FIXME: should load as readonly
 
-  RtlInitUnicodeString (&GdiDriverInfo.ModuleName, ModuleName);
-  Status = ZwSetSystemInformation (SystemLoadImage, &GdiDriverInfo,
sizeof(SYSTEM_LOAD_IMAGE));
+  RtlInitUnicodeString (&GdiDriverInfo.DriverName, ModuleName);
+  Status = ZwSetSystemInformation (SystemLoadGdiDriverInformation,
&GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION));
   if (!NT_SUCCESS(Status)) return NULL;
 
-  return (HANDLE)GdiDriverInfo.ModuleBase;
+  return (HANDLE)GdiDriverInfo.ImageAddress;
 }
 
 /* EOF */