Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VGA/VGA_NEW]

Browse source 
Fix MSVC warnings

svn path=/trunk/; revision=57786
This commit is contained in:
Timo Kreuzer 2012-12-01 11:49:59 +00:00
parent 9b5490c235
commit 1daa25afee
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/win32ss/drivers/miniport/vga/initvga.c
View file

@ -21,7 +21,7 @@ VGA_REGISTERS TextModeRegs;
static VOID FASTCALL static VOID FASTCALL
vgaSaveRegisters(PVGA_REGISTERS Registers) vgaSaveRegisters(PVGA_REGISTERS Registers)
{ {
SIZE_T i; UCHAR i;
for (i = 0; i < sizeof(Registers->CRT); i++) for (i = 0; i < sizeof(Registers->CRT); i++)
{ {
@ -54,7 +54,7 @@ vgaSaveRegisters(PVGA_REGISTERS Registers)
static VOID FASTCALL static VOID FASTCALL
vgaSetRegisters(PVGA_REGISTERS Registers) vgaSetRegisters(PVGA_REGISTERS Registers)
{ {
SIZE_T i; UCHAR i;
/* Update misc output register */ /* Update misc output register */
VideoPortWritePortUchar(MISC, Registers->Misc); VideoPortWritePortUchar(MISC, Registers->Misc);

8
reactos/win32ss/drivers/miniport/vga_new/vbemodes.c
View file

@ -168,7 +168,7 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension)
ULONG Size, ScreenSize; ULONG Size, ScreenSize;
PVIDEOMODE VgaMode; PVIDEOMODE VgaMode;
PVOID BaseAddress; PVOID BaseAddress;
ULONG ScreenStride = 0; ULONG ScreenStride;
PHYSICAL_ADDRESS PhysicalAddress; PHYSICAL_ADDRESS PhysicalAddress;
/* Enable only default vga modes if no vesa */ /* Enable only default vga modes if no vesa */
@ -345,7 +345,8 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension)
{ {
/* Read the screen stride (scanline size) */ /* Read the screen stride (scanline size) */
ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); 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); //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride);
/* Size of frame buffer is Height X ScanLine, align to bank/page size */ /* 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"); //VideoPortDebugPrint(0, "LINEAR MODE!!!\n");
ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0;
if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; 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); //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride);
/* Size of frame buffer is Height X ScanLine, align to page size */ /* Size of frame buffer is Height X ScanLine, align to page size */