Alexandre Julliard : ntdll/tests: Avoid long long printf formats in traces.
Alexandre Julliard
julliard at winehq.org
Sun Jan 4 09:08:59 CST 2009
Module: wine
Branch: master
Commit: b84fda836ee439ebc07993c4496c453174bc87fd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84fda836ee439ebc07993c4496c453174bc87fd
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Jan 3 20:25:19 2009 +0100
ntdll/tests: Avoid long long printf formats in traces.
---
dlls/ntdll/tests/string.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c
index 205a880..6f4d85b 100644
--- a/dlls/ntdll/tests/string.c
+++ b/dlls/ntdll/tests/string.c
@@ -591,20 +591,23 @@ static void one_i64toa_test(int test_num, const ulonglong2str_t *ulonglong2str)
dest_str[LARGE_STRI_BUFFER_LENGTH] = '\0';
result = p_i64toa(ulonglong2str->value, dest_str, ulonglong2str->base);
ok(result == dest_str,
- "(test %d): _i64toa(%Lu, [out], %d) has result %p, expected: %p\n",
- test_num, ulonglong2str->value, ulonglong2str->base, result, dest_str);
+ "(test %d): _i64toa(%08x%08x, [out], %d) has result %p, expected: %p\n",
+ test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value,
+ ulonglong2str->base, result, dest_str);
if (ulonglong2str->mask & 0x04) {
if (memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) != 0) {
if (memcmp(dest_str, ulonglong2str[1].Buffer, LARGE_STRI_BUFFER_LENGTH) != 0) {
ok(memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0,
- "(test %d): _i64toa(%Lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n",
- test_num, ulonglong2str->value, ulonglong2str->base, dest_str, ulonglong2str->Buffer);
+ "(test %d): _i64toa(%08x%08x, [out], %d) assigns string \"%s\", expected: \"%s\"\n",
+ test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value,
+ ulonglong2str->base, dest_str, ulonglong2str->Buffer);
} /* if */
} /* if */
} else {
ok(memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0,
- "(test %d): _i64toa(%Lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n",
- test_num, ulonglong2str->value, ulonglong2str->base, dest_str, ulonglong2str->Buffer);
+ "(test %d): _i64toa(%08x%08x, [out], %d) assigns string \"%s\", expected: \"%s\"\n",
+ test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value,
+ ulonglong2str->base, dest_str, ulonglong2str->Buffer);
} /* if */
}
More information about the wine-cvs
mailing list