Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 01/01: [IMM32] Add ValidateHandle function (#4467)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0b925d2b071e9a1ad94a… commit b0b925d2b071e9a1ad94a51d71f11bb71599fb0c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 23 08:16:53 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 23 08:16:53 2022 +0900 [IMM32] Add ValidateHandle function (#4467) Set the last error on failure of handle validation. CORE-11700 --- dll/win32/imm32/ime.c | 4 ++-- dll/win32/imm32/imm.c | 12 ++++++------ dll/win32/imm32/keymsg.c | 2 +- dll/win32/imm32/precomp.h | 4 +++- dll/win32/imm32/utils.c | 18 +++++++++++------- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index e9c80d195b5..a13f59dd498 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -1692,7 +1692,7 @@ BOOL WINAPI ImmConfigureIMEA(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) TRACE("(%p, %p, 0x%lX, %p)", hKL, hWnd, dwMode, lpData); - if (!ValidateHwndNoErr(hWnd) || Imm32IsCrossProcessAccess(hWnd)) + if (!ValidateHwnd(hWnd) || Imm32IsCrossProcessAccess(hWnd)) return FALSE; pImeDpi = Imm32FindOrLoadImeDpi(hKL); @@ -1746,7 +1746,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) TRACE("(%p, %p, 0x%lX, %p)", hKL, hWnd, dwMode, lpData); - if (!ValidateHwndNoErr(hWnd) || Imm32IsCrossProcessAccess(hWnd)) + if (!ValidateHwnd(hWnd) || Imm32IsCrossProcessAccess(hWnd)) return FALSE; pImeDpi = Imm32FindOrLoadImeDpi(hKL); diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 45328abb595..e2e1e639689 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -509,7 +509,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!IS_IMM_MODE()) return NULL; - pWnd = ValidateHwndNoErr(hWnd); + pWnd = ValidateHwnd(hWnd); if (!pWnd) return NULL; @@ -555,7 +555,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) return FALSE; hwndFocus = (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_FOCUS); - pFocusWnd = ValidateHwndNoErr(hwndFocus); + pFocusWnd = ValidateHwnd(hwndFocus); if (pFocusWnd) hOldIMC = pFocusWnd->hImc; @@ -566,7 +566,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) return TRUE; case 1: - pFocusWnd = ValidateHwndNoErr(hwndFocus); + pFocusWnd = ValidateHwnd(hwndFocus); if (pFocusWnd) { hIMC = pFocusWnd->hImc; @@ -647,7 +647,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) if (!hIMC || !IS_IMM_MODE()) return FALSE; - pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT); + pIMC = ValidateHandle(hIMC, TYPE_INPUTCONTEXT); if (!pIMC || pIMC->head.pti != Imm32CurrentPti()) { ERR("invalid pIMC: %p\n", pIMC); @@ -916,7 +916,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) if (!hImc) return NULL; - pIMC = ValidateHandleNoErr(hImc, TYPE_INPUTCONTEXT); + pIMC = ValidateHandle(hImc, TYPE_INPUTCONTEXT); if (!pIMC || !Imm32CheckImcProcess(pIMC)) return NULL; @@ -986,7 +986,7 @@ static HIMC APIENTRY ImmGetSaveContext(HWND hWnd, DWORD dwContextFlags) goto Quit; } - pWnd = ValidateHwndNoErr(hWnd); + pWnd = ValidateHwnd(hWnd); if (!pWnd || Imm32IsCrossProcessAccess(hWnd)) return NULL; diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 684e4a762bc..2101fcb9afb 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -574,7 +574,7 @@ LRESULT APIENTRY ImmRequestMessageAW(HIMC hIMC, WPARAM wParam, LPARAM lParam, BO hWnd = pIC->hWnd; if (hWnd) - pWnd = ValidateHwndNoErr(hWnd); + pWnd = ValidateHwnd(hWnd); if (pWnd && pWnd->head.pti == Imm32CurrentPti()) ret = Imm32ProcessRequest(hIMC, pWnd, (DWORD)wParam, (LPVOID)lParam, bAnsi); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 82af0034e9b..a7057be1a73 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -79,8 +79,10 @@ extern HANDLE ghImmHeap; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); VOID APIENTRY LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA); -PWND FASTCALL ValidateHwndNoErr(HWND hwnd); LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType); +LPVOID FASTCALL ValidateHandle(HANDLE hObject, UINT uType); +#define ValidateHwndNoErr(hwnd) ValidateHandleNoErr((hwnd), TYPE_WINDOW) +#define ValidateHwnd(hwnd) ValidateHandle((hwnd), TYPE_WINDOW) BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index b3618536782..d135932b25a 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -167,7 +167,7 @@ static PVOID FASTCALL DesktopPtrToUser(PVOID ptr) return (PVOID)NtUserCallOneParam((DWORD_PTR)ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING); } -// Win: HMValidateHandle +// Win: HMValidateHandleNoRip LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) { UINT index; @@ -203,14 +203,18 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) return ptr; } -PWND FASTCALL ValidateHwndNoErr(HWND hwnd) +// Win: HMValidateHandle +LPVOID FASTCALL ValidateHandle(HANDLE hObject, UINT uType) { - /* See if the window is cached */ - PCLIENTINFO ClientInfo = GetWin32ClientInfo(); - if (hwnd == ClientInfo->CallbackWnd.hWnd) - return ClientInfo->CallbackWnd.pWnd; + LPVOID pvObj = ValidateHandleNoErr(hObject, uType); + if (pvObj) + return pvObj; - return ValidateHandleNoErr(hwnd, TYPE_WINDOW); + if (uType == TYPE_WINDOW) + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + else + SetLastError(ERROR_INVALID_HANDLE); + return NULL; } // Win: TestInputContextProcess

2 years, 8 months

[reactos] 01/01: [IMM32_APITEST] himc: Show class on CreateWindow failure (#4466)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9df3176f75b1269144a5… commit e9df3176f75b1269144a5721d18ab310522e9efd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 23 07:18:38 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 23 07:18:38 2022 +0900 [IMM32_APITEST] himc: Show class on CreateWindow failure (#4466) Display the window class name on failure of CreateWindow function call. CORE-11700 --- modules/rostests/apitests/imm32/himc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/imm32/himc.c b/modules/rostests/apitests/imm32/himc.c index d2e7104ba24..38ad975fcc9 100644 --- a/modules/rostests/apitests/imm32/himc.c +++ b/modules/rostests/apitests/imm32/himc.c @@ -173,7 +173,7 @@ static void Test2(void) LPCSTR pszClass = apszClasses[i]; hwnd = CreateWindowA(pszClass, NULL, WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL); - ok(hwnd != NULL, "CreateWindow failed\n"); + ok(hwnd != NULL, "CreateWindow(%s) failed\n", pszClass); hIMC = ImmGetContext(hwnd);

2 years, 8 months

[reactos] 01/01: [NTUSER][IMM32] Create the default IME window! (retry) (#4463)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f719cb97e8e2148ef149… commit 8f719cb97e8e2148ef149edb984e60a9a95b30c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 23 07:11:48 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 23 07:11:48 2022 +0900 [NTUSER][IMM32] Create the default IME window! (retry) (#4463) The default IME window has to be created for each top-level window in specific condition. It is needed for implementing Japanese input. - Add IntFocusSetInputContext helper function. - Call IntFocusSetInputContext after sending WM_KILLFOCUS message. - Add IntWantImeWindow, co_IntCreateDefaultImeWindow, and IntDestroyOwnedWindows helper functions. - Create the default IME window (spwndDefaultIme) for the specified window at IntCreateWindow. - Fix Imm32InternalLockIMC function. CORE-11700 --- dll/win32/imm32/imm.c | 19 ++++--- sdk/include/ddk/immdev.h | 5 ++ win32ss/user/ntuser/focus.c | 60 +++++++++++++++++++++- win32ss/user/ntuser/ime.c | 112 +++++++++++++++++++++++++++++++++++++++-- win32ss/user/ntuser/window.c | 109 +++++++++++++++++++++++++++------------ win32ss/user/ntuser/window.h | 2 + win32ss/user/user32/misc/imm.c | 6 +-- 7 files changed, 265 insertions(+), 48 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5d199630229..45328abb595 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -830,7 +830,13 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) RtlEnterCriticalSection(&pClientImc->cs); if (pClientImc->hInputContext) - goto Finish; + { + pIC = LocalLock(pClientImc->hInputContext); + if (pIC) + goto Success; + else + goto Failure; + } dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId == GetCurrentThreadId() && Imm32IsCiceroMode() && !Imm32Is16BitMode()) @@ -847,14 +853,14 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) } if (!NtUserQueryInputContext(hIMC, QIC_DEFAULTWINDOWIME)) - goto Quit; + goto Failure; hIC = LocalAlloc(LHND, sizeof(INPUTCONTEXTDX)); pIC = LocalLock(hIC); if (!pIC) { LocalFree(hIC); - goto Quit; + goto Failure; } pClientImc->hInputContext = hIC; @@ -862,17 +868,17 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) if (!Imm32CreateInputContext(hIMC, pIC, pClientImc, hNewKL, fSelect)) { pClientImc->hInputContext = LocalFree(pClientImc->hInputContext); - goto Quit; + goto Failure; } -Finish: +Success: CtfImmTIMCreateInputContext(hIMC); RtlLeaveCriticalSection(&pClientImc->cs); InterlockedIncrement(&pClientImc->cLockObj); ImmUnlockClientImc(pClientImc); return pIC; -Quit: +Failure: RtlLeaveCriticalSection(&pClientImc->cs); ImmUnlockClientImc(pClientImc); return NULL; @@ -1243,6 +1249,7 @@ BOOL WINAPI ImmSetActiveContextConsoleIME(HWND hwnd, BOOL fFlag) BOOL WINAPI User32InitializeImmEntryTable(DWORD); +// Win: ImmDllInitialize BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) { HKL hKL; diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 61641ba1633..58bbc1dc1d6 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -24,6 +24,11 @@ extern "C" { #define IMC_GETSOFTKBDPOS 0x0013 #define IMC_SETSOFTKBDPOS 0x0014 +/* wParam for WM_IME_SYSTEM */ +#define IMS_IMEACTIVATE 0x17 +#define IMS_IMEDEACTIVATE 0x18 +#define IMS_ACTIVATELAYOUT 0x19 + #define IMMGWL_IMC 0 #define IMMGWL_PRIVATE (sizeof(LONG)) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index a9ea0965177..7ecb9c88f73 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -7,6 +7,7 @@ */ #include <win32k.h> +#include <ddk/immdev.h> DBG_DEFAULT_CHANNEL(UserFocus); PUSER_MESSAGE_QUEUE gpqForeground = NULL; @@ -145,11 +146,47 @@ co_IntSendDeactivateMessages(HWND hWndPrev, HWND hWnd, BOOL Clear) return Ret; } +// Win: xxxFocusSetInputContext +VOID IntFocusSetInputContext(PWND pWnd, BOOL bActivate, BOOL bCallback) +{ + PTHREADINFO pti; + PWND pImeWnd; + USER_REFERENCE_ENTRY Ref; + HWND hImeWnd; + WPARAM wParam; + LPARAM lParam; + + if (!pWnd || !pWnd->pcls || IS_WND_IMELIKE(pWnd)) + return; + + pti = pWnd->head.pti; + if (!pti || (pti->TIF_flags & TIF_INCLEANUP)) + return; + + pImeWnd = pti->spwndDefaultIme; + if (!pImeWnd) + return; + + UserRefObjectCo(pImeWnd, &Ref); + + hImeWnd = UserHMGetHandle(pImeWnd); + wParam = (bActivate ? IMS_IMEACTIVATE : IMS_IMEDEACTIVATE); + lParam = (LPARAM)UserHMGetHandle(pWnd); + + if (bCallback) + co_IntSendMessageWithCallBack(hImeWnd, WM_IME_SYSTEM, wParam, lParam, NULL, 0, NULL); + else + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, wParam, lParam); + + UserDerefObjectCo(pImeWnd); +} + // // Deactivating the foreground message queue. // // Release Active, Capture and Focus Windows associated with this message queue. // +// Win: xxxDeactivate BOOL FASTCALL IntDeactivateWindow(PTHREADINFO pti, HANDLE tid) { @@ -297,6 +334,10 @@ IntDeactivateWindow(PTHREADINFO pti, HANDLE tid) UserRefObjectCo(pwndFocus, &Ref); co_IntSendMessage(UserHMGetHandle(pwndFocus), WM_KILLFOCUS, 0, 0); + if (IS_IMM_MODE()) + { + IntFocusSetInputContext(pwndFocus, FALSE, FALSE); + } UserDerefObjectCo(pwndFocus); } @@ -569,11 +610,13 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO return InAAPM; } +// Win: xxxSendFocusMessages VOID FASTCALL IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) { PWND pWndPrev; PUSER_MESSAGE_QUEUE ThreadQueue = pti->MessageQueue; // Queue can change... + HWND hwndPrev; ThreadQueue->QF_flags &= ~QF_FOCUSNULLSINCEACTIVE; if (!pWnd && ThreadQueue->spwndActive) @@ -593,12 +636,22 @@ IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) if (pWndPrev) { co_IntSendMessage(UserHMGetHandle(pWndPrev), WM_KILLFOCUS, (WPARAM)UserHMGetHandle(pWnd), 0); + if (IS_IMM_MODE()) + { + IntFocusSetInputContext(pWndPrev, FALSE, FALSE); + } } if (ThreadQueue->spwndFocus == pWnd) { + if (IS_IMM_MODE()) + { + IntFocusSetInputContext(pWnd, TRUE, FALSE); + } + IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(UserHMGetHandle(pWnd), WM_SETFOCUS, (WPARAM)(pWndPrev ? UserHMGetHandle(pWndPrev) : NULL), 0); + hwndPrev = (pWndPrev ? UserHMGetHandle(pWndPrev) : NULL); + co_IntSendMessage(UserHMGetHandle(pWnd), WM_SETFOCUS, (WPARAM)hwndPrev, 0); } } else @@ -608,6 +661,10 @@ IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); co_IntSendMessage(UserHMGetHandle(pWndPrev), WM_KILLFOCUS, 0, 0); + if (IS_IMM_MODE()) + { + IntFocusSetInputContext(pWndPrev, FALSE, FALSE); + } } } } @@ -1241,6 +1298,7 @@ UserSetActiveWindow( _In_opt_ PWND Wnd ) return FALSE; } +// Win: PWND xxxSetFocus(Window) HWND FASTCALL co_UserSetFocus(PWND Window) { diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index e869608724f..f8cd3778512 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1889,7 +1889,110 @@ BOOL IntFindNonImeRelatedWndOfSameThread(PWND pwndParent, PWND pwndTarget) return FALSE; } -// Can we destroy the default IME window for the target child window? +// Determines whether the target window needs the IME window. +// Win: WantImeWindow(pwndParent, pwndTarget) +BOOL FASTCALL IntWantImeWindow(PWND pwndTarget) +{ + PDESKTOP rpdesk; + PWINSTATION_OBJECT rpwinstaParent; + PWND pwndNode, pwndParent = pwndTarget->spwndParent; + + if (gptiCurrent->TIF_flags & TIF_DISABLEIME) + return FALSE; + + if (IS_WND_IMELIKE(pwndTarget)) + return FALSE; + + if (pwndTarget->fnid == FNID_DESKTOP || pwndTarget->fnid == FNID_MESSAGEWND) + return FALSE; + + if (pwndTarget->state & WNDS_SERVERSIDEWINDOWPROC) + return FALSE; + + rpdesk = pwndTarget->head.rpdesk; + if (!rpdesk) + return FALSE; + + rpwinstaParent = rpdesk->rpwinstaParent; + if (!rpwinstaParent || (rpwinstaParent->Flags & WSS_NOIO)) + return FALSE; + + for (pwndNode = pwndParent; pwndNode; pwndNode = pwndNode->spwndParent) + { + if (rpdesk != pwndNode->head.rpdesk) + break; + + if (pwndNode == rpdesk->spwndMessage) + return FALSE; + } + + return TRUE; +} + +// Create the default IME window for the target window. +// Win: xxxCreateDefaultImeWindow(pwndTarget, ATOM, hInst) +PWND FASTCALL co_IntCreateDefaultImeWindow(PWND pwndTarget, HINSTANCE hInst) +{ + LARGE_UNICODE_STRING WindowName; + UNICODE_STRING ClassName; + PWND pImeWnd; + PIMEUI pimeui; + CREATESTRUCTW Cs; + USER_REFERENCE_ENTRY Ref; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + HANDLE pid = PsGetThreadProcessId(pti->pEThread); + + if (!(pti->spDefaultImc) && pid == gpidLogon) + UserCreateInputContext(0); + + if (!(pti->spDefaultImc) || IS_WND_IMELIKE(pwndTarget) || !(pti->rpdesk->pheapDesktop)) + return NULL; + + if (IS_WND_CHILD(pwndTarget) && !(pwndTarget->style & WS_VISIBLE) && + pwndTarget->spwndParent->head.pti->ppi != pti->ppi) + { + return NULL; + } + + RtlInitLargeUnicodeString(&WindowName, L"Default IME", 0); + + ClassName.Buffer = (PWCH)(ULONG_PTR)gpsi->atomSysClass[ICLS_IME]; + ClassName.Length = 0; + ClassName.MaximumLength = 0; + + UserRefObjectCo(pwndTarget, &Ref); + + RtlZeroMemory(&Cs, sizeof(Cs)); + Cs.style = WS_POPUP | WS_DISABLED; + Cs.hInstance = hInst; + Cs.hwndParent = UserHMGetHandle(pwndTarget); + Cs.lpszName = WindowName.Buffer; + Cs.lpszClass = ClassName.Buffer; + + // NOTE: LARGE_UNICODE_STRING is compatible to LARGE_STRING. + pImeWnd = co_UserCreateWindowEx(&Cs, &ClassName, (PLARGE_STRING)&WindowName, NULL, WINVER); + if (pImeWnd) + { + pimeui = ((PIMEWND)pImeWnd)->pimeui; + _SEH2_TRY + { + ProbeForWrite(pimeui, sizeof(IMEUI), 1); + pimeui->fDefault = TRUE; + if (IS_WND_CHILD(pwndTarget) && pwndTarget->spwndParent->head.pti != pti) + pimeui->fChildThreadDef = TRUE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NOTHING; + } + _SEH2_END; + } + + UserDerefObjectCo(pwndTarget); + return pImeWnd; +} + +// Determines whether the system can destroy the default IME window for the target child window. // Win: ImeCanDestroyDefIMEforChild BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget) { @@ -1911,7 +2014,7 @@ BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ; + NOTHING; } _SEH2_END; @@ -1934,8 +2037,7 @@ BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget) return TRUE; } -// Can we destroy the default IME window for the non-child target window? -// If so, this function sets spwndOwner to NULL. +// Determines whether the system can destroy the default IME window for the non-child target window. // Win: ImeCanDestroyDefIME BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget) { @@ -1957,7 +2059,7 @@ BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ; + NOTHING; } _SEH2_END; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 9ec554b4a24..a740fcc11e8 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -8,6 +8,7 @@ */ #include <win32k.h> +#include <ddk/immdev.h> DBG_DEFAULT_CHANNEL(UserWnd); INT gNestedWindowLimit = 50; @@ -658,8 +659,16 @@ LRESULT co_UserFreeWindow(PWND Window, ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } + if (ThreadData->spwndDefaultIme && + ThreadData->spwndDefaultIme->spwndOwner == Window) + { + ThreadData->spwndDefaultIme->spwndOwner = NULL; + } + if (IS_IMM_MODE() && Window == ThreadData->spwndDefaultIme) + { UserAssignmentUnlock((PVOID*)&(ThreadData->spwndDefaultIme)); + } /* Fixes dialog test_focus breakage due to r66237. */ if (ThreadData->MessageQueue->spwndFocus == Window) @@ -1775,7 +1784,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, { PWND pWnd = NULL; HWND hWnd; - PTHREADINFO pti = NULL; + PTHREADINFO pti; BOOL MenuChanged; BOOL bUnicodeWindow; PCALLPROCDATA pcpd; @@ -2027,6 +2036,28 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->strName.MaximumLength = WindowName->Length + sizeof(UNICODE_NULL); } + /* Create the IME window for pWnd */ + if (IS_IMM_MODE() && !(pti->spwndDefaultIme) && IntWantImeWindow(pWnd)) + { + PWND pwndDefaultIme = co_IntCreateDefaultImeWindow(pWnd, pWnd->hModule); + UserAssignmentLock((PVOID*)&(pti->spwndDefaultIme), pwndDefaultIme); + + if (pwndDefaultIme && (pti->pClientInfo->CI_flags & CI_IMMACTIVATE)) + { + USER_REFERENCE_ENTRY Ref; + HKL hKL; + + UserRefObjectCo(pwndDefaultIme, &Ref); + + hKL = pti->KeyboardLayout->hkl; + co_IntSendMessage(UserHMGetHandle(pwndDefaultIme), WM_IME_SYSTEM, + IMS_ACTIVATELAYOUT, (LPARAM)hKL); + pti->pClientInfo->CI_flags &= ~CI_IMMACTIVATE; + + UserDerefObjectCo(pwndDefaultIme); + } + } + /* Correct the window style. */ if ((pWnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) { @@ -2133,7 +2164,6 @@ Error: /* * @implemented - * Win: xxxCreateWindowEx */ PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW* Cs, @@ -2748,6 +2778,49 @@ cleanup: return hwnd; } +// Win: xxxDW_DestroyOwnedWindows +VOID FASTCALL IntDestroyOwnedWindows(PWND Window) +{ + HWND* List; + HWND* phWnd; + PWND pWnd; + PTHREADINFO pti = Window->head.pti; + USER_REFERENCE_ENTRY Ref; + + List = IntWinListOwnedPopups(Window); + if (!List) + return; + + for (phWnd = List; *phWnd; ++phWnd) + { + pWnd = ValidateHwndNoErr(*phWnd); + if (pWnd == NULL) + continue; + ASSERT(pWnd->spwndOwner == Window); + ASSERT(pWnd != Window); + + if (IS_IMM_MODE() && !(pti->TIF_flags & TIF_INCLEANUP) && + pWnd == pti->spwndDefaultIme) + { + continue; + } + + pWnd->spwndOwner = NULL; + if (IntWndBelongsToThread(pWnd, PsGetCurrentThreadWin32Thread())) + { + UserRefObjectCo(pWnd, &Ref); // Temp HACK? + co_UserDestroyWindow(pWnd); + UserDerefObjectCo(pWnd); // Temp HACK? + } + else + { + ERR("IntWndBelongsToThread(0x%p) is FALSE, ignoring.\n", pWnd); + } + } + + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); +} + // Win: xxxDestroyWindow BOOLEAN co_UserDestroyWindow(PVOID Object) { @@ -2876,37 +2949,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) /* Recursively destroy owned windows */ if (!(Window->style & WS_CHILD)) { - HWND* List; - HWND* phWnd; - PWND pWnd; - - List = IntWinListOwnedPopups(Window); - if (List) - { - for (phWnd = List; *phWnd; ++phWnd) - { - pWnd = ValidateHwndNoErr(*phWnd); - if (pWnd == NULL) - continue; - ASSERT(pWnd->spwndOwner == Window); - ASSERT(pWnd != Window); - - pWnd->spwndOwner = NULL; - if (IntWndBelongsToThread(pWnd, PsGetCurrentThreadWin32Thread())) - { - USER_REFERENCE_ENTRY Ref; - UserRefObjectCo(pWnd, &Ref); // Temp HACK? - co_UserDestroyWindow(pWnd); - UserDerefObjectCo(pWnd); // Temp HACK? - } - else - { - ERR("IntWndBelongsToThread(0x%p) is FALSE, ignoring.\n", pWnd); - } - } - - ExFreePoolWithTag(List, USERTAG_WINDOWLIST); - } + IntDestroyOwnedWindows(Window); } /* Generate mouse move message for the next window */ diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 86daff24d97..a093e4e4ee8 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -112,6 +112,8 @@ VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); (((pWnd)->pcls->style & CS_IME) || \ ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) +BOOL FASTCALL IntWantImeWindow(PWND pwndTarget); +PWND FASTCALL co_IntCreateDefaultImeWindow(PWND pwndTarget, HINSTANCE hInst); BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget); BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget); diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 6fa8eafd1d6..f14db5ddf15 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -664,15 +664,15 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) // TODO: break; - case 0x17: + case IMS_IMEACTIVATE: User32SetImeActivenessOfWindow((HWND)lParam, TRUE); break; - case 0x18: + case IMS_IMEDEACTIVATE: User32SetImeActivenessOfWindow((HWND)lParam, FALSE); break; - case 0x19: + case IMS_ACTIVATELAYOUT: ret = IMM_FN(ImmActivateLayout)((HKL)lParam); break;

2 years, 8 months

[reactos] 01/01: [DESK] Correctly store display frequency, so we can rollback in case of error

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f2795ab4cf7fdddf6c9d… commit 2f2795ab4cf7fdddf6c9d88d885a338a7678a888 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Apr 20 18:23:23 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Apr 20 18:23:53 2022 +0200 [DESK] Correctly store display frequency, so we can rollback in case of error --- dll/cpl/desk/settings.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index fb8a2d475f5..93d8b9a246f 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -191,6 +191,7 @@ AddDisplayDevice(IN PSETTINGS_DATA pData, IN const DISPLAY_DEVICE *DisplayDevice newEntry->InitialSettings.dmPelsWidth = newEntry->CurrentSettings->dmPelsWidth; newEntry->InitialSettings.dmPelsHeight = newEntry->CurrentSettings->dmPelsHeight; newEntry->InitialSettings.dmBitsPerPel = newEntry->CurrentSettings->dmBitsPerPel; + newEntry->InitialSettings.dmDisplayFrequency = newEntry->CurrentSettings->dmDisplayFrequency; /* Count different resolutions */ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) @@ -770,6 +771,7 @@ ApplyDisplaySettings(HWND hwndDlg, PSETTINGS_DATA pData) pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency = pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency; } else { @@ -789,6 +791,7 @@ ApplyDisplaySettings(HWND hwndDlg, PSETTINGS_DATA pData) pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth = pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth; pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight = pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight; pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel = pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel; + pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency = pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency; UpdateDisplay(hwndDlg, pData, TRUE); break;

2 years, 8 months

[reactos] 01/01: [NTUSER] Destroy the default IME window (#4462)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bcf23d1ded3d2fc104ba… commit 4bcf23d1ded3d2fc104ba9e85b88fb1a59150183 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 20 16:10:06 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 20 16:10:06 2022 +0900 [NTUSER] Destroy the default IME window (#4462) - Add IntFindNonImeRelatedWndOfSameThread, IntImeCanDestroyDefIMEforChild, and IntImeCanDestroyDefIME helper functions. - Do assignment unlock spwndDefaultIme at co_UserFreeWindow. - Destroy the default IME window of the specified window if necessary at co_UserDestroyWindow. CORE-11700 --- win32ss/user/ntuser/ime.c | 197 +++++++++++++++++++++++++++++++++++++++++-- win32ss/user/ntuser/window.c | 21 ++++- win32ss/user/ntuser/window.h | 13 +++ 3 files changed, 221 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index d7377c32f0b..e869608724f 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -21,15 +21,6 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL) #define LANGID_NEUTRAL MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) -// The IME-like windows are the IME windows and the IME UI windows. -// The IME window's class name is "IME". -// The IME UI window behaves the User Interface of IME for the user. -#define IS_WND_IMELIKE(pwnd) \ - (((pwnd)->pcls->style & CS_IME) || \ - ((pwnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) -#define IS_WND_MENU(pWnd) \ - ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_MENU]) - // The special virtual keys for Japanese: Used for key states. // https://www.kthree.co.jp/kihelp/index.html?page=app/vkey&type=html #define VK_DBE_ALPHANUMERIC 0xF0 @@ -1820,4 +1811,192 @@ Quit: return ret; } +// Searchs a non-IME-related window of the same thread of pwndTarget, +// other than pwndTarget, around pwndParent. Returns TRUE if found. +// +// Win: IsChildSameThread +BOOL IntFindNonImeRelatedWndOfSameThread(PWND pwndParent, PWND pwndTarget) +{ + PWND pwnd, pwndOwner, pwndNode; + PTHREADINFO ptiTarget = pwndTarget->head.pti; + + // For all the children of pwndParent, ... + for (pwnd = pwndParent->spwndChild; pwnd; pwnd = pwnd->spwndNext) + { + if (pwnd == pwndTarget || pwnd->head.pti != ptiTarget || IS_WND_MENU(pwnd)) + continue; + + if (!IS_WND_CHILD(pwnd)) + { + // Check if any IME-like owner. + BOOL bFound1 = FALSE; + for (pwndOwner = pwnd; pwndOwner; pwndOwner = pwndOwner->spwndOwner) + { + if (IS_WND_IMELIKE(pwndOwner)) + { + bFound1 = TRUE; + break; + } + } + if (bFound1) + continue; // Skip if any IME-like owner. + } + + pwndNode = pwnd; + + if (IS_WND_CHILD(pwndNode)) + { + // Check if any same-thread IME-like ancestor. + BOOL bFound2 = FALSE; + for (; IS_WND_CHILD(pwndNode); pwndNode = pwndNode->spwndParent) + { + if (pwndNode->head.pti != ptiTarget) + break; + + if (IS_WND_IMELIKE(pwndNode)) + { + bFound2 = TRUE; + break; + } + } + if (bFound2) + continue; + // Now, pwndNode is non-child or non-same-thread window. + } + + if (!IS_WND_CHILD(pwndNode)) // pwndNode is non-child + { + // Check if any same-thread IME-like owner. + BOOL bFound3 = FALSE; + for (; pwndNode; pwndNode = pwndNode->spwndOwner) + { + if (pwndNode->head.pti != ptiTarget) + break; + + if (IS_WND_IMELIKE(pwndNode)) + { + bFound3 = TRUE; + break; + } + } + if (bFound3) + continue; + } + + return TRUE; + } + + return FALSE; +} + +// Can we destroy the default IME window for the target child window? +// Win: ImeCanDestroyDefIMEforChild +BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget) +{ + PWND pwndNode; + PIMEUI pimeui; + IMEUI SafeImeUI; + + pimeui = ((PIMEWND)pImeWnd)->pimeui; + if (!pimeui || (LONG_PTR)pimeui == (LONG_PTR)-1) + return FALSE; + + // Check IMEUI.fChildThreadDef + _SEH2_TRY + { + ProbeForRead(pimeui, sizeof(IMEUI), 1); + SafeImeUI = *pimeui; + if (!SafeImeUI.fChildThreadDef) + return FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ; + } + _SEH2_END; + + // The parent of pwndTarget is NULL or of the same thread of pwndTarget? + if (pwndTarget->spwndParent == NULL || + pwndTarget->head.pti == pwndTarget->spwndParent->head.pti) + { + return FALSE; + } + + for (pwndNode = pwndTarget; pwndNode; pwndNode = pwndNode->spwndParent) + { + if (pwndNode == pwndNode->head.rpdesk->pDeskInfo->spwnd) + break; + + if (IntFindNonImeRelatedWndOfSameThread(pwndNode->spwndParent, pwndTarget)) + return FALSE; + } + + return TRUE; +} + +// Can we destroy the default IME window for the non-child target window? +// If so, this function sets spwndOwner to NULL. +// Win: ImeCanDestroyDefIME +BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget) +{ + PWND pwndNode; + PIMEUI pimeui; + IMEUI SafeImeUI; + + pimeui = ((PIMEWND)pImeWnd)->pimeui; + if (!pimeui || (LONG_PTR)pimeui == (LONG_PTR)-1) + return FALSE; + + // Check IMEUI.fDestroy + _SEH2_TRY + { + ProbeForRead(pimeui, sizeof(IMEUI), 1); + SafeImeUI = *pimeui; + if (SafeImeUI.fDestroy) + return FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ; + } + _SEH2_END; + + // Any ancestor of pImeWnd is pwndTarget? + if (pImeWnd->spwndOwner) + { + for (pwndNode = pImeWnd->spwndOwner; pwndNode; pwndNode = pwndNode->spwndOwner) + { + if (pwndNode == pwndTarget) + break; + } + + if (!pwndNode) + return FALSE; + } + + // Any ancestor of pwndTarget is IME-like? + for (pwndNode = pwndTarget; pwndNode; pwndNode = pwndNode->spwndOwner) + { + if (IS_WND_IMELIKE(pwndNode)) + return FALSE; + } + + // Adjust the ordering and top-mode status + IntImeSetFutureOwner(pImeWnd, pwndTarget); + for (pwndNode = pImeWnd->spwndOwner; pwndNode; pwndNode = pwndNode->spwndNext) + { + if (pwndNode == pImeWnd) + break; + } + if (pwndNode == pImeWnd) + IntImeCheckTopmost(pImeWnd); + + // Is the owner of pImeWnd NULL or pwndTarget? + if (pImeWnd->spwndOwner && pwndTarget != pImeWnd->spwndOwner) + return FALSE; + + pImeWnd->spwndOwner = NULL; + return TRUE; +} + /* EOF */ diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index da8da6cf68e..9ec554b4a24 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -658,6 +658,9 @@ LRESULT co_UserFreeWindow(PWND Window, ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } + if (IS_IMM_MODE() && Window == ThreadData->spwndDefaultIme) + UserAssignmentUnlock((PVOID*)&(ThreadData->spwndDefaultIme)); + /* Fixes dialog test_focus breakage due to r66237. */ if (ThreadData->MessageQueue->spwndFocus == Window) ThreadData->MessageQueue->spwndFocus = NULL; @@ -2762,7 +2765,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) TRACE("co_UserDestroyWindow(Window = 0x%p, hWnd = 0x%p)\n", Window, hWnd); /* Check for owner thread */ - if ( Window->head.pti != PsGetCurrentThreadWin32Thread()) + if (Window->head.pti != ti) { /* Check if we are destroying the desktop window */ if (! ((Window->head.rpdesk->dwDTFlags & DF_DESTROYED) && Window == Window->head.rpdesk->pDeskInfo->spwnd)) @@ -2918,6 +2921,22 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) /* Send destroy messages */ IntSendDestroyMsg(UserHMGetHandle(Window)); + // Destroy the default IME window if necessary + if (IS_IMM_MODE() && !(ti->TIF_flags & TIF_INCLEANUP) && + ti->spwndDefaultIme && !IS_WND_IMELIKE(Window) && !(Window->state & WNDS_DESTROYED)) + { + if (IS_WND_CHILD(Window)) + { + if (IntImeCanDestroyDefIMEforChild(ti->spwndDefaultIme, Window)) + co_UserDestroyWindow(ti->spwndDefaultIme); + } + else + { + if (IntImeCanDestroyDefIME(ti->spwndDefaultIme, Window)) + co_UserDestroyWindow(ti->spwndDefaultIme); + } + } + if (!IntIsWindow(UserHMGetHandle(Window))) { return TRUE; diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 7086af36fc5..86daff24d97 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -102,4 +102,17 @@ VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); /* Undocumented dwFlags for IntBuildHwndList */ #define IACE_LIST 0x0002 +#define IS_WND_CHILD(pWnd) ((pWnd)->style & WS_CHILD) +#define IS_WND_MENU(pWnd) ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_MENU]) + +// The IME-like windows are the IME windows and the IME UI windows. +// The IME window's class name is "IME". +// The IME UI window behaves the User Interface of IME for the user. +#define IS_WND_IMELIKE(pWnd) \ + (((pWnd)->pcls->style & CS_IME) || \ + ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) + +BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget); +BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget); + /* EOF */

2 years, 8 months

[reactos] 01/01: [CSRSRV] Use the PROCESS_PRIORITY_NORMAL_FOREGROUND constant instead of hardcoding its value (== 9).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=944b942eb2904a2ff3bbf… commit 944b942eb2904a2ff3bbf7250b8a15f5d61e1c50 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 20 03:20:18 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 20 03:53:45 2022 +0200 [CSRSRV] Use the PROCESS_PRIORITY_NORMAL_FOREGROUND constant instead of hardcoding its value (== 9). --- subsystems/win32/csrsrv/procsup.c | 10 +++++----- subsystems/win32/csrss/csrss.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index 13540d00d4e..8d00dc202a3 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -51,9 +51,9 @@ VOID NTAPI CsrSetToNormalPriority(VOID) { - KPRIORITY BasePriority = (8 + 1) + 4; + KPRIORITY BasePriority = PROCESS_PRIORITY_NORMAL_FOREGROUND + 4; - /* Set the Priority */ + /* Set the base priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, &BasePriority, @@ -79,7 +79,7 @@ VOID NTAPI CsrSetToShutdownPriority(VOID) { - KPRIORITY BasePriority = (8 + 1) + 6; + KPRIORITY BasePriority = PROCESS_PRIORITY_NORMAL_FOREGROUND + 6; BOOLEAN Old; /* Get the shutdown privilege */ @@ -88,7 +88,7 @@ CsrSetToShutdownPriority(VOID) FALSE, &Old))) { - /* Set the Priority */ + /* Set the base priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, &BasePriority, @@ -612,7 +612,7 @@ CsrCreateProcess(IN HANDLE hProcess, CsrProcess->ProcessHandle = hProcess; CsrProcess->ShutdownLevel = 0x280; - /* Set the Priority to Background */ + /* Set the priority to Background */ CsrSetBackgroundPriority(CsrProcess); /* Insert the Process */ diff --git a/subsystems/win32/csrss/csrss.c b/subsystems/win32/csrss/csrss.c index a4205d5f3b0..13b5189dbb8 100644 --- a/subsystems/win32/csrss/csrss.c +++ b/subsystems/win32/csrss/csrss.c @@ -41,7 +41,7 @@ _main(int argc, char *envp[], int DebugFlag) { - KPRIORITY BasePriority = (8 + 1) + 4; + KPRIORITY BasePriority = PROCESS_PRIORITY_NORMAL_FOREGROUND + 4; NTSTATUS Status; #if defined (_X86_) ULONG Response; @@ -49,11 +49,11 @@ _main(int argc, UNREFERENCED_PARAMETER(envp); UNREFERENCED_PARAMETER(DebugFlag); - /* Set the Priority */ + /* Set the base priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, &BasePriority, - sizeof(KPRIORITY)); + sizeof(BasePriority)); #if defined (_X86_) /* Give us IOPL so that we can access the VGA registers */

2 years, 8 months

[reactos] 01/01: [UMPNPMGR] Fix hang when installing devices. Addendum to 0296fce00.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27453fb7594ea0c545217… commit 27453fb7594ea0c545217242a16092eed6099071 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Apr 20 02:38:41 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Apr 20 02:38:41 2022 +0300 [UMPNPMGR] Fix hang when installing devices. Addendum to 0296fce00. --- base/services/umpnpmgr/rpcserver.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 1d933e6942b..74a289205d0 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3004,19 +3004,14 @@ GenerateDeviceID( _In_ PNP_RPC_STRING_LEN ulLength) { WCHAR szGeneratedInstance[MAX_DEVICE_ID_LEN]; - PWCHAR ptr; HKEY hKey; DWORD dwInstanceNumber; DWORD dwError = ERROR_SUCCESS; CONFIGRET ret = CR_SUCCESS; /* Fail, if the device name contains backslashes */ - ptr = pszDeviceID; - while (*ptr != UNICODE_NULL) - { - if (*ptr == L'\\') - return CR_INVALID_DEVICE_ID; - } + if (wcschr(pszDeviceID, L'\\') != NULL) + return CR_INVALID_DEVICE_ID; /* Generated ID is: Root\<Device ID>\<Instance number> */ dwInstanceNumber = 0;

2 years, 8 months

[reactos] 01/01: [UMPNPMGR] GenerateDeviceID must fail, if pszDeviceID contains backslashes

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0296fce00ee07ef9e3df2… commit 0296fce00ee07ef9e3df2fe04f8b3f01343d35a7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Apr 19 23:14:23 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Apr 19 23:14:23 2022 +0200 [UMPNPMGR] GenerateDeviceID must fail, if pszDeviceID contains backslashes --- base/services/umpnpmgr/rpcserver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 25461975ee0..1d933e6942b 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3004,11 +3004,20 @@ GenerateDeviceID( _In_ PNP_RPC_STRING_LEN ulLength) { WCHAR szGeneratedInstance[MAX_DEVICE_ID_LEN]; + PWCHAR ptr; HKEY hKey; DWORD dwInstanceNumber; DWORD dwError = ERROR_SUCCESS; CONFIGRET ret = CR_SUCCESS; + /* Fail, if the device name contains backslashes */ + ptr = pszDeviceID; + while (*ptr != UNICODE_NULL) + { + if (*ptr == L'\\') + return CR_INVALID_DEVICE_ID; + } + /* Generated ID is: Root\<Device ID>\<Instance number> */ dwInstanceNumber = 0; while (dwError == ERROR_SUCCESS)

2 years, 8 months

[reactos] 01/01: [NTUSER] Implement NtUserSetImeOwnerWindow (#4460)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=291a94cd6f8f753c4840b… commit 291a94cd6f8f753c4840bd559d833b5408c36d6e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 19 19:03:12 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 19 19:03:12 2022 +0900 [NTUSER] Implement NtUserSetImeOwnerWindow (#4460) - Add IntImeSetFutureOwner, IntGetLastTopMostWindowNoIME, IntImeSetTopMost, and IntImeCheckTopmost helper functions. - Implement NtUserSetImeOwnerWindow function. CORE-11700 --- win32ss/user/ntuser/desktop.c | 4 +- win32ss/user/ntuser/ime.c | 218 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 214 insertions(+), 8 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index ad00fc0c00e..4b82da31ce9 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1344,7 +1344,6 @@ PWND FASTCALL co_GetDesktopWindow(PWND pWnd) return NULL; } -// Win: _GetDesktopWindow HWND FASTCALL IntGetDesktopWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); @@ -1356,6 +1355,7 @@ HWND FASTCALL IntGetDesktopWindow(VOID) return pdo->DesktopWindow; } +// Win: _GetDesktopWindow PWND FASTCALL UserGetDesktopWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); @@ -1369,7 +1369,6 @@ PWND FASTCALL UserGetDesktopWindow(VOID) return UserGetWindowObject(pdo->DesktopWindow); } -// Win: _GetMessageWindow HWND FASTCALL IntGetMessageWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); @@ -1382,6 +1381,7 @@ HWND FASTCALL IntGetMessageWindow(VOID) return pdo->spwndMessage->head.h; } +// Win: _GetMessageWindow PWND FASTCALL UserGetMessageWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index eccaca5fd93..d7377c32f0b 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -21,9 +21,14 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL) #define LANGID_NEUTRAL MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) +// The IME-like windows are the IME windows and the IME UI windows. +// The IME window's class name is "IME". +// The IME UI window behaves the User Interface of IME for the user. #define IS_WND_IMELIKE(pwnd) \ (((pwnd)->pcls->style & CS_IME) || \ ((pwnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) +#define IS_WND_MENU(pWnd) \ + ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_MENU]) // The special virtual keys for Japanese: Used for key states. // https://www.kthree.co.jp/kihelp/index.html?page=app/vkey&type=html @@ -1142,11 +1147,212 @@ Quit: return ret; } +// Choose the preferred owner of the IME window. +// Win: ImeSetFutureOwner +VOID FASTCALL IntImeSetFutureOwner(PWND pImeWnd, PWND pwndOwner) +{ + PWND pwndNode, pwndNextOwner, pwndParent, pwndSibling; + PTHREADINFO pti = pImeWnd->head.pti; + + if (!pwndOwner || (pwndOwner->style & WS_CHILD)) // invalid owner + return; + + // Get the top-level owner of the same thread + for (pwndNode = pwndOwner; ; pwndNode = pwndNextOwner) + { + pwndNextOwner = pwndNode->spwndOwner; + if (!pwndNextOwner || pwndNextOwner->head.pti != pti) + break; + } + + // Don't choose the IME-like windows and the bottom-most windows unless necessary. + if (IS_WND_IMELIKE(pwndNode) || + ((pwndNode->state2 & WNDS2_BOTTOMMOST) && !(pwndOwner->state2 & WNDS2_BOTTOMMOST))) + { + pwndNode = pwndOwner; + } + + pwndParent = pwndNode->spwndParent; + if (!pwndParent || pwndOwner != pwndNode) + { + pImeWnd->spwndOwner = pwndNode; + return; + } + + for (pwndSibling = pwndParent->spwndChild; pwndSibling; pwndSibling = pwndSibling->spwndNext) + { + if (pwndNode->head.pti != pwndSibling->head.pti) + continue; + + if (IS_WND_MENU(pwndSibling) || IS_WND_IMELIKE(pwndSibling)) + continue; + + if (pwndSibling->state2 & WNDS2_INDESTROY) + continue; + + if (pwndNode == pwndSibling || (pwndSibling->style & WS_CHILD)) + continue; + + if (pwndSibling->spwndOwner == NULL || + pwndSibling->head.pti != pwndSibling->spwndOwner->head.pti) + { + pwndNode = pwndSibling; + break; + } + } + + pImeWnd->spwndOwner = pwndNode; +} + +// Get the last non-IME-like top-most window on the desktop. +// Win: GetLastTopMostWindowNoIME +PWND FASTCALL IntGetLastTopMostWindowNoIME(PWND pImeWnd) +{ + PWND pwndNode, pwndOwner, pwndLastTopMost = NULL; + BOOL bFound; + + pwndNode = UserGetDesktopWindow(); + if (!pwndNode || pwndNode->spwndChild == NULL) + return NULL; + + for (pwndNode = pwndNode->spwndChild; + pwndNode && (pwndNode->ExStyle & WS_EX_TOPMOST); + pwndNode = pwndNode->spwndNext) + { + bFound = FALSE; + + if (IS_WND_IMELIKE(pwndNode)) // An IME-like window + { + // Search the IME window from owners + for (pwndOwner = pwndNode; pwndOwner; pwndOwner = pwndOwner->spwndOwner) + { + if (pImeWnd == pwndOwner) + { + bFound = TRUE; + break; + } + } + } + + if (!bFound) + pwndLastTopMost = pwndNode; + } + + return pwndLastTopMost; +} + +// Adjust the ordering of the windows around the IME window. +// Win: ImeSetTopMost +VOID FASTCALL IntImeSetTopMost(PWND pImeWnd, BOOL bTopMost, PWND pwndInsertBefore) +{ + PWND pwndParent, pwndChild, pwndNode, pwndNext, pwndInsertAfter = NULL; + PWND pwndInsertAfterSave; + + pwndParent = pImeWnd->spwndParent; + if (!pwndParent) + return; + + pwndChild = pwndParent->spwndChild; + + if (!bTopMost) + { + // Calculate pwndInsertAfter + pwndInsertAfter = IntGetLastTopMostWindowNoIME(pImeWnd); + if (pwndInsertBefore) + { + for (pwndNode = pwndInsertAfter; pwndNode; pwndNode = pwndNode->spwndNext) + { + if (pwndNode->spwndNext == pwndInsertBefore) + break; + + if (pwndNode == pImeWnd) + return; + } + + if (!pwndNode) + return; + + pwndInsertAfter = pwndNode; + } + + // Adjust pwndInsertAfter if the owner is bottom-most + if (pImeWnd->spwndOwner->state2 & WNDS2_BOTTOMMOST) + { + for (pwndNode = pwndInsertAfter; pwndNode; pwndNode = pwndNode->spwndNext) + { + if (pwndNode == pImeWnd->spwndOwner) + break; + + if (!IS_WND_IMELIKE(pwndNode)) + pwndInsertAfter = pwndNode; + } + } + } + + pwndInsertAfterSave = pwndInsertAfter; + + while (pwndChild) + { + pwndNext = pwndChild->spwndNext; + + // If pwndChild is a good IME-like window, ... + if (IS_WND_IMELIKE(pwndChild) && pwndChild != pwndInsertAfter && + pwndChild->head.pti == pImeWnd->head.pti) + { + // Find pImeWnd from the owners + for (pwndNode = pwndChild; pwndNode; pwndNode = pwndNode->spwndOwner) + { + if (pwndNode != pImeWnd) + continue; + + // Adjust the ordering and the linking + IntUnlinkWindow(pwndChild); + + if (bTopMost) + pwndChild->ExStyle |= WS_EX_TOPMOST; + else + pwndChild->ExStyle &= ~WS_EX_TOPMOST; + + if (!pwndInsertAfter) + IntLinkHwnd(pwndChild, HWND_TOP); + else + IntLinkHwnd(pwndChild, UserHMGetHandle(pwndInsertAfter)); + + // Update the preferred position + pwndInsertAfter = pwndChild; + break; + } + } + + // Get the next child, with ignoring pwndInsertAfterSave + pwndChild = pwndNext; + if (pwndChild && pwndChild == pwndInsertAfterSave && pwndInsertAfter) + pwndChild = pwndInsertAfter->spwndNext; + } +} + +// Make the IME window top-most if necessary. +// Win: ImeCheckTopmost +VOID FASTCALL IntImeCheckTopmost(PWND pImeWnd) +{ + BOOL bTopMost; + PWND pwndOwner = pImeWnd->spwndOwner, pwndInsertBefore = NULL; + + if (!pwndOwner) + return; + + if (pImeWnd->head.pti != gptiForeground) + pwndInsertBefore = pwndOwner; + + bTopMost = !!(pwndOwner->ExStyle & WS_EX_TOPMOST); + IntImeSetTopMost(pImeWnd, bTopMost, pwndInsertBefore); +} + BOOL NTAPI NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { BOOL ret = FALSE; - PWND pImeWnd, pwndFocus, pwndTopLevel, pwnd, pwndActive; + PWND pImeWnd, pwndFocus, pwndTopLevel, pwndNode, pwndActive; PTHREADINFO ptiIme; UserEnterExclusive(); @@ -1169,9 +1375,9 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) pwndTopLevel = IntGetTopLevelWindow(pwndFocus); - for (pwnd = pwndTopLevel; pwnd; pwnd = pwnd->spwndOwner) + for (pwndNode = pwndTopLevel; pwndNode; pwndNode = pwndNode->spwndOwner) { - if (pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME]) + if (pwndNode->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME]) { pwndTopLevel = NULL; break; @@ -1179,7 +1385,7 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) } pImeWnd->spwndOwner = pwndTopLevel; - // TODO: + IntImeCheckTopmost(pImeWnd); } else { @@ -1194,10 +1400,10 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) } else { - // TODO: + IntImeSetFutureOwner(pImeWnd, pImeWnd->spwndOwner); } - // TODO: + IntImeCheckTopmost(pImeWnd); } }

2 years, 8 months

[reactos] 01/01: [NTOS:SE] Add token debug code

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11d9c88c35951d4e9f4b1… commit 11d9c88c35951d4e9f4b1dee76a4917e46e27c0e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Apr 18 10:39:33 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Apr 19 11:04:59 2022 +0200 [NTOS:SE] Add token debug code Implement initial token debug code. For now debug information that is being tracked are: process image file name, process and thread client IDs and token creation method. More specific debug code can be added later only if needed. As for the token creation method, this follows the same principle as on Windows where the creation method is defined by a value denoting the first letter of the said method of creation. That is, 0xC is for token creation, 0xD is for token duplication and 0xF is for token filtering. The debug field names are taken from Windows PDB symbols for WinDBG debug extension support purposes. The names must not be changed! --- ntoskrnl/include/internal/se.h | 4 ++++ ntoskrnl/se/token.c | 48 ++++++++++++++++++++++++++++++++++++++++++ sdk/include/ndk/setypes.h | 16 +++++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 46cf4380488..90c318878a9 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -34,6 +34,10 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION } Policies[1]; } TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION; +#define TOKEN_CREATE_METHOD 0xCUL +#define TOKEN_DUPLICATE_METHOD 0xDUL +#define TOKEN_FILTER_METHOD 0xFUL + FORCEINLINE PSID SepGetGroupFromDescriptor( diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index c0f3e08585a..1415e36009d 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1086,6 +1086,17 @@ SepDuplicateToken( goto Quit; } + /* Fill in token debug information */ +#if DBG + RtlCopyMemory(AccessToken->ImageFileName, + PsGetCurrentProcess()->ImageFileName, + min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); + + AccessToken->ProcessCid = PsGetCurrentProcessId(); + AccessToken->ThreadCid = PsGetCurrentThreadId(); + AccessToken->CreateMethod = TOKEN_DUPLICATE_METHOD; +#endif + /* Assign the data that reside in the TOKEN's variable information area */ AccessToken->VariableLength = VariableLength; EndMem = (PVOID)&AccessToken->VariablePart; @@ -1844,6 +1855,32 @@ SepCreateToken( goto Quit; } + /* Fill in token debug information */ +#if DBG + /* + * We must determine ourselves that the current + * process is not the initial CPU one. The initial + * process is not a "real" process, that is, the + * Process Manager has not yet been initialized and + * as a matter of fact we are creating a token before + * any process gets created by Ps. If it turns out + * that the current process is the initial CPU process + * where token creation execution takes place, don't + * do anything. + */ + if (PsGetCurrentProcess() != &KiInitialProcess) + { + RtlCopyMemory(AccessToken->ImageFileName, + PsGetCurrentProcess()->ImageFileName, + min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); + + AccessToken->ProcessCid = PsGetCurrentProcessId(); + AccessToken->ThreadCid = PsGetCurrentThreadId(); + } + + AccessToken->CreateMethod = TOKEN_CREATE_METHOD; +#endif + /* Assign the data that reside in the TOKEN's variable information area */ AccessToken->VariableLength = VariableLength; EndMem = (PVOID)&AccessToken->VariablePart; @@ -2181,6 +2218,17 @@ SepPerformTokenFiltering( goto Quit; } + /* Fill in token debug information */ +#if DBG + RtlCopyMemory(AccessToken->ImageFileName, + PsGetCurrentProcess()->ImageFileName, + min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); + + AccessToken->ProcessCid = PsGetCurrentProcessId(); + AccessToken->ThreadCid = PsGetCurrentThreadId(); + AccessToken->CreateMethod = TOKEN_FILTER_METHOD; +#endif + /* Assign the data that reside in the token's variable information area */ AccessToken->VariableLength = VariableLength; EndMem = (PVOID)&AccessToken->VariablePart; diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index b76b0a144ff..1f54e097318 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -204,6 +204,14 @@ typedef struct _SECURITY_TOKEN_PROXY_DATA // // Token and auxiliary data // +// ===================!!!IMPORTANT NOTE!!!===================== +// ImageFileName, ProcessCid, ThreadCid and CreateMethod field +// names are taken from Windows Server 2003 SP2 checked build +// WinDBG debug extensions command purposes (such as !logonsession +// command respectively). As such names are hardcoded, we have +// to be compatible with them. THESE FIELD NAMES MUST NOT BE +// CHANGED!!! +// ============================================================ typedef struct _TOKEN { TOKEN_SOURCE TokenSource; /* 0x00 */ @@ -236,7 +244,13 @@ typedef struct _TOKEN PSECURITY_TOKEN_AUDIT_DATA AuditData; /* 0x94 */ PSEP_LOGON_SESSION_REFERENCES LogonSession; /* 0x98 */ LUID OriginatingLogonSession; /* 0x9C */ - ULONG VariablePart; /* 0xA4 */ +#if DBG + UCHAR ImageFileName[16]; /* 0xA4 */ + HANDLE ProcessCid; /* 0xB4 */ + HANDLE ThreadCid; /* 0xB8 */ + ULONG CreateMethod; /* 0xBC */ +#endif + ULONG VariablePart; /* 0xC0 */ } TOKEN, *PTOKEN; typedef struct _AUX_ACCESS_DATA

2 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2022