Skip to content

W
wine-winehq
Commit 5263b5ec authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: In multiline strings there is no need for '\' at the end of the lines.

parent 3be9cbc4
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
dlls/kernel32/tests/atom.c
View file @ 5263b5ec
......@@ -292,7 +292,7 @@ static void test_get_atom_name(void)
{
/* len == 0 with ERROR_MORE_DATA is on NT3.51 */
ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA),
"0x%04x: got %u with %d (excepted '1' or '0' with " \
"0x%04x: got %u with %d (excepted '1' or '0' with "
"ERROR_MORE_DATA)\n", i, len, GetLastError());
ok(outW[1] == DOUBLE('.'), "buffer overwrite\n");
}
......
dlls/kernel32/tests/codepage.c
View file @ 5263b5ec
......@@ -63,7 +63,7 @@ static void test_destination_buffer(void)
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed-1, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
"returned %d with 0x%x/%d and '%s' (expected '0' with " \
"returned %d with 0x%x/%d and '%s' (expected '0' with "
"ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer);
memset(buffer, 'x', maxsize);
......@@ -71,7 +71,7 @@ static void test_destination_buffer(void)
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 1, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
"returned %d with 0x%x/%d and '%s' (expected '0' with " \
"returned %d with 0x%x/%d and '%s' (expected '0' with "
"ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer);
SetLastError(0xdeadbeef);
......@@ -82,7 +82,7 @@ static void test_destination_buffer(void)
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, needed, NULL, NULL);
ok( !len && (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %d with 0x%x/%d (expected '0' with " \
"returned %d with 0x%x/%d (expected '0' with "
"ERROR_INVALID_PARAMETER)\n", len, GetLastError(), GetLastError());
HeapFree(GetProcessHeap(), 0, buffer);
......
dlls/kernel32/tests/heap.c
View file @ 5263b5ec
......@@ -115,7 +115,7 @@ START_TEST(heap)
res = GlobalUnlock(gbl); /* #0 */
/* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */
ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)),
"returned %d with %d (expected '0' with: ERROR_SUCCESS or " \
"returned %d with %d (expected '0' with: ERROR_SUCCESS or "
"MAGIC_DEAD)\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
......@@ -128,7 +128,7 @@ START_TEST(heap)
/* NT: ERROR_NOT_LOCKED, 9x: untouched */
ok( !res &&
((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)),
"returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \
"returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or "
"MAGIC_DEAD)\n", res, GetLastError());
GlobalFree(gbl);
......@@ -141,7 +141,7 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
flags = GlobalFlags(gbl);
ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE),
"returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " \
"returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with "
"ERROR_INVALID_HANDLE)\n", flags, GetLastError());
SetLastError(MAGIC_DEAD);
size = GlobalSize(gbl);
......@@ -220,7 +220,7 @@ START_TEST(heap)
res = LocalUnlock(gbl); /* #0 */
/* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */
ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)),
"returned %d with %d (expected '0' with: ERROR_SUCCESS or " \
"returned %d with %d (expected '0' with: ERROR_SUCCESS or "
"MAGIC_DEAD)\n", res, GetLastError());
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
......@@ -233,7 +233,7 @@ START_TEST(heap)
/* NT: ERROR_NOT_LOCKED, 9x: untouched */
ok( !res &&
((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)),
"returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \
"returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or "
"MAGIC_DEAD)\n", res, GetLastError());
LocalFree(gbl);
......@@ -246,7 +246,7 @@ START_TEST(heap)
SetLastError(MAGIC_DEAD);
flags = LocalFlags(gbl);
ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE),
"returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with " \
"returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with "
"ERROR_INVALID_HANDLE)\n", flags, GetLastError());
SetLastError(MAGIC_DEAD);
size = LocalSize(gbl);
......@@ -275,7 +275,7 @@ START_TEST(heap)
/* NT: ERROR_DISCARDED, 9x: untouched */
ok( (mem == NULL) &&
((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)),
"returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " \
"returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or "
"MAGIC_DEAD)\n", mem, GetLastError(), GetLastError());
GlobalFree(gbl);
......
dlls/kernel32/tests/path.c
View file @ 5263b5ec
......@@ -974,7 +974,7 @@ static void test_GetSystemDirectory(void)
/* 95+NT: total (includes the terminating Zero)
98+ME: 0 with ERROR_INVALID_PARAMETER */
ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)),
"returned %d with 0x%x (expected '%d' or: '0' with " \
"returned %d with 0x%x (expected '%d' or: '0' with "
"ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total);
if (total > MAX_PATH) return;
......@@ -1034,7 +1034,7 @@ static void test_GetWindowsDirectory(void)
/* 95+NT: total (includes the terminating Zero)
98+ME: 0 with ERROR_INVALID_PARAMETER */
ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)),
"returned %d with 0x%x (expected '%d' or: '0' with " \
"returned %d with 0x%x (expected '%d' or: '0' with "
"ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total);
if (total > MAX_PATH) return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment