update for HEAD-2003091401

[reactos.git] / subsys / system / cmd / color.c

diff --git a/subsys/system/cmd/color.c b/subsys/system/cmd/color.c
index 47b34a6..4917605 100644 (file)
--- a/subsys/system/cmd/color.c
+++ b/subsys/system/cmd/color.c
@@ -70,17 +70,17 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
 
        if (bFill == TRUE)
        {
-               GetConsoleScreenBufferInfo (hOut, &csbi);
+               GetConsoleScreenBufferInfo (hConsole, &csbi);
 
                coPos.X = 0;
                coPos.Y = 0;
-               FillConsoleOutputAttribute (hOut,
+               FillConsoleOutputAttribute (hConsole,
                                            (WORD)(wColor & 0x00FF),
                                            (csbi.dwSize.X)*(csbi.dwSize.Y),
                                            coPos,
                                            &dwWritten);
        }
-       SetConsoleTextAttribute (hOut, (WORD)(wColor & 0x00FF));
+       SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF));
 }
 
 
@@ -107,11 +107,11 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
 
        if (StringToColor (&wColor, &rest) == FALSE)
        {
-               ConErrPuts("error in color specification");
+               ConErrPuts(_T("error in color specification"));
                return 1;
        }
 
-       ConErrPrintf ("Color %x\n", wColor);
+       ConErrPrintf (_T("Color %x\n"), wColor);
 
        if ((wColor & 0xF) == (wColor &0xF0) >> 4)
        {
@@ -121,7 +121,7 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
 
        /* set color */
        SetScreenColor (wColor,
-                       (_tcsstr (rest,"/F") || _tcsstr (rest,"/f")));
+                       (_tcsstr (rest,_T("/F")) || _tcsstr (rest,_T("/f"))));
 
        return 0;
 }