Ros-diffs February 2022

ros-diffs@reactos.org

17 participants
108 discussions

[reactos] 01/01: [NTUSER] Implement NtUserCheckImeHotKey (#4351)
by Katayama Hirofumi MZ 10 Feb '22

10 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbe5fd5274335c1ece7f7… commit bbe5fd5274335c1ece7f74964bf21533d59969f3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 10 22:53:28 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 10 22:53:28 2022 +0900 [NTUSER] Implement NtUserCheckImeHotKey (#4351) - Modify NtUserCheckImeHotKey prototype. - Add IntGetImeHotKeyLanguageScore, IntGetActiveKeyboardLayout, IntGetImeHotKeyByKey, and IntCheckImeHotKey helper functions. - Implement NtUserCheckImeHotKey function. CORE-11700 --- win32ss/include/ntuser.h | 4 +- win32ss/user/ntuser/ime.c | 187 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 179 insertions(+), 12 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index f792c08a2c0..95bd2db0a67 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1846,8 +1846,8 @@ NtUserCheckWindowThreadDesktop( DWORD NTAPI NtUserCheckImeHotKey( - DWORD dwUnknown1, - LPARAM dwUnknown2); + UINT uVirtualKey, + LPARAM lParam); HWND NTAPI NtUserChildWindowFromPointEx( diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index f6b0cb18bb2..1ea65ef512b 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -11,6 +11,7 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +#define INVALID_HOTKEY ((UINT)-1) #define MOD_KEYS (MOD_CONTROL | MOD_SHIFT | MOD_ALT | MOD_WIN) #define MOD_LEFT_RIGHT (MOD_LEFT | MOD_RIGHT) @@ -55,6 +56,50 @@ typedef struct tagIMEHOTKEY } IMEHOTKEY, *PIMEHOTKEY; PIMEHOTKEY gpImeHotKeyList = NULL; +LCID glcid = 0; + +UINT FASTCALL IntGetImeHotKeyLanguageScore(HKL hKL, LANGID HotKeyLangId) +{ + LCID lcid; + + if (HotKeyLangId == LANGID_NEUTRAL || HotKeyLangId == LOWORD(hKL)) + return 3; + + _SEH2_TRY + { + lcid = NtCurrentTeb()->CurrentLocale; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + lcid = MAKELCID(LANGID_NEUTRAL, SORT_DEFAULT); + } + _SEH2_END; + + if (HotKeyLangId == LANGIDFROMLCID(lcid)) + return 2; + + if (glcid == 0) + ZwQueryDefaultLocale(FALSE, &glcid); + + if (HotKeyLangId == LANGIDFROMLCID(glcid)) + return 1; + + return 0; +} + +HKL FASTCALL IntGetActiveKeyboardLayout(VOID) +{ + PTHREADINFO pti; + + if (gpqForeground && gpqForeground->spwndActive) + { + pti = gpqForeground->spwndActive->head.pti; + if (pti && pti->KeyboardLayout) + return pti->KeyboardLayout->hkl; + } + + return UserGetKeyboardLayout(0); +} static LANGID FASTCALL IntGetImeHotKeyLangId(DWORD dwHotKeyId) { @@ -165,6 +210,117 @@ static VOID FASTCALL IntDeleteImeHotKey(PIMEHOTKEY *ppList, PIMEHOTKEY pHotKey) } } +PIMEHOTKEY +IntGetImeHotKeyByKey(PIMEHOTKEY pList, UINT uModKeys, UINT uLeftRight, UINT uVirtualKey) +{ + PIMEHOTKEY pNode, ret = NULL; + PTHREADINFO pti = GetW32ThreadInfo(); + LANGID LangId; + HKL hKL = IntGetActiveKeyboardLayout(); + BOOL fKorean = (PRIMARYLANGID(LOWORD(hKL)) == LANG_KOREAN); + UINT nScore, nMaxScore = 0; + + for (pNode = pList; pNode; pNode = pNode->pNext) + { + if (pNode->uVirtualKey != uVirtualKey) + continue; + + if ((pNode->uModifiers & MOD_IGNORE_ALL_MODIFIER)) + { + ; + } + else if ((pNode->uModifiers & MOD_KEYS) != uModKeys) + { + continue; + } + else if ((pNode->uModifiers & uLeftRight) || + (pNode->uModifiers & MOD_LEFT_RIGHT) == uLeftRight) + { + ; + } + else + { + continue; + } + + LangId = IntGetImeHotKeyLangId(pNode->dwHotKeyId); + nScore = IntGetImeHotKeyLanguageScore(hKL, LangId); + if (nScore >= 3) + return pNode; + + if (fKorean) + continue; + + if (nScore == 0) + { + if (pNode->dwHotKeyId == IME_CHOTKEY_IME_NONIME_TOGGLE || + pNode->dwHotKeyId == IME_THOTKEY_IME_NONIME_TOGGLE) + { + if (LOWORD(pti->hklPrev) == LangId) + return pNode; + } + } + + if (nMaxScore < nScore) + { + nMaxScore = nScore; + ret = pNode; + } + } + + return ret; +} + +PIMEHOTKEY IntCheckImeHotKey(PUSER_MESSAGE_QUEUE MessageQueue, UINT uVirtualKey, LPARAM lParam) +{ + PIMEHOTKEY pHotKey; + UINT uModifiers; + BOOL bKeyUp = (lParam & 0x80000000); + const BYTE *KeyState = MessageQueue->afKeyState; + static UINT s_uKeyUpVKey = 0; + + if (bKeyUp) + { + if (s_uKeyUpVKey != uVirtualKey) + { + s_uKeyUpVKey = 0; + return NULL; + } + + s_uKeyUpVKey = 0; + } + + uModifiers = 0; + if (IS_KEY_DOWN(KeyState, VK_LSHIFT)) uModifiers |= (MOD_SHIFT | MOD_LEFT); + if (IS_KEY_DOWN(KeyState, VK_RSHIFT)) uModifiers |= (MOD_SHIFT | MOD_RIGHT); + if (IS_KEY_DOWN(KeyState, VK_LCONTROL)) uModifiers |= (MOD_CONTROL | MOD_LEFT); + if (IS_KEY_DOWN(KeyState, VK_RCONTROL)) uModifiers |= (MOD_CONTROL | MOD_RIGHT); + if (IS_KEY_DOWN(KeyState, VK_LMENU)) uModifiers |= (MOD_ALT | MOD_LEFT); + if (IS_KEY_DOWN(KeyState, VK_RMENU)) uModifiers |= (MOD_ALT | MOD_RIGHT); + + pHotKey = IntGetImeHotKeyByKey(gpImeHotKeyList, + (uModifiers & MOD_KEYS), + (uModifiers & MOD_LEFT_RIGHT), + uVirtualKey); + if (pHotKey) + { + if (bKeyUp) + { + if (pHotKey->uModifiers & MOD_ON_KEYUP) + return pHotKey; + } + else + { + if (pHotKey->uModifiers & MOD_ON_KEYUP) + s_uKeyUpVKey = uVirtualKey; + else + return pHotKey; + } + } + + return NULL; +} + VOID FASTCALL IntFreeImeHotKeys(VOID) { PIMEHOTKEY pNode, pNext; @@ -294,6 +450,27 @@ NtUserSetImeHotKey( return ret; } +DWORD +NTAPI +NtUserCheckImeHotKey(UINT uVirtualKey, LPARAM lParam) +{ + PIMEHOTKEY pNode; + DWORD ret = INVALID_HOTKEY; + + UserEnterExclusive(); + + if (!gpqForeground || !IS_IMM_MODE()) + goto Quit; + + pNode = IntCheckImeHotKey(gpqForeground, uVirtualKey, lParam); + if (pNode) + ret = pNode->dwHotKeyId; + +Quit: + UserLeave(); + return ret; +} + PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) { if (!pwnd) @@ -551,16 +728,6 @@ Quit: return 0; } -DWORD -NTAPI -NtUserCheckImeHotKey( - DWORD VirtualKey, - LPARAM lParam) -{ - STUB; - return 0; -} - BOOL NTAPI NtUserDisableThreadIme(

1 0

[reactos] 01/01: [NTOS:SE] Assign the captured SID and/or privileges to NULL manually on token filtering
by George Bișoc 10 Feb '22

10 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b06522638431f2df25d6… commit 1b06522638431f2df25d688596f2f2aa42bc3266 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Thu Feb 10 09:51:58 2022 +0100 Commit: George Bișoc <fraizeraust99(a)gmail.com> CommitDate: Thu Feb 10 09:51:58 2022 +0100 [NTOS:SE] Assign the captured SID and/or privileges to NULL manually on token filtering This reverts 8479509 commit which pretty much does nothing at all (the captured pointer is NULL within the stack of the function has no effect outside of the function). My mistake, sorry. --- ntoskrnl/se/priv.c | 1 - ntoskrnl/se/sid.c | 1 - ntoskrnl/se/token.c | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/se/priv.c b/ntoskrnl/se/priv.c index ffab568d492..a1013b1844b 100644 --- a/ntoskrnl/se/priv.c +++ b/ntoskrnl/se/priv.c @@ -562,7 +562,6 @@ SeReleaseLuidAndAttributesArray( (PreviousMode != KernelMode || CaptureIfKernel)) { ExFreePoolWithTag(Privilege, TAG_LUID); - Privilege = NULL; } } diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index d6c0f4ad912..509b3777488 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -776,7 +776,6 @@ SeReleaseSidAndAttributesArray( ((AccessMode != KernelMode) || CaptureIfKernel)) { ExFreePoolWithTag(CapturedSidAndAttributes, TAG_SID_AND_ATTRIBUTES); - CapturedSidAndAttributes = NULL; } } diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index a2a232343a7..c0f3e08585a 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -6819,6 +6819,7 @@ Quit: SeReleaseSidAndAttributesArray(CapturedSids, PreviousMode, TRUE); + CapturedSids = NULL; } if (CapturedPrivileges != NULL) @@ -6826,6 +6827,7 @@ Quit: SeReleaseLuidAndAttributesArray(CapturedPrivileges, PreviousMode, TRUE); + CapturedPrivileges = NULL; } if (CapturedRestrictedSids != NULL) @@ -6833,6 +6835,7 @@ Quit: SeReleaseSidAndAttributesArray(CapturedRestrictedSids, PreviousMode, TRUE); + CapturedRestrictedSids = NULL; } return Status;

