From d74a83ca5a01d03ca4332faac7a7b87c4ec1d62b Mon Sep 17 00:00:00 2001
From: Dmitry Chapyshev <dmitry@reactos.org>
Date: Mon, 13 Apr 2009 12:33:33 +0000
Subject: [PATCH] - Add more check on CodePage = 0. +2 passed wine tests

svn path=/trunk/; revision=40480
---
 reactos/subsystems/win32/csrss/win32csr/conio.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c
index 78e3726c758..a72043b9fa8 100644
--- a/reactos/subsystems/win32/csrss/win32csr/conio.c
+++ b/reactos/subsystems/win32/csrss/win32csr/conio.c
@@ -3023,12 +3023,20 @@ CSR_API(CsrSetConsoleOutputCodePage)
 
   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;
 }