Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 13:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Rewrite ImmUnregisterWordW (#3894)

Browse source 
Implementing Japanese input... CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2021-08-12 12:31:06 +09:00 • committed by GitHub
parent 1ead16de95
commit 9b7288df78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

68
dll/win32/imm32/imm.c
View file

@ -4163,28 +4163,56 @@ Quit:
BOOL WINAPI ImmUnregisterWordW( BOOL WINAPI ImmUnregisterWordW(
HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
{ {
ImmHkl *immHkl = IMM_GetImmHkl(hKL); BOOL ret = FALSE;
TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, PIMEDPI pImeDpi;
debugstr_w(lpszUnregister)); LPSTR pszReadingA = NULL, pszUnregisterA = NULL;
if (immHkl->hIME && immHkl->pImeUnregisterWord) INT cchW, cchA;
{
if (is_kbd_ime_unicode(immHkl))
return immHkl->pImeUnregisterWord(lpszReading,dwStyle,lpszUnregister);
else
{
LPSTR lpszaReading = strdupWtoA(lpszReading);
LPSTR lpszaUnregister = strdupWtoA(lpszUnregister);
BOOL rc;
rc = immHkl->pImeUnregisterWord((LPCWSTR)lpszaReading,dwStyle, TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_w(lpszReading), dwStyle,
(LPCWSTR)lpszaUnregister); debugstr_w(lpszUnregister));
HeapFree(GetProcessHeap(),0,lpszaReading);
HeapFree(GetProcessHeap(),0,lpszaUnregister); pImeDpi = ImmLockOrLoadImeDpi(hKL);
return rc; if (!pImeDpi)
}
}
else
return FALSE; return FALSE;
if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)
{
ret = pImeDpi->ImeUnregisterWord(lpszReading, dwStyle, lpszUnregister);
ImmUnlockImeDpi(pImeDpi);
return ret;
}
if (lpszReading)
{
cchW = lstrlenW(lpszReading);
cchA = (cchW + 1) * sizeof(WCHAR);
pszReadingA = Imm32HeapAlloc(0, cchA);
if (!pszReadingA)
goto Quit;
cchA = WideCharToMultiByte(CP_ACP, 0, lpszReading, cchW, pszReadingA, cchA, NULL, NULL);
pszReadingA[cchA] = 0;
}
if (lpszUnregister)
{
cchW = lstrlenW(lpszUnregister);
cchA = (cchW + 1) * sizeof(WCHAR);
pszUnregisterA = Imm32HeapAlloc(0, cchA);
if (!pszUnregisterA)
goto Quit;
cchA = WideCharToMultiByte(CP_ACP, 0, lpszUnregister, cchW, pszUnregisterA, cchA, NULL, NULL);
pszUnregisterA[cchA] = 0;
}
ret = pImeDpi->ImeUnregisterWord(pszReadingA, dwStyle, pszUnregisterA);
Quit:
if (pszReadingA)
HeapFree(g_hImm32Heap, 0, pszReadingA);
if (pszUnregisterA)
HeapFree(g_hImm32Heap, 0, pszUnregisterA);
ImmUnlockImeDpi(pImeDpi);
return ret;
} }
/*********************************************************************** /***********************************************************************