Module: wine Branch: master Commit: e2253d439fb8774cc3fbabdc371edc3ea5792110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2253d439fb8774cc3fbabdc37...
Author: Bernhard Übelacker bernhardu@mailbox.org Date: Sat Aug 6 14:40:10 2016 +0200
kernel32/tests: Convert fiber back to thread even when IsThreadAFiber is not available.
Signed-off-by: Bernhard Übelacker bernhardu@mailbox.org Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/tests/fiber.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9ff9366..7501165 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -155,28 +155,20 @@ static void test_FiberHandling(void) ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); pDeleteFiber(fibers[1]);
- if (!pCreateFiberEx) + if (pCreateFiberEx) { - win_skip( "CreateFiberEx not present\n" ); - return; - } - - fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); - ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError()); - - pSwitchToFiber(fibers[1]); - ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); - pDeleteFiber(fibers[1]); + fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); + ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError());
- if (!pIsThreadAFiber) - { - win_skip( "IsThreadAFiber not present\n" ); - return; + pSwitchToFiber(fibers[1]); + ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); + pDeleteFiber(fibers[1]); } + else win_skip( "CreateFiberEx not present\n" );
- ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); + if (pIsThreadAFiber) ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); test_ConvertFiberToThread(); - ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); + if (pIsThreadAFiber) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); }
static void test_FiberLocalStorage(void)