[PATCH] kernel32/tests: Fix some codepage tests under Windows 10.
Zebediah Figura
z.figura12 at gmail.com
Fri Oct 25 21:01:24 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/kernel32/tests/codepage.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c
index 38f094fcc8..8b6584415c 100644
--- a/dlls/kernel32/tests/codepage.c
+++ b/dlls/kernel32/tests/codepage.c
@@ -271,7 +271,8 @@ static void test_other_invalid_parameters(void)
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL);
- ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError());
+ ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER)
+ || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError());
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL);
@@ -286,7 +287,8 @@ static void test_other_invalid_parameters(void)
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used);
- ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError());
+ ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER)
+ || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError());
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used);
@@ -304,7 +306,9 @@ static void test_other_invalid_parameters(void)
/* CP_UTF8, unrecognized flag and used not NULL => ERROR_INVALID_PARAMETER */
SetLastError(0xdeadbeef);
len = WideCharToMultiByte(CP_UTF8, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, &used);
- ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError());
+ ok(len == 0, "wrong ret %d\n", len);
+ ok(GetLastError() == ERROR_INVALID_PARAMETER
+ || GetLastError() == ERROR_INVALID_FLAGS /* Win10 1709+ */, "wrong error %u\n", GetLastError());
}
static void test_overlapped_buffers(void)
--
2.20.1
More information about the wine-devel
mailing list