commit 4ae16e37eec8e7398ffc2b68170b5dfffd80b369
author Jeff Zaroyko <jeffz@jeffz.name> Fri Oct 02 12:51:49 2009 +1000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 02 11:50:55 2009 +0200
tree 2658327be30a47f60d620f7fcb40348de9b6a9ae
parent 5d530fee54d8c976432eb8328e02be62d6bfa226

imm32: dwIndex flags are mutually exclusive.

dlls/imm32/imm.c

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index f085080..6f97448 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2130,6 +2130,13 @@
     if (!data)
         return FALSE;
 
+    if (!(dwIndex == SCS_SETSTR ||
+          dwIndex == SCS_CHANGEATTR ||
+          dwIndex == SCS_CHANGECLAUSE ||
+          dwIndex == SCS_SETRECONVERTSTRING ||
+          dwIndex == SCS_QUERYRECONVERTSTRING))
+        return FALSE;
+
     if (!is_himc_ime_unicode(data))
         return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp,
                         dwCompLen, lpRead, dwReadLen);
@@ -2178,6 +2185,13 @@
     if (!data)
         return FALSE;
 
+    if (!(dwIndex == SCS_SETSTR ||
+          dwIndex == SCS_CHANGEATTR ||
+          dwIndex == SCS_CHANGECLAUSE ||
+          dwIndex == SCS_SETRECONVERTSTRING ||
+          dwIndex == SCS_QUERYRECONVERTSTRING))
+        return FALSE;
+
     if (is_himc_ime_unicode(data))
         return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp,
                         dwCompLen, lpRead, dwReadLen);

dlls/imm32/tests/imm32.c

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 97a7201..7b76226 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -274,22 +274,18 @@
 
     ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR,
         NULL, 0, NULL, 0);
-    todo_wine
     ok(!ret, "ImmSetCompositionStringW() succeeded.\n");
 
     ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGECLAUSE,
         NULL, 0, NULL, 0);
-    todo_wine
     ok(!ret, "ImmSetCompositionStringW() succeeded.\n");
 
     ret = ImmSetCompositionStringW(imc, SCS_CHANGEATTR | SCS_CHANGECLAUSE,
         NULL, 0, NULL, 0);
-    todo_wine
     ok(!ret, "ImmSetCompositionStringW() succeeded.\n");
 
     ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR | SCS_CHANGECLAUSE,
         NULL, 0, NULL, 0);
-    todo_wine
     ok(!ret, "ImmSetCompositionStringW() succeeded.\n");
 
     ImmReleaseContext(hwnd, imc);