Commit 04b820c3 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

oleaut32: Fix a few tests that fail in win2k.

parent 1edb56ce
......@@ -6859,11 +6859,20 @@ static void test_VarPow(void)
"VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0);
hres = pVarPow(&cy, &right, &result);
ok(hres == S_OK && V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0);
if (hres == S_OK)
{
ok(hres == S_OK && V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0);
}
else
{
ok(hres == DISP_E_BADVARTYPE && V_VT(&result) == VT_EMPTY,
"VARPOW: expected coerced hres 0x%X type VT_EMPTY, got hres 0x%X type %s!\n",
DISP_E_BADVARTYPE, hres, vtstr(V_VT(&result)));
}
hres = pVarPow(&left, &cy, &result);
ok(hres == S_OK && V_VT(&result) == VT_R8,
......@@ -6887,11 +6896,20 @@ static void test_VarPow(void)
"VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0);
hres = pVarPow(&dec, &right, &result);
ok(hres == S_OK && V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0);
if (hres == S_OK)
{
ok(hres == S_OK && V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0);
}
else
{
ok(hres == DISP_E_BADVARTYPE && V_VT(&result) == VT_EMPTY,
"VARPOW: expected coerced hres 0x%X type VT_EMPTY, got hres 0x%X type %s!\n",
DISP_E_BADVARTYPE, hres, vtstr(V_VT(&result)));
}
SysFreeString(num2_str);
SysFreeString(num3_str);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment