https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f1dc9d84a5a56274cfe92d97297127aa67f7f7e
commit 1f1dc9d84a5a56274cfe92d97297127aa67f7f7e Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Fri Oct 21 10:31:15 2022 +0900 Commit: Katayama Hirofumi MZ <[email protected]> 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); }
