mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-23 19:43:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CONUTILS][CMD] Add and use a helper ConStdStreamsSetCacheCodePage() macro instead of repeatedly calling ConStreamSetCacheCodePage() on the standard streams.

Browse Source
This commit is contained in:
Hermès Bélusca-Maïto 2021-05-26 00:01:26 +02:00
parent f268430c05
commit 35f499e52f
No known key found for this signature in database
GPG Key ID: 3B2539C65E7B93D0
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/shell/cmd/cmd.c
View File

@ -529,9 +529,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
OutputCodePage = uNewOutputCodePage;
/* Update the streams codepage cache as well */
ConStreamSetCacheCodePage(StdIn , InputCodePage );
ConStreamSetCacheCodePage(StdOut, OutputCodePage);
ConStreamSetCacheCodePage(StdErr, OutputCodePage);
ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage);
}
/* Restore the original console title */

4
base/shell/cmd/start.c
View File

@ -321,9 +321,7 @@ INT cmd_start (LPTSTR Rest)
OutputCodePage = uNewOutputCodePage;
/* Update the streams codepage cache as well */
ConStreamSetCacheCodePage(StdIn , InputCodePage );
ConStreamSetCacheCodePage(StdOut, OutputCodePage);
ConStreamSetCacheCodePage(StdErr, OutputCodePage);
ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage);
}
}
else

15
sdk/lib/conutils/stream.h
View File

@ -136,14 +136,27 @@ ConStreamSetMode(
IN UINT CacheCodePage OPTIONAL);
#ifdef USE_CRT
// FIXME!
#warning The ConStreamSetCacheCodePage function does not make much sense with the CRT!
#define ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage) NOTHING
#else
BOOL
ConStreamSetCacheCodePage(
IN PCON_STREAM Stream,
IN UINT CacheCodePage);
#endif
#define ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage) \
do { \
ConStreamSetCacheCodePage(StdIn , (InputCodePage )); \
ConStreamSetCacheCodePage(StdOut, (OutputCodePage)); \
ConStreamSetCacheCodePage(StdErr, (OutputCodePage)); \
} while(0)
#endif /* defined(USE_CRT) */
HANDLE
ConStreamGetOSHandle(