From 2d4d9762bb745d394a0873dc2568179159a7bdce Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sun, 26 Jun 2005 05:04:12 +0000
Subject: [PATCH] make lsass, win32k and vbe/xbox miniports use ndk instead of
 old headers

svn path=/trunk/; revision=16277
---
 reactos/drivers/video/miniport/vbe/vbemp.h    |  1 -
 .../drivers/video/miniport/xboxvmp/xboxvmp.c  |  2 +-
 .../drivers/video/miniport/xboxvmp/xboxvmp.h  |  2 +-
 reactos/subsys/system/lsass/lsass.c           |  4 +--
 reactos/subsys/win32k/ldr/loader.c            | 28 ++++++-------------
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h
index 44563778f76..5085be8748a 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.h
+++ b/reactos/drivers/video/miniport/vbe/vbemp.h
@@ -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
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
index 46a6784b3b0..734bd25b702 100644
--- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
+++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
@@ -366,7 +366,7 @@ XboxVmpMapVideoMemory(
                                           sizeof(SYSTEM_BASIC_INFORMATION),
                                           &Length)))
     {
-      FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPage * PAGE_SIZE;
+      FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE;
     }
   else
     {
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
index d90d21ee5bc..30afa57778c 100644
--- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
+++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
@@ -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>
diff --git a/reactos/subsys/system/lsass/lsass.c b/reactos/subsys/system/lsass/lsass.c
index 48457900d29..52df623845c 100644
--- a/reactos/subsys/system/lsass/lsass.c
+++ b/reactos/subsys/system/lsass/lsass.c
@@ -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
diff --git a/reactos/subsys/win32k/ldr/loader.c b/reactos/subsys/win32k/ldr/loader.c
index de3325ddd9c..5137d38eb71 100644
--- a/reactos/subsys/win32k/ldr/loader.c
+++ b/reactos/subsys/win32k/ldr/loader.c
@@ -19,21 +19,11 @@
 /* $Id$
  *
  */
-
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <ddk/ntapi.h>
+#include <w32k.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 @@ HANDLE
 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 @@ HANDLE
 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 */