From c6af94415da2b73a81d07299742fc4ad9e5be81c Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sun, 26 Jun 2005 04:00:25 +0000 Subject: [PATCH] Build videoprt with NDK svn path=/trunk/; revision=16274 --- reactos/drivers/video/videoprt/videoprt.c | 12 ++++++------ reactos/drivers/video/videoprt/videoprt.h | 21 +++------------------ reactos/drivers/video/videoprt/videoprt.xml | 1 + 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/drivers/video/videoprt/videoprt.c index 4f8004bc636..e82d4ca77e4 100644 --- a/reactos/drivers/video/videoprt/videoprt.c +++ b/reactos/drivers/video/videoprt/videoprt.c @@ -65,7 +65,7 @@ IntVideoPortGetProcAddress( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) { - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; PVOID BaseAddress; PIMAGE_EXPORT_DIRECTORY ExportDir; PUSHORT OrdinalPtr; @@ -76,18 +76,18 @@ IntVideoPortGetProcAddress( DPRINT("VideoPortGetProcAddress(%s)\n", FunctionName); - RtlInitUnicodeString(&GdiDriverInfo.ModuleName, L"videoprt"); + RtlInitUnicodeString(&GdiDriverInfo.DriverName, L"videoprt"); Status = ZwSetSystemInformation( - SystemLoadImage, + SystemLoadGdiDriverInformation, &GdiDriverInfo, - sizeof(SYSTEM_LOAD_IMAGE)); + sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) { DPRINT("Couldn't get our own module handle?\n"); return NULL; } - BaseAddress = GdiDriverInfo.ModuleBase; + BaseAddress = GdiDriverInfo.ImageAddress; /* Get the pointer to the export directory */ ExportDir = (PIMAGE_EXPORT_DIRECTORY)IntVideoPortImageDirectoryEntryToData( @@ -359,7 +359,7 @@ IntVideoPortFindAdapter( { ConfigInfo.SystemMemorySize = SystemBasicInfo.NumberOfPhysicalPages * - SystemBasicInfo.PhysicalPageSize; + SystemBasicInfo.PageSize; } /* diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/drivers/video/videoprt/videoprt.h index 9f8c072ca58..6230d0f4398 100644 --- a/reactos/drivers/video/videoprt/videoprt.h +++ b/reactos/drivers/video/videoprt/videoprt.h @@ -28,29 +28,14 @@ #include #include #include -#include #include -/* For process attaching functions */ #include +#include +#include + #define NDEBUG #include -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -int swprintf(wchar_t *buf, const wchar_t *fmt, ...); -int vsprintf(char *buf, const char *fmt, va_list args); - -BOOLEAN STDCALL -HalDisableSystemInterrupt(ULONG Vector, - KIRQL Irql); - -BOOLEAN STDCALL -HalEnableSystemInterrupt(ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode); - -PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader(IN PVOID BaseAddress); - #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') typedef struct _VIDEO_PORT_ADDRESS_MAPPING diff --git a/reactos/drivers/video/videoprt/videoprt.xml b/reactos/drivers/video/videoprt/videoprt.xml index e334ba7299d..fc8a3682523 100644 --- a/reactos/drivers/video/videoprt/videoprt.xml +++ b/reactos/drivers/video/videoprt/videoprt.xml @@ -5,6 +5,7 @@ ntoskrnl hal + videoprt.h agp.c ddc.c dispatch.c