Module: wine Branch: master Commit: 4f0104f8879d6493266861e0daec42cd825d7047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0104f8879d6493266861e0da...
Author: Francois Gouget fgouget@free.fr Date: Mon Jan 9 10:02:29 2012 +0100
oleaut32/tests: Once we have a function pointer, use it consistently.
---
dlls/oleaut32/tests/vartest.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 393caf5..3ff54f8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2312,7 +2312,7 @@ static void test_VarSub(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarSub(&left, &right, &result); + hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), @@ -2332,14 +2332,14 @@ static void test_VarSub(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9;
- hres = VarSub(&cy, &right, &result); + hres = pVarSub(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4702), "VarSub: CY value %f, expected %f\n", r, (double)4720);
- hres = VarSub(&left, &dec, &result); + hres = pVarSub(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarSub: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); @@ -5120,12 +5120,12 @@ static void test_VarMul(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9;
- hres = VarMul(&cy, &right, &result); + hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399);
- hres = VarMul(&left, &dec, &result); + hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2); @@ -5291,7 +5291,7 @@ static void test_VarAdd(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarAdd(&left, &right, &result); + hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); @@ -5311,12 +5311,12 @@ static void test_VarAdd(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9;
- hres = VarAdd(&cy, &right, &result); + hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720);
- hres = VarAdd(&left, &dec, &result); + hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); @@ -8036,7 +8036,7 @@ static void test_VarIdiv(void) V_VT(&right) = VT_I8; V_UI1(&right) = 2;
- hres = VarIdiv(&cy, &cy, &result); + hres = pVarIdiv(&cy, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8045,7 +8045,7 @@ static void test_VarIdiv(void)
if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&cy, &right, &result); + hres = pVarIdiv(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8054,21 +8054,21 @@ static void test_VarIdiv(void) (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000); }
- hres = VarIdiv(&left, &cy, &result); + hres = pVarIdiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 0, "VARIDIV: CY value %d, expected %d\n", V_I4(&result), 0);
- hres = VarIdiv(&left, &dec, &result); + hres = pVarIdiv(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 50, "VARIDIV: DECIMAL value %d, expected %d\n", V_I4(&result), 50);
- hres = VarIdiv(&dec, &dec, &result); + hres = pVarIdiv(&dec, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8077,7 +8077,7 @@ static void test_VarIdiv(void)
if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&dec, &right, &result); + hres = pVarIdiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result)));
-
Alexandre Julliard