[PATCH 2/2] dlls/oleaut32/tests: simplify printf for 64 bit integers
Eric Pouech
eric.pouech at gmail.com
Tue Apr 12 02:59:56 CDT 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/oleaut32/tests/typelib.c | 11 +++++------
dlls/oleaut32/tests/vartest.c | 34 ++++++++++++++++------------------
dlls/oleaut32/tests/vartype.c | 4 ++--
3 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index b273f72ac8d0..2e926a5bc360 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -1194,9 +1194,8 @@ static double WINAPI double_func( double a0, float a1, double a2, int a3 )
static LONGLONG WINAPI longlong_func( LONGLONG a0, CY a1 )
{
- ok( a0 == 0xdead00000000beefll, "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0);
- ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %08lx%08lx\n",
- (DWORD)(a1.int64 >> 32), (DWORD)a1.int64 );
+ ok( a0 == 0xdead00000000beefll, "wrong arg0 %#I64x\n", a0);
+ ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %#I64x\n", a1.int64 );
return ((ULONGLONG)4321 << 32) | 8765;
}
@@ -1208,7 +1207,7 @@ static VARIANT WINAPI variant_func( int a0, BOOL a1, DECIMAL a2, VARIANT a3 )
V_VT(&var) = VT_LPWSTR;
V_UI4(&var) = 0xbabe;
ok( a2.Hi32 == 1122, "wrong arg2.Hi32 %lx\n", a2.Hi32 );
- ok( U1(a2).Lo64 == 3344, "wrong arg2.Lo64 %08lx%08lx\n", (DWORD)(U1(a2).Lo64 >> 32), (DWORD)U1(a2).Lo64 );
+ ok( U1(a2).Lo64 == 3344, "wrong arg2.Lo64 %#I64x\n", U1(a2).Lo64 );
ok( V_VT(&a3) == VT_EMPTY, "wrong arg3 type %x\n", V_VT(&a3) );
ok( V_UI4(&a3) == 0xdeadbeef, "wrong arg3 value %lx\n", V_UI4(&a3) );
return var;
@@ -1389,8 +1388,8 @@ static void test_DispCallFunc(void)
if (res == S_OK)
{
ok( V_VT(&result) == VT_I8, "wrong result type %d\n", V_VT(&result) );
- ok( V_I8(&result) == (((ULONGLONG)4321 << 32) | 8765), "wrong result %08lx%08lx\n",
- (DWORD)(V_I8(&result) >> 32), (DWORD)V_I8(&result) );
+ ok( V_I8(&result) == (((ULONGLONG)4321 << 32) | 8765), "wrong result %#I64x\n",
+ V_I8(&result) );
}
memset( args, 0x55, sizeof(args) );
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index b6ccc083ad42..9456b56eb269 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -558,9 +558,9 @@ static const char *variantstr( const VARIANT *var )
case VT_INT:
sprintf( vtstr_buffer[vtstr_current], "VT_INT(%d)", V_INT(var) ); break;
case VT_I8:
- sprintf( vtstr_buffer[vtstr_current], "VT_I8(%x%08x)", (UINT)(V_I8(var) >> 32), (UINT)V_I8(var) ); break;
+ sprintf( vtstr_buffer[vtstr_current], "VT_I8(%I64x)", V_I8(var) ); break;
case VT_UI8:
- sprintf( vtstr_buffer[vtstr_current], "VT_UI8(%x%08x)", (UINT)(V_UI8(var) >> 32), (UINT)V_UI8(var) ); break;
+ sprintf( vtstr_buffer[vtstr_current], "VT_UI8(%I64x)", V_UI8(var) ); break;
case VT_R4:
sprintf( vtstr_buffer[vtstr_current], "VT_R4(%g)", V_R4(var) ); break;
case VT_R8:
@@ -2515,19 +2515,17 @@ static const char *szFailOk = "Call failed, hres = %08x\n";
#define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \
ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); }
#define EXPECT_I8(val) EXPECT_OK { EXPECT_TYPE(VT_I8); \
- ok(V_I8(&vOut) == val, "Expected i8 = %lx%08lx, got %lx%08lx\n", \
- (LONG)(val >> 32), (LONG)(val), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); }
+ ok(V_I8(&vOut) == val, "Expected i8 = %#I64x, got %#I64x\n", (LONG64)val, V_I8(&vOut)); }
#define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \
- ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \
- (DWORD)((ULONG64)val >> 32), (DWORD)(ULONG64)val, (DWORD)(V_UI8(&vOut) >> 32), (DWORD)V_UI8(&vOut)); }
+ ok(V_UI8(&vOut) == val, "Expected ui8 = %#I64x, got %#I64x\n", (ULONG64)val, V_UI8(&vOut); }
#define EXPECT_R4(val) EXPECT_OK { EXPECT_TYPE(VT_R4); \
ok(V_R4(&vOut) == val, "Expected r4 = %f, got %f\n", val, V_R4(&vOut)); }
#define EXPECT_R8(val) EXPECT_OK { EXPECT_TYPE(VT_R8); \
ok(V_R8(&vOut) == val, "Expected r8 = %g, got %g\n", val, V_R8(&vOut)); }
#define CY_MULTIPLIER 10000
#define EXPECT_CY(val) EXPECT_OK { EXPECT_TYPE(VT_CY); \
- ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = 0x%lx%08lx, got 0x%lx%08lx\n", \
- (DWORD)((LONG64)val >> 23), (DWORD)(LONG64)val, (DWORD)(V_CY(&vOut).int64 >>32), (DWORD)V_CY(&vOut).int64); }
+ ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = %#I64x, got %#I64x\n", \
+ (LONG64)val, V_CY(&vOut).int64); }
#define EXPECT_DECIMAL(valHi, valMid, valLo) EXPECT_OK { EXPECT_TYPE(VT_DECIMAL); \
ok((V_DECIMAL(&vOut).Hi32 == valHi) && (S1(U1(V_DECIMAL(&vOut))).Mid32 == valMid) && \
(S1(U1(V_DECIMAL(&vOut))).Lo32 == valLo), \
@@ -4221,8 +4219,8 @@ static void test_VarInt(void)
pcy->int64 = -11000;
hres = pVarInt(&v,&vDst);
ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == -20000,
- "VarInt: VT_CY wrong, hres=0x%lX 0x%lx%08lx\n",
- hres, (DWORD)(V_CY(&vDst).int64 >> 32), (DWORD)V_CY(&vDst).int64);
+ "VarInt: VT_CY wrong, hres=%#lX %#I64x\n",
+ hres, V_CY(&vDst).int64);
}
static HRESULT (WINAPI *pVarNeg)(LPVARIANT,LPVARIANT);
@@ -9315,8 +9313,8 @@ static void test_VarIdiv(void)
"VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && V_I8(&result) == 5000,
- "VARIDIV: CY value 0x%lx%08lx, expected 0x%x\n",
- (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000);
+ "VARIDIV: CY value %#I64x, expected %#x\n",
+ V_I8(&result), 5000);
}
hres = pVarIdiv(&left, &cy, &result);
@@ -9347,8 +9345,8 @@ static void test_VarIdiv(void)
"VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && V_I8(&result) == 1,
- "VARIDIV: DECIMAL value 0x%lx%08lx, expected %d\n",
- (DWORD)(V_I8(&result) >> 32), (DWORD)V_I8(&result), 1);
+ "VARIDIV: DECIMAL value %I64d, expected %d\n",
+ V_I8(&result), 1);
}
/* Check for division by zero */
@@ -9895,8 +9893,8 @@ static void test_VarImp(void)
"VARIMP: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && V_I8(&result) == -2,
- "VARIMP: CY value %lx%08lx, expected %d\n",
- (DWORD)((V_I8(&result)) >> 32), (DWORD)(V_I8(&result)), -2);
+ "VARIMP: CY value %I64d, expected %d\n",
+ V_I8(&result), -2);
}
hres = pVarImp(&left, &cy, &result);
@@ -9927,8 +9925,8 @@ static void test_VarImp(void)
"VARIMP: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n",
S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && V_I8(&result) == -3,
- "VARIMP: DECIMAL value 0x%lx%08lx, expected %d\n",
- (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), -3);
+ "VARIMP: DECIMAL value %#I64x, expected %d\n",
+ V_I8(&result), -3);
}
SysFreeString(false_str);
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 78b50e6bcdb8..c5137572d9d5 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -3618,8 +3618,8 @@ static void test_VarCyInt(void)
#define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \
S(U(out)).scale == (BYTE)(scl) && S(U(out)).sign == (BYTE)(sgn) && \
out.Hi32 == (ULONG)(hi) && U1(out).Lo64 == (ULONG64)(lo), \
- "expected (%d,%d,%d,(%lx %lx)), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \
- scl, sgn, hi, (LONG)((LONG64)(lo) >> 32), (LONG)((lo) & 0xffffffff), S(U(out)).scale, \
+ "expected (%d,%d,%d,%I64x), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \
+ scl, sgn, hi, (LONG64)(lo), S(U(out)).scale, \
S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres)
#define EXPECTDEC64(scl, sgn, hi, mid, lo) ok(hres == S_OK && \
More information about the wine-devel
mailing list