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

imm32: Fix ImmAssociateContextEx parameter handling.

This commit is contained in:
André Hentschel 2010-04-28 17:23:12 +02:00 committed by Alexandre Julliard
parent 73d4d172d5
commit 8f1e00a17b
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/imm32/imm.c
View File

@ -516,30 +516,30 @@ static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam)
*/ */
BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags)
{ {
TRACE("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags); TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags);
if (!IMM_GetThreadData()->defaultContext) if (!IMM_GetThreadData()->defaultContext)
IMM_GetThreadData()->defaultContext = ImmCreateContext(); IMM_GetThreadData()->defaultContext = ImmCreateContext();
if (dwFlags == IACE_DEFAULT) if (!hWnd) return FALSE;
switch (dwFlags)
{ {
case 0:
ImmAssociateContext(hWnd,hIMC);
return TRUE;
case IACE_DEFAULT:
ImmAssociateContext(hWnd,IMM_GetThreadData()->defaultContext); ImmAssociateContext(hWnd,IMM_GetThreadData()->defaultContext);
return TRUE; return TRUE;
} case IACE_IGNORENOCONTEXT:
else if (dwFlags == IACE_IGNORENOCONTEXT)
{
if (GetPropW(hWnd,szwWineIMCProperty)) if (GetPropW(hWnd,szwWineIMCProperty))
ImmAssociateContext(hWnd,hIMC); ImmAssociateContext(hWnd,hIMC);
return TRUE; return TRUE;
} case IACE_CHILDREN:
else if (dwFlags == IACE_CHILDREN)
{
EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC); EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC);
return TRUE; return TRUE;
} default:
else FIXME("Unknown dwFlags 0x%x\n",dwFlags);
{
ERR("Unknown dwFlags 0x%x\n",dwFlags);
return FALSE; return FALSE;
} }
} }

8
dlls/imm32/tests/imm32.c
View File

@ -330,20 +330,20 @@ static void test_ImmAssociateContextEx(void)
rc = pImmAssociateContextEx(NULL, NULL, 0); rc = pImmAssociateContextEx(NULL, NULL, 0);
ok(!rc, "ImmAssociateContextEx succeeded\n"); ok(!rc, "ImmAssociateContextEx succeeded\n");
rc = pImmAssociateContextEx(hwnd, NULL, 0); rc = pImmAssociateContextEx(hwnd, NULL, 0);
todo_wine ok(rc, "ImmAssociateContextEx failed\n"); ok(rc, "ImmAssociateContextEx failed\n");
rc = pImmAssociateContextEx(NULL, imc, 0); rc = pImmAssociateContextEx(NULL, imc, 0);
ok(!rc, "ImmAssociateContextEx succeeded\n"); ok(!rc, "ImmAssociateContextEx succeeded\n");
rc = pImmAssociateContextEx(hwnd, imc, 0); rc = pImmAssociateContextEx(hwnd, imc, 0);
todo_wine ok(rc, "ImmAssociateContextEx failed\n"); ok(rc, "ImmAssociateContextEx failed\n");
retimc = ImmGetContext(hwnd); retimc = ImmGetContext(hwnd);
ok(retimc == imc, "handles should be the same\n"); ok(retimc == imc, "handles should be the same\n");
ImmReleaseContext(hwnd,retimc); ImmReleaseContext(hwnd,retimc);
rc = pImmAssociateContextEx(hwnd, newimc, 0); rc = pImmAssociateContextEx(hwnd, newimc, 0);
todo_wine ok(rc, "ImmAssociateContextEx failed\n"); ok(rc, "ImmAssociateContextEx failed\n");
retimc = ImmGetContext(hwnd); retimc = ImmGetContext(hwnd);
todo_wine ok(retimc == newimc, "handles should be the same\n"); ok(retimc == newimc, "handles should be the same\n");
ImmReleaseContext(hwnd,retimc); ImmReleaseContext(hwnd,retimc);
rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT);