Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: input: Overwrite font substitutes settings on lang change
by Katayama Hirofumi MZ 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dbd44fde1487acdef673… commit 3dbd44fde1487acdef6739486232344e59d6c4aa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 13 10:36:52 2017 +0900 input: Overwrite font substitutes settings on lang change --- dll/cpl/input/input_list.c | 126 +++++++++++++++++++++++++++++++++++++++++- dll/cpl/input/input_list.h | 2 +- dll/cpl/input/lang/bg-BG.rc | 1 + dll/cpl/input/lang/cs-CZ.rc | 1 + dll/cpl/input/lang/de-DE.rc | 1 + dll/cpl/input/lang/el-GR.rc | 1 + dll/cpl/input/lang/en-US.rc | 1 + dll/cpl/input/lang/es-ES.rc | 1 + dll/cpl/input/lang/fr-FR.rc | 1 + dll/cpl/input/lang/he-IL.rc | 1 + dll/cpl/input/lang/it-IT.rc | 1 + dll/cpl/input/lang/ja-JP.rc | 1 + dll/cpl/input/lang/no-NO.rc | 1 + dll/cpl/input/lang/pl-PL.rc | 1 + dll/cpl/input/lang/pt-BR.rc | 1 + dll/cpl/input/lang/ro-RO.rc | 1 + dll/cpl/input/lang/ru-RU.rc | 1 + dll/cpl/input/lang/sk-SK.rc | 1 + dll/cpl/input/lang/sq-AL.rc | 1 + dll/cpl/input/lang/tr-TR.rc | 1 + dll/cpl/input/lang/uk-UA.rc | 1 + dll/cpl/input/lang/zh-CN.rc | 1 + dll/cpl/input/lang/zh-TW.rc | 1 + dll/cpl/input/resource.h | 1 + dll/cpl/input/settings_page.c | 44 ++++++++++++++- 25 files changed, 189 insertions(+), 5 deletions(-) diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index 0d9718d7e7..1de3246af1 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -2,11 +2,129 @@ * PROJECT: input.dll * FILE: dll/cpl/input/input_list.c * PURPOSE: input.dll -* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +* PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) +* Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input_list.h" +typedef struct +{ + PWCHAR FontName; + PWCHAR SubFontName; +} MUI_SUBFONT; + +#include "../../../base/setup/usetup/muifonts.h" + +BOOL UpdateRegistryForFontSubstitutes(MUI_SUBFONT *pSubstitutes) +{ + DWORD cbData; + HKEY hKey; + static const WCHAR pszKey[] = + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"; + + hKey = NULL; + RegOpenKeyExW(HKEY_LOCAL_MACHINE, pszKey, 0, KEY_ALL_ACCESS, &hKey); + if (hKey == NULL) + return FALSE; + + /* Overwrite only */ + for (; pSubstitutes->FontName; ++pSubstitutes) + { + cbData = (lstrlenW(pSubstitutes->SubFontName) + 1) * sizeof(WCHAR); + RegSetValueExW(hKey, pSubstitutes->FontName, 0, + REG_SZ, (LPBYTE)pSubstitutes->SubFontName, cbData); + } + + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +InputList_SetFontSubstitutes(LCID dwLocaleId) +{ + MUI_SUBFONT *pSubstitutes; + WORD wLangID, wPrimaryLangID, wSubLangID; + + wLangID = LANGIDFROMLCID(dwLocaleId); + wPrimaryLangID = PRIMARYLANGID(wLangID); + wSubLangID = SUBLANGID(wLangID); + + /* FIXME: Add more if necessary */ + switch (wPrimaryLangID) + { + default: + pSubstitutes = LatinFonts; + break; + case LANG_AZERI: + case LANG_BELARUSIAN: + case LANG_BULGARIAN: + case LANG_KAZAK: + case LANG_RUSSIAN: + case LANG_SERBIAN: + case LANG_TATAR: + case LANG_UKRAINIAN: + case LANG_UZBEK: + pSubstitutes = CyrillicFonts; + break; + case LANG_GREEK: + pSubstitutes = GreekFonts; + break; + case LANG_HEBREW: + pSubstitutes = HebrewFonts; + break; + case LANG_CHINESE: + switch (wSubLangID) + { + case SUBLANG_CHINESE_SIMPLIFIED: + case SUBLANG_CHINESE_SINGAPORE: + case SUBLANG_CHINESE_MACAU: + pSubstitutes = ChineseSimplifiedFonts; + break; + case SUBLANG_CHINESE_TRADITIONAL: + case SUBLANG_CHINESE_HONGKONG: + pSubstitutes = ChineseTraditionalFonts; + break; + default: + pSubstitutes = NULL; + DebugBreak(); + break; + } + break; + case LANG_JAPANESE: + pSubstitutes = JapaneseFonts; + break; + case LANG_KOREAN: + pSubstitutes = KoreanFonts; + break; + case LANG_ARABIC: + case LANG_ARMENIAN: + case LANG_BENGALI: + case LANG_FARSI: + case LANG_GEORGIAN: + case LANG_GUJARATI: + case LANG_HINDI: + case LANG_KONKANI: + case LANG_MARATHI: + case LANG_PUNJABI: + case LANG_SANSKRIT: + case LANG_TAMIL: + case LANG_TELUGU: + case LANG_THAI: + case LANG_URDU: + case LANG_VIETNAMESE: + pSubstitutes = UnicodeFonts; + break; + } + + if (pSubstitutes) + { + UpdateRegistryForFontSubstitutes(pSubstitutes); + return TRUE; + } + return FALSE; +} static INPUT_LIST_NODE *_InputList = NULL; @@ -216,11 +334,12 @@ InputList_AddInputMethodToUserRegistry(DWORD dwIndex, INPUT_LIST_NODE *pNode) /* * Writes any changes in input methods to the registry */ -VOID +BOOL InputList_Process(VOID) { INPUT_LIST_NODE *pCurrent; DWORD dwIndex; + BOOL bRet = FALSE; /* Process deleted and edited input methods */ for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) @@ -246,6 +365,7 @@ InputList_Process(VOID) { if (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DEFAULT) { + bRet = InputList_SetFontSubstitutes(pCurrent->pLocale->dwId); InputList_AddInputMethodToUserRegistry(1, pCurrent); break; } @@ -279,6 +399,8 @@ InputList_Process(VOID) dwIndex++; } + + return bRet; } diff --git a/dll/cpl/input/input_list.h b/dll/cpl/input/input_list.h index d2659f306d..e578cc7042 100644 --- a/dll/cpl/input/input_list.h +++ b/dll/cpl/input/input_list.h @@ -30,7 +30,7 @@ typedef struct _INPUT_LIST_NODE VOID InputList_Create(VOID); -VOID +BOOL InputList_Process(VOID); BOOL diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 4b119fba82..97e73c536d 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ляв Alt+Shift" IDS_SWITCH_BET_INLANG "Превключване на езиците за въвеждане" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 8d6d8e6b3f..54e97bff60 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -111,6 +111,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Levý Alt+Shift" IDS_SWITCH_BET_INLANG "Přepnout mezi vstupními jazyky" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 69dd9e5492..705148ac87 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Strg+Umschalt" IDS_LEFT_ALT_SHIFT "Alt links+Umschalt" IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index 2eee60d0f6..332277b89d 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 8df67e0e8f..4d734791c6 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index e18eb8ed7d..3a776808ca 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Mayús" IDS_LEFT_ALT_SHIFT "Alt Izq+Mayús" IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 96584a96d4..e8da479877 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" + IDS_REBOOT_NOW, "Reboot now?" END /* FIXME : À améliorer/compléter */ diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index 515b5eeefa..076ba17295 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "החלף בין שפות כתיבה" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index bc9c07c88a..dd6314f320 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt sinistro+Shift" IDS_SWITCH_BET_INLANG "Cambia lingua di digitazione" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 100f79fd8e..8952da839f 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左Alt+Shift" IDS_SWITCH_BET_INLANG "入力言語の切り替え" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index d2715043b2..e860a6798b 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Venstre Alt+Shift" IDS_SWITCH_BET_INLANG "Bytt mellom inndataspråk" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index e7aee52655..c30300005b 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -114,6 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 4ac6977d16..36a281b6aa 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index b7bf51666e..63dde21faf 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "«Ctrl» + «Shift»" IDS_LEFT_ALT_SHIFT "«Alt» (stâng) + «Shift»" IDS_SWITCH_BET_INLANG "Comutarea între limbile de intrare" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 057e302e07..ffd6e37c80 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt слева+Shift" IDS_SWITCH_BET_INLANG "Переключение между языками ввода" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 09069c15e1..4adb1391ec 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -111,6 +111,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ľavý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index 2c7051fd24..02566a80de 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -110,6 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Ndërro ndër gjuhët hyrese" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 1234b8c049..0caed2bc93 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Denetim + Üst Damga" IDS_LEFT_ALT_SHIFT "Sol Seçenek + Üst Damga" IDS_SWITCH_BET_INLANG "Giriş dilleri arasında geçiş yap." + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index af336ddfbb..bea4493668 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -114,6 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" IDS_SWITCH_BET_INLANG "Перемикання мов вводу" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index cb25920bc1..378132452e 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在输入语言间切换" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 01ec0c4286..39cc993129 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/resource.h b/dll/cpl/input/resource.h index b5ae953fde..fee7e9cda9 100644 --- a/dll/cpl/input/resource.h +++ b/dll/cpl/input/resource.h @@ -57,6 +57,7 @@ #define IDS_LEFT_ALT_SHIFT 15 #define IDS_SWITCH_BET_INLANG 16 #define IDC_TURNOFFTEXTSVCS_CB 17 +#define IDS_REBOOT_NOW 18 /* Layouts */ #define IDS_US_LAYOUT 5000 diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index 0404b63c45..72260a8bee 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -2,7 +2,8 @@ * PROJECT: input.dll * FILE: dll/cpl/input/settings_page.c * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input.h" @@ -357,6 +358,32 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) } } +BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable) +{ + HANDLE hToken; + LUID luid; + TOKEN_PRIVILEGES tokenPrivileges; + BOOL Ret; + + Ret = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + if (!Ret) + return Ret; // failure + + Ret = LookupPrivilegeValueW(NULL, lpPrivilegeName, &luid); + if (Ret) + { + tokenPrivileges.PrivilegeCount = 1; + tokenPrivileges.Privileges[0].Luid = luid; + tokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; + + Ret = AdjustTokenPrivileges(hToken, FALSE, &tokenPrivileges, 0, 0, 0); + } + + CloseHandle(hToken); + return Ret; +} static VOID OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) @@ -405,7 +432,20 @@ OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) case PSN_APPLY: { /* Write Input Methods list to registry */ - InputList_Process(); + if (InputList_Process()) + { + /* Needs reboot */ + WCHAR szNeedsReboot[128], szLanguage[64]; + LoadStringW(hApplet, IDS_REBOOT_NOW, szNeedsReboot, _countof(szNeedsReboot)); + LoadStringW(hApplet, IDS_LANGUAGE, szLanguage, _countof(szLanguage)); + + if (MessageBoxW(hwndDlg, szNeedsReboot, szLanguage, + MB_ICONINFORMATION | MB_YESNOCANCEL) == IDYES) + { + EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); + ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); + } + } } break; }

1 0

[reactos] 01/01: [CMD] Addendum to 26ff2c8 and to r40474 / 8cf1106: Fix CMD process exit code.
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bd33ac4df4948609165e… commit 7bd33ac4df4948609165e99f98c7bd44b46bdf88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 19 00:45:33 2017 +0100 [CMD] Addendum to 26ff2c8 and to r40474 / 8cf1106: Fix CMD process exit code. As it appears, the process exit code of CMD /C is really the errorlevel, and not the "command's return value". --- base/shell/cmd/cmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 549f10d59e..d9a03a265e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1800,7 +1800,7 @@ Initialize(VOID) HMODULE NtDllModule; TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; - INT nExitCode; + // INT nExitCode; HANDLE hIn, hOut; @@ -1985,11 +1985,11 @@ Initialize(VOID) /* Do the /C or /K command */ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); bWaitForCommand = TRUE; - nExitCode = ParseCommandLine(commandline); + /* nExitCode = */ ParseCommandLine(commandline); bWaitForCommand = FALSE; if (option != _T('K')) { - nErrorLevel = nExitCode; + // nErrorLevel = nExitCode; bExit = TRUE; } }

1 0

[reactos] 02/02: [CMD] Fix the errorlevel value set by the EXIT command, and when a batch file has run. CORE-10495 CORE-13672
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26ff2c8ef3ca97ab960be… commit 26ff2c8ef3ca97ab960be45b0005c93090e08cb3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 18 23:41:31 2017 +0100 [CMD] Fix the errorlevel value set by the EXIT command, and when a batch file has run. CORE-10495 CORE-13672 - Fix the behaviour of the EXIT command, where it set the last errorlevel value ONLY when it was called with the /b switch and otherwise kept the ambient one, instead of always using the value that the user specified on the command-line. - When a batch file has terminated, make the Batch() helper returning the errorlevel value so that, when the batch file has been started with the CALL command, CALL can in turn set the correct errorlevel value. Verified with respect to Windows' cmd.exe. --- base/shell/cmd/batch.c | 6 +++++- base/shell/cmd/internal.c | 29 +++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index bf36ddb610..148943a990 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -299,7 +299,8 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) * return until this context has been exited */ new.prev = bc; /* copy some fields in the new structure if it is the same file */ - if (same_fn) { + if (same_fn) + { new.mem = bc->mem; new.memsize = bc->memsize; new.mempos = 0; @@ -366,6 +367,9 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) FreeCommand(Cmd); } + /* Always return the current errorlevel */ + ret = nErrorLevel; + TRACE ("Batch: returns TRUE\n"); fc = saved_fc; diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 4830660bbc..fc05119829 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -514,26 +514,39 @@ INT CommandExit(LPTSTR param) if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_EXIT_HELP); - /* Just make sure */ + + /* Just make sure we don't exit */ bExit = FALSE; - /* Don't exit */ return 0; } - if (bc != NULL && _tcsnicmp(param, _T("/b"), 2) == 0) + if (_tcsnicmp(param, _T("/b"), 2) == 0) { param += 2; - while (_istspace(*param)) - param++; - if (_istdigit(*param)) - nErrorLevel = _ttoi(param); - ExitBatch(); + + /* + * If a current batch file is running, exit it, + * otherwise exit this command interpreter instance. + */ + if (bc) + ExitBatch(); + else + bExit = TRUE; } else { + /* Exit this command interpreter instance */ bExit = TRUE; } + /* Search for an optional exit code */ + while (_istspace(*param)) + param++; + + /* Set the errorlevel to the exit code */ + if (_istdigit(*param)) + nErrorLevel = _ttoi(param); + return 0; }

