Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USER32] Implement ImeWnd_OnImeSetContext (#4329)
by Katayama Hirofumi MZ 02 Feb '22

02 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c6dcdcf81867b701ef88… commit 8c6dcdcf81867b701ef8882565893ba8fa86d078 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 2 11:58:31 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 2 11:58:31 2022 +0900 [USER32] Implement ImeWnd_OnImeSetContext (#4329) - Modify NtUserSetImeOwnerWindow prototype. - Add User32GetTopLevelWindow function. - Add ImeWnd_OnImeSetContext function. - Implement WM_IME_SETCONTEXT message handling of the IME window. CORE-11700 --- sdk/include/ddk/immdev.h | 6 ++ sdk/include/psdk/imm.h | 3 - win32ss/include/ntuser.h | 4 +- win32ss/user/ntuser/ime.c | 4 +- win32ss/user/ntuser/simplecall.c | 4 + win32ss/user/user32/misc/imm.c | 171 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 181 insertions(+), 11 deletions(-) diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 8addb828bb9..61641ba1633 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -24,6 +24,12 @@ extern "C" { #define IMC_GETSOFTKBDPOS 0x0013 #define IMC_SETSOFTKBDPOS 0x0014 +#define IMMGWL_IMC 0 +#define IMMGWL_PRIVATE (sizeof(LONG)) + +#define IMMGWLP_IMC 0 +#define IMMGWLP_PRIVATE (sizeof(LONG_PTR)) + typedef struct _tagINPUTCONTEXT { HWND hWnd; BOOL fOpen; diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index ebd3bb4cb47..83908c9c191 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -209,9 +209,6 @@ typedef struct tagCANDIDATEINFO { DWORD dwPrivateOffset; } CANDIDATEINFO, *LPCANDIDATEINFO; -#define IMMGWL_IMC 0 -#define IMMGWL_PRIVATE (sizeof(LONG)) - /* IME Property bits */ #define IME_PROP_END_UNLOAD 0x0001 #define IME_PROP_KBD_CHAR_FIRST 0x0002 diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 705f5aa08a9..6f897a24736 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3198,9 +3198,9 @@ NTAPI NtUserSetImeInfoEx( PIMEINFOEX pImeInfoEx); -DWORD +BOOL NTAPI -NtUserSetImeOwnerWindow(PIMEINFOEX pImeInfoEx, BOOL fFlag); +NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus); DWORD NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index c492f07507d..5d01bf1397f 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -469,8 +469,8 @@ Quit: return ret; } -DWORD APIENTRY -NtUserSetImeOwnerWindow(PIMEINFOEX pImeInfoEx, BOOL fFlag) +BOOL APIENTRY +NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { STUB return 0; diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 42feafd0f44..ed7583b0bac 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -660,6 +660,10 @@ NtUserCallHwndLock( co_IntUpdateWindows(Window, RDW_ALLCHILDREN, FALSE); Ret = TRUE; break; + + case HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD: + // TODO: + break; } UserDerefObjectCo(Window); diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 7d84a2bb0f4..ee3f109419d 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -23,6 +23,19 @@ HINSTANCE ghImm32 = NULL; BOOL bImmInitializing = FALSE; +INT gnImmUnknownFlag1 = -1; + +PWND FASTCALL User32GetTopLevelWindow(PWND pwnd) +{ + if (!pwnd) + return NULL; + + while (pwnd->style & WS_CHILD) + pwnd = pwnd->spwndParent; + + return pwnd; +} + /* define stub functions */ #undef DEFINE_IMM_ENTRY #define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ @@ -654,6 +667,157 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) return ret; } +LRESULT ImeWnd_OnImeSetContext(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + HIMC hIMC; + LPINPUTCONTEXTDX pIC; + HWND hwndFocus, hwndOldImc, hwndNewImc, hImeWnd, hwndActive; + PWND pwndFocus, pwndOldImc, pwndNewImc, pImeWnd, pwndOwner; + COMPOSITIONFORM CompForm; + + pimeui->fActivate = !!wParam; + hwndOldImc = pimeui->hwndIMC; + + if (wParam) + { + if (!pimeui->hwndUI) + pimeui->hwndUI = User32CreateImeUIWindow(pimeui, pimeui->hKL); + + if (gnImmUnknownFlag1 == -1) + { + gnImmUnknownFlag1 = (INT)NtUserGetThreadState(THREADSTATE_UNKNOWN17); + if (gnImmUnknownFlag1) + pimeui->fCtrlShowStatus = FALSE; + } + + if (gnImmUnknownFlag1) + { + pwndOwner = pimeui->spwnd->spwndOwner; + if (pwndOwner) + { + User32UpdateImcOfImeUI(pimeui, pwndOwner->hImc); + + if (pimeui->hwndUI) + SetWindowLongPtrW(pimeui->hwndUI, IMMGWLP_IMC, (LONG_PTR)pwndOwner->hImc); + } + + return User32SendImeUIMessage(pimeui, WM_IME_SETCONTEXT, wParam, lParam, TRUE); + } + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + hwndFocus = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_FOCUS); + + hIMC = IMM_FN(ImmGetContext)(hwndFocus); + + if (hIMC && !User32CanSetImeWindowToImc(hIMC, hImeWnd)) + { + User32UpdateImcOfImeUI(pimeui, NULL); + return 0; + } + + User32UpdateImcOfImeUI(pimeui, hIMC); + + if (pimeui->hwndUI) + SetWindowLongPtrW(pimeui->hwndUI, IMMGWLP_IMC, (LONG_PTR)hIMC); + + if (hIMC) + { + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (!pIC) + return 0; + + if (hwndFocus != pIC->hWnd) + { + IMM_FN(ImmUnlockIMC)(hIMC); + return 0; + } + + if ((pIC->dwUIFlags & 0x40000) && hwndOldImc != hwndFocus) + { + RtlZeroMemory(&CompForm, sizeof(CompForm)); + IMM_FN(ImmSetCompositionWindow)(hIMC, &CompForm); + + pIC->dwUIFlags &= ~0x40000; + } + + IMM_FN(ImmUnlockIMC)(hIMC); + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + if (NtUserSetImeOwnerWindow(hImeWnd, hwndFocus)) + pimeui->hwndIMC = hwndFocus; + } + else + { + pimeui->hwndIMC = hwndFocus; + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + NtUserSetImeOwnerWindow(hImeWnd, NULL); + } + } + + ret = User32SendImeUIMessage(pimeui, WM_IME_SETCONTEXT, wParam, lParam, TRUE); + + if (!pimeui->spwnd) + return 0; + + if (!pimeui->fCtrlShowStatus || !User32GetImeShowStatus()) + return ret; + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + hwndFocus = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_FOCUS); + pwndFocus = ValidateHwnd(hwndFocus); + + if (wParam) + { + if (pwndFocus && pimeui->spwnd->head.pti == pwndFocus->head.pti) + { + hwndNewImc = pimeui->hwndIMC; + if (pimeui->fShowStatus) + { + pwndNewImc = ValidateHwnd(hwndNewImc); + pwndOldImc = ValidateHwnd(hwndOldImc); + if (pwndNewImc && pwndOldImc && pwndNewImc != pwndOldImc && + User32GetTopLevelWindow(pwndNewImc) != User32GetTopLevelWindow(pwndOldImc)) + { + User32NotifyOpenStatus(pimeui, hwndOldImc, FALSE); + User32NotifyOpenStatus(pimeui, hwndNewImc, TRUE); + } + } + else + { + if (ValidateHwnd(hwndNewImc)) + User32NotifyOpenStatus(pimeui, hwndNewImc, TRUE); + } + } + + pImeWnd = pimeui->spwnd; + hImeWnd = (pImeWnd ? UserHMGetHandle(pImeWnd) : NULL); + if (hImeWnd) + NtUserCallHwndLock(hImeWnd, HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD); + } + else + { + pImeWnd = pimeui->spwnd; + hImeWnd = UserHMGetHandle(pImeWnd); + hwndActive = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_ACTIVE); + if (!pwndFocus || !hwndActive || pImeWnd->head.pti != pwndFocus->head.pti) + { + if (IsWindow(hwndOldImc)) + { + User32NotifyOpenStatus(pimeui, hwndOldImc, FALSE); + } + else + { + pimeui->fShowStatus = FALSE; + User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, IMN_CLOSESTATUSWINDOW, 0, TRUE); + } + } + } + + return ret; +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -673,7 +837,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa NtUserSetWindowFNID(hwnd, FNID_IME); pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); pimeui->spwnd = pWnd; - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); + SetWindowLongPtrW(hwnd, IMMGWLP_IMC, (LONG_PTR)pimeui); } else { @@ -740,7 +904,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCDESTROY: HeapFree(GetProcessHeap(), 0, pimeui); - SetWindowLongPtrW(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, IMMGWLP_IMC, 0); NtUserSetWindowFNID(hwnd, FNID_DESTROY); break; @@ -773,8 +937,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_IME_SETCONTEXT: - // TODO: - break; + return ImeWnd_OnImeSetContext(pimeui, wParam, lParam); case WM_IME_SYSTEM: return ImeWnd_OnImeSystem(pimeui, wParam, lParam);

1 0

[reactos] 01/01: [NTUSER] Move IMM-related code to ime.c (#4322)
by Katayama Hirofumi MZ 02 Feb '22

02 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=470aa2761033294f8f432… commit 470aa2761033294f8f43261ee98324be705f607c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 2 11:56:40 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 2 11:56:40 2022 +0900 [NTUSER] Move IMM-related code to ime.c (#4322) Move the IMM-related code from ntstubs.c into ime.c. CORE-11700 --- win32ss/user/ntuser/ime.c | 203 +++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/ntstubs.c | 206 ------------------------------------------ 2 files changed, 203 insertions(+), 206 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 18806d68a8d..c492f07507d 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -12,6 +12,34 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +DWORD +APIENTRY +NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) +{ + PTHREADINFO pti; + PKL pOldKL, pNewKL; + + UserEnterExclusive(); + + pti = GetW32ThreadInfo(); + pOldKL = pti->KeyboardLayout; + if (pOldKL && pOldKL->hkl != hOldKL) + goto Quit; + + pNewKL = UserHklToKbl(hNewKL); + if (!pNewKL) + goto Quit; + + if (IS_IME_HKL(hNewKL) != IS_IME_HKL(hOldKL)) + pti->hklPrev = hOldKL; + + pti->KeyboardLayout = pNewKL; + +Quit: + UserLeave(); + return 0; +} + DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) { PIMC pIMC; @@ -534,4 +562,179 @@ BOOL APIENTRY NtUserDestroyInputContext(HIMC hIMC) return ret; } +PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) +{ + PIMC pIMC; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + PDESKTOP pdesk = pti->rpdesk; + + if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? + return NULL; + + if (!pdesk) // No desktop? + return NULL; + + // pti->spDefaultImc should be already set if non-first time. + if (dwClientImcData && !pti->spDefaultImc) + return NULL; + + // Create an input context user object. + pIMC = UserCreateObject(gHandleTable, pdesk, pti, NULL, TYPE_INPUTCONTEXT, sizeof(IMC)); + if (!pIMC) + return NULL; + + // Release the extra reference (UserCreateObject added 2 references). + UserDereferenceObject(pIMC); + + if (dwClientImcData) // Non-first time. + { + // Insert pIMC to the second position (non-default) of the list. + pIMC->pImcNext = pti->spDefaultImc->pImcNext; + pti->spDefaultImc->pImcNext = pIMC; + } + else // First time. It's the default IMC. + { + // Add the first one (default) to the list. + pti->spDefaultImc = pIMC; + pIMC->pImcNext = NULL; + } + + pIMC->dwClientImcData = dwClientImcData; // Set it. + return pIMC; +} + +HIMC +APIENTRY +NtUserCreateInputContext(ULONG_PTR dwClientImcData) +{ + PIMC pIMC; + HIMC ret = NULL; + + if (!dwClientImcData) + return NULL; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserCreateInputContext(dwClientImcData); + if (pIMC) + ret = UserHMGetHandle(pIMC); + +Quit: + UserLeave(); + return ret; +} + +DWORD +APIENTRY +NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) +{ + STUB + return 0; +} + +BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) +{ + PTHREADINFO pti = GetW32ThreadInfo(); + PTHREADINFO ptiIMC = pIMC->head.pti; + + if (pti->ppi != ptiIMC->ppi) // Different process? + return FALSE; + + switch (dwType) + { + case UIC_CLIENTIMCDATA: + if (pIMC->dwClientImcData) + return FALSE; // Already set + + pIMC->dwClientImcData = dwValue; + break; + + case UIC_IMEWINDOW: + if (!ValidateHwndNoErr((HWND)dwValue)) + return FALSE; // Invalid HWND + + pIMC->hImeWnd = (HWND)dwValue; + break; + + default: + return FALSE; + } + + return TRUE; +} + +BOOL +APIENTRY +NtUserUpdateInputContext( + HIMC hIMC, + DWORD dwType, + DWORD_PTR dwValue) +{ + PIMC pIMC; + BOOL ret = FALSE; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ret = UserUpdateInputContext(pIMC, dwType, dwValue); + +Quit: + UserLeave(); + return ret; +} + +DWORD_PTR +APIENTRY +NtUserQueryInputContext(HIMC hIMC, DWORD dwType) +{ + PIMC pIMC; + PTHREADINFO ptiIMC; + DWORD_PTR ret = 0; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ptiIMC = pIMC->head.pti; + + switch (dwType) + { + case QIC_INPUTPROCESSID: + ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); + break; + + case QIC_INPUTTHREADID: + ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); + break; + + case QIC_DEFAULTWINDOWIME: + if (ptiIMC->spwndDefaultIme) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); + break; + + case QIC_DEFAULTIMC: + if (ptiIMC->spDefaultImc) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); + break; + } + +Quit: + UserLeave(); + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index cdb801dc765..8f1a678be8d 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -9,14 +9,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); -DWORD -APIENTRY -NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) -{ - STUB - return 0; -} - // // Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx // @@ -338,63 +330,6 @@ NtUserSetSysColors( return Ret; } -BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) -{ - PTHREADINFO pti = GetW32ThreadInfo(); - PTHREADINFO ptiIMC = pIMC->head.pti; - - if (pti->ppi != ptiIMC->ppi) // Different process? - return FALSE; - - switch (dwType) - { - case UIC_CLIENTIMCDATA: - if (pIMC->dwClientImcData) - return FALSE; // Already set - - pIMC->dwClientImcData = dwValue; - break; - - case UIC_IMEWINDOW: - if (!ValidateHwndNoErr((HWND)dwValue)) - return FALSE; // Invalid HWND - - pIMC->hImeWnd = (HWND)dwValue; - break; - - default: - return FALSE; - } - - return TRUE; -} - -BOOL -APIENTRY -NtUserUpdateInputContext( - HIMC hIMC, - DWORD dwType, - DWORD_PTR dwValue) -{ - PIMC pIMC; - BOOL ret = FALSE; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (!pIMC) - goto Quit; - - ret = UserUpdateInputContext(pIMC, dwType, dwValue); - -Quit: - UserLeave(); - return ret; -} - DWORD APIENTRY NtUserUpdateInstance( @@ -453,71 +388,6 @@ NtUserYieldTask(VOID) return 0; } -PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) -{ - PIMC pIMC; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesk = pti->rpdesk; - - if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? - return NULL; - - if (!pdesk) // No desktop? - return NULL; - - // pti->spDefaultImc should be already set if non-first time. - if (dwClientImcData && !pti->spDefaultImc) - return NULL; - - // Create an input context user object. - pIMC = UserCreateObject(gHandleTable, pdesk, pti, NULL, TYPE_INPUTCONTEXT, sizeof(IMC)); - if (!pIMC) - return NULL; - - // Release the extra reference (UserCreateObject added 2 references). - UserDereferenceObject(pIMC); - - if (dwClientImcData) // Non-first time. - { - // Insert pIMC to the second position (non-default) of the list. - pIMC->pImcNext = pti->spDefaultImc->pImcNext; - pti->spDefaultImc->pImcNext = pIMC; - } - else // First time. It's the default IMC. - { - // Add the first one (default) to the list. - pti->spDefaultImc = pIMC; - pIMC->pImcNext = NULL; - } - - pIMC->dwClientImcData = dwClientImcData; // Set it. - return pIMC; -} - -HIMC -APIENTRY -NtUserCreateInputContext(ULONG_PTR dwClientImcData) -{ - PIMC pIMC; - HIMC ret = NULL; - - if (!dwClientImcData) - return NULL; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserCreateInputContext(dwClientImcData); - if (pIMC) - ret = UserHMGetHandle(pIMC); - -Quit: - UserLeave(); - return ret; -} - DWORD APIENTRY NtUserGetRawInputBuffer( @@ -741,53 +611,6 @@ Quit: return Status; } -DWORD_PTR -APIENTRY -NtUserQueryInputContext( - HIMC hIMC, - DWORD dwType) -{ - PIMC pIMC; - PTHREADINFO ptiIMC; - DWORD_PTR ret = 0; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (!pIMC) - goto Quit; - - ptiIMC = pIMC->head.pti; - - switch (dwType) - { - case QIC_INPUTPROCESSID: - ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); - break; - - case QIC_INPUTTHREADID: - ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); - break; - - case QIC_DEFAULTWINDOWIME: - if (ptiIMC->spwndDefaultIme) - ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); - break; - - case QIC_DEFAULTIMC: - if (ptiIMC->spDefaultImc) - ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); - break; - } - -Quit: - UserLeave(); - return ret; -} - BOOL APIENTRY NtUserRealInternalGetMessage( @@ -1015,34 +838,6 @@ Quit: return Status; } -DWORD -APIENTRY -NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) -{ - PTHREADINFO pti; - PKL pOldKL, pNewKL; - - UserEnterExclusive(); - - pti = GetW32ThreadInfo(); - pOldKL = pti->KeyboardLayout; - if (pOldKL && pOldKL->hkl != hOldKL) - goto Quit; - - pNewKL = UserHklToKbl(hNewKL); - if (!pNewKL) - goto Quit; - - if (IS_IME_HKL(hNewKL) != IS_IME_HKL(hOldKL)) - pti->hklPrev = hOldKL; - - pti->KeyboardLayout = pNewKL; - -Quit: - UserLeave(); - return 0; -} - BOOL APIENTRY NtUserSoundSentry(VOID) @@ -1174,5 +969,4 @@ NtDxEngGetRedirectionBitmap( return 0; } - /* EOF */

1 0

[reactos] 01/01: [USER32] Add ImeWnd_OnImeSystem (#4327)
by Katayama Hirofumi MZ 31 Jan '22

31 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99614febadf56ad08f5cb… commit 99614febadf56ad08f5cb0f90267aa13d24cee99 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 31 21:20:08 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 31 21:20:08 2022 +0900 [USER32] Add ImeWnd_OnImeSystem (#4327) - Add WM_IME_SYSTEM message handling of the IME window. - Modify immtable.h. CORE-11700 --- win32ss/user/ntuser/simplecall.c | 5 + win32ss/user/user32/include/immtable.h | 1 + win32ss/user/user32/misc/imm.c | 179 ++++++++++++++++++++++++++++++++- 3 files changed, 181 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 76ea0340c7b..42feafd0f44 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -891,6 +891,11 @@ NtUserCallHwndParamLock( switch (Routine) { + case X_ROUTINE_IMESHOWSTATUSCHANGE: + { + // TODO: + break; + } case TWOPARAM_ROUTINE_VALIDATERGN: { PREGION Rgn = REGION_LockRgn((HRGN)Param); diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h index 4e194a02811..5672285ec4b 100644 --- a/win32ss/user/user32/include/immtable.h +++ b/win32ss/user/user32/include/immtable.h @@ -32,6 +32,7 @@ DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC hIMC, BOOL bOpen), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD dwFlags), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCandidateWindow, (HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandForm), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC hIMC, LPCANDIDATEFORM lpCandForm), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC hIMC, LPDWORD lpdwConversion, LPDWORD lpdwSentence), 0, NONVOID) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 2a9f6d523f0..7d84a2bb0f4 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -16,6 +16,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); #define IMM_INIT_MAGIC 0x19650412 +#define MAX_CANDIDATEFORM 4 /* Is != NULL when we have loaded the IMM ourselves */ HINSTANCE ghImm32 = NULL; @@ -491,6 +492,168 @@ ImeWnd_OnImeControl(PIMEUI pimeui, WPARAM wParam, LPARAM lParam, BOOL unicode) return 0; } +static VOID FASTCALL User32SetImeActivenessOfWindow(HWND hWnd, BOOL bActive) +{ + HIMC hIMC; + + if (!hWnd || !IsWindow(hWnd)) + { + IMM_FN(ImmSetActiveContext)(NULL, NULL, bActive); + return; + } + + hIMC = IMM_FN(ImmGetContext)(hWnd); + IMM_FN(ImmSetActiveContext)(hWnd, hIMC, bActive); + IMM_FN(ImmReleaseContext)(hWnd, hIMC); +} + +static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret = 0; + LPINPUTCONTEXTDX pIC; + HIMC hIMC = pimeui->hIMC; + LPCANDIDATEFORM pCandForm; + LPCOMPOSITIONFORM pCompForm; + DWORD dwConversion, dwSentence; + HWND hImeWnd; + BOOL bCompForm; + CANDIDATEFORM CandForm; + COMPOSITIONFORM CompForm; + UINT iCandForm; + + switch (wParam) + { + case 0x05: + if (User32GetImeShowStatus() == !lParam) + { + hImeWnd = UserHMGetHandle(pimeui->spwnd); + NtUserCallHwndParamLock(hImeWnd, lParam, X_ROUTINE_IMESHOWSTATUSCHANGE); + } + break; + + case 0x06: + if (!hIMC) + break; + + bCompForm = TRUE; + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (pIC) + { + bCompForm = !(pIC->dwUIFlags & 0x2); + IMM_FN(ImmUnlockIMC)(hIMC); + } + + if (!IsWindow(pimeui->hwndIMC)) + break; + + if (bCompForm && IMM_FN(ImmGetCompositionWindow)(hIMC, &CompForm)) + { + if (CompForm.dwStyle) + IMM_FN(ImmSetCompositionWindow)(hIMC, &CompForm); + } + + for (iCandForm = 0; iCandForm < MAX_CANDIDATEFORM; ++iCandForm) + { + if (IMM_FN(ImmGetCandidateWindow)(hIMC, iCandForm, &CandForm)) + { + if (CandForm.dwStyle) + IMM_FN(ImmSetCandidateWindow)(hIMC, &CandForm); + } + } + break; + + case 0x09: + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (!pIC) + break; + + pCandForm = &pIC->cfCandForm[lParam]; + IMM_FN(ImmSetCandidateWindow)(hIMC, pCandForm); + IMM_FN(ImmUnlockIMC)(hIMC); + break; + + case 0x0A: + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (!pIC) + break; + + IMM_FN(ImmSetCompositionFontW)(hIMC, &pIC->lfFont.W); + IMM_FN(ImmUnlockIMC)(hIMC); + break; + + case 0x0B: + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (!pIC) + break; + + pCompForm = &pIC->cfCompForm; + pIC->dwUIFlags |= 0x8; + IMM_FN(ImmSetCompositionWindow)(hIMC, pCompForm); + IMM_FN(ImmUnlockIMC)(hIMC); + break; + + case 0x0D: + IMM_FN(ImmConfigureIMEW)((HKL)lParam, pimeui->hwndIMC, IME_CONFIG_GENERAL, NULL); + break; + + case 0x0F: + if (hIMC) + IMM_FN(ImmSetOpenStatus)(hIMC, (BOOL)lParam); + break; + + case 0x11: + ret = IMM_FN(ImmFreeLayout)((DWORD)lParam); + break; + + case 0x13: + // TODO: + break; + + case 0x14: + IMM_FN(ImmGetConversionStatus)(hIMC, &dwConversion, &dwSentence); + ret = dwConversion; + break; + + case 0x15: + // TODO: + break; + + case 0x17: + User32SetImeActivenessOfWindow((HWND)lParam, TRUE); + break; + + case 0x18: + User32SetImeActivenessOfWindow((HWND)lParam, FALSE); + break; + + case 0x19: + ret = IMM_FN(ImmActivateLayout)((HKL)lParam); + break; + + case 0x1C: + ret = IMM_FN(ImmPutImeMenuItemsIntoMappedFile)((HIMC)lParam); + break; + + case 0x1D: + // TODO: + break; + + case 0x1E: + ret = (ULONG_PTR)IMM_FN(ImmGetContext)((HWND)lParam); + break; + + case 0x1F: + case 0x20: + ret = IMM_FN(ImmSystemHandler)(hIMC, wParam, lParam); + break; + + default: + break; + } + + return ret; +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -545,8 +708,17 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return 0; case WM_IME_SYSTEM: - // TODO: - return 0; + switch (wParam) + { + case 0x03: + case 0x10: + case 0x13: + break; + + default: + return 0; + } + break; default: { @@ -605,8 +777,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_IME_SYSTEM: - // TODO: - break; + return ImeWnd_OnImeSystem(pimeui, wParam, lParam); default: {

1 0

[reactos] 01/01: [NTUSER] UserIsDBCSEnabled: Vietnamese doesn't use DBCS
by Katayama Hirofumi MZ 31 Jan '22

31 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173fca6ed663744d6836f… commit 173fca6ed663744d6836f88b03872431ced2ff35 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 31 09:33:19 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 31 09:33:19 2022 +0900 [NTUSER] UserIsDBCSEnabled: Vietnamese doesn't use DBCS CORE-11700 --- win32ss/user/ntuser/metric.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index 9b8d71da2a6..35f840d5d6a 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -21,7 +21,6 @@ BOOL APIENTRY UserIsDBCSEnabled(VOID) case LANG_CHINESE: case LANG_JAPANESE: case LANG_KOREAN: - //case LANG_VIETNAMESE: // Are you using double-byte character strings? return TRUE; default:

1 0

[reactos] 01/01: [USER32] Don't delay-load-link to imm32.dll (#4328)
by Katayama Hirofumi MZ 31 Jan '22

31 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbab1914a6fb6f2865cb8… commit fbab1914a6fb6f2865cb80d892dd3f36836b136f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 31 09:30:47 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 31 09:30:47 2022 +0900 [USER32] Don't delay-load-link to imm32.dll (#4328) Reduce binary size. - Don't directly call the IMM32 functions. Use IMM_FN instead. - Modify CMakeLists.txt to unlink imm32.dll. CORE-11700 --- win32ss/user/user32/CMakeLists.txt | 2 +- win32ss/user/user32/controls/edit.c | 5 +++++ win32ss/user/user32/windows/defwnd.c | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index 4cf9620a5c8..c181932f8ee 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -87,7 +87,7 @@ if(MSVC AND (ARCH STREQUAL "i386")) target_sources(user32 PRIVATE $<TARGET_OBJECTS:ftol2_sse>) endif() -add_delay_importlibs(user32 imm32 usp10) +add_delay_importlibs(user32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h SOURCE) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index f01558a9d06..9fc7d3f0f0d 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -45,6 +45,11 @@ #include <user32.h> #define WIN32_LEAN_AND_MEAN #include <usp10.h> +#ifdef __REACTOS__ +#define ImmGetContext IMM_FN(ImmGetContext) +#define ImmGetCompositionStringW IMM_FN(ImmGetCompositionStringW) +#define ImmReleaseContext IMM_FN(ImmReleaseContext) +#endif WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DECLARE_DEBUG_CHANNEL(combo); diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index b7a624061e3..c6e97e5f704 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -951,16 +951,16 @@ RealDefWindowProcA(HWND hWnd, LONG size, i; unsigned char lead = 0; char *buf = NULL; - HIMC himc = ImmGetContext( hWnd ); + HIMC himc = IMM_FN(ImmGetContext)( hWnd ); if (himc) { - if ((size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, NULL, 0 ))) + if ((size = IMM_FN(ImmGetCompositionStringA)( himc, GCS_RESULTSTR, NULL, 0 ))) { if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0; - else size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, buf, size ); + else size = IMM_FN(ImmGetCompositionStringA)( himc, GCS_RESULTSTR, buf, size ); } - ImmReleaseContext( hWnd, himc ); + IMM_FN(ImmReleaseContext)( hWnd, himc ); for (i = 0; i < size; i++) { @@ -990,7 +990,7 @@ RealDefWindowProcA(HWND hWnd, { HWND hwndIME; - hwndIME = ImmGetDefaultIMEWnd(hWnd); + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); if (hwndIME) Result = SendMessageA(hwndIME, Msg, wParam, lParam); break; @@ -1000,9 +1000,9 @@ RealDefWindowProcA(HWND hWnd, { HWND hwndIME; - hwndIME = ImmGetDefaultIMEWnd(hWnd); + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); if (hwndIME) - Result = ImmIsUIMessageA(hwndIME, Msg, wParam, lParam); + Result = SendMessageA(hwndIME, Msg, wParam, lParam); break; } @@ -1150,16 +1150,16 @@ RealDefWindowProcW(HWND hWnd, { LONG size, i; WCHAR *buf = NULL; - HIMC himc = ImmGetContext( hWnd ); + HIMC himc = IMM_FN(ImmGetContext)( hWnd ); if (himc) { - if ((size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 ))) + if ((size = IMM_FN(ImmGetCompositionStringW)( himc, GCS_RESULTSTR, NULL, 0 ))) { if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0; - else size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); + else size = IMM_FN(ImmGetCompositionStringW)( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); } - ImmReleaseContext( hWnd, himc ); + IMM_FN(ImmReleaseContext)( hWnd, himc ); for (i = 0; i < size / sizeof(WCHAR); i++) SendMessageW( hWnd, WM_IME_CHAR, buf[i], 1 ); @@ -1175,7 +1175,7 @@ RealDefWindowProcW(HWND hWnd, { HWND hwndIME; - hwndIME = ImmGetDefaultIMEWnd(hWnd); + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); if (hwndIME) Result = SendMessageW(hwndIME, Msg, wParam, lParam); break; @@ -1185,9 +1185,9 @@ RealDefWindowProcW(HWND hWnd, { HWND hwndIME; - hwndIME = ImmGetDefaultIMEWnd(hWnd); + hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd); if (hwndIME) - Result = ImmIsUIMessageW(hwndIME, Msg, wParam, lParam); + Result = SendMessageW(hwndIME, Msg, wParam, lParam); break; }

1 0

[reactos] 01/01: [USER32] Improve RegisterIMEClass function
by Katayama Hirofumi MZ 30 Jan '22

30 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d735373e46cb84fa29335… commit d735373e46cb84fa293359b881b1e22ef5f6bb29 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 31 04:21:45 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 31 04:21:45 2022 +0900 [USER32] Improve RegisterIMEClass function CORE-11700 --- win32ss/user/user32/misc/imm.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index ae711d1b70d..2a9f6d523f0 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -653,37 +653,29 @@ UpdatePerUserImmEnabling(VOID) return Ret; } -static const WCHAR imeW[] = {'I','M','E',0}; - BOOL WINAPI RegisterIMEClass(VOID) { - WNDCLASSEXW WndClass; ATOM atom; + WNDCLASSEXW WndClass = { sizeof(WndClass) }; + + WndClass.lpszClassName = L"IME"; + WndClass.style = CS_GLOBALCLASS; + WndClass.lpfnWndProc = ImeWndProcW; + WndClass.cbWndExtra = sizeof(LONG_PTR); + WndClass.hCursor = LoadCursorW(NULL, IDC_ARROW); - ZeroMemory(&WndClass, sizeof(WndClass)); - - WndClass.cbSize = sizeof(WndClass); - WndClass.lpszClassName = imeW; - WndClass.style = CS_GLOBALCLASS; - WndClass.lpfnWndProc = ImeWndProcW; - WndClass.cbWndExtra = sizeof(LONG_PTR); - WndClass.hCursor = LoadCursorW(NULL, IDC_ARROW); - - atom = RegisterClassExWOWW( &WndClass, - 0, - FNID_IME, - 0, - FALSE); - if (atom) + atom = RegisterClassExWOWW(&WndClass, 0, FNID_IME, 0, FALSE); + if (!atom) { - RegisterDefaultClasses |= ICLASS_TO_MASK(ICLS_IME); - TRACE("Register IME Class!\n"); - return TRUE; + ERR("Failed to register IME Class!\n"); + return FALSE; } - ERR("Failed to register IME Class!\n"); - return FALSE; + + RegisterDefaultClasses |= ICLASS_TO_MASK(ICLS_IME); + TRACE("RegisterIMEClass atom = %u\n", atom); + return TRUE; } /*

1 0

[reactos] 01/01: [TAPIUI] Fix es-ES.rc MSVC warning RC4206 : title string too long; truncated at 256 CORE-18034
by Joachim Henze 30 Jan '22

30 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cacb2db2f369191345e60… commit cacb2db2f369191345e602c546a3a869a9a3bcf7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 30 17:20:57 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 30 17:20:57 2022 +0100 [TAPIUI] Fix es-ES.rc MSVC warning RC4206 : title string too long; truncated at 256 CORE-18034 An addendum to 0.4.15-dev-257-g 546862babcd441cc7c1ce4dd5d77e4385be59e74 which was (#2667) Thanks for the shortened translation, provided by Vic Marcal and julenuri. --- dll/win32/tapiui/lang/es-ES.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/tapiui/lang/es-ES.rc b/dll/win32/tapiui/lang/es-ES.rc index 276583b38f8..1c47f5acf9e 100644 --- a/dll/win32/tapiui/lang/es-ES.rc +++ b/dll/win32/tapiui/lang/es-ES.rc @@ -155,7 +155,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Acceder a números de llamada l&ocales:", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL - LTEXT "Utiliza los botones a continuación para introducir los pasos de marcado para las llamadas internacionales. Introduce esos pasos en el orden exacto como aparecen en tu tarjeta telefónica. Para hacer llamadas locales sin usar una tarjeta telefónica, déjalo en blanco.", 2000, 7, 40, 238, 24 + LTEXT "Usa los botones a continuación para introducir los pasos de marcado para las llamadas internacionales. Introdúcelos en el orden exacto como aparecen en tu tarjeta telefónica. Para hacer llamadas locales sin tarjeta telefónica déjalo vacío.", 2000, 7, 40, 238, 24 LTEXT "Pasos de marcado de la tarjeta t&elefónica:", -1, 7, 72, 238, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE PUSHBUTTON "Mover &Arriba", 1022, 195, 83, 50, 14

1 0

[reactos] 01/01: [MSPAINT] Improve Undo/Redo and finishing tool (#4324)
by Katayama Hirofumi MZ 30 Jan '22

30 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0839711566bf13a111bba… commit 0839711566bf13a111bba72f8bc88fa1392c3cd0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 30 12:05:23 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 30 12:05:23 2022 +0900 [MSPAINT] Improve Undo/Redo and finishing tool (#4324) - Fix Undo/Redo mechanism. - Finish drawing when the tool is to be chanaged and when the file is to be saved. - Add ToolBase::OnFinishDraw to virtualize finishing drawing. - Extend bClearRedo parameter to ImageModel::Undo. - Add ImageModel::DrawSelectionBackground and ImageModel::DeleteSelection methods. - Fix some WM_PAINT message handling. CORE-17969 --- base/applications/mspaint/history.cpp | 32 +++- base/applications/mspaint/history.h | 5 +- base/applications/mspaint/imgarea.cpp | 9 +- base/applications/mspaint/imgarea.h | 7 +- base/applications/mspaint/mouse.cpp | 219 +++++++++++++++++++-------- base/applications/mspaint/palette.cpp | 6 +- base/applications/mspaint/selection.cpp | 67 ++++---- base/applications/mspaint/selection.h | 13 ++ base/applications/mspaint/selectionmodel.cpp | 5 - base/applications/mspaint/selectionmodel.h | 1 - base/applications/mspaint/toolsettings.cpp | 7 +- base/applications/mspaint/toolsmodel.cpp | 31 ++-- base/applications/mspaint/toolsmodel.h | 2 + base/applications/mspaint/winproc.cpp | 56 +++++-- 14 files changed, 311 insertions(+), 149 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 7aa36fab4dc..bc0749148fa 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -57,7 +57,7 @@ void ImageModel::CopyPrevious() imageSaved = FALSE; } -void ImageModel::Undo() +void ImageModel::Undo(BOOL bClearRedo) { ATLTRACE("%s: %d\n", __FUNCTION__, undoSteps); if (undoSteps > 0) @@ -68,7 +68,9 @@ void ImageModel::Undo() currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); undoSteps--; - if (redoSteps < HISTORYSIZE - 1) + if (bClearRedo) + redoSteps = 0; + else if (redoSteps < HISTORYSIZE - 1) redoSteps++; if (GetWidth() != oldWidth || GetHeight() != oldHeight) NotifyDimensionsChanged(); @@ -251,3 +253,29 @@ void ImageModel::RotateNTimes90Degrees(int iN) } NotifyImageChanged(); } + +void ImageModel::DrawSelectionBackground(COLORREF rgbBG) +{ + if (toolsModel.GetActiveTool() == TOOL_FREESEL) + selectionModel.DrawBackgroundPoly(hDrawingDC, rgbBG); + else + selectionModel.DrawBackgroundRect(hDrawingDC, rgbBG); +} + +void ImageModel::DeleteSelection() +{ + if (selectionWindow.IsWindowVisible()) + ResetToPrevious(); + CopyPrevious(); + if (selectionWindow.IsWindowVisible()) + Undo(TRUE); + DrawSelectionBackground(paletteModel.GetBgColor()); + selectionWindow.ShowWindow(SW_HIDE); + NotifyImageChanged(); +} + +void ImageModel::Bound(POINT& pt) +{ + pt.x = max(0, min(pt.x, GetWidth())); + pt.y = max(0, min(pt.y, GetHeight())); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 697b65bf128..17ef43b9e48 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -26,7 +26,7 @@ private: public: ImageModel(); void CopyPrevious(void); - void Undo(void); + void Undo(BOOL bClearRedo = FALSE); void Redo(void); void ResetToPrevious(void); void ClearHistory(void); @@ -45,4 +45,7 @@ public: void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); + void DrawSelectionBackground(COLORREF rgbBG); + void DeleteSelection(); + void Bound(POINT& pt); }; diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 0cb2f8de2ab..c0a5f832251 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -259,7 +259,7 @@ LRESULT CImgAreaWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& } else { - if (drawing || ToolBase::pointSP != 0) + if (drawing || ToolBase::pointSP != 0 || selectionWindow.IsWindowVisible()) cancelDrawing(); } } @@ -411,3 +411,10 @@ LRESULT CImgAreaWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, SetBkMode(hdc, TRANSPARENT); return (LRESULT)GetStockObject(NULL_BRUSH); } + +void CImgAreaWindow::finishDrawing() +{ + toolsModel.OnFinishDraw(); + drawing = FALSE; + Invalidate(FALSE); +} diff --git a/base/applications/mspaint/imgarea.h b/base/applications/mspaint/imgarea.h index a898f1e893b..384b8ac3ff4 100644 --- a/base/applications/mspaint/imgarea.h +++ b/base/applications/mspaint/imgarea.h @@ -17,6 +17,10 @@ public: { } + BOOL drawing; + void cancelDrawing(); + void finishDrawing(); + DECLARE_WND_CLASS_EX(_T("ImgAreaWindow"), CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CImgAreaWindow) @@ -40,8 +44,6 @@ public: MESSAGE_HANDLER(WM_CTLCOLOREDIT, OnCtlColorEdit) END_MSG_MAP() - BOOL drawing; - private: LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -63,5 +65,4 @@ private: LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); - void cancelDrawing(); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index b442d0c9daf..fda0bc64a81 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -76,6 +76,10 @@ void updateLast(LONG x, LONG y) void ToolBase::reset() { pointSP = 0; + start.x = start.y = last.x = last.y = -1; + selectionModel.ResetPtStack(); + if (selectionWindow.IsWindow()) + selectionWindow.ShowWindow(SW_HIDE); } void ToolBase::OnCancelDraw() @@ -83,6 +87,11 @@ void ToolBase::OnCancelDraw() reset(); } +void ToolBase::OnFinishDraw() +{ + reset(); +} + void ToolBase::beginEvent() { m_hdc = imageModel.GetDC(); @@ -100,48 +109,75 @@ void ToolBase::endEvent() // TOOL_FREESEL struct FreeSelTool : ToolBase { - FreeSelTool() : ToolBase(TOOL_FREESEL) + BOOL m_bLeftButton; + + FreeSelTool() : ToolBase(TOOL_FREESEL), m_bLeftButton(FALSE) { } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { - imageModel.CopyPrevious(); - selectionWindow.ShowWindow(SW_HIDE); - selectionModel.ResetPtStack(); - selectionModel.PushToPtStack(x, y); + if (bLeftButton) + { + imageModel.CopyPrevious(); + selectionWindow.ShowWindow(SW_HIDE); + selectionModel.ResetPtStack(); + selectionModel.PushToPtStack(x, y); + } + m_bLeftButton = bLeftButton; } void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { - if (selectionModel.PtStackSize() == 1) - imageModel.CopyPrevious(); - selectionModel.PushToPtStack(max(0, min(x, imageModel.GetWidth())), max(0, min(y, imageModel.GetHeight()))); - imageModel.ResetToPrevious(); - selectionModel.DrawFramePoly(m_hdc); + if (bLeftButton) + { + POINT pt = { x, y }; + imageModel.Bound(pt); + selectionModel.PushToPtStack(pt.x, pt.y); + imageModel.ResetToPrevious(); + selectionModel.DrawFramePoly(m_hdc); + } } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { - selectionModel.CalculateBoundingBoxAndContents(m_hdc); - if (selectionModel.PtStackSize() > 1) + if (bLeftButton) { - selectionModel.DrawBackgroundPoly(m_hdc, m_bg); - imageModel.CopyPrevious(); - - selectionModel.DrawSelection(m_hdc); + imageModel.ResetToPrevious(); + if (selectionModel.PtStackSize() > 2) + { + selectionModel.CalculateBoundingBoxAndContents(m_hdc); + placeSelWin(); + selectionWindow.IsMoved(FALSE); + selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); + } + else + { + imageModel.Undo(TRUE); + selectionWindow.IsMoved(FALSE); + selectionModel.ResetPtStack(); + selectionWindow.ShowWindow(SW_HIDE); + } + } + } - placeSelWin(); - selectionWindow.ShowWindow(SW_SHOW); - ForceRefreshSelectionContents(); + void OnFinishDraw() + { + if (m_bLeftButton) + { + selectionWindow.IsMoved(FALSE); + selectionWindow.ForceRefreshSelectionContents(); } - selectionModel.ResetPtStack(); + m_bLeftButton = FALSE; + ToolBase::OnFinishDraw(); } void OnCancelDraw() { - imageModel.ResetToPrevious(); - selectionModel.ResetPtStack(); + if (m_bLeftButton) + imageModel.Undo(TRUE); + m_bLeftButton = FALSE; + selectionWindow.IsMoved(FALSE); ToolBase::OnCancelDraw(); } }; @@ -149,31 +185,32 @@ struct FreeSelTool : ToolBase // TOOL_RECTSEL struct RectSelTool : ToolBase { - RectSelTool() : ToolBase(TOOL_RECTSEL) + BOOL m_bLeftButton; + + RectSelTool() : ToolBase(TOOL_RECTSEL), m_bLeftButton(FALSE) { } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { - imageModel.CopyPrevious(); if (bLeftButton) { imageModel.CopyPrevious(); selectionWindow.ShowWindow(SW_HIDE); selectionModel.SetSrcRectSizeToZero(); } + m_bLeftButton = bLeftButton; } void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { - POINT temp; if (bLeftButton) { imageModel.ResetToPrevious(); - temp.x = max(0, min(x, imageModel.GetWidth())); - temp.y = max(0, min(y, imageModel.GetHeight())); - selectionModel.SetSrcAndDestRectFromPoints(start, temp); - RectSel(m_hdc, start.x, start.y, temp.x, temp.y); + POINT pt = { x, y }; + imageModel.Bound(pt); + selectionModel.SetSrcAndDestRectFromPoints(start, pt); + RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } } @@ -182,25 +219,35 @@ struct RectSelTool : ToolBase if (bLeftButton) { imageModel.ResetToPrevious(); + if (start.x == x && start.y == y) + imageModel.Undo(TRUE); + selectionModel.CalculateContents(m_hdc); + placeSelWin(); + selectionWindow.IsMoved(FALSE); if (selectionModel.IsSrcRectSizeNonzero()) - { - selectionModel.CalculateContents(m_hdc); - selectionModel.DrawBackgroundRect(m_hdc, m_bg); - imageModel.CopyPrevious(); - - selectionModel.DrawSelection(m_hdc); + selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); + else + selectionWindow.ShowWindow(SW_HIDE); + } + } - placeSelWin(); - selectionWindow.ShowWindow(SW_SHOW); - ForceRefreshSelectionContents(); - } + void OnFinishDraw() + { + if (m_bLeftButton) + { + selectionWindow.IsMoved(FALSE); + selectionWindow.ForceRefreshSelectionContents(); } + m_bLeftButton = FALSE; + ToolBase::OnFinishDraw(); } void OnCancelDraw() { - imageModel.ResetToPrevious(); - selectionModel.ResetPtStack(); + if (m_bLeftButton) + imageModel.Undo(TRUE); + m_bLeftButton = FALSE; + selectionWindow.IsMoved(FALSE); ToolBase::OnCancelDraw(); } }; @@ -232,8 +279,7 @@ struct GenericDrawTool : ToolBase void OnCancelDraw() { OnButtonUp(FALSE, 0, 0); - imageModel.Undo(); - selectionModel.ResetPtStack(); + imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } }; @@ -275,20 +321,29 @@ struct ColorTool : ToolBase { } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void fetchColor(BOOL bLeftButton, LONG x, LONG y) { - COLORREF tempColor; + COLORREF rgbColor; if (0 <= x && x < imageModel.GetWidth() && 0 <= y && y < imageModel.GetHeight()) - tempColor = GetPixel(m_hdc, x, y); + rgbColor = GetPixel(m_hdc, x, y); else - tempColor = RGB(255, 255, 255); // Outside is white + rgbColor = RGB(255, 255, 255); // Outside is white if (bLeftButton) - paletteModel.SetFgColor(tempColor); + paletteModel.SetFgColor(rgbColor); else - paletteModel.SetBgColor(tempColor); + paletteModel.SetBgColor(rgbColor); + } + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + { + fetchColor(bLeftButton, x, y); + } + + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + { + fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); } }; @@ -368,12 +423,11 @@ struct TextTool : ToolBase void UpdatePoint(LONG x, LONG y) { - POINT temp; imageModel.ResetToPrevious(); - temp.x = max(0, min(x, imageModel.GetWidth())); - temp.y = max(0, min(y, imageModel.GetHeight())); - selectionModel.SetSrcAndDestRectFromPoints(start, temp); - RectSel(m_hdc, start.x, start.y, temp.x, temp.y); + POINT pt = { x, y }; + imageModel.Bound(pt); + selectionModel.SetSrcAndDestRectFromPoints(start, pt); + RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) @@ -392,7 +446,7 @@ struct TextTool : ToolBase void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { - imageModel.ResetToPrevious(); + imageModel.Undo(TRUE); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) @@ -405,6 +459,7 @@ struct TextTool : ToolBase textEditWindow.GetEditRect(&rc); INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1); + imageModel.CopyPrevious(); Text(m_hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText, textEditWindow.GetFont(), style); } @@ -451,13 +506,12 @@ struct TextTool : ToolBase } } - void OnCancelDraw() + void OnFinishDraw() { - imageModel.ResetToPrevious(); - selectionModel.ResetPtStack(); - textEditWindow.SetWindowText(NULL); - textEditWindow.ShowWindow(SW_HIDE); - ToolBase::OnCancelDraw(); + toolsModel.OnButtonDown(TRUE, -1, -1, TRUE); + toolsModel.OnButtonUp(TRUE, -1, -1); + selectionWindow.IsMoved(FALSE); + ToolBase::OnFinishDraw(); } }; @@ -481,7 +535,9 @@ struct LineTool : GenericDrawTool // TOOL_BEZIER struct BezierTool : ToolBase { - BezierTool() : ToolBase(TOOL_BEZIER) + BOOL m_bLeftButton; + + BezierTool() : ToolBase(TOOL_BEZIER), m_bLeftButton(FALSE) { } @@ -501,6 +557,7 @@ struct BezierTool : ToolBase Bezier(m_hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], rgb, toolsModel.GetLineWidth()); break; } + m_bLeftButton = bLeftButton; } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) @@ -535,10 +592,20 @@ struct BezierTool : ToolBase void OnCancelDraw() { OnButtonUp(FALSE, 0, 0); - imageModel.Undo(); - selectionModel.ResetPtStack(); + imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } + + void OnFinishDraw() + { + if (pointSP) + { + imageModel.ResetToPrevious(); + --pointSP; + draw(m_bLeftButton); + } + ToolBase::OnFinishDraw(); + } }; // TOOL_RECT @@ -563,7 +630,9 @@ struct RectTool : GenericDrawTool // TOOL_SHAPE struct ShapeTool : ToolBase { - ShapeTool() : ToolBase(TOOL_SHAPE) + BOOL m_bLeftButton; + + ShapeTool() : ToolBase(TOOL_SHAPE), m_bLeftButton(FALSE) { } @@ -576,6 +645,7 @@ struct ShapeTool : ToolBase else Poly(m_hdc, pointStack, pointSP + 1, m_bg, m_fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), bClosed, FALSE); } + m_bLeftButton = bLeftButton; } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) @@ -631,10 +701,25 @@ struct ShapeTool : ToolBase void OnCancelDraw() { - imageModel.ResetToPrevious(); - selectionModel.ResetPtStack(); + imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } + + void OnFinishDraw() + { + if (pointSP) + { + imageModel.ResetToPrevious(); + --pointSP; + draw(m_bLeftButton, -1, -1, TRUE); + pointSP = 0; + } + else + { + imageModel.Undo(TRUE); + } + ToolBase::OnFinishDraw(); + } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index 9667397a5bf..24fe9c96bf5 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -19,9 +19,9 @@ LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b HBRUSH oldBrush; int i, a, b; - DefWindowProc(WM_PAINT, wParam, lParam); + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps); - HDC hDC = GetDC(); for(b = 2; b < 30; b++) for(a = 2; a < 29; a++) if ((a + b) % 2 == 1) @@ -54,7 +54,7 @@ LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b DeleteObject(SelectObject(hDC, oldBrush)); DeleteObject(SelectObject(hDC, oldPen)); } - ReleaseDC(hDC); + EndPaint(&ps); return 0; } diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 74083505bc2..d3e7fe6065a 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -54,14 +54,13 @@ ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, return TRUE; } -void -ForceRefreshSelectionContents() +void CSelectionWindow::ForceRefreshSelectionContents() { if (::IsWindowVisible(selectionWindow)) { - selectionWindow.SendMessage(WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - selectionWindow.SendMessage(WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - selectionWindow.SendMessage(WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + imageModel.ResetToPrevious(); + imageModel.DrawSelectionBackground(m_rgbBack); + selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); } } @@ -90,16 +89,16 @@ int CSelectionWindow::IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeig LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DefWindowProc(WM_PAINT, wParam, lParam); + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps); if (!m_bMoving) { - HDC hDC = GetDC(); SelectionFrame(hDC, 1, 1, Zoomed(selectionModel.GetDestRectWidth()) + (GRIP_SIZE * 2) - 1, Zoomed(selectionModel.GetDestRectHeight()) + (GRIP_SIZE * 2) - 1, GetSysColor(COLOR_HIGHLIGHT)); - ReleaseDC(hDC); } + EndPaint(&ps); return 0; } @@ -145,6 +144,7 @@ LRESULT CSelectionWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, scrlClientWindow.SendMessage(WM_PAINT, 0, 0); imageArea.InvalidateRect(NULL, FALSE); imageArea.SendMessage(WM_PAINT, 0, 0); + m_rgbBack = paletteModel.GetBgColor(); return 0; } @@ -153,6 +153,7 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B if (m_bMoving) { imageModel.ResetToPrevious(); + imageModel.DrawSelectionBackground(m_rgbBack); m_ptFrac.x += GET_X_LPARAM(lParam) - m_ptPos.x; m_ptFrac.y += GET_Y_LPARAM(lParam) - m_ptPos.y; m_ptDelta.x += UnZoomed(m_ptFrac.x); @@ -173,17 +174,10 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B strSize.Format(_T("%ld x %ld"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - if (toolsModel.GetActiveTool() == TOOL_TEXT) - { - selectionModel.DrawTextToolText(imageModel.GetDC(), paletteModel.GetFgColor(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } + if (m_iAction != ACTION_MOVE) + selectionModel.DrawSelectionStretched(imageModel.GetDC()); else - { - if (m_iAction != ACTION_MOVE) - selectionModel.DrawSelectionStretched(imageModel.GetDC()); - else - selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } + selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); imageArea.InvalidateRect(NULL, FALSE); imageArea.SendMessage(WM_PAINT, 0, 0); m_ptPos.x = GET_X_LPARAM(lParam); @@ -203,26 +197,26 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B return 0; } +LRESULT CSelectionWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + m_bMoved = TRUE; + return 0; +} + LRESULT CSelectionWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_bMoving) { m_bMoving = FALSE; ReleaseCapture(); - if (m_iAction != ACTION_MOVE) + if (m_iAction != ACTION_MOVE && toolsModel.GetActiveTool() != TOOL_TEXT) { - if (toolsModel.GetActiveTool() == TOOL_TEXT) - { - // FIXME: What to do? - } - else - { - selectionModel.ScaleContentsToFit(); - } + imageModel.Undo(); + imageModel.DrawSelectionBackground(m_rgbBack); + selectionModel.ScaleContentsToFit(); + imageModel.CopyPrevious(); } placeSelWin(); - ShowWindow(SW_HIDE); - ShowWindow(SW_SHOW); } return 0; } @@ -234,10 +228,10 @@ LRESULT CSelectionWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lPar m_bMoving = FALSE; if (m_iAction == ACTION_MOVE) { - // FIXME: dirty hack - placeSelWin(); - imageModel.Undo(); - imageModel.Undo(); + if (toolsModel.GetActiveTool() == TOOL_RECTSEL) + imageArea.cancelDrawing(); + else + placeSelWin(); } else { @@ -262,23 +256,16 @@ LRESULT CSelectionWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CSelectionWindow::OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (toolsModel.GetActiveTool() == TOOL_TEXT) - ForceRefreshSelectionContents(); return 0; } LRESULT CSelectionWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (toolsModel.GetActiveTool() == TOOL_FREESEL || - toolsModel.GetActiveTool() == TOOL_RECTSEL || - toolsModel.GetActiveTool() == TOOL_TEXT) - ForceRefreshSelectionContents(); return 0; } LRESULT CSelectionWindow::OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - ForceRefreshSelectionContents(); return 0; } diff --git a/base/applications/mspaint/selection.h b/base/applications/mspaint/selection.h index 82ba84a6016..8e61b77d9ef 100644 --- a/base/applications/mspaint/selection.h +++ b/base/applications/mspaint/selection.h @@ -12,6 +12,15 @@ class CSelectionWindow : public CWindowImpl<CSelectionWindow> { public: + CSelectionWindow() : m_bMoved(FALSE) + { + } + + BOOL IsMoved() const { return m_bMoved; } + void IsMoved(BOOL bMoved) { m_bMoved = bMoved; } + + void ForceRefreshSelectionContents(); + DECLARE_WND_CLASS_EX(_T("Selection"), CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CSelectionWindow) @@ -24,6 +33,7 @@ public: MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_MOVE, OnMove) MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) @@ -47,14 +57,17 @@ public: LRESULT OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); private: static const LPCTSTR m_lpszCursorLUT[9]; + BOOL m_bMoved; BOOL m_bMoving; int m_iAction; POINT m_ptPos; POINT m_ptFrac; POINT m_ptDelta; + COLORREF m_rgbBack; int IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight); }; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 50c6ad4a53f..86d34dbd86d 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -337,11 +337,6 @@ LONG SelectionModel::GetDestRectTop() const return m_rcDest.top; } -void SelectionModel::DrawTextToolText(HDC hDCImage, COLORREF crFg, COLORREF crBg, BOOL bBgTransparent) -{ - Text(hDCImage, m_rcDest.left, m_rcDest.top, m_rcDest.right, m_rcDest.bottom, crFg, crBg, textToolText, hfontTextFont, bBgTransparent); -} - void SelectionModel::NotifyRefreshNeeded() { selectionWindow.SendMessage(WM_SELECTIONMODELREFRESHNEEDED); diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 523f22145fb..0243bc08f96 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -66,7 +66,6 @@ public: LONG GetDestRectLeft() const; LONG GetDestRectTop() const; void GetRect(LPRECT prc) const; - void DrawTextToolText(HDC hDCImage, COLORREF crFg, COLORREF crBg, BOOL bBgTransparent = FALSE); private: SelectionModel(const SelectionModel&); diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 0c3d3e0bdf9..19f826ea825 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -33,12 +33,11 @@ LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + PAINTSTRUCT ps; RECT rect1 = { 0, 0, 42, 66 }; RECT rect2 = { 0, 70, 42, 136 }; - DefWindowProc(WM_PAINT, wParam, lParam); - - HDC hdc = GetDC(); + HDC hdc = BeginPaint(&ps); DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (toolsModel.GetActiveTool() == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE); DrawEdge(hdc, &rect2, (toolsModel.GetActiveTool() >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); switch (toolsModel.GetActiveTool()) @@ -181,7 +180,7 @@ LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BO case TOOL_PEN: break; } - ReleaseDC(hdc); + EndPaint(&ps); return 0; } diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 8811cf087ff..e42b04c6230 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -85,6 +85,11 @@ TOOLTYPE ToolsModel::GetOldActiveTool() const void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { + OnFinishDraw(); + + if (m_activeTool == nActiveTool) + return; + switch (m_activeTool) { case TOOL_FREESEL: @@ -92,15 +97,7 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) case TOOL_RUBBER: case TOOL_COLOR: case TOOL_ZOOM: - break; - case TOOL_TEXT: - if (nActiveTool != TOOL_TEXT) - { - // Finish the text - OnButtonDown(TRUE, -1, -1, TRUE); - OnButtonUp(TRUE, -1, -1); - } break; default: @@ -171,15 +168,18 @@ void ToolsModel::NotifyToolChanged() void ToolsModel::NotifyToolSettingsChanged() { - toolSettingsWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); - selectionWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); + if (toolSettingsWindow.IsWindow()) + toolSettingsWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); + if (selectionWindow.IsWindow()) + selectionWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); } void ToolsModel::NotifyZoomChanged() { - toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); + if (toolSettingsWindow.IsWindow()) + toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); if (selectionWindow.IsWindow()) @@ -212,11 +212,20 @@ void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void ToolsModel::OnCancelDraw() { + ATLTRACE("ToolsModel::OnCancelDraw()\n"); m_pToolObject->beginEvent(); m_pToolObject->OnCancelDraw(); m_pToolObject->endEvent(); } +void ToolsModel::OnFinishDraw() +{ + ATLTRACE("ToolsModel::OnFinishDraw()\n"); + m_pToolObject->beginEvent(); + m_pToolObject->OnFinishDraw(); + m_pToolObject->endEvent(); +} + void ToolsModel::resetTool() { m_pToolObject->reset(); diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index f6d4496d985..9d3a053e576 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -60,6 +60,7 @@ struct ToolBase } virtual void OnCancelDraw(); + virtual void OnFinishDraw(); void beginEvent(); void endEvent(); @@ -110,6 +111,7 @@ public: void OnMouseMove(BOOL bLeftButton, LONG x, LONG y); void OnButtonUp(BOOL bLeftButton, LONG x, LONG y); void OnCancelDraw(); + void OnFinishDraw(); void resetTool(); void selectAll(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 9105d85115e..b76a310070b 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -89,6 +89,8 @@ void CMainWindow::alignChildrenToMainWindow() void CMainWindow::saveImage(BOOL overwrite) { + imageArea.finishDrawing(); + if (isAFile && overwrite) { imageModel.SaveImage(filepathname); @@ -156,7 +158,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) placeSelWin(); selectionWindow.ShowWindow(SW_SHOW); - ForceRefreshSelectionContents(); + selectionWindow.ForceRefreshSelectionContents(); } LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -238,6 +240,8 @@ LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH BOOL CMainWindow::ConfirmSave() { + imageArea.finishDrawing(); + if (imageModel.IsImageSaved()) return TRUE; @@ -407,14 +411,7 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } else { - switch (toolsModel.GetActiveTool()) - { - case TOOL_SHAPE: case TOOL_BEZIER: - imageArea.SendMessage(nMsg, wParam, lParam); - break; - default: - break; - } + imageArea.SendMessage(nMsg, wParam, lParam); } } return 0; @@ -430,6 +427,13 @@ LRESULT CMainWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, B LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + // Disable commands while dragging mouse + if (imageArea.drawing && ::GetCapture()) + { + ATLTRACE("locking!\n"); + return 0; + } + switch (LOWORD(wParam)) { case IDM_HELPINFO: @@ -531,12 +535,31 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_EDITUNDO: if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; + if (selectionWindow.IsWindowVisible()) + { + if (toolsModel.GetActiveTool() == TOOL_RECTSEL || + toolsModel.GetActiveTool() == TOOL_FREESEL) + { + imageArea.cancelDrawing(); + break; + } + } + if (ToolBase::pointSP != 0) // drawing something? + { + imageArea.cancelDrawing(); + break; + } imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; + if (ToolBase::pointSP != 0) // drawing something? + { + imageArea.finishDrawing(); + break; + } imageModel.Redo(); imageArea.Invalidate(FALSE); break; @@ -562,8 +585,19 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_EDITDELETESELECTION: { - /* remove selection window and already painted content using undo */ - imageModel.Undo(); + switch (toolsModel.GetActiveTool()) + { + case TOOL_FREESEL: + case TOOL_RECTSEL: + imageModel.DeleteSelection(); + break; + + case TOOL_TEXT: + imageArea.cancelDrawing(); + break; + default: + break; + } break; } case IDM_EDITSELECTALL:

1 0

[reactos] 02/02: [BOOTDATA] "open" actions for 'msstylesfile' and 'themefile' should be REG_EXPAND_SZ since they contain unexpanded environment variables.
by Hermès Bélusca-Maïto 30 Jan '22

30 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5b029d0fc065faccb3c3… commit c5b029d0fc065faccb3c3176f6ba1b407bfe9555 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 30 03:45:34 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 03:51:34 2022 +0100 [BOOTDATA] "open" actions for 'msstylesfile' and 'themefile' should be REG_EXPAND_SZ since they contain unexpanded environment variables. --- boot/bootdata/hivecls.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 103fed49b8c..89a72322516 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -510,14 +510,14 @@ HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154 HKCR,".msstyles","",0x00000000,"msstylesfile" HKCR,"msstylesfile","",0x00000000,%MSSTYLESFILE% HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme /file:""%1""" -HKCR,"msstylesfile\shell\Enable\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:""%1""" +HKCR,"msstylesfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme /file:""%1""" +HKCR,"msstylesfile\shell\Enable\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:""%1""" ; Theme Files HKCR,".theme","",0x00000000,"themefile" HKCR,"themefile","",0x00000000,%THEMEFILE% HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" +HKCR,"themefile\shell\open\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" ; URL shortcuts (e.g. used in Favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut"

1 0

[reactos] 01/02: [BOOTDATA] Add missing quotes around %1 for the 'cplfile' Control_RunDLL command line.
by Hermès Bélusca-Maïto 30 Jan '22

30 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4929d8ddb8098bd60bb02… commit 4929d8ddb8098bd60bb02fdefb6ac4e3cdae7912 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 30 03:16:45 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 03:51:33 2022 +0100 [BOOTDATA] Add missing quotes around %1 for the 'cplfile' Control_RunDLL command line. Suppose you copy a CPL file (e.g. console.dll renamed into console.cpl) into a path containing spaces, for example into the Desktop: C:\Documents and Settings\Administrator\Desktop\console.cpl If the shell registry value for the "open" action of 'cplfile' does not contain quotes around %1, then the Control_RunDLL function will attempt to load "C:\Documents" as a file, which of course does not exist. (NOTE: Missing in ReactOS: Doing a PathFindOnPath() or a PathFileExists() call to verify that the file actually exists, instead of blindly trying to run it and failing later in kernel32!LoadExecuteExW ...) Adding quotes around the %1 fixes this and the correct file is being loaded. This behaviour has been confirmed to exist e.g. on Windows Server 2003 too (and is thus *NOT* a bug in ReactOS/Wine's Control_RunDLL implementation). ---------------------- How to confirm this behaviour, in Win2k3 x86: 1. Start Win2k3 in debug mode under WinDbg. Ensure you have the debug symbols available. 2. Once loaded, break into the debugger, attach context to explorer.exe, and enter the magical :) single WinDbg command (all in one line, with **NO inserted newlines!!**): bp shell32!CPL_RunMeBaby ".echo \"CPL CmdLine:\"; ?? (wchar_t*)*(void**)(@esp+12); bp SHLWAPI!PathIsFileSpecW \".echo \\\"CPL Path:\\\"; ?? (wchar_t*)*(void**)(@esp+4); bc \\\"SHLWAPI!PathIsFileSpecW\\\"; g;\"; g" (Explanation: a breakpoint is placed in the internal shell32!CPL_RunMeBaby function. When the bp is hit, it runs the large WinDbg command inside the quotes. This command echoes an informative line, then dumps the 3rd parameter of the function on the stack that contains the CPL command-line. It then adds a new breakpoint in SHLWAPI!PathIsFileSpecW, which is the function that is being called *just after* the internal parsing of the CPL command-line, and will verify whether the extracted CPL path does exist. That new breakpoint in turn will run a WinDbg command that will: (i) Display the CPL file path (1st-param of that new function), then (ii) Clear that breakpoint. Finally, automatic continuation ensues.) 3. On vanilla Win2k3, whose 'cplfile' "open" action does contain the quotes around %1: rundll32.exe shell32.dll,Control_RunDLL "%1",%* you will observe the following: CPL CmdLine: wchar_t * 0x00094e30 ""C:\Documents and Settings\Administrator\Desktop\console.cpl"," CPL Path: wchar_t * 0x0007f898 "C:\Documents and Settings\Administrator\Desktop\console.cpl" Notice the extra pair of quotes around the CPL filename in the CmdLine. 4. When modifying the 'cplfile' "open" action by *removing* the quotes around %1, you will instead see the following, thereby confirming the behaviour, which is now identical to what used to happen in ROS: CPL CmdLine: wchar_t * 0x00094e30 "C:\Documents and Settings\Administrator\Desktop\console.cpl," CPL Path: wchar_t * 0x0007f898 "C:\Documents" Due to the (now) absence of quotes around %1, the command-line gets wrongly parsed and the extracted file path is incorrect. --- boot/bootdata/hivecls.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index e70e15f837e..103fed49b8c 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -126,8 +126,8 @@ HKCR,"cplfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" HKCR,"cplfile\shell\cplopen","",0x00000000,%CPLFILE_OPENWITH% ;;HKCR,"cplfile\shell\cplopen","MUIVerb",0x00020000,"@%SystemRoot%\system32\shell32.dll,-154" -HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" -HKCR,"cplfile\shell\runas\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLLAsUser %1,%*" +HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,"cplfile\shell\runas\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLLAsUser ""%1"",%*" ; Cursors HKCR,".cur","",0x00000000,"curfile"

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