1 0

[reactos] 01/01: [IMM32] Implement ImmWINNLSGetEnableStatus
by Katayama Hirofumi MZ 10 Feb '22

10 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cdfc245b361337007a53… commit 8cdfc245b361337007a53e8c9a6f52549e90bfad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 10 15:18:44 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 10 15:18:44 2022 +0900 [IMM32] Implement ImmWINNLSGetEnableStatus CORE-11700 --- dll/win32/imm32/imm.c | 17 ++++++++++++++++- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/precomp.h | 1 + dll/win32/imm32/utils.c | 8 ++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index dc0d19ecf1f..d0ecbd2103c 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1176,7 +1176,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) } else { - hIMC = Imm32GetContextEx(hWnd, TRUE); + hIMC = Imm32GetContextEx(hWnd, 1); pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC) { @@ -1221,6 +1221,21 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) return TRUE; } +/*********************************************************************** + * ImmWINNLSGetEnableStatus (IMM32.@) + */ + +BOOL WINAPI ImmWINNLSGetEnableStatus(HWND hWnd) +{ + if (!Imm32IsSystemJapaneseOrKorean()) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + return !!Imm32GetContextEx(hWnd, 2); +} + /*********************************************************************** * ImmSetActiveContextConsoleIME(IMM32.@) */ diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 59fb8f37956..eb1fa8046f1 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -115,5 +115,5 @@ @ stdcall ImmUnregisterWordA(long str long str) @ stdcall ImmUnregisterWordW(long wstr long wstr) @ stdcall -stub ImmWINNLSEnableIME(ptr long) -@ stdcall -stub ImmWINNLSGetEnableStatus(ptr) +@ stdcall ImmWINNLSGetEnableStatus(ptr) @ stdcall ImmWINNLSGetIMEHotkey(ptr) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 533fa714d0e..1d5319dc340 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -94,6 +94,7 @@ LONG APIENTRY IchAnsiFromWide(LONG cchWide, LPCWSTR pchWide, UINT uCodePage); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect); BOOL APIENTRY Imm32ReleaseIME(HKL hKL); +BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID); static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) { diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 29c2c3adfeb..86be064c251 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -41,6 +41,14 @@ Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff) return S_OK; } +BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID) +{ + LCID lcid = GetSystemDefaultLCID(); + LANGID LangID = LANGIDFROMLCID(lcid); + WORD wPrimary = PRIMARYLANGID(LangID); + return (wPrimary == LANG_JAPANESE || wPrimary == LANG_KOREAN); +} + BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) { BOOL ret;

1 0

[reactos] 01/01: [IMM32] Implement ImmSendMessageToActiveDefImeWndW
by Katayama Hirofumi MZ 10 Feb '22

10 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf32c7cb5e8087f7c5ce4… commit cf32c7cb5e8087f7c5ce40b8e9f7b4ac90897c80 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 10 15:05:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 10 15:05:59 2022 +0900 [IMM32] Implement ImmSendMessageToActiveDefImeWndW CORE-11700 --- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/keymsg.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 956b8a7cee2..59fb8f37956 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -91,7 +91,7 @@ @ stdcall ImmRequestMessageW(ptr ptr ptr) @ stdcall ImmSendIMEMessageExA(ptr ptr) @ stdcall ImmSendIMEMessageExW(ptr ptr) -@ stub ImmSendMessageToActiveDefImeWndW +@ stdcall ImmSendMessageToActiveDefImeWndW(long ptr ptr) @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) @ stdcall ImmSetCandidateWindow(ptr ptr) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 4273220d24b..a8fa1d84b83 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -1048,3 +1048,21 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); return Imm32RequestMessageAW(hIMC, wParam, lParam, FALSE); } + +/*********************************************************************** + * ImmSendMessageToActiveDefImeWndW (IMM32.@) + */ +LRESULT WINAPI +ImmSendMessageToActiveDefImeWndW(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hwndIME; + + if (uMsg != WM_COPYDATA) + return 0; + + hwndIME = (HWND)NtUserQueryWindow((HWND)wParam, QUERY_WINDOW_DEFAULT_IME); + if (!hwndIME) + return 0; + + return SendMessageW(hwndIME, uMsg, wParam, lParam); +}

