Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-12 22:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]

Browse source 
Adjust Bda->ScreenColumns in graphics modes. Fix line wrapping.


svn path=/trunk/; revision=68090
This commit is contained in:
Aleksandar Andrejevic 2015-06-09 14:00:43 +00:00
parent d15ab1916a
commit e730ef4e7d
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
View file

@ -2445,6 +2445,9 @@ static BOOLEAN VidBiosSetVideoMode(BYTE ModeNumber)
Bda->ScreenColumns = Resolution.X; Bda->ScreenColumns = Resolution.X;
Bda->ScreenRows = Resolution.Y - 1; Bda->ScreenRows = Resolution.Y - 1;
/* Adjust the number of columns for graphics modes */
if (ModeNumber > 3) Bda->ScreenColumns >>= 3;
/* Update the current font */ /* Update the current font */
Bda->CharacterHeight = VideoModes[ModeNumber].CharacterHeight; Bda->CharacterHeight = VideoModes[ModeNumber].CharacterHeight;
switch (Bda->CharacterHeight) switch (Bda->CharacterHeight)
@ -2614,15 +2617,17 @@ static VOID VidBiosDrawGlyph(WORD CharData, BOOLEAN UseAttr, BYTE Page, BYTE Row
/* Read from VGA memory to load the latch register */ /* Read from VGA memory to load the latch register */
EmulatorReadMemory(&EmulatorContext, EmulatorReadMemory(&EmulatorContext,
TO_LINEAR(CgaSegment[(Row + i) & 1], TO_LINEAR(CgaSegment[(Row * Bda->CharacterHeight + i) & 1],
((((Row + i) >> 1) * Bda->ScreenColumns) >> 2) + Column * 2), (((Row * Bda->CharacterHeight + i) >> 1)
* Bda->ScreenColumns + Column) * 2),
(LPVOID)&Dummy, (LPVOID)&Dummy,
sizeof(USHORT)); sizeof(USHORT));
} }
EmulatorWriteMemory(&EmulatorContext, EmulatorWriteMemory(&EmulatorContext,
TO_LINEAR(CgaSegment[(Row + i) & 1], TO_LINEAR(CgaSegment[(Row * Bda->CharacterHeight + i) & 1],
((((Row + i) >> 1) * Bda->ScreenColumns) >> 2) + Column * 2), (((Row * Bda->CharacterHeight + i) >> 1)
* Bda->ScreenColumns + Column) * 2),
(LPVOID)&Pixel, (LPVOID)&Pixel,
sizeof(USHORT)); sizeof(USHORT));
} }
@ -2662,15 +2667,17 @@ static VOID VidBiosDrawGlyph(WORD CharData, BOOLEAN UseAttr, BYTE Page, BYTE Row
/* Read from VGA memory to load the latch register */ /* Read from VGA memory to load the latch register */
EmulatorReadMemory(&EmulatorContext, EmulatorReadMemory(&EmulatorContext,
TO_LINEAR(CgaSegment[(Row + i) & 1], TO_LINEAR(CgaSegment[(Row * Bda->CharacterHeight + i) & 1],
((((Row + i) >> 1) * Bda->ScreenColumns) >> 3) + Column), (((Row * Bda->CharacterHeight + i) >> 1)
* Bda->ScreenColumns) + Column),
(LPVOID)&Dummy, (LPVOID)&Dummy,
sizeof(UCHAR)); sizeof(UCHAR));
} }
EmulatorWriteMemory(&EmulatorContext, EmulatorWriteMemory(&EmulatorContext,
TO_LINEAR(CgaSegment[(Row + i) & 1], TO_LINEAR(CgaSegment[(Row * Bda->CharacterHeight + i) & 1],
((((Row + i) >> 1) * Bda->ScreenColumns) >> 3) + Column), (((Row * Bda->CharacterHeight + i) >> 1)
* Bda->ScreenColumns) + Column),
(LPVOID)&Glyph[i], (LPVOID)&Glyph[i],
sizeof(UCHAR)); sizeof(UCHAR));
} }
@ -2734,14 +2741,16 @@ static VOID VidBiosDrawGlyph(WORD CharData, BOOLEAN UseAttr, BYTE Page, BYTE Row
/* Read from VGA memory to load the latch register */ /* Read from VGA memory to load the latch register */
EmulatorReadMemory(&EmulatorContext, EmulatorReadMemory(&EmulatorContext,
TO_LINEAR(GRAPHICS_VIDEO_SEG, TO_LINEAR(GRAPHICS_VIDEO_SEG,
(((Row + i) * Bda->ScreenColumns) >> 3) + Column), ((Row * Bda->CharacterHeight + i)
* Bda->ScreenColumns) + Column),
(LPVOID)&Dummy, (LPVOID)&Dummy,
sizeof(UCHAR)); sizeof(UCHAR));
} }
EmulatorWriteMemory(&EmulatorContext, EmulatorWriteMemory(&EmulatorContext,
TO_LINEAR(GRAPHICS_VIDEO_SEG, TO_LINEAR(GRAPHICS_VIDEO_SEG,
(((Row + i) * Bda->ScreenColumns) >> 3) + Column), ((Row * Bda->CharacterHeight + i)
* Bda->ScreenColumns) + Column),
(LPVOID)&Glyph[i], (LPVOID)&Glyph[i],
sizeof(UCHAR)); sizeof(UCHAR));
} }
@ -2782,7 +2791,8 @@ static VOID VidBiosDrawGlyph(WORD CharData, BOOLEAN UseAttr, BYTE Page, BYTE Row
EmulatorWriteMemory(&EmulatorContext, EmulatorWriteMemory(&EmulatorContext,
TO_LINEAR(GRAPHICS_VIDEO_SEG, TO_LINEAR(GRAPHICS_VIDEO_SEG,
(Row + i) * Bda->ScreenColumns + Column * 8), ((Row * Bda->CharacterHeight + i)
* Bda->ScreenColumns + Column) << 3),
(LPVOID)PixelBuffer, (LPVOID)PixelBuffer,
sizeof(PixelBuffer)); sizeof(PixelBuffer));
} }