Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 09:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]

Browse source 
Fix few problems in BiosCopyTextConsoleToVgaMemory (copied screen region and temp buffer freeing).

svn path=/branches/ntvdm/; revision=61544
This commit is contained in:
Hermès Bélusca-Maïto 2014-01-06 00:17:59 +00:00
parent 98e367f291
commit 0042be70fb
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
subsystems/ntvdm/bios.c
View file

@ -797,12 +797,12 @@ Done:
return TRUE; return TRUE;
} }
static VOID BiosCopyTextConsoleToVgaMemory(VOID) static VOID BiosCopyTextConsoleToVgaMemory(PCOORD ConsoleSize)
{ {
PCHAR_INFO CharBuffer; PCHAR_INFO CharBuffer;
COORD BufferSize = {Bda->ScreenColumns, Bda->ScreenRows + 1}; COORD BufferSize = {Bda->ScreenColumns, Bda->ScreenRows + 1};
COORD Origin = { 0, 0 }; COORD Origin = { 0, 0 };
SMALL_RECT ScreenRect; SMALL_RECT ConRect;
INT i, j; INT i, j;
INT Counter = 0; INT Counter = 0;
@ -816,16 +816,17 @@ static VOID BiosCopyTextConsoleToVgaMemory(VOID)
* sizeof(CHAR_INFO)); * sizeof(CHAR_INFO));
if (CharBuffer == NULL) return; if (CharBuffer == NULL) return;
ScreenRect.Left = ScreenRect.Top = 0; ConRect.Left = 0;
ScreenRect.Right = BufferSize.X; ConRect.Top = ConsoleSize->Y - BufferSize.Y;
ScreenRect.Bottom = BufferSize.Y; ConRect.Right = ConRect.Left + BufferSize.X - 1;
ConRect.Bottom = ConRect.Top + BufferSize.Y - 1;
/* Read the data from the console into the temporary buffer... */ /* Read the data from the console into the temporary buffer... */
ReadConsoleOutputA(BiosConsoleOutput, ReadConsoleOutputA(BiosConsoleOutput,
CharBuffer, CharBuffer,
BufferSize, BufferSize,
Origin, Origin,
&ScreenRect); &ConRect);
/* ... and copy the temporary buffer into the VGA memory */ /* ... and copy the temporary buffer into the VGA memory */
for (i = 0; i < BufferSize.Y; i++) for (i = 0; i < BufferSize.Y; i++)
@ -842,6 +843,9 @@ static VOID BiosCopyTextConsoleToVgaMemory(VOID)
sizeof(WORD)); sizeof(WORD));
} }
} }
/* Free the temporary buffer */
HeapFree(GetProcessHeap(), 0, CharBuffer);
} }
static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers)
@ -1910,11 +1914,12 @@ BOOLEAN BiosInitialize(VOID)
/* Set the default video mode */ /* Set the default video mode */
BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE);
GetConsoleScreenBufferInfo(BiosConsoleOutput, &ConsoleInfo);
/* Copy console data into VGA memory */ /* Copy console data into VGA memory */
BiosCopyTextConsoleToVgaMemory(); BiosCopyTextConsoleToVgaMemory(&ConsoleInfo.dwSize);
/* Update the cursor position for the current page */ /* Update the cursor position for the current page */
GetConsoleScreenBufferInfo(BiosConsoleOutput, &ConsoleInfo);
BiosSetCursorPosition(ConsoleInfo.dwCursorPosition.Y, BiosSetCursorPosition(ConsoleInfo.dwCursorPosition.Y,
ConsoleInfo.dwCursorPosition.X, ConsoleInfo.dwCursorPosition.X,
Bda->VideoPage); Bda->VideoPage);
@ -1968,8 +1973,8 @@ VOID BiosCleanup(VOID)
// ConRect.Top = ConsoleInfo.dwCursorPosition.Y / (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1); // ConRect.Top = ConsoleInfo.dwCursorPosition.Y / (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1);
// ConRect.Top *= (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1); // ConRect.Top *= (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1);
ConRect.Top = ConsoleInfo.dwCursorPosition.Y; ConRect.Top = ConsoleInfo.dwCursorPosition.Y;
ConRect.Right = ConRect.Left + BiosSavedBufferInfo.srWindow.Right - BiosSavedBufferInfo.srWindow.Left; ConRect.Right = ConRect.Left + BiosSavedBufferInfo.srWindow.Right - BiosSavedBufferInfo.srWindow.Left;
ConRect.Bottom = ConRect.Top + (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top); ConRect.Bottom = ConRect.Top + BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top ;
/* See the following trick explanation in vga.c:VgaEnterTextMode() */ /* See the following trick explanation in vga.c:VgaEnterTextMode() */
SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize);
SetConsoleWindowInfo(BiosConsoleOutput, TRUE, &ConRect); SetConsoleWindowInfo(BiosConsoleOutput, TRUE, &ConRect);