[ros-diffs] [spetreolle] 25126: unicode build fixes

Author: spetreolle
Date: Mon Dec 11 21:04:02 2006
New Revision: 25126

URL: http://svn.reactos.org/svn/reactos?rev=25126&view=rev
Log:
unicode build fixes

Modified:
    trunk/reactos/base/shell/cmd/console.c
    trunk/reactos/base/shell/cmd/start.c

Modified: trunk/reactos/base/shell/cmd/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r…
==============================================================================
--- trunk/reactos/base/shell/cmd/console.c (original)
+++ trunk/reactos/base/shell/cmd/console.c Mon Dec 11 21:04:02 2006
@@ -238,7 +238,7 @@
 INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
 {
 	INT len;
-	PCHAR pBuf;
+	PTCHAR pBuf;
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 	TCHAR szOut[OUTPUT_BUFFER_SIZE];
 	DWORD dwWritten;
@@ -284,12 +284,7 @@
         }
  
 	len = _vstprintf (szOut, szFormat, arg_ptr);
-#ifdef _UNICODE
-	pBuf = malloc(len + 1);
-	len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL)
- 1;
-#else
 	pBuf = szOut;
-#endif
  
 	for(i = 0; i < len; i++)
 	{ 

Modified: trunk/reactos/base/shell/cmd/start.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev…
==============================================================================
--- trunk/reactos/base/shell/cmd/start.c (original)
+++ trunk/reactos/base/shell/cmd/start.c Mon Dec 11 21:04:02 2006
@@ -50,27 +50,27 @@
 			ConOutResPaging(TRUE,STRING_START_HELP1);
 			return 0;
 		}
-		else if(!_tcsicmp(arg[i], "/LOW"))
+		else if(!_tcsicmp(arg[i], _T("/LOW")))
 		{
 			Priority = IDLE_PRIORITY_CLASS;		
 		}
-		else if(!_tcsicmp(arg[i], "/NORMAL"))
+		else if(!_tcsicmp(arg[i], _T("/NORMAL")))
 		{
 			Priority = NORMAL_PRIORITY_CLASS;
 		}
-		else if(!_tcsicmp(arg[i], "/HIGH"))
+		else if(!_tcsicmp(arg[i], _T("/HIGH")))
 		{
 			Priority = HIGH_PRIORITY_CLASS;		
 		}
-		else if(!_tcsicmp(arg[i], "/REALTIME"))
+		else if(!_tcsicmp(arg[i], _T("/REALTIME")))
 		{
 			Priority = REALTIME_PRIORITY_CLASS;
 		}
-		else if(!_tcsicmp(arg[i], "/ABOVENORMAL"))
+		else if(!_tcsicmp(arg[i], _T("/ABOVENORMAL")))
 		{
 			Priority = ABOVE_NORMAL_PRIORITY_CLASS;		
 		}
-		else if(!_tcsicmp(arg[i], "/BELOWNORMAL"))
+		else if(!_tcsicmp(arg[i], _T("/BELOWNORMAL")))
 		{
 			Priority = BELOW_NORMAL_PRIORITY_CLASS;
 		}