oleaut32: Fix 64bit warnings in tests.
This commit is contained in:
parent
146e6b8b69
commit
0e8b75bb12
|
@ -277,7 +277,7 @@ static void test_safearray(void)
|
|||
{
|
||||
SAFEARRAY *a, b, *c;
|
||||
unsigned int i;
|
||||
long indices[2];
|
||||
LONG indices[2];
|
||||
HRESULT hres;
|
||||
SAFEARRAYBOUND bound, bounds[2];
|
||||
VARIANT v;
|
||||
|
@ -1649,7 +1649,7 @@ static void test_SafeArrayDestroyData (void)
|
|||
SAFEARRAY *sa;
|
||||
HRESULT hres;
|
||||
int value = 0xdeadbeef;
|
||||
long index[1];
|
||||
LONG index[1];
|
||||
void HUGEP *temp_pvData;
|
||||
|
||||
sab.lLbound = 0;
|
||||
|
|
|
@ -396,7 +396,7 @@ static void test_marshal_VARIANT(void)
|
|||
MIDL_STUB_MESSAGE stubMsg = { 0 };
|
||||
USER_MARSHAL_CB umcb = { 0 };
|
||||
unsigned char *buffer, *next;
|
||||
unsigned long ul;
|
||||
ULONG ul;
|
||||
short s;
|
||||
double d;
|
||||
DWORD *wirev;
|
||||
|
@ -914,7 +914,7 @@ static void test_marshal_VARIANT(void)
|
|||
check_safearray(wirev, lpsa);
|
||||
if (VARIANT_UNMARSHAL_WORKS)
|
||||
{
|
||||
long bound, bound2;
|
||||
LONG bound, bound2;
|
||||
VARTYPE vt, vt2;
|
||||
VariantInit(&v2);
|
||||
next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2);
|
||||
|
@ -955,7 +955,7 @@ static void test_marshal_VARIANT(void)
|
|||
check_safearray(wirev, lpsa);
|
||||
if (VARIANT_UNMARSHAL_WORKS)
|
||||
{
|
||||
long bound, bound2;
|
||||
LONG bound, bound2;
|
||||
VARTYPE vt, vt2;
|
||||
VariantInit(&v2);
|
||||
next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2);
|
||||
|
|
|
@ -314,7 +314,7 @@ static void test_VariantClear(void)
|
|||
VARIANTARG v;
|
||||
VARIANT v2;
|
||||
size_t i;
|
||||
long i4;
|
||||
LONG i4;
|
||||
IUnknown *punk;
|
||||
|
||||
#if 0
|
||||
|
|
|
@ -3499,7 +3499,7 @@ static void test_VarDateChangeTypeEx(void)
|
|||
"expected " #x "*CY_MULTIPLIER, got (%8lx %8lx); hres=0x%08lx\n", S(out).Hi, S(out).Lo, hres)
|
||||
|
||||
#define EXPECTCY64(x,y) \
|
||||
ok(hres == S_OK && S(out).Hi == (long)x && S(out).Lo == y, \
|
||||
ok(hres == S_OK && S(out).Hi == (LONG)x && S(out).Lo == y, \
|
||||
"expected " #x #y "(%lu,%lu), got (%lu,%lu); hres=0x%08lx\n", \
|
||||
(ULONG)(x), (ULONG)(y), S(out).Hi, S(out).Lo, hres)
|
||||
|
||||
|
|
Loading…
Reference in New Issue