[ros-diffs] [tfaber] 64103: [CONSRV] - Fix MSVC build

Author: tfaber
Date: Wed Sep 10 13:52:31 2014
New Revision: 64103

URL: http://svn.reactos.org/svn/reactos?rev=64103&view=rev
Log:
[CONSRV]
- Fix MSVC build

Modified:
    trunk/reactos/win32ss/user/winsrv/consrv/popup.c

Modified: trunk/reactos/win32ss/user/winsrv/consrv/popup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/popup.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/popup.c	[iso-8859-1] Wed Sep 10 13:52:31
2014
@@ -54,15 +54,17 @@
 {
     COORD coPos;
     DWORD Written;
+    CODE_ELEMENT Code;
 
     /* Set screen attributes */
     coPos.X = xLeft;
     for (coPos.Y = yTop; coPos.Y < yTop + Height; coPos.Y++)
     {
+        Code.Attribute = Buffer->PopupDefaultAttrib;
         ConDrvFillConsoleOutput(Buffer->Header.Console,
                                 Buffer,
                                 CODE_ATTRIBUTE,
-                                (CODE_ELEMENT)(WORD)Buffer->PopupDefaultAttrib,
+                                Code,
                                 Width,
                                 &coPos,
                                 &Written);
@@ -71,10 +73,11 @@
     /* draw upper left corner */
     coPos.X = xLeft;
     coPos.Y = yTop;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xDA, // '+',
+    Code.AsciiChar = 0xDA; // '+'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             1,
                             &coPos,
                             &Written);
@@ -82,10 +85,11 @@
     /* draw upper edge */
     coPos.X = xLeft + 1;
     coPos.Y = yTop;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xC4, // '-',
+    Code.AsciiChar = 0xC4; // '-'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             Width - 2,
                             &coPos,
                             &Written);
@@ -93,10 +97,11 @@
     /* draw upper right corner */
     coPos.X = xLeft + Width - 1;
     coPos.Y = yTop;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xBF, // '+',
+    Code.AsciiChar = 0xBF; // '+'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             1,
                             &coPos,
                             &Written);
@@ -105,28 +110,31 @@
     for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++)
     {
         coPos.X = xLeft;
+        Code.AsciiChar = 0xB3; // '|'
         ConDrvFillConsoleOutput(Buffer->Header.Console,
                                 Buffer,
                                 CODE_ASCII,
-                                (CODE_ELEMENT)(CHAR)0xB3, // '|',
+                                Code,
                                 1,
                                 &coPos,
                                 &Written);
 
         coPos.X = xLeft + 1;
+        Code.AsciiChar = ' ';
         ConDrvFillConsoleOutput(Buffer->Header.Console,
                                 Buffer,
                                 CODE_ASCII,
-                                (CODE_ELEMENT)(CHAR)' ',
+                                Code,
                                 Width - 2,
                                 &coPos,
                                 &Written);
 
         coPos.X = xLeft + Width - 1;
+        Code.AsciiChar = 0xB3; // '|'
         ConDrvFillConsoleOutput(Buffer->Header.Console,
                                 Buffer,
                                 CODE_ASCII,
-                                (CODE_ELEMENT)(CHAR)0xB3, // '|',
+                                Code,
                                 1,
                                 &coPos,
                                 &Written);
@@ -135,10 +143,11 @@
     /* draw lower left corner */
     coPos.X = xLeft;
     coPos.Y = yTop + Height - 1;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xC0, // '+',
+    Code.AsciiChar = 0xC0; // '+'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             1,
                             &coPos,
                             &Written);
@@ -146,10 +155,11 @@
     /* draw lower edge */
     coPos.X = xLeft + 1;
     coPos.Y = yTop + Height - 1;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xC4, // '-',
+    Code.AsciiChar = 0xC4; // '-'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             Width - 2,
                             &coPos,
                             &Written);
@@ -157,10 +167,11 @@
     /* draw lower right corner */
     coPos.X = xLeft + Width - 1;
     coPos.Y = yTop + Height - 1;
-    ConDrvFillConsoleOutput(Buffer->Header.Console,
-                            Buffer,
-                            CODE_ASCII,
-                            (CODE_ELEMENT)(CHAR)0xD9, // '+',
+    Code.AsciiChar = 0xD9; // '+'
+    ConDrvFillConsoleOutput(Buffer->Header.Console,
+                            Buffer,
+                            CODE_ASCII,
+                            Code,
                             1,
                             &coPos,
                             &Written);