New patch for dlls/imm32/tests/imm32.c (was: Simplify code in dlls/imm32/tests/imm32.c)

Gerald Pfeifer gerald at pfeifer.com
Sat Sep 12 08:40:25 CDT 2009


On Sat, 20 Jun 2009, Paul Vriens wrote:
>> -    ok(ret || !ret, "You'll never read this.\n");
>> +    ok(TRUE, "You'll never read this.\n");
> We could use broken() to make sure we follow the wanted behaviour for 
> Wine. From the patch that changed that item it should be:
> 
> ok(!ret || broken(ret), .....)
> 
> If you look however at test.winehq.org it looks like hardly any box 
> meets the proper requirements to run these tests at all.
> 
> So I'd say:
> 
> ok(!ret, "After being cancelled the composition string is empty.\n");
> 
> (Tested on my W2K3 and Vista boxes).

I had thought you'd submit this as a patch, but since I didn't see that,
here we go.  Sorry for the misunderstanding/delay!

Gerald

ChangeLog:
Simplify code in dlls/imm32/tests/imm32.c (and avoid false warning).

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index edda55b..db1cd8d 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -212,7 +212,7 @@ static void test_ImmNotifyIME(void) {
 
     /* behavior differs between win9x and NT */
     ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr));
-    ok(ret || !ret, "You'll never read this.\n");
+    ok(!ret, "After being cancelled the composition string is empty.\n");
 
     msg_spy_flush_msgs();
 



More information about the wine-patches mailing list