1 0

[reactos] 01/01: [NTOS:SE] Assign the captured privilege or SID as NULL when releasing
by George Bișoc 09 Feb '22

09 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8479509a7bc482ea2aaaf… commit 8479509a7bc482ea2aaaf73a8c12d42521ced794 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 9 10:29:56 2022 +0100 Commit: George Bișoc <fraizeraust99(a)gmail.com> CommitDate: Wed Feb 9 10:29:56 2022 +0100 [NTOS:SE] Assign the captured privilege or SID as NULL when releasing Whenever a captured security property such as privilege or SID is released, we must not have such captured property point at random address in memory but rather we must assign it as NULL after it's been freed from pool memory. This avoids potential double-after-free situations where we might release a buffer twice. This is exactly the case with token filtering. --- ntoskrnl/se/priv.c | 1 + ntoskrnl/se/sid.c | 1 + ntoskrnl/se/token.c | 8 +------- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/se/priv.c b/ntoskrnl/se/priv.c index a1013b1844b..ffab568d492 100644 --- a/ntoskrnl/se/priv.c +++ b/ntoskrnl/se/priv.c @@ -562,6 +562,7 @@ SeReleaseLuidAndAttributesArray( (PreviousMode != KernelMode || CaptureIfKernel)) { ExFreePoolWithTag(Privilege, TAG_LUID); + Privilege = NULL; } } diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 509b3777488..d6c0f4ad912 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -776,6 +776,7 @@ SeReleaseSidAndAttributesArray( ((AccessMode != KernelMode) || CaptureIfKernel)) { ExFreePoolWithTag(CapturedSidAndAttributes, TAG_SID_AND_ATTRIBUTES); + CapturedSidAndAttributes = NULL; } } diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index fa4a0e8d847..a2a232343a7 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Security token implementation support * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> - * Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ @@ -6819,8 +6819,6 @@ Quit: SeReleaseSidAndAttributesArray(CapturedSids, PreviousMode, TRUE); - - CapturedSids = NULL; } if (CapturedPrivileges != NULL) @@ -6828,8 +6826,6 @@ Quit: SeReleaseLuidAndAttributesArray(CapturedPrivileges, PreviousMode, TRUE); - - CapturedPrivileges = NULL; } if (CapturedRestrictedSids != NULL) @@ -6837,8 +6833,6 @@ Quit: SeReleaseSidAndAttributesArray(CapturedRestrictedSids, PreviousMode, TRUE); - - CapturedRestrictedSids = NULL; } return Status;

1 0

[reactos] 01/01: [SHELL32_APITEST] Try to fix Test Win2003_x64
by Katayama Hirofumi MZ 09 Feb '22

