Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USER32] Load keyboard layouts on logon correctly (#4686)
by Katayama Hirofumi MZ 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e110335e706a267cae1d… commit 8e110335e706a267cae1d691a6ac774add6ad931 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 14 02:58:28 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 14 02:58:28 2022 +0900 [USER32] Load keyboard layouts on logon correctly (#4686) - Add IntLoadPreloadKeyboardLayouts helper function to load the layouts on log-on. - In UpdatePerUserSystemParameters function, call CliImmInitializeHotKeys and IntLoadPreloadKeyboardLayouts functions. CORE-16600 --- win32ss/user/user32/include/user32p.h | 2 ++ win32ss/user/user32/misc/logon.c | 6 ++++ win32ss/user/user32/windows/input.c | 63 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/win32ss/user/user32/include/user32p.h b/win32ss/user/user32/include/user32p.h index 78a0b6be53f..e531ad847af 100644 --- a/win32ss/user/user32/include/user32p.h +++ b/win32ss/user/user32/include/user32p.h @@ -130,5 +130,7 @@ HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp); BOOL WINAPI InitializeImmEntryTable(VOID); HRESULT User32GetImmFileName(_Out_ LPWSTR lpBuffer, _In_ size_t cchBuffer); BOOL WINAPI UpdatePerUserImmEnabling(VOID); +VOID APIENTRY CliImmInitializeHotKeys(DWORD dwAction, HKL hKL); +VOID IntLoadPreloadKeyboardLayouts(VOID); /* EOF */ diff --git a/win32ss/user/user32/misc/logon.c b/win32ss/user/user32/misc/logon.c index bc735aa7ab4..a763e24e370 100644 --- a/win32ss/user/user32/misc/logon.c +++ b/win32ss/user/user32/misc/logon.c @@ -104,5 +104,11 @@ UpdatePerUserSystemParameters(DWORD dwReserved, // Update Imm support and load Imm32.dll. UpdatePerUserImmEnabling(); + /* Delete all the IME hotkeys */ + CliImmInitializeHotKeys(SETIMEHOTKEY_DELETEALL, NULL); + + /* Load Preload keyboard layouts */ + IntLoadPreloadKeyboardLayouts(); + return NtUserUpdatePerUserSystemParameters(dwReserved, bEnable); } diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index a018d3aeca2..87df74fc06b 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -143,6 +143,69 @@ Failure: return FALSE; } + +/* Win: LoadPreloadKeyboardLayouts */ +VOID IntLoadPreloadKeyboardLayouts(VOID) +{ + UINT nNumber, uFlags; + DWORD cbValue, dwType; + WCHAR szNumber[32], szValue[KL_NAMELENGTH]; + HKEY hPreloadKey; + BOOL bOK = FALSE; + HKL hKL, hDefaultKL = NULL; + + if (RegOpenKeyW(HKEY_CURRENT_USER, + L"Keyboard Layout\\Preload", + &hPreloadKey) != ERROR_SUCCESS) + { + return; + } + + for (nNumber = 1; nNumber <= 1000; ++nNumber) + { + _ultow(nNumber, szNumber, 10); + + cbValue = sizeof(szValue); + if (RegQueryValueExW(hPreloadKey, + szNumber, + NULL, + &dwType, + (LPBYTE)szValue, + &cbValue) != ERROR_SUCCESS) + { + break; + } + + if (dwType != REG_SZ) + continue; + + if (nNumber == 1) /* The first entry is for default keyboard layout */ + uFlags = KLF_SUBSTITUTE_OK | KLF_ACTIVATE | KLF_RESET; + else + uFlags = KLF_SUBSTITUTE_OK | KLF_NOTELLSHELL | KLF_REPLACELANG; + + hKL = LoadKeyboardLayoutW(szValue, uFlags); + if (hKL) + { + bOK = TRUE; + if (nNumber == 1) /* The first entry */ + hDefaultKL = hKL; + } + } + + RegCloseKey(hPreloadKey); + + if (hDefaultKL) + SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hDefaultKL, 0); + + if (!bOK) + { + /* Fallback to English (US) */ + LoadKeyboardLayoutW(L"00000409", KLF_SUBSTITUTE_OK | KLF_ACTIVATE | KLF_RESET); + } +} + + BOOL APIENTRY CliSaveImeHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKL, BOOL bDelete) {

1 0

[reactos] 01/01: [ATL] Fix window position to fit in screen area (#4512)
by Jose Carlos Jesus 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e215a088f9ed5e83620d7… commit e215a088f9ed5e83620d7c4ce949e4f430646d95 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Sep 13 16:00:45 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 13 18:00:45 2022 +0300 [ATL] Fix window position to fit in screen area (#4512) Clicking "Edit compatibility modes" button in the "Compatibility" tab opens a window centered on the parent window. If we move the parent window to one of the screen edges and then click this button again, the new window will appear off screen. Adjust position of created window, so now it would be completely visible. CORE-17089 Reviewed-by: Mark Jansen <mark.jansen(a)reactos.org> Reviewed-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- sdk/lib/atl/atlwin.h | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 447e06f94b7..b970fe7b173 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -320,9 +320,37 @@ public: int wndCenterHeight = wndCenterRect.bottom - wndCenterRect.top; int wndWidth = wndRect.right - wndRect.left; int wndHeight = wndRect.bottom - wndRect.top; + int xPos = wndCenterRect.left + ((wndCenterWidth - wndWidth + 1) >> 1); + int yPos = wndCenterRect.top + ((wndCenterHeight - wndHeight + 1) >> 1); + + if (!(::GetWindowLong(hWndCenter, GWL_STYLE) & WS_CHILD)) + { + MONITORINFO mi; + mi.cbSize = sizeof(mi); + HMONITOR hMonitor = MonitorFromWindow(hWndCenter, MONITOR_DEFAULTTOPRIMARY); + GetMonitorInfo(hMonitor, &mi); + + if (xPos + wndWidth > mi.rcWork.right) + { + xPos = mi.rcWork.right - wndWidth; + } + else if (xPos < mi.rcWork.left) + { + xPos = mi.rcWork.left; + } + + if (yPos + wndHeight > mi.rcWork.bottom) + { + yPos = mi.rcWork.bottom - wndHeight; + } + if (yPos < mi.rcWork.top) + { + yPos = mi.rcWork.top; + } + } return ::MoveWindow(m_hWnd, - wndCenterRect.left + ((wndCenterWidth - wndWidth + 1) >> 1), - wndCenterRect.top + ((wndCenterHeight - wndHeight + 1) >> 1), + xPos, + yPos, wndWidth, wndHeight, TRUE); }

1 0

[reactos] 01/01: [SYSSETUP] Update German (de-DE) translation (#4679)
by Joachim Henze 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7f75a88ea9a068587275… commit d7f75a88ea9a068587275e8fd860c55cf11ac745 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Tue Sep 13 15:22:51 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 13 16:22:51 2022 +0300 [SYSSETUP] Update German (de-DE) translation (#4679) - Fix typos in existing translation - Update new strings that were added during 0.4.15-dev'ing Addendum to 3f053db3 and 6d09885c. CORE-18357 --- dll/win32/syssetup/lang/de-DE.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 6802a7b0ac2..53eecdb9e4a 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -111,7 +111,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Installation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Registeren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Registrieren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installieren der Elemente des Startmenüs", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Speichern der Einstellungen", IDC_TASKTEXT3, 65, 51, 232, 8 LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT4, 65, 63, 232, 8 @@ -179,12 +179,12 @@ BEGIN IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für Ihren Computer festlegen." IDS_LOCALETITLE "Regionale Einstellungen" IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "Die Einstellung für Standards und Formate ist %s, und der Standort ist %s." + IDS_LAYOUTTEXT "Die Standard-Texteingabesprache und -methode ist: Tastaturlayout %s" IDS_DATETIMETITLE "Datum und Uhrzeit" IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit für Ihren Computer ein." IDS_PROCESSTITLE "Abschliessen der Installation" - IDS_PROCESSSUBTITLE "Bitte waten Sie, während die letzten Installationsschritte ausgeführt werden." + IDS_PROCESSSUBTITLE "Bitte warten Sie, während die letzten Installationsschritte ausgeführt werden." IDS_THEMESELECTIONTITLE "Erscheinungsbild" IDS_THEMESELECTIONSUBTITLE "Wählen Sie Ihr bevorzugtes Theme" END

1 0

[reactos] 01/01: [DOC] 3rd Party Files.txt: Fix Buslogic driver version (#4685)
by Serge Gautherie 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8482972a41eb7ec347672… commit 8482972a41eb7ec3476727b302d4dc7c827035c5 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Sep 13 14:30:13 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 13 15:30:13 2022 +0300 [DOC] 3rd Party Files.txt: Fix Buslogic driver version (#4685) Correct version is in the BusLogic958.rc file. Addendum to 5ee633f7d7e (0.4.15-dev-4556). CORE-18180 --- media/doc/3rd Party Files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b9af7331333..1b0385c3d5f 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -147,7 +147,7 @@ URL: http://alter.org.ua/soft/win/uni_ata/ Title: Miniport driver for the Buslogic BT 958 SCSI Controller Path: drivers/storage/port/buslogic -Used Version: v1.2.0.2 (2005-08-17) +Used Version: 1.2.0.4 (2005-08-17) License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) URL: https://customerconnect.vmware.com/downloads/details?productId=23&downloadG…

1 0

[reactos] 01/01: [DOC] 3rd Party Files.txt: Add 3rdparty/ to some sdk/lib/ paths (#4642)
by Serge Gautherie 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d6a11eaa3a4a6ad0cbe3… commit 8d6a11eaa3a4a6ad0cbe3d2974d52014043541d1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Sep 13 14:08:45 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 13 15:08:45 2022 +0300 [DOC] 3rd Party Files.txt: Add 3rdparty/ to some sdk/lib/ paths (#4642) --- media/doc/3rd Party Files.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index f9c9e611729..b9af7331333 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -190,13 +190,13 @@ License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) URL: http://savannah.gnu.org/projects/freefont/ Title: GNU adns -Path: sdk/lib/adns +Path: sdk/lib/3rdparty/adns Used Version: 1.0 REV 5 License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) URL: http://www.gnu.org/software/adns/, http://adns.jgaa.com Title: CardLib -Path: sdk/lib/cardlib +Path: sdk/lib/3rdparty/cardlib Used Version: 2005-07-14 License: URL: http://www.catch22.net/tuts/cardlib @@ -208,7 +208,7 @@ License: Modified BSD License (sdk/lib/drivers/lwip/COPYING) URL: https://savannah.nongnu.org/projects/lwip/ Title: FreeType -Path: sdk/lib/freetype +Path: sdk/lib/3rdparty/freetype Used Version: 2.9.0 License: FTL (https://spdx.org/licenses/FTL.html) URL: http://www.freetype.org @@ -220,37 +220,37 @@ License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) URL: https://github.com/dosfstools/dosfstools Title: libmpg123 (used by winemp3.acm) -Path: sdk/lib/libmpg123 +Path: sdk/lib/3rdparty/libmpg123 Used Version: 1.26.1 License: LGPL-2.1 (https://spdx.org/licenses/LGPL-2.1.html) URL: http://www.mpg123.de/ Title: libsamplerate -Path: sdk/lib/libsamplerate +Path: sdk/lib/3rdparty/libsamplerate Used Version: 0.1.9 License: BSD-2-Clause (https://spdx.org/licenses/BSD-2-Clause.html) URL: http://www.mega-nerd.com/SRC/download.html Title: win-iconv -Path: sdk/lib/libwin-iconv +Path: sdk/lib/3rdparty/libwin-iconv Used Version: git commit 8765259 License: URL: https://github.com/win-iconv/win-iconv Title: LibXML -Path: sdk/lib/libxml2 +Path: sdk/lib/3rdparty/libxml2 Used Version: 2.9.12 License: MIT (https://spdx.org/licenses/MIT.htmlf) URL: http://xmlsoft.org, ftp://xmlsoft.org/libxml2/ Title: STLport -Path: sdk/lib/stlport +Path: sdk/lib/3rdparty/stlport Used Version: 5.2.1 License: BSD-2-Clause (https://spdx.org/licenses/BSD-2-Clause.html) URL: http://stlport.sourceforge.net/ Title: ZLib -Path: sdk/lib/zlib +Path: sdk/lib/3rdparty/zlib Used Version: 1.2.11 License: Zlib (https://spdx.org/licenses/Zlib.html) URL: http://www.zlib.net

1 0

[reactos] 01/01: [BOOTDATA] Fix 'Layout Id' values of hivesys.inf
by Katayama Hirofumi MZ 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6cabfd1f3e3007b327fe… commit b6cabfd1f3e3007b327fe8b777fe4d3955a90641 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 13 15:48:04 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 13 15:50:18 2022 +0900 [BOOTDATA] Fix 'Layout Id' values of hivesys.inf Fix them to Win2k3's settings. CORE-11700 --- boot/bootdata/hivesys.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index ff31905f025..65c54f7131e 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -509,6 +509,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5031" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout File",0x00000000,"kbdcz1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Id", 0x00000000,"0005" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Text",0x00000000,%CZECH_QWERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5032" @@ -525,6 +526,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5138" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgr1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Id", 0x00000000,"0012" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Text",0x00000000,%GERMAN_RISTOME% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5137" @@ -651,10 +653,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5035" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout File",0x00000000,"kbdpl.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout Id", 0x00000000,"0007" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout Text",0x00000000,%POLISH_214% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5036" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout File",0x00000000,"kbdbr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Id", 0x00000000,"001D" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Text",0x00000000,%PORTUGESE_BRAZILIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010416","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5126" @@ -675,6 +679,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5055" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout File",0x00000000,"kbdru1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Id", 0x00000000,"0008" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Text",0x00000000,%RUSSIAN_TYPEWRITER% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5056" @@ -695,6 +700,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsl1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Id", 0x00000000,"0013" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Text",0x00000000,%SLOVAK_QWERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5040" @@ -756,6 +762,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Displa ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5044" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Id", 0x00000000,"0027" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Text",0x00000000,%LITHUANIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5088"

1 0

[reactos] 01/01: [NTUSER] Fix UserSetDefaultInputLang by using reordering
by Katayama Hirofumi MZ 13 Sep '22

13 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b76602ff229d9ad0e9d09… commit b76602ff229d9ad0e9d09b2b6b54cd62b6373f05 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 13 14:32:39 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 13 14:32:39 2022 +0900 [NTUSER] Fix UserSetDefaultInputLang by using reordering - Move IntReorderKeyboardLayouts function. - Fix UserSetDefaultInputLang function. CORE-11700 --- win32ss/user/ntuser/kbdlayout.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 45e055d8758..2f1aed71039 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -556,6 +556,26 @@ UserHklToKbl(HKL hKl) return NULL; } +// Win: ReorderKeyboardLayouts +VOID FASTCALL +IntReorderKeyboardLayouts( + _Inout_ PWINSTATION_OBJECT pWinSta, + _Inout_ PKL pNewKL) +{ + PKL pOldKL = gspklBaseLayout; + + if ((pWinSta->Flags & WSS_NOIO) || pNewKL == pOldKL) + return; + + pNewKL->pklPrev->pklNext = pNewKL->pklNext; + pNewKL->pklNext->pklPrev = pNewKL->pklPrev; + pNewKL->pklNext = pOldKL; + pNewKL->pklPrev = pOldKL->pklPrev; + pOldKL->pklPrev->pklNext = pNewKL; + pOldKL->pklPrev = pNewKL; + gspklBaseLayout = pNewKL; /* Should we use UserAssignmentLock? */ +} + /* * UserSetDefaultInputLang * @@ -571,7 +591,7 @@ UserSetDefaultInputLang(HKL hKl) if (!pKl) return FALSE; - gspklBaseLayout = pKl; + IntReorderKeyboardLayouts(IntGetProcessWindowStation(NULL), pKl); return TRUE; } @@ -741,26 +761,6 @@ co_UserActivateKeyboardLayout( return hOldKL; } -// Win: ReorderKeyboardLayouts -VOID FASTCALL -IntReorderKeyboardLayouts( - _Inout_ PWINSTATION_OBJECT pWinSta, - _Inout_ PKL pNewKL) -{ - PKL pOldKL = gspklBaseLayout; - - if ((pWinSta->Flags & WSS_NOIO) || pNewKL == pOldKL) - return; - - pNewKL->pklPrev->pklNext = pNewKL->pklNext; - pNewKL->pklNext->pklPrev = pNewKL->pklPrev; - pNewKL->pklNext = pOldKL; - pNewKL->pklPrev = pOldKL->pklPrev; - pOldKL->pklPrev->pklNext = pNewKL; - pOldKL->pklPrev = pNewKL; - gspklBaseLayout = pNewKL; /* Should we use UserAssignmentLock? */ -} - /* Win: xxxActivateKeyboardLayout */ HKL APIENTRY co_IntActivateKeyboardLayout(

1 0

[reactos] 01/01: [NTFS] PrintAllVCNs(): Fix a typo in an ASSERT() (#4682)
by Serge Gautherie 12 Sep '22

12 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f308c6a2bc9cc8678385a… commit f308c6a2bc9cc8678385a55fab6956867595d71d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Sep 12 21:30:28 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 12 22:30:28 2022 +0300 [NTFS] PrintAllVCNs(): Fix a typo in an ASSERT() (#4682) It was introduced in 0.4.7-dev-590-g 5579428b4f1. --- drivers/filesystems/ntfs/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index ed53df2c8f0..65c41c4e4f0 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -56,7 +56,7 @@ PrintAllVCNs(PDEVICE_EXTENSION Vcb, BytesRead = ReadAttribute(Vcb, IndexAllocationContext, 0, (PCHAR)Buffer, BufferSize); - ASSERT(BytesRead = BufferSize); + ASSERT(BytesRead == BufferSize); CurrentNode = Buffer;

1 0

[reactos] 03/03: [SHELL32] Only hide a window when there is a window to hide
by Mark Jansen 12 Sep '22

12 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96e3c7bcc508a60dceed8… commit 96e3c7bcc508a60dceed8a3911ec922e1d7d4863 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 11 22:14:46 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 12 20:00:39 2022 +0200 [SHELL32] Only hide a window when there is a window to hide --- dll/win32/shell32/shellmenu/CMenuDeskBar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp b/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp index 02e8717eccb..cf8934cd833 100644 --- a/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp +++ b/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp @@ -645,7 +645,8 @@ HRESULT CMenuDeskBar::_CloseBar() if (FAILED_UNEXPECTEDLY(hr)) return hr; - SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE); + if (m_hWnd) + SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE); return UIActivateIO(FALSE, NULL); }

1 0

[reactos] 02/03: [SHELL32] Properly destroy window
by Mark Jansen 12 Sep '22

12 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0ba8fd4a3f891ecdca37… commit d0ba8fd4a3f891ecdca37e1b914d03aa0c79650e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 11 22:14:15 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 12 20:00:39 2022 +0200 [SHELL32] Properly destroy window --- dll/win32/shell32/shellmenu/CMenuSite.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CMenuSite.cpp b/dll/win32/shell32/shellmenu/CMenuSite.cpp index 010408de073..6faf0fabb0c 100644 --- a/dll/win32/shell32/shellmenu/CMenuSite.cpp +++ b/dll/win32/shell32/shellmenu/CMenuSite.cpp @@ -246,7 +246,8 @@ HRESULT STDMETHODCALLTYPE CMenuSite::SetDeskBarSite(IUnknown *punkSite) m_DeskBand = NULL; m_WinEventHandler = NULL; m_hWndBand = NULL; - m_hWnd = NULL; + if (m_hWnd) + DestroyWindow(); m_DeskBarSite = NULL; }

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