Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Rewrite ImmSetCompositionWindow (#3855)

Browse source 
Implementing Japanese input... CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2021-07-28 23:26:02 +09:00 committed by GitHub
parent 8e1dea0c8c
commit f972a9fbd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2997,38 +2997,28 @@ BOOL WINAPI ImmSetCompositionStringW(
BOOL WINAPI ImmSetCompositionWindow(
HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
{
BOOL reshow = FALSE;
InputContextData *data = get_imc_data(hIMC);
DWORD dwImeThreadId, dwThreadId;
LPINPUTCONTEXT pIC;
HWND hWnd;
TRACE("(%p, %p)\n", hIMC, lpCompForm);
if (lpCompForm)
TRACE("\t%x, %s, %s\n", lpCompForm->dwStyle,
wine_dbgstr_point(&lpCompForm->ptCurrentPos),
wine_dbgstr_rect(&lpCompForm->rcArea));
if (!data)
{
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
if (IMM_IsCrossThreadAccess(NULL, hIMC))
dwImeThreadId = NtUserQueryInputContext(hIMC, 1);
dwThreadId = GetCurrentThreadId();
if (dwImeThreadId != dwThreadId)
return FALSE;
data->IMC.cfCompForm = *lpCompForm;
pIC = ImmLockIMC(hIMC);
if (pIC == NULL)
return FALSE;
if (IsWindowVisible(data->immKbd->UIWnd))
{
reshow = TRUE;
ShowWindow(data->immKbd->UIWnd,SW_HIDE);
}
pIC->cfCompForm = *lpCompForm;
pIC->fdwInit |= INIT_COMPFORM;
/* FIXME: this is a partial stub */
hWnd = pIC->hWnd;
if (reshow)
ShowWindow(data->immKbd->UIWnd,SW_SHOWNOACTIVATE);
ImmUnlockIMC(hIMC);
ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0);
Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0,
IMC_SETCOMPOSITIONWINDOW, IMN_SETCOMPOSITIONWINDOW, 0);
return TRUE;
}