Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [CMIDRIVER] Remove useless Visual Studio resource editor file.
by Hermès Bélusca-Maïto 12 Feb '22

12 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78a7d7dc324ab4597de81… commit 78a7d7dc324ab4597de81ec470c70058d9b6c083 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 11 14:31:49 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 12 16:21:32 2022 +0100 [CMIDRIVER] Remove useless Visual Studio resource editor file. --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps | Bin 440 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps deleted file mode 100644 index e596df04b52..00000000000 Binary files a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps and /dev/null differ

1 0

[reactos] 01/02: [FDEBUG][CMIDRIVER] Add missing psdk dependency for user-mode code.
by Hermès Bélusca-Maïto 12 Feb '22

12 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f73c0e08e2459354f1bed… commit f73c0e08e2459354f1bed192db4c5469ff5bdafa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 11 14:33:02 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 12 16:21:30 2022 +0100 [FDEBUG][CMIDRIVER] Add missing psdk dependency for user-mode code. --- boot/freeldr/fdebug/CMakeLists.txt | 1 + drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt | 2 ++ drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+) diff --git a/boot/freeldr/fdebug/CMakeLists.txt b/boot/freeldr/fdebug/CMakeLists.txt index ad446182f13..568a5e5cd74 100644 --- a/boot/freeldr/fdebug/CMakeLists.txt +++ b/boot/freeldr/fdebug/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(fdebug fdebug.c rs232.c fdebug.rc) +add_dependencies(fdebug psdk) set_module_type(fdebug win32gui UNICODE) add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET fdebug DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd livecd hybridcd) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt index 8574b420629..61cf0185783 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt @@ -7,6 +7,8 @@ if(NOT MSVC) set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") endif() +add_dependencies(cmicontrol psdk) + add_importlibs(cmicontrol user32 gdi32 ole32 advapi32 comctl32 shell32 dsound setupapi winmm msvcrt kernel32) set_module_type(cmicontrol win32gui) add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt index 95c5a7fb7ae..a426ccb6015 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(cmicpl MODULE cmicpl.cpp cmicpl.rc) +add_dependencies(cmicpl psdk) set_module_type(cmicpl cpl UNICODE) add_importlibs(cmicpl shell32 msvcrt kernel32) add_cd_file(TARGET cmicpl DESTINATION reactos/system32/drivers FOR all)

1 0

