=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32/tests: Allow GetLastError to be unchanged in a test.

Alexandre Julliard julliard at winehq.org
Fri Mar 30 12:32:36 CDT 2018


Module: wine
Branch: master
Commit: d28628e9204e684bb695d1580abbf06eab89a2ff
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d28628e9204e684bb695d1580abbf06eab89a2ff

Author: André Hentschel <nerv at dawncrow.de>
Date:   Thu Mar 29 19:28:57 2018 +0200

kernel32/tests: Allow GetLastError to be unchanged in a test.

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/locale.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 5d5cc17..d8f51d3 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -4660,7 +4660,8 @@ static void test_GetGeoInfo(void)
     SetLastError(0xdeadbeef);
     ret = pGetGeoInfoA(344, GEO_ISO2, NULL, 0, 0);
     ok(ret == 0, "got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER ||
+       broken(GetLastError() == 0xdeadbeef /* Win10 */), "got %d\n", GetLastError());
 
     ret = pGetGeoInfoA(203, GEO_ISO2, NULL, 0, 0);
     ok(ret == 3, "got %d\n", ret);




More information about the wine-cvs mailing list