update for HEAD-2003050101

[reactos.git] / subsys / system / usetup / console.c

diff --git a/subsys/system/usetup/console.c b/subsys/system/usetup/console.c
index 912f8be..11ff663 100644 (file)
--- a/subsys/system/usetup/console.c
+++ b/subsys/system/usetup/console.c
@@ -346,10 +346,10 @@ WriteConsoleOutputCharacters(LPCSTR lpCharacter,
                                 NULL,
                                 &IoStatusBlock,
                                 IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER,
-                                NULL,
-                                0,
                                 Buffer,
-                                nLength + sizeof(COORD));
+                                nLength + sizeof(COORD),
+                                NULL,
+                                0);
   if (Status == STATUS_PENDING)
     {
       NtWaitForSingleObject(StdOutput,
@@ -397,10 +397,10 @@ WriteConsoleOutputCharactersW(LPCWSTR lpCharacter,
                                 NULL,
                                 &IoStatusBlock,
                                 IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER,
-                                NULL,
-                                0,
                                 Buffer,
-                                nLength + sizeof(COORD));
+                                nLength + sizeof(COORD),
+                                NULL,
+                                0);
   if (Status == STATUS_PENDING)
     {
       NtWaitForSingleObject(StdOutput,
@@ -444,10 +444,10 @@ WriteConsoleOutputAttributes(CONST USHORT *lpAttribute,
                                 NULL,
                                 &IoStatusBlock,
                                 IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE,
-                                NULL,
-                                0,
                                 Buffer,
-                                nLength * sizeof(USHORT) + sizeof(COORD));
+                                nLength * sizeof(USHORT) + sizeof(COORD),
+                                NULL,
+                                0);
   if (Status == STATUS_PENDING)
     {
       NtWaitForSingleObject(StdOutput,
@@ -904,11 +904,17 @@ ClearScreen(VOID)
 
 
 VOID
-SetStatusText(PCHAR Text)
+SetStatusText(char* fmt, ...)
 {
+  char Buffer[128];
+  va_list ap;
   COORD coPos;
   ULONG Written;
 
+  va_start(ap, fmt);
+  vsprintf(Buffer, fmt, ap);
+  va_end(ap);
+
   coPos.X = 0;
   coPos.Y = yScreen - 1;
 
@@ -922,8 +928,8 @@ SetStatusText(PCHAR Text)
                             coPos,
                             &Written);
 
-  WriteConsoleOutputCharacters(Text,
-                              strlen(Text),
+  WriteConsoleOutputCharacters(Buffer,
+                              strlen(Buffer),
                               coPos);
 }