From 72e43c4b3374e0df6197b90c891b670cc306af2d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 13 Jan 2019 15:56:23 +0100 Subject: [PATCH] [VGA_NEW] Fix 64 bit issues --- win32ss/drivers/miniport/vga_new/modeset.c | 18 +++++++++--------- win32ss/drivers/miniport/vga_new/vga.c | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/win32ss/drivers/miniport/vga_new/modeset.c b/win32ss/drivers/miniport/vga_new/modeset.c index 4df1004b87f..2466edc7020 100644 --- a/win32ss/drivers/miniport/vga_new/modeset.c +++ b/win32ss/drivers/miniport/vga_new/modeset.c @@ -33,7 +33,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -42,7 +42,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -51,7 +51,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VOID @@ -99,12 +99,12 @@ Return Value: { ULONG ulCmd; - ULONG ulPort; + ULONG_PTR ulPort; UCHAR jValue; USHORT usValue; ULONG culCount; ULONG ulIndex; - ULONG ulBase; + ULONG_PTR ulBase; if (pusCmdStream == NULL) { @@ -112,7 +112,7 @@ Return Value: return TRUE; } - ulBase = (ULONG)HwDeviceExtension->IOAddress; + ulBase = (ULONG_PTR)HwDeviceExtension->IOAddress; // // Now set the adapter to the desired mode. @@ -518,7 +518,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ @@ -656,7 +656,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ @@ -720,7 +720,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ diff --git a/win32ss/drivers/miniport/vga_new/vga.c b/win32ss/drivers/miniport/vga_new/vga.c index 1b07397419c..41906254181 100644 --- a/win32ss/drivers/miniport/vga_new/vga.c +++ b/win32ss/drivers/miniport/vga_new/vga.c @@ -53,7 +53,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -62,7 +62,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -71,7 +71,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS