Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 01/01: [REGEDIT] Use InitCommonControlsEx instead of InitCommonControls (#3686)
by Katayama Hirofumi MZ 26 May '21

26 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=949e3a9cece68c25f4086… commit 949e3a9cece68c25f4086f8e2387e541f9e6c589 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 26 21:11:10 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 26 21:11:10 2021 +0900 [REGEDIT] Use InitCommonControlsEx instead of InitCommonControls (#3686) NOTE: Windows sets 0xFFFF to icce.dwICC but we use better value. --- base/applications/regedit/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/applications/regedit/main.c b/base/applications/regedit/main.c index e85e62f51b4..05f0e475f62 100644 --- a/base/applications/regedit/main.c +++ b/base/applications/regedit/main.c @@ -57,7 +57,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { BOOL AclUiAvailable; HMENU hEditMenu; - + INITCOMMONCONTROLSEX icce; WNDCLASSEXW wcFrame; WNDCLASSEXW wcChild; ATOM hFrameWndClass; @@ -97,8 +97,10 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) hPopupMenus = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_POPUP_MENUS)); /* Initialize the Windows Common Controls DLL */ - // TODO: Replace this call by InitCommonControlsEx(_something_) - InitCommonControls(); + /* NOTE: Windows sets 0xFFFF to icce.dwICC but we use better value. */ + icce.dwSize = sizeof(icce); + icce.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES; + InitCommonControlsEx(&icce); hEditMenu = GetSubMenu(hMenuFrame, 1);

1 0

[reactos] 01/01: [NTOS:IO] Be more specific for chasing CORE-17587
by Jérôme Gardou 26 May '21

26 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0ebf68d981ece0e2a1b9… commit b0ebf68d981ece0e2a1b916fbd2510adf989baee Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 26 11:03:34 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed May 26 11:03:34 2021 +0200 [NTOS:IO] Be more specific for chasing CORE-17587 Addendum to 42ec1388d7 --- ntoskrnl/io/iomgr/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/error.c b/ntoskrnl/io/iomgr/error.c index 7f33cac131d..db8c0c97903 100644 --- a/ntoskrnl/io/iomgr/error.c +++ b/ntoskrnl/io/iomgr/error.c @@ -713,7 +713,7 @@ IoRaiseInformationalHardError(IN NTSTATUS ErrorStatus, { DPRINT1("IoRaiseInformationalHardError: %lx, '%wZ'\n", ErrorStatus, String); #if DBG - __debugbreak(); /* CORE-17587 */ + ASSERT(ErrorStatus != STATUS_FILE_CORRUPT_ERROR); /* CORE-17587 */ #endif return FALSE; }

1 0

[reactos] 01/01: [NTOS:IO] Break on IoRaiseInformationalHardError
by Jérôme Gardou 26 May '21

26 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42ec1388d7206cefce620… commit 42ec1388d7206cefce62012547a89807a68dc321 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 26 10:48:29 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed May 26 10:48:29 2021 +0200 [NTOS:IO] Break on IoRaiseInformationalHardError This one will eventually be reverted. For now, this will help debugging CORE-17587 --- ntoskrnl/io/iomgr/error.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/io/iomgr/error.c b/ntoskrnl/io/iomgr/error.c index 312b29f942a..7f33cac131d 100644 --- a/ntoskrnl/io/iomgr/error.c +++ b/ntoskrnl/io/iomgr/error.c @@ -712,6 +712,9 @@ IoRaiseInformationalHardError(IN NTSTATUS ErrorStatus, IN PKTHREAD Thread) { DPRINT1("IoRaiseInformationalHardError: %lx, '%wZ'\n", ErrorStatus, String); +#if DBG + __debugbreak(); /* CORE-17587 */ +#endif return FALSE; }

1 0

[reactos] 06/06: [CMD] Reset the current thread UI language at startup, and when updating the local code page cache. CORE-17601
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53bd132cec8ca86339382… commit 53bd132cec8ca86339382678779b6f423db3eba1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 26 01:19:10 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:12 2021 +0200 [CMD] Reset the current thread UI language at startup, and when updating the local code page cache. CORE-17601 --- base/shell/cmd/cmd.c | 32 ++++++++++++++++++++++---------- base/shell/cmd/start.c | 20 +++++++++++++------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 05ca5969d43..99070ff24f9 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -506,14 +506,14 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) dwExitCode = 1; } - /* Restore our default console mode */ + /* Restore the default console mode */ SetConsoleMode(ConStreamGetOSHandle(StdIn), ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); SetConsoleMode(ConStreamGetOSHandle(StdOut), ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); } - /* Update our local codepage cache */ + /* Update the local code page cache */ { UINT uNewInputCodePage = GetConsoleCP(); UINT uNewOutputCodePage = GetConsoleOutputCP(); @@ -521,15 +521,21 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) if ((InputCodePage != uNewInputCodePage) || (OutputCodePage != uNewOutputCodePage)) { + InputCodePage = uNewInputCodePage; + OutputCodePage = uNewOutputCodePage; + + /* Reset the current thread UI language */ + if (IsConsoleHandle(ConStreamGetOSHandle(StdOut)) || + IsConsoleHandle(ConStreamGetOSHandle(StdErr))) + { + ConSetThreadUILanguage(0); + } + /* Update the streams cached code page */ + ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage); + /* Update the locale as well */ InitLocale(); } - - InputCodePage = uNewInputCodePage; - OutputCodePage = uNewOutputCodePage; - - /* Update the streams codepage cache as well */ - ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage); } /* Restore the original console title */ @@ -2178,7 +2184,7 @@ Initialize(VOID) /* Add ctrl break handler */ AddBreakHandler(); - /* Set our default console mode */ + /* Set the default console mode */ hOut = ConStreamGetOSHandle(StdOut); hIn = ConStreamGetOSHandle(StdIn); SetConsoleMode(hOut, 0); // Reinitialize the console output mode @@ -2287,7 +2293,7 @@ Initialize(VOID) ConSetScreenColor(ConStreamGetOSHandle(StdOut), wDefColor, TRUE); #endif - /* Reset the output Standard Streams translation modes and codepage caches */ + /* Reset the output Standard Streams translation modes and code page caches */ // ConStreamSetMode(StdIn , OutputStreamMode, InputCodePage ); ConStreamSetMode(StdOut, OutputStreamMode, OutputCodePage); ConStreamSetMode(StdErr, OutputStreamMode, OutputCodePage); @@ -2374,6 +2380,12 @@ int _tmain(int argc, const TCHAR *argv[]) ConStreamInit(StdIn , GetStdHandle(STD_INPUT_HANDLE) , /*OutputStreamMode*/ AnsiText, InputCodePage); ConStreamInit(StdOut, GetStdHandle(STD_OUTPUT_HANDLE), OutputStreamMode, OutputCodePage); ConStreamInit(StdErr, GetStdHandle(STD_ERROR_HANDLE) , OutputStreamMode, OutputCodePage); + /* Reset the current thread UI language */ + if (IsConsoleHandle(ConStreamGetOSHandle(StdOut)) || + IsConsoleHandle(ConStreamGetOSHandle(StdErr))) + { + ConSetThreadUILanguage(0); + } CMD_ModuleHandle = GetModuleHandle(NULL); diff --git a/base/shell/cmd/start.c b/base/shell/cmd/start.c index 901502e43df..aec8aa8c853 100644 --- a/base/shell/cmd/start.c +++ b/base/shell/cmd/start.c @@ -305,7 +305,7 @@ INT cmd_start (LPTSTR Rest) } CloseHandle (prci.hProcess); - /* Update our local codepage cache */ + /* Update the local code page cache */ { UINT uNewInputCodePage = GetConsoleCP(); UINT uNewOutputCodePage = GetConsoleOutputCP(); @@ -313,15 +313,21 @@ INT cmd_start (LPTSTR Rest) if ((InputCodePage != uNewInputCodePage) || (OutputCodePage != uNewOutputCodePage)) { + InputCodePage = uNewInputCodePage; + OutputCodePage = uNewOutputCodePage; + + /* Reset the current thread UI language */ + if (IsConsoleHandle(ConStreamGetOSHandle(StdOut)) || + IsConsoleHandle(ConStreamGetOSHandle(StdErr))) + { + ConSetThreadUILanguage(0); + } + /* Update the streams cached code page */ + ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage); + /* Update the locale as well */ InitLocale(); } - - InputCodePage = uNewInputCodePage; - OutputCodePage = uNewOutputCodePage; - - /* Update the streams codepage cache as well */ - ConStdStreamsSetCacheCodePage(InputCodePage, OutputCodePage); } } else

1 0

[reactos] 05/06: [MODE] Reset the current thread UI language and streams codepage after changing the console codepage. Add extra error handling. CORE-17601
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0483063b6932c779bc114… commit 0483063b6932c779bc114948a0f1f3a7dc58d24f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 25 20:17:43 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:11 2021 +0200 [MODE] Reset the current thread UI language and streams codepage after changing the console codepage. Add extra error handling. CORE-17601 --- base/applications/cmdutils/mode/lang/de-DE.rc | 1 + base/applications/cmdutils/mode/lang/en-US.rc | 1 + base/applications/cmdutils/mode/lang/it-IT.rc | 1 + base/applications/cmdutils/mode/lang/pl-PL.rc | 1 + base/applications/cmdutils/mode/lang/ro-RO.rc | 1 + base/applications/cmdutils/mode/lang/ru-RU.rc | 1 + base/applications/cmdutils/mode/lang/tr-TR.rc | 1 + base/applications/cmdutils/mode/lang/zh-CN.rc | 1 + base/applications/cmdutils/mode/mode.c | 65 ++++++++++++++++++++------- base/applications/cmdutils/mode/resource.h | 1 + 10 files changed, 58 insertions(+), 16 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/de-DE.rc b/base/applications/cmdutils/mode/lang/de-DE.rc index 5355ac86e83..a2ccfcc4a06 100644 --- a/base/applications/cmdutils/mode/lang/de-DE.rc +++ b/base/applications/cmdutils/mode/lang/de-DE.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/en-US.rc b/base/applications/cmdutils/mode/lang/en-US.rc index ce84d5d0e5f..c0fc8055e47 100644 --- a/base/applications/cmdutils/mode/lang/en-US.rc +++ b/base/applications/cmdutils/mode/lang/en-US.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/it-IT.rc b/base/applications/cmdutils/mode/lang/it-IT.rc index 77a7b6360a3..e0d3010a7de 100644 --- a/base/applications/cmdutils/mode/lang/it-IT.rc +++ b/base/applications/cmdutils/mode/lang/it-IT.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "ERRORE: valore non valido per i bit di stop %d:\n" IDS_ERROR_NO_MEMORY "ERRORE: memoria insufficiente.\n" IDS_ERROR_SCREEN_LINES_COL "Lo schermo non può essere impostato con il numero di righe e colonne specificato.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/pl-PL.rc b/base/applications/cmdutils/mode/lang/pl-PL.rc index 0cd8d44268d..96e47961e1e 100644 --- a/base/applications/cmdutils/mode/lang/pl-PL.rc +++ b/base/applications/cmdutils/mode/lang/pl-PL.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "BŁĄD: Nieprawidłowa wartość dla bitów separatora %d:\n" IDS_ERROR_NO_MEMORY "BŁĄD: Za mało pamięci.\n" IDS_ERROR_SCREEN_LINES_COL "BŁĄD: Nie można ustawić ekranu na określoną liczbę wierszy i kolumn.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc b/base/applications/cmdutils/mode/lang/ro-RO.rc index 01c83e098b2..8c8c38e47d9 100644 --- a/base/applications/cmdutils/mode/lang/ro-RO.rc +++ b/base/applications/cmdutils/mode/lang/ro-RO.rc @@ -77,4 +77,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori %d:\n" IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n" IDS_ERROR_SCREEN_LINES_COL "Ecranul nu poate fi stabilit cu numărul de linii sau coloane specificate.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/ru-RU.rc b/base/applications/cmdutils/mode/lang/ru-RU.rc index 81d2190c7d5..d79c2235757 100644 --- a/base/applications/cmdutils/mode/lang/ru-RU.rc +++ b/base/applications/cmdutils/mode/lang/ru-RU.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "ОШИБКА: Неверное значение стоповых битов %d:\n" IDS_ERROR_NO_MEMORY "ОШИБКА: Недостаточно памяти.\n" IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/tr-TR.rc b/base/applications/cmdutils/mode/lang/tr-TR.rc index 31cfe37bfd9..9b93bf8c2d1 100644 --- a/base/applications/cmdutils/mode/lang/tr-TR.rc +++ b/base/applications/cmdutils/mode/lang/tr-TR.rc @@ -70,4 +70,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "YANLIŞLIK: %d Durma İkilleri için geçersiz değer:\n" IDS_ERROR_NO_MEMORY "YANLIŞLIK: Yeterli bellek yok.\n" IDS_ERROR_SCREEN_LINES_COL "Görüntülük, belirtilen yataç ve dikeç sayısına ayarlanamıyor.\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/lang/zh-CN.rc b/base/applications/cmdutils/mode/lang/zh-CN.rc index 7e8e841dcdd..3a6ca30be63 100644 --- a/base/applications/cmdutils/mode/lang/zh-CN.rc +++ b/base/applications/cmdutils/mode/lang/zh-CN.rc @@ -68,4 +68,5 @@ BEGIN IDS_ERROR_INVALID_STOP_BITS "错误: 终止位 %d 值无效:\n" IDS_ERROR_NO_MEMORY "错误: 内存不足。\n" IDS_ERROR_SCREEN_LINES_COL "屏幕无法被设置成指定的行数和列数。\n" + IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" END diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index 054564e3ddb..8cb834b6c23 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Mode Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Provides fast mode setup for DOS devices. + * COPYRIGHT: Copyright 2002 Robert Dickenson + * Copyright 2016-2021 Hermes Belusca-Maito + */ /* * ReactOS mode console command * @@ -19,14 +26,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Mode Utility - * FILE: base/applications/cmdutils/mode/mode.c - * PURPOSE: Provides fast mode setup for DOS devices. - * PROGRAMMERS: Robert Dickenson - * Hermes Belusca-Maito - */ #include <stdio.h> #include <stdlib.h> @@ -453,22 +452,18 @@ invalid_parameter: int SetConsoleCPState(IN PCWSTR ArgStr) { PCWSTR argStr = ArgStr; - DWORD CodePage = 0; + DWORD value = 0; + UINT uOldCodePage, uNewCodePage; if ( (_wcsnicmp(argStr, L"SELECT=", 7) == 0 && (argStr += 7)) || (_wcsnicmp(argStr, L"SEL=", 4) == 0 && (argStr += 4)) ) { - argStr = ParseNumber(argStr, &CodePage); + argStr = ParseNumber(argStr, &value); if (!argStr) goto invalid_parameter; /* This should be the end of the string */ while (*argStr == L' ') argStr++; if (*argStr) goto invalid_parameter; - - SetConsoleCP(CodePage); - SetConsoleOutputCP(CodePage); - // "The code page specified is not valid." - ShowConsoleCPStatus(); } else { @@ -477,7 +472,45 @@ invalid_parameter: return 1; } - return 0; + uNewCodePage = value; + +/** + ** IMPORTANT NOTE: This code must be kept synchronized with CHCP.COM + **/ + + /* + * Save the original console code page to be restored + * in case SetConsoleCP() or SetConsoleOutputCP() fails. + */ + uOldCodePage = GetConsoleCP(); + + /* + * Try changing the console input and output code pages. + * If it succeeds, refresh the local code page information. + */ + if (SetConsoleCP(uNewCodePage)) + { + if (SetConsoleOutputCP(uNewCodePage)) + { + /* Success, reset the current thread UI language + * and update the streams cached code page. */ + ConSetThreadUILanguage(0); + ConStdStreamsSetCacheCodePage(uNewCodePage, uNewCodePage); + + /* Display the current console status */ + ShowConsoleStatus(); + return 0; + } + else + { + /* Failure, restore the original console code page */ + SetConsoleCP(uOldCodePage); + } + } + + /* An error happened, display an error and bail out */ + ConResPuts(StdErr, IDS_ERROR_INVALID_CODEPAGE); + return 1; } diff --git a/base/applications/cmdutils/mode/resource.h b/base/applications/cmdutils/mode/resource.h index 2916e47c2c4..65b05fa8806 100644 --- a/base/applications/cmdutils/mode/resource.h +++ b/base/applications/cmdutils/mode/resource.h @@ -47,5 +47,6 @@ #define IDS_ERROR_INVALID_STOP_BITS 35 #define IDS_ERROR_NO_MEMORY 36 #define IDS_ERROR_SCREEN_LINES_COL 37 +#define IDS_ERROR_INVALID_CODEPAGE 38 #endif /* RESOURCE_H */

1 0

[reactos] 04/06: [CHCP] Reset the current thread UI language and streams codepage after changing the console codepage. CORE-17601
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8ef85ad710a8a4825616… commit a8ef85ad710a8a48256165a08dfb6b725433ab2f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 25 20:04:01 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:11 2021 +0200 [CHCP] Reset the current thread UI language and streams codepage after changing the console codepage. CORE-17601 --- base/applications/cmdutils/chcp/chcp.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/base/applications/cmdutils/chcp/chcp.c b/base/applications/cmdutils/chcp/chcp.c index 56c13089edf..36f5291f42c 100644 --- a/base/applications/cmdutils/chcp/chcp.c +++ b/base/applications/cmdutils/chcp/chcp.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Change CodePage Command - * FILE: base/applications/cmdutils/chcp/chcp.c - * PURPOSE: Displays or changes the active console input and output codepages. - * PROGRAMMERS: Eric Kohl - * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Change CodePage Command + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Displays or changes the active console input and output code pages. + * COPYRIGHT: Copyright 1999 Eric Kohl + * Copyright 2017-2021 Hermes Belusca-Maito */ /* * CHCP.C - chcp internal command. @@ -64,27 +63,36 @@ int wmain(int argc, WCHAR* argv[]) return 1; } +/** + ** IMPORTANT NOTE: This code must be kept synchronized with MODE.COM!SetConsoleCPState() + **/ + /* - * Save the original console codepage to be restored in case - * SetConsoleCP() or SetConsoleOutputCP() fails. + * Save the original console code page to be restored + * in case SetConsoleCP() or SetConsoleOutputCP() fails. */ uOldCodePage = GetConsoleCP(); /* - * Try changing the console input codepage. If it works then also change - * the console output codepage, and refresh our local codepage cache. + * Try changing the console input and output code pages. + * If it succeeds, refresh the local code page information. */ if (SetConsoleCP(uNewCodePage)) { if (SetConsoleOutputCP(uNewCodePage)) { + /* Success, reset the current thread UI language + * and update the streams cached code page. */ + ConSetThreadUILanguage(0); + ConStdStreamsSetCacheCodePage(uNewCodePage, uNewCodePage); + /* Display the active code page number */ ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP()); return 0; } else { - /* Failure, restore the original console codepage */ + /* Failure, restore the original console code page */ SetConsoleCP(uOldCodePage); } }

1 0

[reactos] 03/06: [CONUTILS] Implement ConSetThreadUILanguage() as a wrapper for kernel32!SetThreadUILanguage(). CORE-17601
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3aabc088e5c889bcdef… commit 7c3aabc088e5c889bcdeffb38b0cf1896bdc5bfb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 26 00:12:10 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:10 2021 +0200 [CONUTILS] Implement ConSetThreadUILanguage() as a wrapper for kernel32!SetThreadUILanguage(). CORE-17601 Dynamically load SetThreadUILanguage(), so as to support systems where this API is not present. Hopefully implemented in a thread-safe manner. --- sdk/lib/conutils/utils.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- sdk/lib/conutils/utils.h | 8 +++++-- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/sdk/lib/conutils/utils.c b/sdk/lib/conutils/utils.c index 31fe8951092..35f7f6b92d6 100644 --- a/sdk/lib/conutils/utils.c +++ b/sdk/lib/conutils/utils.c @@ -3,8 +3,8 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Base set of functions for loading string resources * and message strings, and handle type identification. - * COPYRIGHT: Copyright 2017-2018 ReactOS Team - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2017-2021 ReactOS Team + * Copyright 2017-2021 Hermes Belusca-Maito */ /** @@ -320,6 +320,57 @@ FormatMessageSafeW( return dwLength; } +/** + * @name ConSetThreadUILanguage + * Sets the current thread's user interface language. + * Mostly used by console applications for selecting a + * language identifier that best supports the NT Console. + * This function dynamically loads and calls kernel32!SetThreadUILanguage() + * so as to be able to work on older environments where this + * API is not supported. + * The FormatMessage() API also bases itself on the thread's + * current language for its default behaviour (unless an explicit + * language identifier has been provided). + * + * @param[in,opt] LangId + * (Vista+) A non-zero language identifier that specifies the + * current thread's user interface language to set. + * (XP/2003) Set the language identifier to 0 for selecting a + * language identifier that best supports the NT Console. + * + * @return + * Returns LangId in case of success, or 0 in case of failure. + * If LangId was set to 0, the function always succeeds and returns + * the language identifier that best supports the NT Console. + * + * @remark + * This function is thread-safe. + * + * @see <a href="https://docs.microsoft.com/en-us/windows/win32/api/winnls/nf-winnls-setthre…">SetThreadUILanguage() (on MSDN)</a> + **/ +LANGID +ConSetThreadUILanguage( + IN LANGID LangId OPTIONAL) +{ + /* The function pointer is shared amongst all threads */ + static volatile LANGID (WINAPI *pfnSetThreadUILanguage)(LANGID) = NULL; + + if (!pfnSetThreadUILanguage) + { + /* Load the API from kernel32 */ + PVOID pFunc = (PVOID)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetThreadUILanguage"); + if (!pFunc) + { + /* Fail since the API is not available */ + return 0; + } + /* Set the function pointer in case it hasn't been already set by another thread */ + InterlockedCompareExchangePointer((PVOID*)&pfnSetThreadUILanguage, pFunc, NULL); + // ASSERT(pfnSetThreadUILanguage); + } + return pfnSetThreadUILanguage(LangId); +} + /** * @name IsTTYHandle * Checks whether a handle refers to a valid TTY object. diff --git a/sdk/lib/conutils/utils.h b/sdk/lib/conutils/utils.h index 798548056e9..7d613d996fd 100644 --- a/sdk/lib/conutils/utils.h +++ b/sdk/lib/conutils/utils.h @@ -3,8 +3,8 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Base set of functions for loading string resources * and message strings, and handle type identification. - * COPYRIGHT: Copyright 2017-2018 ReactOS Team - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2017-2021 ReactOS Team + * Copyright 2017-2021 Hermes Belusca-Maito */ /** @@ -56,6 +56,10 @@ FormatMessageSafeW( IN DWORD nSize, IN va_list *Arguments OPTIONAL); +LANGID +ConSetThreadUILanguage( + IN LANGID LangId OPTIONAL); + BOOL IsTTYHandle(IN HANDLE hHandle);

1 0

[reactos] 02/06: [CONUTILS][CMD] Add and use a helper ConStdStreamsSetCacheCodePage() macro instead of repeatedly calling ConStreamSetCacheCodePage() on the standard streams.
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35f499e52f20c9b04bf1f… commit 35f499e52f20c9b04bf1ff6b622152f70b00702c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 26 00:01:26 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:09 2021 +0200 [CONUTILS][CMD] Add and use a helper ConStdStreamsSetCacheCodePage() macro instead of repeatedly calling ConStreamSetCacheCodePage() on the standard streams. --- base/shell/cmd/cmd.c | 4 +--- base/shell/cmd/start.c | 4 +--- sdk/lib/conutils/stream.h | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index e92426d8cb3..05ca5969d43 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -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 */ diff --git a/base/shell/cmd/start.c b/base/shell/cmd/start.c index de07c3e0e7e..901502e43df 100644 --- a/base/shell/cmd/start.c +++ b/base/shell/cmd/start.c @@ -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 diff --git a/sdk/lib/conutils/stream.h b/sdk/lib/conutils/stream.h index 17e8b0a7431..6e1dbe486d4 100644 --- a/sdk/lib/conutils/stream.h +++ b/sdk/lib/conutils/stream.h @@ -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(

1 0

[reactos] 01/06: [CONUTILS] Update some documentation.
by Hermès Bélusca-Maïto 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f268430c053c46def90ab… commit f268430c053c46def90ab399074ec02df9a79acd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 25 23:34:01 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 26 01:42:09 2021 +0200 [CONUTILS] Update some documentation. --- sdk/lib/conutils/outstream.c | 18 +++++++++--------- sdk/lib/conutils/utils.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index 6a45630a9bb..9dd0dfa1207 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -831,7 +831,7 @@ ConResPrintf( * Similarly to ConPuts(), no terminating new-line character is appended. * * @see ConPuts(), ConResPuts() and associated functions, - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT ConMsgPuts( @@ -846,7 +846,7 @@ ConMsgPuts( LPWSTR lpMsgBuf = NULL; /* - * Sanitize dwFlags. This version always ignore explicitely the inserts + * Sanitize dwFlags. This version always ignores explicitly the inserts * as we emulate the behaviour of the (f)puts function. */ dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer. @@ -919,7 +919,7 @@ ConMsgPrintf2V( LPWSTR lpMsgBuf = NULL; /* - * Sanitize dwFlags. This version always ignore explicitely the inserts. + * Sanitize dwFlags. This version always ignores explicitly the inserts. * The string that we will return to the user will not be pre-formatted. */ dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer. @@ -1024,7 +1024,7 @@ ConMsgPrintf2V( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintf(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT ConMsgPrintfV( @@ -1123,7 +1123,7 @@ ConMsgPrintfV( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintfV(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT __cdecl @@ -1212,7 +1212,7 @@ ConMsgPrintf( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintf(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT ConResMsgPrintfExV( @@ -1323,7 +1323,7 @@ ConResMsgPrintfExV( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintf(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT ConResMsgPrintfV( @@ -1387,7 +1387,7 @@ ConResMsgPrintfV( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintf(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT __cdecl @@ -1454,7 +1454,7 @@ ConResMsgPrintfEx( * Numbers of characters successfully written to @p Stream. * * @see ConPrintf(), ConResPrintf() and associated functions, ConMsgPrintf(), - * <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ INT __cdecl diff --git a/sdk/lib/conutils/utils.c b/sdk/lib/conutils/utils.c index 15c7ac028f4..31fe8951092 100644 --- a/sdk/lib/conutils/utils.c +++ b/sdk/lib/conutils/utils.c @@ -247,7 +247,7 @@ K32LoadStringW( * crash if a malformed source string is retrieved and then being used * for formatting. It basically wraps calls to FormatMessage() within SEH. * - * @see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).…">FormatMessage() (on MSDN)</a> + * @see <a href="https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-forma…">FormatMessage() (on MSDN)</a> **/ DWORD WINAPI @@ -290,7 +290,7 @@ FormatMessageSafeW( * and we did not pass the flag FORMAT_MESSAGE_IGNORE_INSERTS, and the * message string expected too many inserts. * In this last case only, we can call again FormatMessage but ignore - * explicitely the inserts. The string that we will return to the user + * explicitly the inserts. The string that we will return to the user * will not be pre-formatted. */ if (((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) || lpBuffer) &&

1 0

[reactos] 01/01: [NTOS:MM] Remove wrong cleaning of PDEs at session cleanup
by Hervé Poussineau 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=831cad3410ac163f95737… commit 831cad3410ac163f95737b0f14583b407bdff07b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue May 25 21:12:41 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 25 21:13:32 2021 +0200 [NTOS:MM] Remove wrong cleaning of PDEs at session cleanup --- ntoskrnl/mm/ARM3/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/session.c b/ntoskrnl/mm/ARM3/session.c index c849c9952c3..cb4de5f9b5f 100644 --- a/ntoskrnl/mm/ARM3/session.c +++ b/ntoskrnl/mm/ARM3/session.c @@ -374,8 +374,8 @@ MiDereferenceSession(VOID) SessionGlobal = MmSessionSpace->GlobalVirtualAddress; /* Delete all session PDEs and flush the TB */ - RtlZeroMemory(MiAddressToPde(MmSessionBase), - BYTES_TO_PAGES(MmSessionSize) * sizeof(MMPDE)); + //RtlZeroMemory(MiAddressToPde(MmSessionBase), + // BYTES_TO_PAGES(MmSessionSize) * sizeof(MMPDE)); KeFlushEntireTb(FALSE, FALSE); /* Clean up the references here. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2021