mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-23 19:43:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32] s/ImmNt3Trans/WINNLSTranslateMessage/

Browse Source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-10-21 10:31:15 +09:00
parent 8f0e22ac23
commit 1f1dc9d84a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dll/win32/imm32/keymsg.c
View File

@ -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
{

31
dll/win32/imm32/win3.c
View File

@ -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);
}