From: Bernhard Übelacker bernhardu@mailbox.org
--- dlls/ntdll/tests/string.c | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 3d975d12a10..525e46469ae 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1672,104 +1672,104 @@ static void test__snwprintf(void) res = p_snwprintf(buffer, lstrlenW(teststring), teststring); ok(res == lstrlenW(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenW(teststring)); ok(!wcscmp(buffer, L"hello worldX"), "_snprintf returned buffer %s, expected 'hello worldX'.\n", - debugstr_w(buffer)); + debugstr_wn(buffer, ARRAY_SIZE(buffer)));
wcscpy(buffer, origstring); res = p_snwprintf(buffer, lstrlenW(teststring) + 1, teststring); ok(res == lstrlenW(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenW(teststring)); ok(!wcscmp(buffer, teststring), "_snprintf returned buffer %s, expected %s.\n", - debugstr_w(buffer), debugstr_w(teststring)); + debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(teststring));
memset(buffer, 0xcc, sizeof(buffer)); res = p_snwprintf(buffer, 4, L"test"); ok(res == 4, "res = %d\n", res); - ok(!memcmp(buffer, L"test", 4 * sizeof(WCHAR)), "buf = %s\n", debugstr_w(buffer)); + ok(!memcmp(buffer, L"test", 4 * sizeof(WCHAR)), "buf = %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); ok(buffer[4] == 0xcccc, "buffer[4] = %x\n", buffer[4]);
memset(buffer, 0xcc, sizeof(buffer)); res = p_snwprintf(buffer, 3, L"test"); ok(res == -1, "res = %d\n", res); - ok(!memcmp(buffer, L"tes", 3 * sizeof(WCHAR)), "buf = %s\n", debugstr_w(buffer)); + ok(!memcmp(buffer, L"tes", 3 * sizeof(WCHAR)), "buf = %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); ok(buffer[3] == 0xcccc, "buffer[3] = %x\n", buffer[3]);
memset(buffer, 0xcc, sizeof(buffer)); res = p_snwprintf(buffer, 4, L"%s", L"test"); ok(res == 4, "res = %d\n", res); - ok(!memcmp(buffer, L"test", 4 * sizeof(WCHAR)), "buf = %s\n", debugstr_w(buffer)); + ok(!memcmp(buffer, L"test", 4 * sizeof(WCHAR)), "buf = %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); ok(buffer[4] == 0xcccc, "buffer[4] = %x\n", buffer[4]);
memset(buffer, 0xcc, sizeof(buffer)); res = p_snwprintf(buffer, 3, L"%s", L"test"); ok(res == -1, "res = %d\n", res); - ok(!memcmp(buffer, L"tes", 3), "buf = %s\n", debugstr_w(buffer)); + ok(!memcmp(buffer, L"tes", 3), "buf = %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); ok(buffer[3] == 0xcccc, "buffer[3] = %x\n", buffer[3]);
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%I64x %d", (ULONGLONG)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%I32x %d", 0x123456, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"123456 1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"123456 1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%#x %#x", 0, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"0 0x1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"0 0x1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%hx %hd", 0x123456, 987654); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"3456 4614"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"3456 4614"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
if (sizeof(void *) == 8) { res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%Ix %d", (ULONG_PTR)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%zx %d", (ULONG_PTR)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"1234567890 1") || broken(!wcscmp(buffer, L"zx 878082192")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%tx %d", (ULONG_PTR)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"1234567890 1") || broken(!wcscmp(buffer, L"tx 878082192")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%jx %d", (ULONG_PTR)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"1234567890 1") || broken(!wcscmp(buffer, L"jx 878082192")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%llx %d", (ULONG_PTR)0x1234567890, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"1234567890 1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); } else { res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%Ix %d", (ULONG_PTR)0x123456, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); - ok(!wcscmp(buffer, L"123456 1"), "got %s\n", debugstr_w(buffer)); + ok(!wcscmp(buffer, L"123456 1"), "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%zx %d", (ULONG_PTR)0x123456, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"123456 1") || broken(!wcscmp(buffer, L"zx 1193046")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%tx %d", (ULONG_PTR)0x123456, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"123456 1") || broken(!wcscmp(buffer, L"tx 1193046")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%jx %d", 0x1234567890ull, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"1234567890 1") || broken(!wcscmp(buffer, L"jx 878082192")), - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)));
res = p_snwprintf(buffer, ARRAY_SIZE(buffer), L"%llx %d", 0x1234567890ull, 1); ok(res == lstrlenW(buffer), "wrong size %d\n", res); ok(!wcscmp(buffer, L"1234567890 1") || broken(!wcscmp(buffer, L"34567890 18")), /* winxp */ - "got %s\n", debugstr_w(buffer)); + "got %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer))); } }