1 0

[reactos] 01/02: [CMD] Code formatting only.
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24ed5344745899cf26494… commit 24ed5344745899cf26494ce1cb8b5b226ce84147 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 18 21:32:10 2017 +0100 [CMD] Code formatting only. --- base/shell/cmd/call.c | 6 +++--- base/shell/cmd/internal.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/shell/cmd/call.c b/base/shell/cmd/call.c index 56b61dbe2e..2cf2772c3c 100644 --- a/base/shell/cmd/call.c +++ b/base/shell/cmd/call.c @@ -34,7 +34,7 @@ * Perform CALL command. */ -INT cmd_call (LPTSTR param) +INT cmd_call(LPTSTR param) { TCHAR line[CMDLINE_LENGTH + 1]; TCHAR *first; @@ -49,7 +49,7 @@ INT cmd_call (LPTSTR param) /* Do a second round of %-variable substitutions */ if (!SubstituteVars(param, line, _T('%'))) - return nErrorLevel = 1; + return (nErrorLevel = 1); /* Find start and end of first word */ first = line; @@ -67,7 +67,7 @@ INT cmd_call (LPTSTR param) memmove(param + 1, param, (_tcslen(param) + 1) * sizeof(TCHAR)); *param++ = _T('\0'); - if (*first == _T(':') && (bc)) + if (*first == _T(':') && bc) { /* CALL :label - call a subroutine of the current batch file */ while (*param == _T(' ')) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 4e14daf527..4830660bbc 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -282,7 +282,7 @@ INT cmd_chdir (LPTSTR param) #ifdef INCLUDE_CMD_MKDIR /* Helper function for mkdir to make directories in a path. -Dont use the api to decrease depence on libs */ +Don't use the api to decrease dependence on libs */ BOOL MakeFullPath(TCHAR * DirPath) { @@ -509,21 +509,21 @@ INT cmd_rmdir (LPTSTR param) /* * set the exitflag to true */ -INT CommandExit (LPTSTR param) +INT CommandExit(LPTSTR param) { - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_EXIT_HELP); + ConOutResPaging(TRUE, STRING_EXIT_HELP); /* Just make sure */ bExit = FALSE; - /* Dont exit */ + /* Don't exit */ return 0; } - if (bc != NULL && _tcsnicmp(param,_T("/b"),2) == 0) + if (bc != NULL && _tcsnicmp(param, _T("/b"), 2) == 0) { param += 2; - while (_istspace (*param)) + while (_istspace(*param)) param++; if (_istdigit(*param)) nErrorLevel = _ttoi(param);

1 0

[reactos] 01/01: [FREELDR] PcMemGetBiosMemoryMap(): Add checks for entry sizes and bare handling of error case. CORE-13332
by Serge Gautherie 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14563105034fc009bb764… commit 14563105034fc009bb764e65e40a8158644028a7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Oct 9 01:40:22 2017 +0200 [FREELDR] PcMemGetBiosMemoryMap(): Add checks for entry sizes and bare handling of error case. CORE-13332 --- boot/freeldr/freeldr/arch/i386/pcmem.c | 23 +++++++++++++++++++++++ boot/freeldr/freeldr/include/arch/pc/pcbios.h | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index aa5b18d226..9b0997ebf5 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -293,6 +293,29 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi goto nextRange; } + /* Extra safety: unexpected entry length. + * All in-between values are valid too, as x86 is little-indian + * and only lower byte is used per ACPI 6.2-A. + */ + if (Regs.x.ecx < RTL_SIZEOF_THROUGH_FIELD(BIOS_MEMORY_MAP, Type) || + Regs.x.ecx > sizeof(BIOS_MEMORY_MAP)) + { + ERR("Int 15h AX=E820h returned an invalid entry length! (would-be-PcBiosMapCount = %lu, Entry length = (%Iu <=) %lu (<= %Iu))\n\n", + PcBiosMapCount, RTL_SIZEOF_THROUGH_FIELD(BIOS_MEMORY_MAP, Type), Regs.x.ecx, sizeof(BIOS_MEMORY_MAP)); + /* Warn user, unless wrong case is "first and not too big entry", which is otherwise harmless. */ + if (PcBiosMapCount > 0 || Regs.x.ecx > sizeof(BIOS_MEMORY_MAP)) + { + ASSERTMSG("Int 15h AX=E820h returned an invalid entry length!", FALSE); + } + /* We keep previous entries (if any), but do not dare trying next entries. + * We assume these entries are good to use as is. If they are not, we are in trouble... + * (And don't ask what happens if BIOS actually overflowed our entry buffer...) + * + * FIXME: Safer = revert previous entries, Safest = blacklist this BIOS. + */ + break; + } + /* Copy data to global buffer */ RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index ecfaf90b2a..b60df0b122 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -19,6 +19,11 @@ typedef struct ULONG Reserved; } BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; +/* Int 15h AX=E820h Entry minimal size. */ +C_ASSERT(FIELD_OFFSET(BIOS_MEMORY_MAP, Reserved) == 20); +/* Int 15h AX=E820h Entry maximal size. */ +C_ASSERT(sizeof(BIOS_MEMORY_MAP) == 24); + /* FIXME: Should be moved to NDK, and respective ACPI header files */ typedef struct _ACPI_BIOS_DATA {

1 0

[reactos] 01/01: [NFS41_NP] Attempt to fix MSVC build
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ddebe3291568bb18d032… commit 2ddebe3291568bb18d03207337315d4f38d4d630 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 21:36:57 2017 +0100 [NFS41_NP] Attempt to fix MSVC build --- dll/np/nfs/nfs41_np.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/np/nfs/nfs41_np.c b/dll/np/nfs/nfs41_np.c index 42aa46730d..ce03c41999 100644 --- a/dll/np/nfs/nfs41_np.c +++ b/dll/np/nfs/nfs41_np.c @@ -649,10 +649,11 @@ NPCancelConnection( DbgP((TEXT("NPCancelConnection: Name %S EntryName %S\n"), lpName,pNetResource->LocalName)); - DbgP((TEXT("NPCancelConnection: Name Length %d Entry Name Length %d\n"), #ifndef __REACTOS__ + DbgP((TEXT("NPCancelConnection: Name Length %d Entry Name Length %d\n"), pNetResource->LocalNameLength,pNetResource->LocalName)); #else + DbgP((TEXT("NPCancelConnection: Name Length %d Entry Name Length %d\n"), (wcslen(lpName) + 1) * sizeof(WCHAR), pNetResource->LocalNameLength)); #endif

1 0

[reactos] 02/02: [SHELL32] Drop slash when dismounting a remote drive. MPR and NP are expecting a drive letter. This fixes dismounting a network drive using explorer.
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b543202d7e1927833d8… commit 45b543202d7e1927833d84faebdb39924d2b4e09 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 21:26:18 2017 +0100 [SHELL32] Drop slash when dismounting a remote drive. MPR and NP are expecting a drive letter. This fixes dismounting a network drive using explorer. --- dll/win32/shell32/folders/CDrivesFolder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index a708dc4d49..701a10643f 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -253,6 +253,7 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, else if (wParam == CMDID_DISCONNECT) { /* do disconnect */ + wszBuf[2] = UNICODE_NULL; dwError = WNetCancelConnection2W(wszBuf, 0, FALSE); if (dwError == NO_ERROR) {

1 0

[reactos] 01/02: [NFS41_NP] Fix debug print in case of connection cancel failure
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=764b2b6ef72cff6072918… commit 764b2b6ef72cff60729184284d654c6a47699539 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 21:25:00 2017 +0100 [NFS41_NP] Fix debug print in case of connection cancel failure --- dll/np/nfs/nfs41_np.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/np/nfs/nfs41_np.c b/dll/np/nfs/nfs41_np.c index 7dea7f3548..42aa46730d 100644 --- a/dll/np/nfs/nfs41_np.c +++ b/dll/np/nfs/nfs41_np.c @@ -650,7 +650,11 @@ NPCancelConnection( DbgP((TEXT("NPCancelConnection: Name %S EntryName %S\n"), lpName,pNetResource->LocalName)); DbgP((TEXT("NPCancelConnection: Name Length %d Entry Name Length %d\n"), +#ifndef __REACTOS__ pNetResource->LocalNameLength,pNetResource->LocalName)); +#else + (wcslen(lpName) + 1) * sizeof(WCHAR), pNetResource->LocalNameLength)); +#endif } }

1 0

[reactos] 01/01: [CMD] ExecutePipeline() returns the last error level (set to process exit code). CORE-13974
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56a19b1439effc8a3990f… commit 56a19b1439effc8a3990f97ff9241379d55a07cb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 18 20:50:50 2017 +0100 [CMD] ExecutePipeline() returns the last error level (set to process exit code). CORE-13974 This should fix situations where (for example): command_1 | command_2 && echo Succeeded should *NOT* run "echo Succeeded" if any of the command_1 or command_2 has failed. This also makes the ExecutePipeline() function on par with the other "ExecuteXXX()" helpers. Problem diagnosed by Doug Lyons; patch inspired by contributor 'cagey45'. --- base/shell/cmd/cmd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index e6c9bec785..549f10d59e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -636,7 +636,7 @@ ExecuteAsync(PARSED_COMMAND *Cmd) return prci.hProcess; } -static VOID +static INT ExecutePipeline(PARSED_COMMAND *Cmd) { #ifdef FEATURE_REDIRECTION @@ -708,7 +708,7 @@ ExecutePipeline(PARSED_COMMAND *Cmd) while (--nProcesses >= 0) CloseHandle(hProcess[nProcesses]); - return; + return nErrorLevel; failed: if (hInput) @@ -721,6 +721,8 @@ failed: SetStdHandle(STD_INPUT_HANDLE, hOldConIn); SetStdHandle(STD_OUTPUT_HANDLE, hOldConOut); #endif + + return nErrorLevel; } INT @@ -771,7 +773,7 @@ ExecuteCommand(PARSED_COMMAND *Cmd) Ret = ExecuteCommand(Sub->Next); break; case C_PIPE: - ExecutePipeline(Cmd); + Ret = ExecutePipeline(Cmd); break; case C_IF: Ret = ExecuteIf(Cmd);

1 0

[reactos] 01/01: [SHELL32] Update French translation, following 6465705
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0701527f200a37e29f94f… commit 0701527f200a37e29f94fb7f4d350274f0b344bb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:56:59 2017 +0100 [SHELL32] Update French translation, following 6465705 --- dll/win32/shell32/lang/fr-FR.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 16aaf76420..325487e4fe 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -683,8 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formater..." IDS_RENAME "Renommer" IDS_PASTE "Insérer" - IDS_EJECT "Eject" - IDS_DISCONNECT "Disconnect" + IDS_EJECT "Éjecter" + IDS_DISCONNECT "Déconnecter" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" @@ -753,7 +753,7 @@ BEGIN IDS_NEWFOLDER "Nouveau dossier" IDS_DRIVE_FIXED "Disque local" - IDS_DRIVE_CDROM "CD Drive" + IDS_DRIVE_CDROM "Lecteur CD" IDS_DRIVE_NETWORK "Disque réseau" IDS_DRIVE_FLOPPY "Disquette 3.5" IDS_DRIVE_REMOVABLE "Disque amovible" @@ -778,11 +778,11 @@ BEGIN IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Fichiers exécutables (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTLOCKVOLUME "Impossible de verrouiller le volume (code d'erreur : %lu)." + IDS_CANTDISMOUNTVOLUME "Impossible de démonter le volume (code d'erreur : %lu)." + IDS_CANTEJECTMEDIA "Impossible d'éjecter le média (code d'erreur : %lu)." + IDS_CANTSHOWPROPERTIES "Impossible de montrer les propriétés (code d'erreur : %lu)." + IDS_CANTDISCONNECT "Impossible de déconnecter (code d'erreur : %lu)." IDS_DIRECTORY "Dossier" IDS_BAT_FILE "Fichier Batch ReactOS"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs