Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IMM32] Fix ImmSetActiveContext
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=962c4557b58682835b4f9… commit 962c4557b58682835b4f9509e4b10931ff354af5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 13:07:11 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 13:08:49 2022 +0900 [IMM32] Fix ImmSetActiveContext CORE-11700 --- dll/win32/imm32/imm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e85be84762f..2d913677274 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -477,6 +477,7 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) return TRUE; } +/* Win: Internal_CtfImeSetActiveContextAlways */ static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { TRACE("We have to do something\n"); @@ -1129,9 +1130,10 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) PCLIENTIMC pClientImc; LPINPUTCONTEXTDX pIC; PIMEDPI pImeDpi; + HIMC hOldIMC; HKL hKL; BOOL fOpen = FALSE; - DWORD dwConversion = 0, iShow = ISC_SHOWUIALL; + DWORD dwConversion = 0, dwShowFlags = ISC_SHOWUIALL; HWND hwndDefIME; TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive); @@ -1144,7 +1146,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) if (!fActive) { if (pClientImc) - pClientImc->dwFlags &= ~CLIENTIMC_UNKNOWN4; + pClientImc->dwFlags &= ~CLIENTIMC_UNKNOWN5; } else if (hIMC) { @@ -1162,7 +1164,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) pClientImc->dwFlags |= CLIENTIMC_UNKNOWN5; if (pIC->dwUIFlags & 2) - iShow = (ISC_SHOWUIGUIDELINE | ISC_SHOWUIALLCANDIDATEWINDOW); + dwShowFlags = (ISC_SHOWUIGUIDELINE | ISC_SHOWUIALLCANDIDATEWINDOW); fOpen = pIC->fOpen; dwConversion = pIC->fdwConversion; @@ -1171,18 +1173,16 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) } else { - hIMC = ImmGetSaveContext(hWnd, 1); - pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + hOldIMC = ImmGetSaveContext(hWnd, 1); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hOldIMC); if (pIC) { pIC->hWnd = hWnd; - ImmUnlockIMC(hIMC); + ImmUnlockIMC(hOldIMC); } - hIMC = NULL; } hKL = GetKeyboardLayout(0); - if (IS_CICERO_MODE() && !IS_16BIT_MODE()) { Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); @@ -1199,7 +1199,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) if (IsWindow(hWnd)) { - SendMessageW(hWnd, WM_IME_SETCONTEXT, fActive, iShow); + SendMessageW(hWnd, WM_IME_SETCONTEXT, fActive, dwShowFlags); if (fActive) NtUserNotifyIMEStatus(hWnd, fOpen, dwConversion); } @@ -1207,7 +1207,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) { hwndDefIME = ImmGetDefaultIMEWnd(NULL); if (hwndDefIME) - SendMessageW(hwndDefIME, WM_IME_SETCONTEXT, 0, iShow); + SendMessageW(hwndDefIME, WM_IME_SETCONTEXT, 0, dwShowFlags); } if (pClientImc)

1 0

[reactos] 01/01: [IMM32] Minor fix of ImmSetCompositionWindow
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2865423abedb2fee272b3… commit 2865423abedb2fee272b387e50eae913bcad517f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 11:29:47 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 11:29:47 2022 +0900 [IMM32] Minor fix of ImmSetCompositionWindow CORE-11700 --- dll/win32/imm32/ime.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 5dbddca417e..0fc3494d9d0 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -1468,19 +1468,24 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ BOOL WINAPI ImmSetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - LPINPUTCONTEXT pIC; + LPINPUTCONTEXTDX pIC; HWND hWnd; if (Imm32IsCrossThreadAccess(hIMC)) return FALSE; - pIC = ImmLockIMC(hIMC); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC == NULL) return FALSE; pIC->cfCompForm = *lpCompForm; pIC->fdwInit |= INIT_COMPFORM; + if (pIC->dwUIFlags & 0x8) + pIC->dwUIFlags &= ~0x8; + else + pIC->dwUIFlags &= ~0x2; + hWnd = pIC->hWnd; ImmUnlockIMC(hIMC);

1 0

[reactos] 01/01: [IMM32] Fix and improve Imm32SelectInputContext
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b086f910d8b3ac4a20bb9… commit b086f910d8b3ac4a20bb9f4edb6b561c49690e1c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 11:22:00 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 11:23:34 2022 +0900 [IMM32] Fix and improve Imm32SelectInputContext CORE-11700 --- dll/win32/imm32/imm.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 761dc127c9a..e85be84762f 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -180,8 +180,8 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) LPCOMPOSITIONSTRING pCS; LOGFONTA LogFontA; LOGFONTW LogFontW; - BOOL fOpen, bIsNewHKLIme = TRUE, bIsOldHKLIme = TRUE, bClientWide, bNewDpiWide; - DWORD cbNewPrivate = 0, cbOldPrivate = 0, dwConversion, dwSentence, dwSize, dwNewSize; + BOOL fOldOpen, bIsNewHKLIme = TRUE, bIsOldHKLIme = TRUE, bClientWide, bNewDpiWide; + DWORD cbNewPrivate = 0, cbOldPrivate = 0, dwOldConversion, dwOldSentence, dwSize, dwNewSize; PIMEDPI pNewImeDpi = NULL, pOldImeDpi = NULL; HANDLE hPrivate; PIME_STATE pNewState = NULL, pOldState = NULL; @@ -205,14 +205,11 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) pClientImc->uCodePage = CP_ACP; } - if (cbNewPrivate < sizeof(DWORD)) - cbNewPrivate = sizeof(DWORD); - if (pOldImeDpi) cbOldPrivate = pOldImeDpi->ImeInfo.dwPrivateDataSize; - if (cbOldPrivate < sizeof(DWORD)) - cbOldPrivate = sizeof(DWORD); + cbNewPrivate = max(cbNewPrivate, sizeof(DWORD)); + cbOldPrivate = max(cbOldPrivate, sizeof(DWORD)); if (pClientImc->hKL == hOldKL) { @@ -226,13 +223,10 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) pClientImc->hKL = NULL; } - if (CtfImmIsTextFrameServiceDisabled()) + if (CtfImmIsTextFrameServiceDisabled() && IS_CICERO_MODE() && !IS_16BIT_MODE()) { - if (IS_IMM_MODE() && !IS_CICERO_MODE()) - { - bIsNewHKLIme = IS_IME_HKL(hNewKL); - bIsOldHKLIme = IS_IME_HKL(hOldKL); - } + bIsNewHKLIme = IS_IME_HKL(hNewKL); + bIsOldHKLIme = IS_IME_HKL(hOldKL); } pIC = (LPINPUTCONTEXTDX)Imm32InternalLockIMC(hIMC, FALSE); @@ -250,9 +244,9 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) } else { - dwConversion = pIC->fdwConversion; - dwSentence = pIC->fdwSentence; - fOpen = pIC->fOpen; + dwOldConversion = pIC->fdwConversion; + dwOldSentence = pIC->fdwSentence; + fOldOpen = pIC->fOpen; if (pNewImeDpi) { @@ -359,7 +353,8 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) if (pOldState) { pOldState->fOpen = !!pIC->fOpen; - pOldState->dwConversion = (pIC->fdwConversion & ~IME_CMODE_EUDC); + pOldState->dwConversion = pIC->fdwConversion; + pOldState->dwConversion &= ~IME_CMODE_EUDC; pOldState->dwSentence = pIC->fdwSentence; pOldState->dwInit = pIC->fdwInit; } @@ -376,7 +371,8 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) pIC->fOpen = pNewState->fOpen; } - pIC->fdwConversion = (pNewState->dwConversion & ~IME_CMODE_EUDC); + pIC->fdwConversion = pNewState->dwConversion; + pIC->fdwConversion &= ~IME_CMODE_EUDC; pIC->fdwSentence = pNewState->dwSentence; pIC->fdwInit = pNewState->dwInit; } @@ -396,11 +392,11 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) } pIC->dwChange = 0; - if (pIC->fOpen != fOpen) + if (pIC->fOpen != fOldOpen) pIC->dwChange |= INPUTCONTEXTDX_CHANGE_OPEN; - if (pIC->fdwConversion != dwConversion) + if (pIC->fdwConversion != dwOldConversion) pIC->dwChange |= INPUTCONTEXTDX_CHANGE_CONVERSION; - if (pIC->fdwSentence != dwSentence) + if (pIC->fdwSentence != dwOldSentence) pIC->dwChange |= INPUTCONTEXTDX_CHANGE_SENTENCE; ImmUnlockIMC(hIMC);

