Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 17:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

the name GetCodePage and OutCodePage is a bit misleading, change it to InputCodePage and OutputCodePage

Browse source 
svn path=/trunk/; revision=15077
This commit is contained in:
Magnus Olsen 2005-05-07 11:54:22 +00:00
parent e23d422877
commit a418e5094f
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/cmd/chcp.c
View file

@ -77,7 +77,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
SetConsoleOutputCP (uNewCodePage);
InitLocale ();
GetCodePage = GetConsoleCP();
InputCodePage= GetConsoleCP();
}
freep (arg);

12
reactos/subsys/system/cmd/cmd.c
View file

@ -427,8 +427,8 @@ Execute (LPTSTR full, LPTSTR first, LPTSTR rest)
}
/* Get code page if it has been change */
GetCodePage = GetConsoleCP();
OutCodePage = GetConsoleOutputCP();
InputCodePage= GetConsoleCP();
OutputCodePage = GetConsoleOutputCP();
#ifndef __REACTOS__
SetConsoleTitle (szWindowTitle);
#endif
@ -1419,8 +1419,8 @@ int main (int argc, char *argv[])
#endif
SetFileApisToOEM();
GetCodePage = 0;
OutCodePage = 0;
InputCodePage= 0;
OutputCodePage = 0;
hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
@ -1433,8 +1433,8 @@ int main (int argc, char *argv[])
wColor = Info.wAttributes;
wDefColor = wColor;
GetCodePage = GetConsoleCP();
OutCodePage = GetConsoleOutputCP();
InputCodePage= GetConsoleCP();
OutputCodePage = GetConsoleOutputCP();
/* check switches on command-line */
Initialize(argc, argv);

4
reactos/subsys/system/cmd/cmd.h
View file

@ -298,8 +298,8 @@ VOID PrintDate (VOID);
VOID PrintTime (VOID);
/* cache codepage */
extern UINT GetCodePage;
extern UINT OutCodePage;
extern UINT InputCodePage;
extern UINT OutputCodePage;
/* Prototypes for MEMORY.C */
INT CommandMemory (LPTSTR, LPTSTR);

12
reactos/subsys/system/cmd/console.c
View file

@ -20,8 +20,8 @@
#define OUTPUT_BUFFER_SIZE 4096
UINT GetCodePage;
UINT OutCodePage;
UINT InputCodePage;
UINT OutputCodePage;
VOID ConInDisable (VOID)
@ -111,7 +111,7 @@ VOID ConInString (LPTSTR lpInput, DWORD dwLength)
ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL);
#ifdef _UNICODE
MultiByteToWideChar( GetCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1);
MultiByteToWideChar( InputCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1);
#endif
p = lpInput;
for (i = 0; i < dwRead; i++, p++)
@ -139,7 +139,7 @@ static VOID ConChar(TCHAR c, DWORD nStdHandle)
WCHAR ws[2];
ws[0] = c;
ws[1] = 0;
WideCharToMultiByte( OutCodePage, 0, ws, 2, as, 2, NULL, NULL);
WideCharToMultiByte( OutputCodePage, 0, ws, 2, as, 2, NULL, NULL);
cc = as[0];
#else
cc = c;
@ -165,7 +165,7 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle)
len = _tcslen(szText);
#ifdef _UNICODE
pBuf = malloc(len + 1);
len = WideCharToMultiByte( OutCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1;
len = WideCharToMultiByte( OutputCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1;
#else
pBuf = szText;
#endif
@ -200,7 +200,7 @@ VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
len = _vstprintf (szOut, szFormat, arg_ptr);
#ifdef _UNICODE
pBuf = malloc(len + 1);
len = WideCharToMultiByte( OutCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1;
len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1;
#else
pBuf = szOut;
#endif

4
reactos/subsys/system/cmd/start.c
View file

@ -115,8 +115,8 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
CloseHandle (prci.hThread);
CloseHandle (prci.hProcess);
/* Get New code page if it has change */
GetCodePage = GetConsoleCP();
OutCodePage = GetConsoleOutputCP();
InputCodePage= GetConsoleCP();
OutputCodePage = GetConsoleOutputCP();
}
else
{