- Fix MSVC build

svn path=/trunk/; revision=64103
This commit is contained in:
Thomas Faber 2014-09-10 13:52:31 +00:00
parent e393b80e07
commit de2119ac36

View file

@ -54,15 +54,17 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
{ {
COORD coPos; COORD coPos;
DWORD Written; DWORD Written;
CODE_ELEMENT Code;
/* Set screen attributes */ /* Set screen attributes */
coPos.X = xLeft; coPos.X = xLeft;
for (coPos.Y = yTop; coPos.Y < yTop + Height; coPos.Y++) for (coPos.Y = yTop; coPos.Y < yTop + Height; coPos.Y++)
{ {
Code.Attribute = Buffer->PopupDefaultAttrib;
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ATTRIBUTE, CODE_ATTRIBUTE,
(CODE_ELEMENT)(WORD)Buffer->PopupDefaultAttrib, Code,
Width, Width,
&coPos, &coPos,
&Written); &Written);
@ -71,10 +73,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw upper left corner */ /* draw upper left corner */
coPos.X = xLeft; coPos.X = xLeft;
coPos.Y = yTop; coPos.Y = yTop;
Code.AsciiChar = 0xDA; // '+'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xDA, // '+', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);
@ -82,10 +85,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw upper edge */ /* draw upper edge */
coPos.X = xLeft + 1; coPos.X = xLeft + 1;
coPos.Y = yTop; coPos.Y = yTop;
Code.AsciiChar = 0xC4; // '-'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xC4, // '-', Code,
Width - 2, Width - 2,
&coPos, &coPos,
&Written); &Written);
@ -93,10 +97,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw upper right corner */ /* draw upper right corner */
coPos.X = xLeft + Width - 1; coPos.X = xLeft + Width - 1;
coPos.Y = yTop; coPos.Y = yTop;
Code.AsciiChar = 0xBF; // '+'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xBF, // '+', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);
@ -105,28 +110,31 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++) for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++)
{ {
coPos.X = xLeft; coPos.X = xLeft;
Code.AsciiChar = 0xB3; // '|'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xB3, // '|', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);
coPos.X = xLeft + 1; coPos.X = xLeft + 1;
Code.AsciiChar = ' ';
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)' ', Code,
Width - 2, Width - 2,
&coPos, &coPos,
&Written); &Written);
coPos.X = xLeft + Width - 1; coPos.X = xLeft + Width - 1;
Code.AsciiChar = 0xB3; // '|'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xB3, // '|', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);
@ -135,10 +143,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw lower left corner */ /* draw lower left corner */
coPos.X = xLeft; coPos.X = xLeft;
coPos.Y = yTop + Height - 1; coPos.Y = yTop + Height - 1;
Code.AsciiChar = 0xC0; // '+'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xC0, // '+', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);
@ -146,10 +155,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw lower edge */ /* draw lower edge */
coPos.X = xLeft + 1; coPos.X = xLeft + 1;
coPos.Y = yTop + Height - 1; coPos.Y = yTop + Height - 1;
Code.AsciiChar = 0xC4; // '-'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xC4, // '-', Code,
Width - 2, Width - 2,
&coPos, &coPos,
&Written); &Written);
@ -157,10 +167,11 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer,
/* draw lower right corner */ /* draw lower right corner */
coPos.X = xLeft + Width - 1; coPos.X = xLeft + Width - 1;
coPos.Y = yTop + Height - 1; coPos.Y = yTop + Height - 1;
Code.AsciiChar = 0xD9; // '+'
ConDrvFillConsoleOutput(Buffer->Header.Console, ConDrvFillConsoleOutput(Buffer->Header.Console,
Buffer, Buffer,
CODE_ASCII, CODE_ASCII,
(CODE_ELEMENT)(CHAR)0xD9, // '+', Code,
1, 1,
&coPos, &coPos,
&Written); &Written);