Huw Davies : oleaut32: Fix tests under win2k.

Alexandre Julliard julliard at wine.codeweavers.com
Fri May 5 15:24:09 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 74b63d5e0dc750e4a334f4caacbc55b6b44d504e
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=74b63d5e0dc750e4a334f4caacbc55b6b44d504e

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed May  3 17:03:00 2006 +0100

oleaut32: Fix tests under win2k.

---

 dlls/oleaut32/tests/usrmarshal.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c
index 9f2db8b..3f417e1 100644
--- a/dlls/oleaut32/tests/usrmarshal.c
+++ b/dlls/oleaut32/tests/usrmarshal.c
@@ -100,7 +100,7 @@ static void check_safearray(void *buffer
 
     if(!lpsa)
     {
-        ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa);
+        ok(*(void **)wiresa == NULL, "wiresa + 0x0 should be NULL instead of 0x%08lx\n", *(DWORD *)wiresa);
         return;
     }
 
@@ -108,7 +108,7 @@ static void check_safearray(void *buffer
     sftype = get_union_type(lpsa);
     cell_count = get_cell_count(lpsa);
 
-    ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa);
+    ok(*(DWORD *)wiresa, "wiresa + 0x0 should be non-NULL instead of 0x%08lx\n", *(DWORD *)wiresa); /* win2k: this is lpsa. winxp: this is 0x00000001 */
     wiresa += sizeof(DWORD);
     ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa);
     wiresa += sizeof(DWORD);




More information about the wine-cvs mailing list