Commit 14e069b3 authored by Michael Karcher's avatar Michael Karcher Committed by Alexandre Julliard

oleaut32/tests: Call functions via manually obtained pointers.

parent b58cab40
...@@ -1098,7 +1098,7 @@ static void test_VarUI1FromDisp(void) ...@@ -1098,7 +1098,7 @@ static void test_VarUI1FromDisp(void)
dispatch.vt = VT_UI1; dispatch.vt = VT_UI1;
dispatch.bFailInvoke = FALSE; dispatch.bFailInvoke = FALSE;
hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out); hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out);
trace("0x%08x\n", hres); trace("0x%08x\n", hres);
hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1);
...@@ -1106,7 +1106,7 @@ static void test_VarUI1FromDisp(void) ...@@ -1106,7 +1106,7 @@ static void test_VarUI1FromDisp(void)
dispatch.bFailInvoke = TRUE; dispatch.bFailInvoke = TRUE;
hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out); hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out);
trace("0x%08x\n", hres); trace("0x%08x\n", hres);
hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1);
...@@ -4803,7 +4803,7 @@ static void test_VarBstrFromDate(void) ...@@ -4803,7 +4803,7 @@ static void test_VarBstrFromDate(void)
#define BSTR_CY(l, a, b, e) \ #define BSTR_CY(l, a, b, e) \
S(l).Lo = b; S(l).Hi = a; \ S(l).Lo = b; S(l).Hi = a; \
hres = VarBstrFromCy(l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ hres = pVarBstrFromCy(l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\
ok(hres == S_OK, "got hres 0x%08x\n", hres);\ ok(hres == S_OK, "got hres 0x%08x\n", hres);\
if (hres== S_OK && bstr)\ if (hres== S_OK && bstr)\
{\ {\
...@@ -4865,7 +4865,7 @@ static void test_VarBstrFromCy(void) ...@@ -4865,7 +4865,7 @@ static void test_VarBstrFromCy(void)
#define BSTR_DEC(l, a, b, c, d, e) \ #define BSTR_DEC(l, a, b, c, d, e) \
SETDEC(l, a,b,c,d);\ SETDEC(l, a,b,c,d);\
hres = VarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ hres = pVarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\
ok(hres == S_OK, "got hres 0x%08x\n", hres);\ ok(hres == S_OK, "got hres 0x%08x\n", hres);\
if (hres== S_OK && bstr)\ if (hres== S_OK && bstr)\
{\ {\
...@@ -4874,7 +4874,7 @@ static void test_VarBstrFromCy(void) ...@@ -4874,7 +4874,7 @@ static void test_VarBstrFromCy(void)
#define BSTR_DEC64(l, a, b, c, x, d, e) \ #define BSTR_DEC64(l, a, b, c, x, d, e) \
SETDEC64(l, a,b,c,x,d);\ SETDEC64(l, a,b,c,x,d);\
hres = VarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ hres = pVarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\
ok(hres == S_OK, "got hres 0x%08x\n", hres);\ ok(hres == S_OK, "got hres 0x%08x\n", hres);\
if (hres== S_OK && bstr)\ if (hres== S_OK && bstr)\
{\ {\
......
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