ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imm32: Exit on invalid window in ImmAssociateContext. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2021-10-15 15:26:57 +02:00 committed by Alexandre Julliard
parent 80ac0b9af4
commit 266c1101b3
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/imm32/imm.c
View File

@ -583,12 +583,13 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate)
*/ */
HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
{ {
HIMC old = NULL;
InputContextData *data = get_imc_data(hIMC); InputContextData *data = get_imc_data(hIMC);
HIMC defaultContext;
HIMC old;
TRACE("(%p, %p):\n", hWnd, hIMC); TRACE("(%p, %p):\n", hWnd, hIMC);
if(hIMC && !data) if (!IsWindow(hWnd) || (hIMC && !data))
return NULL; return NULL;
/* /*
@ -600,30 +601,26 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC))
return NULL; return NULL;
if (hWnd) defaultContext = get_default_context( hWnd );
old = RemovePropW(hWnd, szwWineIMCProperty);
if (old == NULL)
old = defaultContext;
else if (old == (HIMC)-1)
old = NULL;
if (hIMC != defaultContext)
{ {
HIMC defaultContext = get_default_context( hWnd ); if (hIMC == NULL) /* Meaning disable imm for that window*/
old = RemovePropW(hWnd,szwWineIMCProperty); SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1);
else
SetPropW(hWnd, szwWineIMCProperty, hIMC);
}
if (old == NULL) if (old)
old = defaultContext; {
else if (old == (HIMC)-1) InputContextData *old_data = old;
old = NULL; if (old_data->IMC.hWnd == hWnd)
old_data->IMC.hWnd = NULL;
if (hIMC != defaultContext)
{
if (hIMC == NULL) /* Meaning disable imm for that window*/
SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1);
else
SetPropW(hWnd,szwWineIMCProperty,hIMC);
}
if (old)
{
InputContextData *old_data = old;
if (old_data->IMC.hWnd == hWnd)
old_data->IMC.hWnd = NULL;
}
} }
if (!hIMC) if (!hIMC)