Alexandre Julliard : oleaut32/tests: Avoid printing pointer differences in traces.
Alexandre Julliard
julliard at winehq.org
Thu Jan 8 08:30:55 CST 2009
Module: wine
Branch: master
Commit: 6f3184829fbcfd69654eab0aa6668380fc49ae4c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3184829fbcfd69654eab0aa6668380fc49ae4c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jan 8 13:02:32 2009 +0100
oleaut32/tests: Avoid printing pointer differences in traces.
---
dlls/oleaut32/tests/safearray.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index 0a03141..4fc615e 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -275,7 +275,7 @@ static struct {
static void test_safearray(void)
{
SAFEARRAY *a, b, *c;
- unsigned int i;
+ unsigned int i, diff;
LONG indices[2];
HRESULT hres;
SAFEARRAYBOUND bound, bounds[2];
@@ -434,19 +434,22 @@ static void test_safearray(void)
indices[1] = 23;
hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2);
ok(S_OK == hres,"SAPOI failed [1,23], hres 0x%x\n",hres);
- ok(ptr2 - ptr1 == 8,"ptr difference is not 8, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1);
+ diff = ptr2 - ptr1;
+ ok(diff == 8,"ptr difference is not 8, but %d (%p vs %p)\n", diff, ptr2, ptr1);
indices[0] = 3;
indices[1] = 24;
hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2);
ok(S_OK == hres,"SAPOI failed [5,24], hres 0x%x\n",hres);
- ok(ptr2 - ptr1 == 176,"ptr difference is not 176, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1);
+ diff = ptr2 - ptr1;
+ ok(diff == 176,"ptr difference is not 176, but %d (%p vs %p)\n", diff, ptr2, ptr1);
indices[0] = 20;
indices[1] = 23;
hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2);
ok(S_OK == hres,"SAPOI failed [20,23], hres 0x%x\n",hres);
- ok(ptr2 - ptr1 == 76,"ptr difference is not 76, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1);
+ diff = ptr2 - ptr1;
+ ok(diff == 76,"ptr difference is not 76, but %d (%p vs %p)\n", diff, ptr2, ptr1);
hres = SafeArrayUnaccessData(a);
ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres);
More information about the wine-cvs
mailing list