Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

make lsass, win32k and vbe/xbox miniports use ndk instead of old headers

Browse source 
svn path=/trunk/; revision=16277
This commit is contained in:
Alex Ionescu 2005-06-26 05:04:12 +00:00
parent 499eae2bd2
commit 2d4d9762bb
5 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/drivers/video/miniport/vbe/vbemp.h
View file

@ -27,7 +27,6 @@
#include <ddk/miniport.h> #include <ddk/miniport.h>
#include <ddk/video.h> #include <ddk/video.h>
#include <ddk/ntddvdeo.h> #include <ddk/ntddvdeo.h>
#include <ddk/ntapi.h>
/* /*
* Compile-time define to get VBE 1.2 support. The implementation * Compile-time define to get VBE 1.2 support. The implementation

2
reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
View file

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

2
reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
View file

@ -28,7 +28,7 @@
#include <ddk/miniport.h> #include <ddk/miniport.h>
#include <ddk/video.h> #include <ddk/video.h>
#include <ddk/ntddvdeo.h> #include <ddk/ntddvdeo.h>
#include <ddk/ntapi.h> #include <ndk/ntndk.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>

4
reactos/subsys/system/lsass/lsass.c
View file

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

28
reactos/subsys/win32k/ldr/loader.c
View file

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