09 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ed22ed326fa60213917a… commit 3ed22ed326fa60213917a2a6a33b8a6ee4dc0afa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 9 12:37:06 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Feb 9 12:37:06 2022 +0900 [SHELL32_APITEST] Try to fix Test Win2003_x64 rm: cannot remove 'C:\\tests/testdata/shell32_apitest_sub.exe': Permission denied --- modules/rostests/apitests/shell32/SHChangeNotify.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index 71fd9b54e15..e1edb4a5376 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -930,12 +930,13 @@ static unsigned __stdcall TestThreadProc(void *) START_TEST(SHChangeNotify) { -#ifdef DISABLE_THIS_TESTCASE - skip("This testcase is disabled by DISABLE_THIS_TESTCASE macro.\n"); -#endif #ifdef TOTAL_TICK DWORD dwOldTick = GetTickCount(); #endif +#ifdef DISABLE_THIS_TESTCASE + skip("This testcase is disabled by DISABLE_THIS_TESTCASE macro.\n"); + return; +#endif trace("Please don't operate your PC while testing...\n"); @@ -961,4 +962,7 @@ START_TEST(SHChangeNotify) DWORD dwTick = dwNewTick - dwOldTick; trace("SHChangeNotify: Total %lu.%lu sec\n", (dwTick / 1000), (dwTick / 100 % 10)); #endif + + DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); + Sleep(500); }

1 0

[reactos] 01/01: [NTUSER] Refactoring ime.c
by Katayama Hirofumi MZ 09 Feb '22

09 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e52ce89be339efc89fed3… commit e52ce89be339efc89fed3bc0ea09b4f73022762f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 9 11:51:27 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Feb 9 11:51:27 2022 +0900 [NTUSER] Refactoring ime.c s/WINAPI/NTAPI/ CORE-11700 --- win32ss/user/ntuser/ime.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 25adc48265d..f6b0cb18bb2 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -313,7 +313,7 @@ HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc) } DWORD -APIENTRY +NTAPI NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) { PTHREADINFO pti; @@ -399,7 +399,7 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM w } NTSTATUS -APIENTRY +NTAPI NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount) { NTSTATUS ret = STATUS_UNSUCCESSFUL; @@ -509,7 +509,7 @@ static VOID FASTCALL UserSetImeConversionKeyState(PTHREADINFO pti, DWORD dwConve } DWORD -APIENTRY +NTAPI NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) { PWND pwnd; @@ -552,7 +552,7 @@ Quit: } DWORD -APIENTRY +NTAPI NtUserCheckImeHotKey( DWORD VirtualKey, LPARAM lParam) @@ -562,7 +562,7 @@ NtUserCheckImeHotKey( } BOOL -APIENTRY +NTAPI NtUserDisableThreadIme( DWORD dwThreadID) { @@ -630,7 +630,7 @@ Quit: } DWORD -APIENTRY +NTAPI NtUserGetAppImeLevel(HWND hWnd) { DWORD ret = 0; @@ -708,7 +708,7 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA } BOOL -APIENTRY +NTAPI NtUserGetImeInfoEx( PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType) @@ -733,18 +733,18 @@ NtUserGetImeInfoEx( _SEH2_END; ret = UserGetImeInfoEx(NULL, &ImeInfoEx, SearchType); - if (ret) + if (!ret) + goto Quit; + + _SEH2_TRY { - _SEH2_TRY - { - *pImeInfoEx = ImeInfoEx; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ret = FALSE; - } - _SEH2_END; + *pImeInfoEx = ImeInfoEx; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = FALSE; } + _SEH2_END; Quit: UserLeave(); @@ -752,7 +752,7 @@ Quit: } BOOL -APIENTRY +NTAPI NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) { BOOL ret = FALSE; @@ -807,7 +807,7 @@ BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx) } BOOL -APIENTRY +NTAPI NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx) { BOOL ret = FALSE; @@ -836,7 +836,7 @@ Quit: return ret; } -BOOL APIENTRY +BOOL NTAPI NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { BOOL ret = FALSE; @@ -960,7 +960,7 @@ BOOLEAN UserDestroyInputContext(PVOID Object) return TRUE; } -BOOL APIENTRY NtUserDestroyInputContext(HIMC hIMC) +BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) { PIMC pIMC; BOOL ret = FALSE; @@ -1053,7 +1053,7 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) } HIMC -APIENTRY +NTAPI NtUserCreateInputContext(ULONG_PTR dwClientImcData) { PIMC pIMC; @@ -1141,7 +1141,7 @@ DWORD FASTCALL IntAssociateInputContextEx(PWND pWnd, PIMC pIMC, DWORD dwFlags) } DWORD -APIENTRY +NTAPI NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) { DWORD ret = 2; @@ -1194,7 +1194,7 @@ BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) } BOOL -APIENTRY +NTAPI NtUserUpdateInputContext( HIMC hIMC, DWORD dwType, @@ -1220,7 +1220,7 @@ Quit: } DWORD_PTR -APIENTRY +NTAPI NtUserQueryInputContext(HIMC hIMC, DWORD dwType) { PIMC pIMC;

1 0

[reactos] 01/01: [NTUSER] Implement NtUserSetImeHotKey (#4350)
by Katayama Hirofumi MZ 09 Feb '22

09 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d5cc578697966c5171fb… commit 5d5cc578697966c5171fb81ad2b59fef3744fb22 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 9 11:27:44 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 9 11:27:44 2022 +0900 [NTUSER] Implement NtUserSetImeHotKey (#4350) - Modify NtUserGetImeHotKey and NtUserSetImeHotKey prototypes. - Define enum SETIMEHOTKEY_ACTION in <undocuser.h>. - Define IMEHOTKEY structure in ime.c. - Add IntGetImeHotKeyLangId, IntAddImeHotKey, IntGetImeHotKeyById, IntGetImeHotKeyByKeyAndLang, IntDeleteImeHotKey, IntFreeImeHotKeys, and IntSetImeHotKey helper functions. - Implement NtUserGetImeHotKey and NtUserSetImeHotKey functions. - Cleanup the IME hotkeys at process exit. CORE-11700 --- sdk/include/reactos/undocuser.h | 8 ++ win32ss/include/ntuser.h | 23 ++-- win32ss/user/ntuser/ime.c | 282 ++++++++++++++++++++++++++++++++++++---- win32ss/user/ntuser/input.h | 1 + win32ss/user/ntuser/main.c | 2 + 5 files changed, 280 insertions(+), 36 deletions(-) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index 3c0ebb3c149..f396c58a7ba 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -394,6 +394,14 @@ typedef enum _QUERY_INPUT_CONTEXT QIC_DEFAULTIMC } QUERY_INPUT_CONTEXT; +/* NtUserSetImeHotKey actions */ +typedef enum tagSETIMEHOTKEY_ACTION +{ + SETIMEHOTKEY_DELETE = 1, + SETIMEHOTKEY_ADD, + SETIMEHOTKEY_DELETEALL +} SETIMEHOTKEY_ACTION; + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 6f897a24736..f792c08a2c0 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2388,11 +2388,12 @@ NtUserGetIconSize( LONG *plcx, LONG *plcy); -BOOL NTAPI -NtUserGetImeHotKey(IN DWORD dwHotKey, - OUT LPUINT lpuModifiers, - OUT LPUINT lpuVKey, - OUT LPHKL lphKL); +BOOL +NTAPI +NtUserGetImeHotKey(DWORD dwHotKeyId, + LPUINT lpuModifiers, + LPUINT lpuVirtualKey, + LPHKL lphKL); BOOL NTAPI @@ -3184,14 +3185,14 @@ NTAPI NtUserSetFocus( HWND hWnd); -DWORD +BOOL NTAPI NtUserSetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4); + DWORD dwHotKeyId, + UINT uModifiers, + UINT uVirtualKey, + HKL hKL, + DWORD dwAction); BOOL NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 5c67c673afe..25adc48265d 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -11,6 +11,14 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +#define MOD_KEYS (MOD_CONTROL | MOD_SHIFT | MOD_ALT | MOD_WIN) +#define MOD_LEFT_RIGHT (MOD_LEFT | MOD_RIGHT) + +#define LANGID_CHINESE_SIMPLIFIED MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED) +#define LANGID_JAPANESE MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT) +#define LANGID_KOREAN MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN) +#define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL) +#define LANGID_NEUTRAL MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) #define IS_WND_IMELIKE(pwnd) \ (((pwnd)->pcls->style & CS_IME) || \ @@ -37,6 +45,255 @@ HIMC ghIMC = NULL; BOOL gfImeOpen = (BOOL)-1; DWORD gdwImeConversion = (DWORD)-1; +typedef struct tagIMEHOTKEY +{ + struct tagIMEHOTKEY *pNext; + DWORD dwHotKeyId; + UINT uVirtualKey; + UINT uModifiers; + HKL hKL; +} IMEHOTKEY, *PIMEHOTKEY; + +PIMEHOTKEY gpImeHotKeyList = NULL; + +static LANGID FASTCALL IntGetImeHotKeyLangId(DWORD dwHotKeyId) +{ +#define IME_CHOTKEY 0x10 +#define IME_JHOTKEY 0x30 +#define IME_KHOTKEY 0x50 +#define IME_THOTKEY 0x70 +#define IME_XHOTKEY 0x90 + static const LANGID s_array[] = + { + /* 0x00 */ (WORD)-1, + /* 0x10 */ LANGID_CHINESE_SIMPLIFIED, + /* 0x20 */ LANGID_CHINESE_SIMPLIFIED, + /* 0x30 */ LANGID_JAPANESE, + /* 0x40 */ LANGID_JAPANESE, + /* 0x50 */ LANGID_KOREAN, + /* 0x60 */ LANGID_KOREAN, + /* 0x70 */ LANGID_CHINESE_TRADITIONAL, + /* 0x80 */ LANGID_CHINESE_TRADITIONAL + }; + + if (IME_CHOTKEY <= dwHotKeyId && dwHotKeyId < IME_XHOTKEY) + return s_array[(dwHotKeyId & 0xF0) >> 4]; + return LANGID_NEUTRAL; +} + +static VOID FASTCALL IntAddImeHotKey(PIMEHOTKEY *ppList, PIMEHOTKEY pHotKey) +{ + PIMEHOTKEY pNode; + + if (!*ppList) + { + *ppList = pHotKey; + return; + } + + for (pNode = *ppList; pNode; pNode = pNode->pNext) + { + if (!pNode->pNext) + { + pNode->pNext = pHotKey; + return; + } + } +} + +static PIMEHOTKEY FASTCALL IntGetImeHotKeyById(PIMEHOTKEY pList, DWORD dwHotKeyId) +{ + PIMEHOTKEY pNode; + for (pNode = pList; pNode; pNode = pNode->pNext) + { + if (pNode->dwHotKeyId == dwHotKeyId) + return pNode; + } + return NULL; +} + +static PIMEHOTKEY APIENTRY +IntGetImeHotKeyByKeyAndLang(PIMEHOTKEY pList, UINT uModKeys, UINT uLeftRight, + UINT uVirtualKey, LANGID TargetLangId) +{ + PIMEHOTKEY pNode; + LANGID LangID; + UINT uModifiers; + + for (pNode = pList; pNode; pNode = pNode->pNext) + { + if (pNode->uVirtualKey != uVirtualKey) + continue; + + LangID = IntGetImeHotKeyLangId(pNode->dwHotKeyId); + if (LangID != TargetLangId) + continue; + + uModifiers = pNode->uModifiers; + if (uModifiers & MOD_IGNORE_ALL_MODIFIER) + return pNode; + + if ((uModifiers & MOD_KEYS) != uModKeys) + continue; + + if ((uModifiers & uLeftRight) || (uModifiers & MOD_LEFT_RIGHT) == uLeftRight) + return pNode; + } + + return NULL; +} + +static VOID FASTCALL IntDeleteImeHotKey(PIMEHOTKEY *ppList, PIMEHOTKEY pHotKey) +{ + PIMEHOTKEY pNode; + + if (*ppList == pHotKey) + { + *ppList = pHotKey->pNext; + ExFreePoolWithTag(pHotKey, USERTAG_IMEHOTKEY); + return; + } + + for (pNode = *ppList; pNode; pNode = pNode->pNext) + { + if (pNode->pNext == pHotKey) + { + pNode->pNext = pHotKey->pNext; + ExFreePoolWithTag(pHotKey, USERTAG_IMEHOTKEY); + return; + } + } +} + +VOID FASTCALL IntFreeImeHotKeys(VOID) +{ + PIMEHOTKEY pNode, pNext; + for (pNode = gpImeHotKeyList; pNode; pNode = pNext) + { + pNext = pNode->pNext; + ExFreePoolWithTag(pNode, USERTAG_IMEHOTKEY); + } + gpImeHotKeyList = NULL; +} + +static BOOL APIENTRY +IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DWORD dwAction) +{ + PIMEHOTKEY pNode; + LANGID LangId; + + switch (dwAction) + { + case SETIMEHOTKEY_DELETE: + pNode = IntGetImeHotKeyById(gpImeHotKeyList, dwHotKeyId); + if (!pNode) + return FALSE; + + IntDeleteImeHotKey(&gpImeHotKeyList, pNode); + return TRUE; + + case SETIMEHOTKEY_ADD: + if (uVirtualKey == VK_PACKET) + return FALSE; + + LangId = IntGetImeHotKeyLangId(dwHotKeyId); + if (LangId == LANGID_KOREAN) + return FALSE; + + pNode = IntGetImeHotKeyByKeyAndLang(gpImeHotKeyList, + (uModifiers & MOD_KEYS), + (uModifiers & MOD_LEFT_RIGHT), + uVirtualKey, LangId); + if (!pNode) + pNode = IntGetImeHotKeyById(gpImeHotKeyList, dwHotKeyId); + + if (pNode) + { + pNode->uModifiers = uModifiers; + pNode->uVirtualKey = uVirtualKey; + pNode->hKL = hKL; + return TRUE; + } + + pNode = ExAllocatePoolWithTag(PagedPool, sizeof(IMEHOTKEY), USERTAG_IMEHOTKEY); + if (!pNode) + return FALSE; + + pNode->pNext = NULL; + pNode->dwHotKeyId = dwHotKeyId; + pNode->uModifiers = uModifiers; + pNode->uVirtualKey = uVirtualKey; + pNode->hKL = hKL; + IntAddImeHotKey(&gpImeHotKeyList, pNode); + return TRUE; + + case SETIMEHOTKEY_DELETEALL: + IntFreeImeHotKeys(); + return TRUE; + + default: + return FALSE; + } +} + +BOOL NTAPI +NtUserGetImeHotKey(DWORD dwHotKeyId, LPUINT lpuModifiers, LPUINT lpuVirtualKey, LPHKL lphKL) +{ + PIMEHOTKEY pNode = NULL; + + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForWrite(lpuModifiers, sizeof(UINT), 1); + ProbeForWrite(lpuVirtualKey, sizeof(UINT), 1); + if (lphKL) + ProbeForWrite(lphKL, sizeof(HKL), 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + goto Quit; + } + _SEH2_END; + + pNode = IntGetImeHotKeyById(gpImeHotKeyList, dwHotKeyId); + if (!pNode) + goto Quit; + + _SEH2_TRY + { + *lpuModifiers = pNode->uModifiers; + *lpuVirtualKey = pNode->uVirtualKey; + if (lphKL) + *lphKL = pNode->hKL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + pNode = NULL; + } + _SEH2_END; + +Quit: + UserLeave(); + return !!pNode; +} + +BOOL +NTAPI +NtUserSetImeHotKey( + DWORD dwHotKeyId, + UINT uModifiers, + UINT uVirtualKey, + HKL hKL, + DWORD dwAction) +{ + BOOL ret; + UserEnterExclusive(); + ret = IntSetImeHotKey(dwHotKeyId, uModifiers, uVirtualKey, hKL, dwAction); + UserLeave(); + return ret; +} + PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) { if (!pwnd) @@ -194,17 +451,6 @@ Quit: return ret; } -BOOL WINAPI -NtUserGetImeHotKey(IN DWORD dwHotKey, - OUT LPUINT lpuModifiers, - OUT LPUINT lpuVKey, - OUT LPHKL lphKL) -{ - STUB - - return FALSE; -} - static VOID FASTCALL UserSetImeConversionKeyState(PTHREADINFO pti, DWORD dwConversion) { HKL hKL; @@ -305,20 +551,6 @@ Quit: return 0; } -DWORD -APIENTRY -NtUserSetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - DWORD APIENTRY NtUserCheckImeHotKey( diff --git a/win32ss/user/ntuser/input.h b/win32ss/user/ntuser/input.h index bd185a12c04..3cae36048f1 100644 --- a/win32ss/user/ntuser/input.h +++ b/win32ss/user/ntuser/input.h @@ -85,6 +85,7 @@ BOOL NTAPI UserSendMouseInput(MOUSEINPUT *pMouseInput, BOOL bInjected); /* IMM */ UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE, PWND, UINT, WPARAM, LPARAM); +VOID FASTCALL IntFreeImeHotKeys(VOID); extern DWORD gSystemFS; extern UINT gSystemCPCharSet; diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 62e1f157271..dfdf2d64c0b 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -180,6 +180,8 @@ UserProcessDestroy(PEPROCESS Process) if (ppiScrnSaver == ppiCurrent) ppiScrnSaver = NULL; + IntFreeImeHotKeys(); + if (gpwlCache) { ExFreePoolWithTag(gpwlCache, USERTAG_WINDOWLIST);

1 0

[reactos] 01/01: [NOTEPAD] Add Croatian translation (hr-HR) (#4338)
by Andrej Bartulin 09 Feb '22

09 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0fc48d6e29c654889661… commit e0fc48d6e29c65488966116dd9b5eb10ed4e504a Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Wed Feb 9 02:26:22 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 9 10:26:22 2022 +0900 [NOTEPAD] Add Croatian translation (hr-HR) (#4338) --- base/applications/notepad/lang/hr-Hr.rc | 172 ++++++++++++++++++++++++++++++++ base/applications/notepad/rsrc.rc | 3 + 2 files changed, 175 insertions(+) diff --git a/base/applications/notepad/lang/hr-Hr.rc b/base/applications/notepad/lang/hr-Hr.rc new file mode 100644 index 00000000000..97bc5abda3a --- /dev/null +++ b/base/applications/notepad/lang/hr-Hr.rc @@ -0,0 +1,172 @@ +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "N", CMD_NEW_WINDOW, VIRTKEY,CONTROL , SHIFT + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Datoteka" + BEGIN + MENUITEM "&Novo\tCtrl+N", CMD_NEW + MENUITEM "Novi &prozor\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "&Otvori...\tCtrl+O", CMD_OPEN + MENUITEM "&Spremi\tCtrl+S", CMD_SAVE + MENUITEM "Spremi &kao...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Postavljanje st&ranice...", CMD_PAGE_SETUP + MENUITEM "&Ispiši...\tCtrl+P", CMD_PRINT + MENUITEM SEPARATOR + MENUITEM "I&zađi", CMD_EXIT + END + POPUP "&Uređivanje" + BEGIN + MENUITEM "&Poništi\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Izreži\tCtrl+X", CMD_CUT + MENUITEM "&Kopiraj\tCtrl+C", CMD_COPY + MENUITEM "Z&alijepi\tCtrl+V", CMD_PASTE + MENUITEM "Iz&briši\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Traži...\tCtrl+F", CMD_SEARCH + MENUITEM "Pronađi s&ljedeće\tF3", CMD_SEARCH_NEXT + MENUITEM "&Zamijeni...\tCtrl+H", CMD_REPLACE + MENUITEM "Idi &na...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Odaberi &sve\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Vrijeme/&Datum\tF5", CMD_TIME_DATE + END + POPUP "&Oblikovanje" + BEGIN + MENUITEM "Prelo&mi riječi", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "Pri&kaz" + BEGIN + MENUITEM "T&raka stanja", CMD_STATUSBAR + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Prikaži pomoć", CMD_HELP_CONTENTS + MENUITEM SEPARATOR + MENUITEM "&O programu Blok za pisanje", CMD_HELP_ABOUT_NOTEPAD + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +FONT 8, "MS Shell Dlg" +CAPTION "Postavljanje stranice" +BEGIN + GROUPBOX "Pretpregled", 0, 240, 6, 120, 153, BS_GROUPBOX + CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 + GROUPBOX "Papir", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "Ve&ličina:", stc2, 16, 22, 36, 8 + COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + LTEXT "L&adica:", stc3, 16, 42, 36, 8 + COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Orijentacija", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "P&ortret", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&ejzaž", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Granice", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&Lijevo:", stc15, 88, 82, 30, 8 + EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Desno:", stc16, 159, 82, 30, 8 + EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Vrh:", stc17, 88, 102, 30, 8 + EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&D&no:", stc18, 159, 102, 30, 8 + EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Zaglavlje:", 0x140, 8, 132, 40, 15 + EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Podnožje:", 0x142, 8, 149, 40, 15 + EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "Pomoć", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "U redu", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Odustani", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "P&isač...", psh3, 310, 170, 50, 14 +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kodiranje" +BEGIN + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodiranje:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Krajnje linije:", 0x156, 65, 20, 41, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Idi na liniju" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Broj linije:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "U redu", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Stranica &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_NOTEPAD "Blok za pisanje" + STRING_ERROR "Greška" + STRING_WARNING "Upozorenje" + STRING_INFO "Informacija" + STRING_UNTITLED "Bez naslova" + STRING_ALL_FILES "Sve datoteke (*.*)" + STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)" + STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\ +Molimo Vas da koristite drugu aplikaciju." + STRING_NOTEXT "Niste unijeli tekst. \ +\nMolimo Vas da nešto unesete i ponovo pokušate." + STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\ +Želite li stvoriti novu datoteku ?" + STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\ +Želite li spremiti te promjene ?" + STRING_NOTFOUND "'%s' ne može biti pronađena." + STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \ +zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." + STRING_CANNOTFIND "Ne mogu pronaći '%s'" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Mac (CR)" + STRING_LINE_COLUMN "Linija %d, Stupac %d" + STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\Provjerite je li pisač uključen i je li pravilno konfiguiran." + + STRING_TEXT_DOCUMENT "Tekstni dokument" + STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" +END diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc index bcb9003c35d..7adcac3b944 100644 --- a/base/applications/notepad/rsrc.rc +++ b/base/applications/notepad/rsrc.rc @@ -74,6 +74,9 @@ IDI_NPICON ICON "res/notepad.ico" #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-Hr.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

[reactos] 03/03: [CONCFG:FONT] Implement support for the Windows 10 "__DefaultTTFont__" special FaceName value. (#4337)
by Hermès Bélusca-Maïto 08 Feb '22

08 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae45e0985ba55a50f86a… commit 2ae45e0985ba55a50f86a88a25067d937fcd3062 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 30 18:29:00 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 8 15:59:10 2022 +0100 [CONCFG:FONT] Implement support for the Windows 10 "__DefaultTTFont__" special FaceName value. (#4337) This special value tells the console to default to whichever font is deemed most appropriate for the current code page. Add Doxygen documentation for FindCachedTTFont(). --- win32ss/user/winsrv/concfg/font.c | 124 ++++++++++++++++++++++++++++++++------ win32ss/user/winsrv/concfg/font.h | 15 ++++- 2 files changed, 117 insertions(+), 22 deletions(-) diff --git a/win32ss/user/winsrv/concfg/font.c b/win32ss/user/winsrv/concfg/font.c index 485126a4928..74ef6292fe0 100644 --- a/win32ss/user/winsrv/concfg/font.c +++ b/win32ss/user/winsrv/concfg/font.c @@ -24,7 +24,9 @@ /* GLOBALS ********************************************************************/ -#define TERMINAL_FACENAME L"Terminal" +#define TERMINAL_FACENAME L"Terminal" +#define DEFAULT_NON_DBCS_FONTFACE L"Lucida Console" // L"Consolas" +#define DEFAULT_TT_FONT_FACENAME L"__DefaultTTFont__" /* TrueType font list cache */ SINGLE_LIST_ENTRY TTFontCache = { NULL }; @@ -322,6 +324,35 @@ FindSuitableFont( Param.SearchFont.CharSet = CodePageToCharSet(CodePage); Param.CodePage = CodePage; + if (/* !FaceName || */ !*FaceName) + { + /* Find and use a default Raster font */ + + /* Use "Terminal" as the fallback */ + StringCchCopyW(FaceName, LF_FACESIZE, TERMINAL_FACENAME); +#if 0 + // FIXME: CJK font choose workaround: Don't choose Asian + // charset font if there is no preferred font for CJK. + if (IsCJKCodePage(CodePage)) + FontData->CharSet = ANSI_CHARSET; +#endif + FontData->Family &= ~TMPF_TRUETYPE; + } + else if (wcscmp(FaceName, DEFAULT_TT_FONT_FACENAME) == 0) + { + /* Find and use a default TrueType font */ + FontEntry = FindCachedTTFont(NULL, CodePage); + if (FontEntry) + { + StringCchCopyW(FaceName, LF_FACESIZE, FontEntry->FaceName); + } + else + { + StringCchCopyW(FaceName, LF_FACESIZE, DEFAULT_NON_DBCS_FONTFACE); + } + FontData->Family |= TMPF_TRUETYPE; + } + /* Search for a TrueType alternative face name */ FontEntry = FindCachedTTFont(FaceName, CodePage); if (FontEntry) @@ -492,12 +523,20 @@ CreateConsoleFontEx( FontData->Size.Y = Height; FontData->CharSet = 0; // CodePageToCharSet(CodePage); - hFont = CreateConsoleFontWorker(FontData, CodePage); - if (hFont) - return hFont; + if (/* !FaceName || */ !*FaceName || wcscmp(FaceName, DEFAULT_TT_FONT_FACENAME) == 0) + { + /* We do not have an actual font face name yet and should find one. + * Call FindSuitableFont() to determine the default font to use. */ + } + else + { + hFont = CreateConsoleFontWorker(FontData, CodePage); + if (hFont) + return hFont; - DBGFNT1("CreateConsoleFont('%S') failed - Try to find a suitable font...\n", - FaceName); + DBGFNT1("CreateConsoleFont('%S') failed - Try to find a suitable font...\n", + FaceName); + } /* * We could not create a font with the default settings. @@ -515,6 +554,9 @@ CreateConsoleFontEx( if (!UseDefaultFallback) return NULL; + // + // FIXME: See also !*FaceName case in FindSuitableFont(). + // /* Use "Terminal" as the fallback */ StringCchCopyW(FaceName, LF_FACESIZE, TERMINAL_FACENAME); #if 0 @@ -523,6 +565,7 @@ CreateConsoleFontEx( if (IsCJKCodePage(CodePage)) FontData->CharSet = ANSI_CHARSET; #endif + FontData->Family &= ~TMPF_TRUETYPE; } else { @@ -1113,33 +1156,74 @@ RefreshTTFontCache(VOID) InitTTFontCache(); } +/** + * @brief + * Searches for a font in the console TrueType font cache, + * with the specified code page. + * + * @param[in,opt] FaceName + * An optional pointer to a maximally @b LF_FACESIZE-sized buffer. + * The buffer contains the face name of the font to search for. + * + * - If FaceName != NULL, search for the named font that should + * match the provided code page (when CodePage != INVALID_CP). + * + * - If FaceName == NULL, search for a font with the provided + * code page. In this case, CodePage cannot be == INVALID_CP, + * otherwise the search fails. + * + * @param[in] CodePage + * The code page the font has to support, or @b INVALID_CP when + * searching a font by face name only. + * + * @return + * A pointer to the cache entry for the font, or @b NULL if not found. + **/ PTT_FONT_ENTRY FindCachedTTFont( - // _In_reads_or_z_(LF_FACESIZE) - _In_ PCWSTR FaceName, + _In_reads_or_z_opt_(LF_FACESIZE) + PCWSTR FaceName, _In_ UINT CodePage) { PSINGLE_LIST_ENTRY Entry; PTT_FONT_ENTRY FontEntry; - /* Search for the font in the cache */ - for (Entry = TTFontCache.Next; - Entry != NULL; - Entry = Entry->Next) + if (FaceName) { - FontEntry = CONTAINING_RECORD(Entry, TT_FONT_ENTRY, Entry); - - /* NOTE: The font face names are case-sensitive */ - if ((wcscmp(FontEntry->FaceName , FaceName) == 0) || - (wcscmp(FontEntry->FaceNameAlt, FaceName) == 0)) + /* Search for the named font */ + for (Entry = TTFontCache.Next; + Entry != NULL; + Entry = Entry->Next) { - /* Return a match if we don't look at the code pages, or when they match */ - if ((CodePage == INVALID_CP) || (CodePage == FontEntry->CodePage)) + FontEntry = CONTAINING_RECORD(Entry, TT_FONT_ENTRY, Entry); + + /* NOTE: The font face names are case-sensitive */ + if ((wcscmp(FontEntry->FaceName , FaceName) == 0) || + (wcscmp(FontEntry->FaceNameAlt, FaceName) == 0)) { - return FontEntry; + /* Return the font if we don't search by code page, or when they match */ + if ((CodePage == INVALID_CP) || (CodePage == FontEntry->CodePage)) + { + return FontEntry; + } } } } + else if (CodePage != INVALID_CP) + { + /* Search for a font with the specified code page */ + for (Entry = TTFontCache.Next; + Entry != NULL; + Entry = Entry->Next) + { + FontEntry = CONTAINING_RECORD(Entry, TT_FONT_ENTRY, Entry); + + /* Return the font if the code pages match */ + if (CodePage == FontEntry->CodePage) + return FontEntry; + } + } + return NULL; } diff --git a/win32ss/user/winsrv/concfg/font.h b/win32ss/user/winsrv/concfg/font.h index bff2107a7c8..382792817c5 100644 --- a/win32ss/user/winsrv/concfg/font.h +++ b/win32ss/user/winsrv/concfg/font.h @@ -150,10 +150,21 @@ RefreshTTFontCache(VOID); PTT_FONT_ENTRY FindCachedTTFont( - // _In_reads_or_z_(LF_FACESIZE) - _In_ PCWSTR FaceName, + _In_reads_or_z_opt_(LF_FACESIZE) + PCWSTR FaceName, _In_ UINT CodePage); +/** + * @brief + * Verifies whether the given font is an additional console TrueType font. + * Wrapper macros around FindCachedTTFont(). + * + * @remark + * These macros are equivalents of the functions + * IsAvailableTTFont() and IsAvailableTTFontCP() in + * https://github.com/microsoft/terminal/blob/main/src/propsheet/dbcs.cpp + **/ + #define IsAdditionalTTFont(FaceName) \ (FindCachedTTFont((FaceName), INVALID_CP) != NULL)

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2022