imm32: ImmConfigureIME should return 0 when the type is IME_CONFIG_REGISTERWORD and the data is NULL.
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index abcff55..2c9489a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c
@@ -513,6 +513,9 @@ TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + if (dwMode == IME_CONFIG_REGISTERWORD && !lpData) + return FALSE; + if (immHkl->hIME && immHkl->pImeConfigure) { if (dwMode != IME_CONFIG_REGISTERWORD || !is_kbd_ime_unicode(immHkl)) @@ -545,6 +548,9 @@ TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + if (dwMode == IME_CONFIG_REGISTERWORD && !lpData) + return FALSE; + if (immHkl->hIME && immHkl->pImeConfigure) { if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl))
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7208092..29ac553 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c
@@ -254,11 +254,29 @@ return 0; } +static int test_ImmIME(void) +{ + HIMC imc; + + imc = ImmGetContext(hwnd); + if (imc) + { + BOOL rc; + rc = ImmConfigureIMEA(imc, NULL, IME_CONFIG_REGISTERWORD, NULL); + ok (rc == 0, "ImmConfigureIMEA did not fail\n"); + rc = ImmConfigureIMEW(imc, NULL, IME_CONFIG_REGISTERWORD, NULL); + ok (rc == 0, "ImmConfigureIMEW did not fail\n"); + } + ImmReleaseContext(hwnd,imc); + return 0; +} + START_TEST(imm32) { if (init()) { test_ImmNotifyIME(); test_ImmGetCompositionString(); + test_ImmIME(); } cleanup(); }