From 1daa25afee4a8a7e004568c0f795ba50377f5fc6 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 1 Dec 2012 11:49:59 +0000 Subject: [PATCH] [VGA/VGA_NEW] Fix MSVC warnings svn path=/trunk/; revision=57786 --- reactos/win32ss/drivers/miniport/vga/initvga.c | 4 ++-- reactos/win32ss/drivers/miniport/vga_new/vbemodes.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/reactos/win32ss/drivers/miniport/vga/initvga.c b/reactos/win32ss/drivers/miniport/vga/initvga.c index 5e24286b617..3b523f5d38b 100644 --- a/reactos/win32ss/drivers/miniport/vga/initvga.c +++ b/reactos/win32ss/drivers/miniport/vga/initvga.c @@ -21,7 +21,7 @@ VGA_REGISTERS TextModeRegs; static VOID FASTCALL vgaSaveRegisters(PVGA_REGISTERS Registers) { - SIZE_T i; + UCHAR i; for (i = 0; i < sizeof(Registers->CRT); i++) { @@ -54,7 +54,7 @@ vgaSaveRegisters(PVGA_REGISTERS Registers) static VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - SIZE_T i; + UCHAR i; /* Update misc output register */ VideoPortWritePortUchar(MISC, Registers->Misc); diff --git a/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c b/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c index 5e2fc4aef8b..e322ac003ab 100644 --- a/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c +++ b/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c @@ -168,7 +168,7 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension) ULONG Size, ScreenSize; PVIDEOMODE VgaMode; PVOID BaseAddress; - ULONG ScreenStride = 0; + ULONG ScreenStride; PHYSICAL_ADDRESS PhysicalAddress; /* Enable only default vga modes if no vesa */ @@ -345,7 +345,8 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension) { /* Read the screen stride (scanline size) */ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); - VgaMode->wbytes = ScreenStride; + //ASSERT(ScreenStride <= MAX_USHORT); + VgaMode->wbytes = (USHORT)ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); /* Size of frame buffer is Height X ScanLine, align to bank/page size */ @@ -372,7 +373,8 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension) //VideoPortDebugPrint(0, "LINEAR MODE!!!\n"); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; - VgaMode->wbytes = ScreenStride; + //ASSERT(ScreenStride <= MAX_USHORT); + VgaMode->wbytes = (USHORT)ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); /* Size of frame buffer is Height X ScanLine, align to page size */