James Hawkins : oleaut32: Fix a few failing tests in win9x.
Alexandre Julliard
julliard at winehq.org
Tue Jul 8 06:11:10 CDT 2008
Module: wine
Branch: master
Commit: 698fac49839ad93cc95aa87cd3f089d4577efd16
URL: http://source.winehq.org/git/wine.git/?a=commit;h=698fac49839ad93cc95aa87cd3f089d4577efd16
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Tue Jul 8 00:00:01 2008 -0500
oleaut32: Fix a few failing tests in win9x.
---
dlls/oleaut32/tests/vartest.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index c3842bf..21eeb3f 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -2085,7 +2085,12 @@ static void test_VarSub(void)
leftvt == VT_RECORD || rightvt == VT_RECORD)
{
if (leftvt == VT_RECORD && rightvt == VT_I8)
- expectedhres = DISP_E_TYPEMISMATCH;
+ {
+ if (HAVE_OLEAUT32_I8)
+ expectedhres = DISP_E_TYPEMISMATCH;
+ else
+ expectedhres = DISP_E_BADVARTYPE;
+ }
else if (leftvt < VT_UI1 && rightvt == VT_RECORD)
expectedhres = DISP_E_TYPEMISMATCH;
else if (leftvt >= VT_UI1 && rightvt == VT_RECORD)
@@ -5412,7 +5417,8 @@ static void test_VarCat(void)
hres = VarCat(&left,&right,&result);
ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres);
hres = VarCmp(&result,&expected,lcid,0);
- ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres);
+ ok(hres == VARCMP_EQ ||
+ broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres);
VariantClear(&left);
VariantClear(&right);
@@ -5428,7 +5434,8 @@ static void test_VarCat(void)
hres = VarCat(&left,&right,&result);
ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres);
hres = VarCmp(&result,&expected,lcid,0);
- ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres);
+ ok(hres == VARCMP_EQ ||
+ broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres);
VariantClear(&left);
VariantClear(&right);
More information about the wine-cvs
mailing list