Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-29 06:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- More correct fix of tests

Browse source 
svn path=/trunk/; revision=40486
This commit is contained in:
Dmitry Chapyshev 2009-04-13 17:13:35 +00:00
parent 8ad7700db8
commit 864371fe84
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/kernel32/misc/nls.c
View file

@ -1252,6 +1252,7 @@ BOOL
WINAPI WINAPI
IsValidCodePage(UINT CodePage) IsValidCodePage(UINT CodePage)
{ {
if (CodePage == 0) return FALSE;
if (CodePage == CP_UTF8 || CodePage == CP_UTF7) if (CodePage == CP_UTF8 || CodePage == CP_UTF7)
return TRUE; return TRUE;
if (IntGetLoadedCodePageEntry(CodePage)) if (IntGetLoadedCodePageEntry(CodePage))

28
reactos/subsystems/win32/csrss/win32csr/conio.c
View file

@ -2970,22 +2970,16 @@ CSR_API(CsrSetConsoleCodePage)
Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
if (Request->Data.SetConsoleCodePage.CodePage == 0)
{ if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage))
ConioUnlockConsole(Console);
return STATUS_INVALID_PARAMETER;
}
else
{
if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage))
{ {
Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; Console->CodePage = Request->Data.SetConsoleCodePage.CodePage;
ConioUnlockConsole(Console); ConioUnlockConsole(Console);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
}
ConioUnlockConsole(Console); ConioUnlockConsole(Console);
return STATUS_UNSUCCESSFUL; return STATUS_INVALID_PARAMETER;
} }
CSR_API(CsrGetConsoleOutputCodePage) CSR_API(CsrGetConsoleOutputCodePage)
@ -3023,22 +3017,16 @@ CSR_API(CsrSetConsoleOutputCodePage)
Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
if (Request->Data.SetConsoleOutputCodePage.CodePage == 0)
{ if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage))
ConioUnlockConsole(Console);
return STATUS_INVALID_PARAMETER;
}
else
{
if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage))
{ {
Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage;
ConioUnlockConsole(Console); ConioUnlockConsole(Console);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
}
ConioUnlockConsole(Console); ConioUnlockConsole(Console);
return STATUS_UNSUCCESSFUL; return STATUS_INVALID_PARAMETER;
} }
CSR_API(CsrGetProcessList) CSR_API(CsrGetProcessList)