Alexandre Julliard : ole32/tests: Fix a test failure on newer Windows versions.

Alexandre Julliard julliard at winehq.org
Fri Oct 12 11:37:44 CDT 2012


Module: wine
Branch: master
Commit: cba98a2d8e127bc8e0f379abb107435bb2171388
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cba98a2d8e127bc8e0f379abb107435bb2171388

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Oct 12 11:54:03 2012 +0200

ole32/tests: Fix a test failure on newer Windows versions.

---

 dlls/ole32/tests/propvariant.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c
index 2de480a..769d49a 100644
--- a/dlls/ole32/tests/propvariant.c
+++ b/dlls/ole32/tests/propvariant.c
@@ -463,8 +463,9 @@ static void test_varianttoproperty(void)
         0, FALSE, 0);
 
     ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue);
-    ok(len == 0, "unexpected length %d\n", len);
-    ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType);
+    ok(len == 4 || broken(len == 0) /* before Vista */, "unexpected length %d\n", len);
+    if (len) ok(!memcmp(propvalue, serialized_empty, 4), "got wrong data\n");
+    else ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType);
 
     propvar.vt = VT_NULL;
     len = 20;




More information about the wine-cvs mailing list