Ros-diffs October 2022

ros-diffs@reactos.org

23 participants
162 discussions

[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

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

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91e3d06cdb4d4a0d1876b… commit 91e3d06cdb4d4a0d1876bc0eaae1447c61944246 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 12:47:15 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 12:47:15 2022 +0900 [IMM32] Fix and improve Imm32InquireIme 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 403d831a9b6..1a654825970 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -54,12 +54,15 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) if (NtUserGetThreadState(THREADSTATE_ISWINLOGON2)) dwSysInfoFlags |= IME_SYSINFO_WINLOGON; + if (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) + dwSysInfoFlags |= IME_SYSINFO_WOW16; + if (IS_IME_HKL(pImeDpi->hKL)) { if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) return FALSE; } - else if (IS_CICERO_MODE()) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) { if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL)) return FALSE; @@ -139,11 +142,13 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) } else { - if (pImeDpi->uCodePage != GetACP() && pImeDpi->uCodePage) + if (pImeDpi->uCodePage != GetACP() && pImeDpi->uCodePage != CP_ACP) return FALSE; MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPSTR)szUIClass, -1, pImeDpi->szUIClass, _countof(pImeDpi->szUIClass)); + + pImeDpi->szUIClass[_countof(pImeDpi->szUIClass) - 1] = UNICODE_NULL; } return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW);

1 0

[reactos] 01/01: [IMM32] Improve ImmAssociateContext readability
by Katayama Hirofumi MZ 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72c56c2f1fbd4581b9150… commit 72c56c2f1fbd4581b91504c32115771d72f1e0e6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 12:32:45 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 12:32:45 2022 +0900 [IMM32] Improve ImmAssociateContext readability CORE-11700 --- dll/win32/imm32/imm.c | 26 +++++++++++++++----------- dll/win32/imm32/utils.c | 2 ++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 8f7f14764d9..e8498d9163d 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -513,19 +513,23 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) return hIMC; dwValue = NtUserAssociateInputContext(hWnd, hIMC, 0); - if (dwValue == 0) - return hOldIMC; - if (dwValue != 1) - return NULL; - - hwndFocus = (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_FOCUS); - if (hwndFocus == hWnd) + switch (dwValue) { - ImmSetActiveContext(hWnd, hOldIMC, FALSE); - ImmSetActiveContext(hWnd, hIMC, TRUE); - } + case 0: + return hOldIMC; - return hOldIMC; + case 1: + hwndFocus = (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_FOCUS); + if (hwndFocus == hWnd) + { + ImmSetActiveContext(hWnd, hOldIMC, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); + } + return hOldIMC; + + default: + return NULL; + } } /*********************************************************************** diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 3616f7ea39c..d2271fbabe0 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -207,6 +207,7 @@ LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW) } /* Converts the character index */ +/* Win: CalcCharacterPositionAtoW */ LONG APIENTRY IchWideFromAnsi(LONG cchAnsi, LPCSTR pchAnsi, UINT uCodePage) { LONG cchWide; @@ -227,6 +228,7 @@ LONG APIENTRY IchWideFromAnsi(LONG cchAnsi, LPCSTR pchAnsi, UINT uCodePage) } /* Converts the character index */ +/* Win: CalcCharacterPositionWtoA */ LONG APIENTRY IchAnsiFromWide(LONG cchWide, LPCWSTR pchWide, UINT uCodePage) { LONG cb, cchAnsi;

1 0

[reactos] 01/01: [IMM32] Use UNICODE_NULL for null characters
by Katayama Hirofumi MZ 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9b2b1a6cd106ab46d7fa… commit f9b2b1a6cd106ab46d7fa49369cc46ca933158cd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 12:29:29 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 12:29:29 2022 +0900 [IMM32] Use UNICODE_NULL for null characters CORE-11700 --- dll/win32/imm32/ime.c | 8 ++++---- dll/win32/imm32/utils.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index de34b8d90ce..403d831a9b6 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -69,7 +69,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) return FALSE; } - szUIClass[_countof(szUIClass) - 1] = 0; + szUIClass[_countof(szUIClass) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ if (pImeInfo->dwPrivateDataSize == 0) pImeInfo->dwPrivateDataSize = sizeof(DWORD); @@ -1224,7 +1224,7 @@ LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData) ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szW, hKL); if (ret) { - szW[_countof(szW) - 1] = 0; + szW[_countof(szW) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ WideCharToMultiByte(pImeDpi->uCodePage, 0, szW, -1, lpData, MAX_IMM_FILENAME, NULL, NULL); ((LPSTR)lpData)[MAX_IMM_FILENAME - 1] = 0; @@ -1235,7 +1235,7 @@ LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData) case IME_ESC_HANJA_MODE: MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED, lpData, -1, szW, _countof(szW)); - szW[_countof(szW) - 1] = 0; + szW[_countof(szW) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szW, hKL); break; @@ -1304,7 +1304,7 @@ LRESULT WINAPI ImmEscapeW(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData) szA[_countof(szA) - 1] = 0; MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED, szA, -1, lpData, MAX_IMM_FILENAME); - ((LPWSTR)lpData)[MAX_IMM_FILENAME - 1] = 0; + ((LPWSTR)lpData)[MAX_IMM_FILENAME - 1] = UNICODE_NULL; /* Avoid buffer overrun */ } break; diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index cde837ece0e..3616f7ea39c 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -904,7 +904,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) szImeFileName[0] = 0; cbData = sizeof(szImeFileName); RegQueryValueExW(hkeyIME, L"Ime File", NULL, NULL, (LPBYTE)szImeFileName, &cbData); - szImeFileName[_countof(szImeFileName) - 1] = 0; + szImeFileName[_countof(szImeFileName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ RegCloseKey(hkeyIME); @@ -997,7 +997,7 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou cbData = sizeof(szPreloadKey); lError = RegQueryValueExW(hkeyPreload, szPreloadNumber, NULL, NULL, (LPBYTE)szPreloadKey, &cbData); - szPreloadKey[_countof(szPreloadKey) - 1] = 0; + szPreloadKey[_countof(szPreloadKey) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ if (lError != ERROR_SUCCESS || lstrcmpiW(szImeKey, szPreloadKey) == 0) break; /* Found an empty room or the same key */

1 0

[reactos] 01/01: [IMM32] ImmTranslateMessage: Minor fix
by Katayama Hirofumi MZ 20 Oct '22

20 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378d0e814c16e7f6c4cea… commit 378d0e814c16e7f6c4cea5237b98cab48c8cf474 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 20 11:32:23 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 20 11:32:23 2022 +0900 [IMM32] ImmTranslateMessage: Minor fix CORE-11700 --- dll/win32/imm32/keymsg.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 104a6f6ee43..2d354954d8a 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -1093,7 +1093,17 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD wChar = 0; kret = ToAsciiEx(vk, HIWORD(lKeyData), abKeyState, &wChar, 0, hKL); if (kret > 0) - vk = MAKEWORD(vk, wChar); + { + if ((BYTE)vk == VK_PACKET) + { + vk &= 0xFF; + vk |= (wChar << 8); + } + else + { + vk = MAKEWORD(vk, wChar); + } + } } }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2022