[reactos] 01/01: [NTUSER][USER32] Implement IntImmProcessKey (#4353)
by Katayama Hirofumi MZ 11 Feb '22

11 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5c9d532e83c7a2d0d108… commit b5c9d532e83c7a2d0d10863b26e2592c6f74bcce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 12 08:32:13 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 12 08:32:13 2022 +0900 [NTUSER][USER32] Implement IntImmProcessKey (#4353) - Establish the trampoline callback USER32_CALLBACK_IMMPROCESSKEY for imm32!ImmProcessKey function, between NTUSER and IMM32. - Add IntGetImeCompatFlags helper function. - Implement co_IntImmProcessKey and IntImmProcessKey functions. CORE-11700 --- win32ss/include/callback.h | 14 ++- win32ss/user/ntuser/callback.c | 24 +++++ win32ss/user/ntuser/callback.h | 4 + win32ss/user/ntuser/ime.c | 197 ++++++++++++++++++++++++++++++++----- win32ss/user/user32/misc/dllmain.c | 15 ++- 5 files changed, 226 insertions(+), 28 deletions(-) diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index 7eef1d6c278..a75a6de3803 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -19,7 +19,8 @@ #define USER32_CALLBACK_SETOBM (15) #define USER32_CALLBACK_LPK (16) #define USER32_CALLBACK_UMPD (17) -#define USER32_CALLBACK_MAXIMUM (17) +#define USER32_CALLBACK_IMMPROCESSKEY (18) +#define USER32_CALLBACK_MAXIMUM (18) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -168,6 +169,15 @@ typedef struct _LPK_CALLBACK_ARGUMENTS BOOL bRect; } LPK_CALLBACK_ARGUMENTS, *PLPK_CALLBACK_ARGUMENTS; +typedef struct _IMMPROCESSKEY_CALLBACK_ARGUMENTS +{ + HWND hWnd; + HKL hKL; + UINT vKey; + LPARAM lParam; + DWORD dwHotKeyID; +} IMMPROCESSKEY_CALLBACK_ARGUMENTS, *PIMMPROCESSKEY_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -204,4 +214,6 @@ NTSTATUS WINAPI User32CallLPKFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 25e6eee5dd7..9b5ac56965a 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -1247,4 +1247,28 @@ co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize return 0; } +DWORD +APIENTRY +co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) +{ + DWORD ret = 0; + NTSTATUS Status; + ULONG ResultLength = sizeof(DWORD); + PVOID ResultPointer = NULL; + IMMPROCESSKEY_CALLBACK_ARGUMENTS Common = { hWnd, hKL, vKey, lParam, dwHotKeyID }; + + UserLeaveCo(); + Status = KeUserModeCallback(USER32_CALLBACK_IMMPROCESSKEY, + &Common, + sizeof(Common), + &ResultPointer, + &ResultLength); + UserEnterCo(); + + if (NT_SUCCESS(Status)) + ret = *(LPDWORD)ResultPointer; + + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/callback.h b/win32ss/user/ntuser/callback.h index c83be89a976..79217f86425 100644 --- a/win32ss/user/ntuser/callback.h +++ b/win32ss/user/ntuser/callback.h @@ -76,3 +76,7 @@ BOOL FASTCALL co_IntSetWndIcons(VOID); VOID FASTCALL co_IntDeliverUserAPC(VOID); VOID FASTCALL co_IntSetupOBM(VOID); BOOL FASTCALL IntMsgCreateStructW(PWND,CREATESTRUCTW*,CREATESTRUCTW*,PVOID*,PVOID*); + +DWORD +APIENTRY +co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID); diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 1ea65ef512b..f7c67164c4e 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -58,6 +58,14 @@ typedef struct tagIMEHOTKEY PIMEHOTKEY gpImeHotKeyList = NULL; LCID glcid = 0; +DWORD FASTCALL IntGetImeCompatFlags(PTHREADINFO pti) +{ + if (!pti) + pti = PsGetCurrentThreadWin32Thread(); + + return pti->ppi->dwImeCompatFlags; +} + UINT FASTCALL IntGetImeHotKeyLanguageScore(HKL hKL, LANGID HotKeyLangId) { LCID lcid; @@ -343,7 +351,10 @@ IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DW case SETIMEHOTKEY_DELETE: pNode = IntGetImeHotKeyById(gpImeHotKeyList, dwHotKeyId); if (!pNode) + { + ERR("dwHotKeyId: 0x%lX\n", dwHotKeyId); return FALSE; + } IntDeleteImeHotKey(&gpImeHotKeyList, pNode); return TRUE; @@ -550,29 +561,122 @@ DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) } UINT FASTCALL -IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam) { - PKL pKbdLayout; + UINT uVirtualKey, ret = 0; + DWORD dwHotKeyId; + PKL pKL; + PIMC pIMC = NULL; + PIMEHOTKEY pImeHotKey; + HKL hKL; + HWND hWnd; ASSERT_REFS_CO(pWnd); - if ( Msg == WM_KEYDOWN || - Msg == WM_SYSKEYDOWN || - Msg == WM_KEYUP || - Msg == WM_SYSKEYUP ) - { - //Vk = wParam & 0xff; - pKbdLayout = pWnd->head.pti->KeyboardLayout; - if (pKbdLayout == NULL) return 0; - // - if (!(gpsi->dwSRVIFlags & SRVINFO_IMM32)) return 0; - // need ime.h! - } - // Call User32: - // Anything but BOOL! - //ImmRet = co_IntImmProcessKey(UserHMGetHandle(pWnd), pKbdLayout->hkl, Vk, lParam, HotKey); - FIXME(" is UNIMPLEMENTED.\n"); - return 0; + switch (uMsg) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + break; + + default: + return 0; + } + + hWnd = UserHMGetHandle(pWnd); + pKL = pWnd->head.pti->KeyboardLayout; + if (!pKL) + return 0; + + uVirtualKey = LOBYTE(wParam); + pImeHotKey = IntCheckImeHotKey(MessageQueue, uVirtualKey, lParam); + if (pImeHotKey) + { + dwHotKeyId = pImeHotKey->dwHotKeyId; + hKL = pImeHotKey->hKL; + } + else + { + dwHotKeyId = INVALID_HOTKEY; + hKL = NULL; + } + + if (IME_HOTKEY_DSWITCH_FIRST <= dwHotKeyId && dwHotKeyId <= IME_HOTKEY_DSWITCH_LAST) + { + if (pKL->hkl != hKL) + { + UserPostMessage(hWnd, WM_INPUTLANGCHANGEREQUEST, + ((pKL->dwFontSigs & gSystemFS) ? INPUTLANGCHANGE_SYSCHARSET : 0), + (LPARAM)hKL); + } + + if (IntGetImeCompatFlags(pWnd->head.pti) & 0x800000) + return 0; + + return IPHK_HOTKEY; + } + + if (!IS_IMM_MODE()) + return 0; + + if (dwHotKeyId == INVALID_HOTKEY) + { + if (!pKL->piiex) + return 0; + + if (pWnd->hImc) + pIMC = UserGetObject(gHandleTable, pWnd->hImc, TYPE_INPUTCONTEXT); + if (!pIMC) + return 0; + + if ((lParam & 0x80000000) && + (pKL->piiex->ImeInfo.fdwProperty & IME_PROP_IGNORE_UPKEYS)) + { + return 0; + } + + switch (uVirtualKey) + { + case VK_DBE_CODEINPUT: + case VK_DBE_ENTERCONFIGMODE: + case VK_DBE_ENTERWORDREGISTERMODE: + case VK_DBE_HIRAGANA: + case VK_DBE_KATAKANA: + case VK_DBE_NOCODEINPUT: + case VK_DBE_NOROMAN: + case VK_DBE_ROMAN: + break; + + default: + { + if (uMsg == WM_SYSKEYDOWN || uMsg == WM_SYSKEYUP) + { + if (uVirtualKey != VK_MENU && uVirtualKey != VK_F10) + return 0; + } + + if (!(pKL->piiex->ImeInfo.fdwProperty & IME_PROP_NEED_ALTKEY)) + { + if (uVirtualKey == VK_MENU || (lParam & 0x20000000)) + return 0; + } + break; + } + } + } + + if (LOBYTE(uVirtualKey) == VK_PACKET) + uVirtualKey = MAKELONG(wParam, GetW32ThreadInfo()->wchInjected); + + ret = co_IntImmProcessKey(hWnd, pKL->hkl, uVirtualKey, lParam, dwHotKeyId); + + if (IntGetImeCompatFlags(pWnd->head.pti) & 0x800000) + ret &= ~IPHK_HOTKEY; + + return ret; } NTSTATUS @@ -587,6 +691,7 @@ NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCo if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -695,8 +800,14 @@ NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pwnd = ValidateHwndNoErr(hwnd); - if (!pwnd || !IS_IMM_MODE()) + if (!pwnd) goto Quit; pti = pwnd->head.pti; @@ -741,6 +852,7 @@ NtUserDisableThreadIme( if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -812,6 +924,7 @@ NtUserGetAppImeLevel(HWND hWnd) if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -886,7 +999,10 @@ NtUserGetImeInfoEx( UserEnterShared(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } _SEH2_TRY { @@ -928,16 +1044,17 @@ NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) UserEnterExclusive(); - pWnd = ValidateHwndNoErr(hWnd); - if (!pWnd) - goto Quit; - if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd) + goto Quit; + pti = PsGetCurrentThreadWin32Thread(); if (pWnd->head.pti->ppi == pti->ppi) ret = UserSetProp(pWnd, AtomImeLevel, (HANDLE)(ULONG_PTR)dwLevel, TRUE); @@ -983,7 +1100,10 @@ NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } _SEH2_TRY { @@ -1012,8 +1132,14 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pImeWnd = ValidateHwndNoErr(hImeWnd); - if (!IS_IMM_MODE() || !pImeWnd || pImeWnd->fnid != FNID_IME) + if (!pImeWnd || pImeWnd->fnid != FNID_IME) goto Quit; pwndFocus = ValidateHwndNoErr(hwndFocus); @@ -1140,6 +1266,7 @@ BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -1185,7 +1312,10 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) PDESKTOP pdesk = pti->rpdesk; if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? + { + ERR("IME is disabled\n"); return NULL; + } if (!pdesk) // No desktop? return NULL; @@ -1232,7 +1362,10 @@ NtUserCreateInputContext(ULONG_PTR dwClientImcData) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserCreateInputContext(dwClientImcData); if (pIMC) @@ -1317,8 +1450,14 @@ NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pWnd = ValidateHwndNoErr(hWnd); - if (!pWnd || !IS_IMM_MODE()) + if (!pWnd) goto Quit; pIMC = (hIMC ? UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT) : NULL); @@ -1373,7 +1512,10 @@ NtUserUpdateInputContext( UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); if (!pIMC) @@ -1397,7 +1539,10 @@ NtUserQueryInputContext(HIMC hIMC, DWORD dwType) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); if (!pIMC) diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 72f82aa1b43..ab5e6fcf825 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -223,10 +223,10 @@ PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = User32CallOBMFromKernel, User32CallLPKFromKernel, User32CallUMPDFromKernel, + User32CallImmProcessKeyFromKernel, }; - VOID WINAPI GdiProcessSetup(VOID); @@ -712,3 +712,16 @@ NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength) } return ZwCallbackReturn( pktOut, cbSize, Status ); } + +NTSTATUS WINAPI +User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PIMMPROCESSKEY_CALLBACK_ARGUMENTS Common = Arguments; + DWORD Result = IMM_FN(ImmProcessKey)(Common->hWnd, + Common->hKL, + Common->vKey, + Common->lParam, + Common->dwHotKeyID); + + return ZwCallbackReturn(&Result, sizeof(DWORD), STATUS_SUCCESS); +}

1 0

[reactos] 01/01: [NOTEPAD] Fix hr-Hr.rc compiler warning 'unrecognized escape sequence' CORE-18043
by Joachim Henze 11 Feb '22

11 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27d73cd78b5a5370e3752… commit 27d73cd78b5a5370e37526ca40740197790e2b29 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Feb 11 12:42:03 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Feb 11 12:42:03 2022 +0100 [NOTEPAD] Fix hr-Hr.rc compiler warning 'unrecognized escape sequence' CORE-18043 It regressed by 0.4.15-dev-3810-g e0fc48d6e29c65488966116dd9b5eb10ed4e504a (#4338) No release was ever affected therefore. The diff looks massive in tgit-diffview, strange, but I actually replaced just a '\' with '\n' at line 168. My local diff tool does properly display it as a one-line-change only. --- base/applications/notepad/lang/hr-Hr.rc | 344 ++++++++++++++++---------------- 1 file changed, 172 insertions(+), 172 deletions(-) diff --git a/base/applications/notepad/lang/hr-Hr.rc b/base/applications/notepad/lang/hr-Hr.rc index 97bc5abda3a..cee444019a1 100644 --- a/base/applications/notepad/lang/hr-Hr.rc +++ b/base/applications/notepad/lang/hr-Hr.rc @@ -1,172 +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 +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\nProvjerite 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

1 0

[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

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