[dchapyshev] 40480: - Add more check on CodePage = 0. +2 passed wine tests

Author: dchapyshev
Date: Mon Apr 13 16:33:33 2009
New Revision: 40480

URL: http://svn.reactos.org/svn/reactos?rev=40480&view=rev
Log:
- Add more check on CodePage = 0. +2 passed wine tests

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/conio.c

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 16:33:33
2009
@@ -3023,12 +3023,20 @@
 
   Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
   Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
-  if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage))
+  if (Request->Data.SetConsoleOutputCodePage.CodePage == 0)
+  {
+    ConioUnlockConsole(Console);
+    return STATUS_INVALID_PARAMETER;
+  }
+  else
+  {
+    if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage))
     {
       Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage;
       ConioUnlockConsole(Console);
       return STATUS_SUCCESS;
     }
+  }
   ConioUnlockConsole(Console);
   return STATUS_UNSUCCESSFUL;
 }