Paul Gofman : kernel32/tests: Fix fiber test errors on newer Win10.
Alexandre Julliard
julliard at winehq.org
Thu Oct 1 15:50:29 CDT 2020
Module: wine
Branch: master
Commit: d25854ad3167e98f703b60d32acf0e7d94d51be6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25854ad3167e98f703b60d32acf0e7d94d51be6
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Tue Sep 29 23:15:28 2020 +0300
kernel32/tests: Fix fiber test errors on newer Win10.
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/fiber.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c
index 7501165dc8..db2bd0923b 100644
--- a/dlls/kernel32/tests/fiber.c
+++ b/dlls/kernel32/tests/fiber.c
@@ -217,13 +217,12 @@ static void test_FiberLocalStorage(void)
SetLastError( 0xdeadbeef );
ret = pFlsSetValue( 128, (void*) 0x217 );
- ok( !ret, "setting fls index 128 (out of bounds) succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER,
+ ok( ret || GetLastError() == ERROR_INVALID_PARAMETER,
"setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
val = pFlsGetValue( 128 );
- ok( GetLastError() == ERROR_INVALID_PARAMETER,
+ ok( GetLastError() == ERROR_INVALID_PARAMETER || val == (void *)0x217,
"getting fls index 128 (out of bounds) wrong error %u\n", GetLastError() );
/* Test index 0 */
@@ -276,7 +275,7 @@ static void test_FiberLocalStorage(void)
SetLastError( 0xdeadbeef );
val = pFlsGetValue( fls_2 );
- ok( val == NULL, "fls index %u wrong value %p\n", fls, val );
+ ok( val == NULL || val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val );
ok( GetLastError() == ERROR_SUCCESS,
"getting fls index %u failed with error %u\n", fls_2, GetLastError() );
pFlsFree( fls_2 );
More information about the wine-cvs
mailing list