1 0

[reactos] 01/01: [IMM32] Move CtfImmTIMCreateInputContext calls
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edbeaa3c87668d370995f… commit edbeaa3c87668d370995f42a8a518bb6917d1d51 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 10:52:43 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 10:52:43 2022 +0900 [IMM32] Move CtfImmTIMCreateInputContext calls CORE-11700 --- dll/win32/imm32/imm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e8498d9163d..761dc127c9a 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -778,6 +778,8 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC, PCLIENTIMC pClientImc, HK if (!pIC->hPrivate) goto Fail; + CtfImmTIMCreateInputContext(hIMC); + if (pImeDpi) { /* Select the IME */ @@ -829,9 +831,14 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) { pIC = LocalLock(pClientImc->hInputContext); if (pIC) + { + CtfImmTIMCreateInputContext(hIMC); goto Success; + } else + { goto Failure; + } } dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); @@ -868,7 +875,6 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) } Success: - CtfImmTIMCreateInputContext(hIMC); RtlLeaveCriticalSection(&pClientImc->cs); InterlockedIncrement(&pClientImc->cLockObj); ImmUnlockClientImc(pClientImc);

1 0

[reactos] 01/01: [IMM32] ImmGetImeInfoEx minor fix
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db16a1f7836dad8701f12… commit db16a1f7836dad8701f1252242d7affbca4bba85 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 10:40:38 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 10:40:38 2022 +0900 [IMM32] ImmGetImeInfoEx minor fix CORE-11700 --- dll/win32/imm32/ime.c | 5 +---- dll/win32/imm32/precomp.h | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 2e3b7370db5..5dbddca417e 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -887,11 +887,8 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch { if (!IS_IME_HKL(hKL)) { - if (!CtfImmIsTextFrameServiceDisabled() || - !IS_CICERO_MODE() || IS_16BIT_MODE()) - { + if (CtfImmIsTextFrameServiceDisabled() || !IS_CICERO_MODE() || IS_16BIT_MODE()) return FALSE; - } } SearchType = ImeInfoExKeyboardLayout; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 5e1138482cc..91eb68c984a 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -157,6 +157,7 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou HKL APIENTRY Imm32AssignNewLayout(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); BOOL APIENTRY Imm32CopyImeFile(LPWSTR pszOldFile, LPCWSTR pszNewFile); +/* Win: PtiCurrent */ static inline PTHREADINFO FASTCALL Imm32CurrentPti(VOID) { if (NtCurrentTeb()->Win32ThreadInfo == NULL)

1 0

[reactos] 01/01: [IMM32] s/ImmNt3Trans/WINNLSTranslateMessage/
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f1dc9d84a5a56274cfe9… commit 1f1dc9d84a5a56274cfe92d97297127aa67f7f7e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 10:31:15 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 10:32:33 2022 +0900 [IMM32] s/ImmNt3Trans/WINNLSTranslateMessage/ CORE-11700 --- dll/win32/imm32/keymsg.c | 4 ++-- dll/win32/imm32/win3.c | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 2d354954d8a..11198aa545a 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -928,7 +928,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) if (wLang == LANG_JAPANESE || (wLang == LANG_KOREAN && NtUserGetAppImeLevel(pIC->hWnd) == 3)) { - dwCount = ImmNt3Trans(dwCount, pTrans, hIMC, bAnsi, wLang); + dwCount = WINNLSTranslateMessage(dwCount, pTrans, hIMC, bAnsi, wLang); } } #endif @@ -983,7 +983,7 @@ ImmPostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) if (pNewTransMsg) { RtlCopyMemory(pNewTransMsg, lpTransMsg, cbTransMsg); - dwCount = ImmNt3Trans(dwCount, pNewTransMsg, hIMC, bAnsi, Lang); + dwCount = WINNLSTranslateMessage(dwCount, pNewTransMsg, hIMC, bAnsi, Lang); } else { diff --git a/dll/win32/imm32/win3.c b/dll/win32/imm32/win3.c index 43bb2abadb4..68dc4861f8c 100644 --- a/dll/win32/imm32/win3.c +++ b/dll/win32/imm32/win3.c @@ -11,18 +11,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); #ifdef IMM_WIN3_SUPPORT /* 3.x support */ +/* Win: JTransCompositionA */ DWORD APIENTRY -ImmNt3JTransCompA(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, - const TRANSMSG *pSrc, LPTRANSMSG pDest) +Imm32JTransCompA(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, + const TRANSMSG *pSrc, LPTRANSMSG pDest) { // FIXME *pDest = *pSrc; return 1; } +/* Win: JTransCompositionW */ DWORD APIENTRY -ImmNt3JTransCompW(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, - const TRANSMSG *pSrc, LPTRANSMSG pDest) +Imm32JTransCompW(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, + const TRANSMSG *pSrc, LPTRANSMSG pDest) { // FIXME *pDest = *pSrc; @@ -32,8 +34,8 @@ ImmNt3JTransCompW(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, typedef LRESULT (WINAPI *FN_SendMessage)(HWND, UINT, WPARAM, LPARAM); DWORD APIENTRY -ImmNt3JTrans(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC, - LPCOMPOSITIONSTRING pCS, BOOL bAnsi) +WINNLSTranslateMessageJ(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC, + LPCOMPOSITIONSTRING pCS, BOOL bAnsi) { DWORD ret = 0; HWND hWnd, hwndDefIME; @@ -114,9 +116,9 @@ ImmNt3JTrans(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC, case WM_IME_COMPOSITION: if (bAnsi) - dwNumber = ImmNt3JTransCompA(pIC, pCS, pEntry, pTrans); + dwNumber = Imm32JTransCompA(pIC, pCS, pEntry, pTrans); else - dwNumber = ImmNt3JTransCompW(pIC, pCS, pEntry, pTrans); + dwNumber = Imm32JTransCompW(pIC, pCS, pEntry, pTrans); ret += dwNumber; pTrans += dwNumber; @@ -171,14 +173,15 @@ DoDefault: } DWORD APIENTRY -ImmNt3KTrans(DWORD dwCount, LPTRANSMSG pEntries, LPINPUTCONTEXTDX pIC, - LPCOMPOSITIONSTRING pCS, BOOL bAnsi) +WINNLSTranslateMessageK(DWORD dwCount, LPTRANSMSG pEntries, LPINPUTCONTEXTDX pIC, + LPCOMPOSITIONSTRING pCS, BOOL bAnsi) { - return dwCount; // FIXME + FIXME("(0x%X, %p, %p, %p, %d)\n", dwCount, pEntries, pIC, pCS, bAnsi); + return dwCount; } DWORD APIENTRY -ImmNt3Trans(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLang) +WINNLSTranslateMessage(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLang) { BOOL ret = FALSE; LPINPUTCONTEXTDX pIC; @@ -192,9 +195,9 @@ ImmNt3Trans(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLan if (pCS) { if (wLang == LANG_JAPANESE) - ret = ImmNt3JTrans(dwCount, pEntries, pIC, pCS, bAnsi); + ret = WINNLSTranslateMessageJ(dwCount, pEntries, pIC, pCS, bAnsi); else if (wLang == LANG_KOREAN) - ret = ImmNt3KTrans(dwCount, pEntries, pIC, pCS, bAnsi); + ret = WINNLSTranslateMessageK(dwCount, pEntries, pIC, pCS, bAnsi); ImmUnlockIMCC(pIC->hCompStr); }

