[tkreuzer] 57786: [VGA/VGA_NEW] Fix MSVC warnings

Author: tkreuzer
Date: Sat Dec  1 11:49:59 2012
New Revision: 57786

URL: http://svn.reactos.org/svn/reactos?rev=57786&view=rev
Log:
[VGA/VGA_NEW]
Fix MSVC warnings

Modified:
    trunk/reactos/win32ss/drivers/miniport/vga/initvga.c
    trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c

Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg...
==============================================================================
--- trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] Sat Dec  1 11:49:59 2012
@@ -21,7 +21,7 @@
 static VOID FASTCALL
 vgaSaveRegisters(PVGA_REGISTERS Registers)
 {
-   SIZE_T i;
+   UCHAR i;

for (i = 0; i < sizeof(Registers->CRT); i++)
    {
@@ -54,7 +54,7 @@
 static VOID FASTCALL
 vgaSetRegisters(PVGA_REGISTERS Registers)
 {
-   SIZE_T i;
+   UCHAR i;

/* Update misc output register */
    VideoPortWritePortUchar(MISC, Registers->Misc);

Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg...
==============================================================================
--- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Sat Dec  1 11:49:59 2012
@@ -168,7 +168,7 @@
     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 @@
             {
                 /* 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 @@
                 //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 */