Alexandre Julliard : hlink/tests: Comment out a test for an uninitialized return value.
Alexandre Julliard
julliard at winehq.org
Mon Jun 21 11:07:03 CDT 2010
Module: wine
Branch: master
Commit: 2a26e954ec13bc2fc47b6464ee063b102b6b4e7e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a26e954ec13bc2fc47b6464ee063b102b6b4e7e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 21 11:49:07 2010 +0200
hlink/tests: Comment out a test for an uninitialized return value.
---
dlls/hlink/tests/hlink.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c
index d454819..cf031f5 100644
--- a/dlls/hlink/tests/hlink.c
+++ b/dlls/hlink/tests/hlink.c
@@ -1093,7 +1093,8 @@ static void test_HlinkGetSetMonikerReference(void)
/* invalid HLINKSETF flags */
hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two);
- ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres);
+ /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */
+ if (0) ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres);
hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc);
ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt);
@@ -1244,10 +1245,11 @@ static void test_HlinkGetSetStringReference(void)
CoTaskMemFree(fnd_loc);
hres = IHlink_SetStringReference(link, 4, NULL, NULL);
- ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);
+ /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */
+ if (0) ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);
hres = IHlink_SetStringReference(link, -4, NULL, NULL);
- ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres);
+ if (0) ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres);
IHlink_Release(link);
}
More information about the wine-cvs
mailing list