1 0

[reactos] 01/01: [IMM32] Simplify Imm32WriteImeLayout
by Katayama Hirofumi MZ 21 Oct '22

21 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f0e22ac23b06a5193b12… commit 8f0e22ac23b06a5193b12048d799749975733f5c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 21 10:11:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 21 10:11:59 2022 +0900 [IMM32] Simplify Imm32WriteImeLayout CORE-11700 --- dll/win32/imm32/precomp.h | 2 +- dll/win32/imm32/utils.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index ca8da55a108..5e1138482cc 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -153,7 +153,7 @@ HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase); HRESULT APIENTRY Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff); BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx); UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts); -BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout); +BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayoutText); HKL APIENTRY Imm32AssignNewLayout(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); BOOL APIENTRY Imm32CopyImeFile(LPWSTR pszOldFile, LPCWSTR pszNewFile); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index d2271fbabe0..1bcbb20823f 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -933,11 +933,11 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) } // Win: WriteImeLayout -BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout) +BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayoutText) { UINT iPreload; HKEY hkeyLayouts, hkeyIME, hkeyPreload; - WCHAR szImeKey[20], szPreloadNumber[20], szPreloadKey[20], szImeFileName[80]; + WCHAR szImeKey[20], szPreloadNumber[20], szPreloadKey[20]; DWORD cbData; LANGID LangID; LONG lError; @@ -963,8 +963,8 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou goto Failure; /* Write "Layout Text" */ - cbData = (wcslen(pszLayout) + 1) * sizeof(WCHAR); - lError = RegSetValueExW(hkeyIME, L"Layout Text", 0, REG_SZ, (LPBYTE)pszLayout, cbData); + cbData = (wcslen(pszLayoutText) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout Text", 0, REG_SZ, (LPBYTE)pszLayoutText, cbData); if (lError != ERROR_SUCCESS) goto Failure; @@ -976,11 +976,10 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou case LANG_KOREAN: pszLayoutFile = L"kbdkor.dll"; break; default: pszLayoutFile = L"kbdus.dll"; break; } - StringCchCopyW(szImeFileName, _countof(szImeFileName), pszLayoutFile); /* Write "Layout File" */ - cbData = (wcslen(szImeFileName) + 1) * sizeof(WCHAR); - lError = RegSetValueExW(hkeyIME, L"Layout File", 0, REG_SZ, (LPBYTE)szImeFileName, cbData); + cbData = (wcslen(pszLayoutFile) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout File", 0, REG_SZ, (LPBYTE)pszLayoutFile, cbData); if (lError != ERROR_SUCCESS) goto Failure;

1 0

[reactos] 01/01: [HHCTRL.OCX] Fix toolbar icons order
by Stanislav Motylkov 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8ee11e0ff864f1358bb6… commit a8ee11e0ff864f1358bb686f663254e07ae3e38d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Oct 20 21:20:36 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 20 21:20:36 2022 +0300 [HHCTRL.OCX] Fix toolbar icons order In `hhtoolbar.bmp` the "Expand" icon comes first, then "Collapse". Import Wine commit wine-7.19-39-g4f4b342ad44: https://source.winehq.org/git/wine.git/commit/4f4b342ad44f2d099a2546ad70e56… CORE-12198 --- dll/win32/hhctrl.ocx/resource.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/hhctrl.ocx/resource.h b/dll/win32/hhctrl.ocx/resource.h index 02c5b490bbf..59ba13b134c 100644 --- a/dll/win32/hhctrl.ocx/resource.h +++ b/dll/win32/hhctrl.ocx/resource.h @@ -45,9 +45,9 @@ #define HHTB_REFRESH 1 #define HHTB_HOME 2 #define HHTB_SYNC 3 -#define HHTB_CONTRACT 4 -#define HHTB_EXPAND 5 -#define HHTB_NUMBITMAPS HHTB_EXPAND +#define HHTB_EXPAND 4 +#define HHTB_CONTRACT 5 +#define HHTB_NUMBITMAPS HHTB_CONTRACT #define MIID_SELECTALL 10 #define MIID_VIEWSOURCE 11

1 0

[reactos] 01/01: [IMM32][INCLUDE] s/IMEDPI_FLAG_UNKNOWN/IMEDPI_FLAG_UNLOADED/
by Katayama Hirofumi MZ 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4572aad16a7397e938dea… commit 4572aad16a7397e938dea7f094a2c2b662b8ef48 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 13:50:37 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 13:50:37 2022 +0900 [IMM32][INCLUDE] s/IMEDPI_FLAG_UNKNOWN/IMEDPI_FLAG_UNLOADED/ CORE-11700 --- dll/win32/imm32/ime.c | 6 +++--- win32ss/include/ntuser.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 38df8aa9b32..2e3b7370db5 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -341,7 +341,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL) if (pImeDpi0->cLockObj) { - pImeDpi0->dwFlags |= IMEDPI_FLAG_UNKNOWN; + pImeDpi0->dwFlags |= IMEDPI_FLAG_UNLOADED; ret = FALSE; goto Quit; } @@ -932,7 +932,7 @@ PIMEDPI WINAPI ImmLockImeDpi(HKL hKL) if (pImeDpi->hKL == hKL) /* found */ { /* lock if possible */ - if (pImeDpi->dwFlags & IMEDPI_FLAG_UNKNOWN) + if (pImeDpi->dwFlags & IMEDPI_FLAG_UNLOADED) pImeDpi = NULL; else ++(pImeDpi->cLockObj); @@ -966,7 +966,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) return; } - if ((pImeDpi->dwFlags & IMEDPI_FLAG_UNKNOWN) == 0) + if ((pImeDpi->dwFlags & IMEDPI_FLAG_UNLOADED) == 0) { if ((pImeDpi->dwFlags & IMEDPI_FLAG_LOCKED) == 0 || (pImeDpi->ImeInfo.fdwProperty & IME_PROP_END_UNLOAD) == 0) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index f7d753b5361..12c65a3bb33 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1297,7 +1297,7 @@ C_ASSERT(sizeof(IMEDPI) == 0xa8); #endif /* flags for IMEDPI.dwFlags */ -#define IMEDPI_FLAG_UNKNOWN 0x1 +#define IMEDPI_FLAG_UNLOADED 0x1 #define IMEDPI_FLAG_LOCKED 0x2 /* unconfirmed */

1 0

[reactos] 01/01: [IMM32] Fix ImeDpi_Escape by adding !IS_16BIT_MODE()
by Katayama Hirofumi MZ 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27cc079d904f73c09b3dd… commit 27cc079d904f73c09b3ddccdcb4d0785569115f8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 13:48:11 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 13:48:11 2022 +0900 [IMM32] Fix ImeDpi_Escape by adding !IS_16BIT_MODE() CORE-11700 --- dll/win32/imm32/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 1a654825970..38df8aa9b32 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -316,7 +316,7 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) if (IS_IME_HKL(hKL)) return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); - if (IS_CICERO_MODE()) + if (IS_CICERO_MODE() && !IS_16BIT_MODE()) return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); return 0;

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