Module: wine Branch: refs/heads/master Commit: 0e8b75bb128d9fac32df1a83cedafb057d1f921f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e8b75bb128d9fac32df1a83...
Author: Kevin Koltzau kevin@plop.org Date: Thu Jun 15 22:52:54 2006 -0400
oleaut32: Fix 64bit warnings in tests.
---
dlls/oleaut32/tests/safearray.c | 4 ++-- dlls/oleaut32/tests/usrmarshal.c | 6 +++--- dlls/oleaut32/tests/vartest.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 9fc4061..4cd2ad6 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -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 (v SAFEARRAY *sa; HRESULT hres; int value = 0xdeadbeef; - long index[1]; + LONG index[1]; void HUGEP *temp_pvData;
sab.lLbound = 0; diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 6290086..0b30ff3 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -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); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index be5d6d4..e8e4654 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -314,7 +314,7 @@ static void test_VariantClear(void) VARIANTARG v; VARIANT v2; size_t i; - long i4; + LONG i4; IUnknown *punk;
#if 0 diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 87147e5..347b256 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3499,7 +3499,7 @@ #define EXPECTCY(x) \ "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)