[1/6]kernel32/tests: run fiber on more platforms
André Hentschel
nerv at dawncrow.de
Sun Jan 24 09:29:30 CST 2010
all six applied passes all winetestbot machines
---
dlls/kernel32/tests/fiber.c | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c
index 34bc0c3..30c4a5e 100644
--- a/dlls/kernel32/tests/fiber.c
+++ b/dlls/kernel32/tests/fiber.c
@@ -27,39 +27,51 @@ static void (WINAPI *pSwitchToFiber)(LPVOID);
static void (WINAPI *pDeleteFiber)(LPVOID);
static LPVOID fibers[2];
-static BYTE testparam = 187;
+static BYTE testparam = 185;
-static BOOL init_funcs(void)
+static VOID init_funcs(void)
{
HMODULE hKernel32 = GetModuleHandle("kernel32");
-#define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE;
+#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f);
X(CreateFiber);
X(ConvertThreadToFiber);
X(ConvertFiberToThread);
X(SwitchToFiber);
X(DeleteFiber);
#undef X
-
- return TRUE;
}
static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter)
{
BYTE *tparam = (BYTE *)lpFiberParameter;
- ok(*tparam == 187, "Parameterdata expected not to be changed\n");
+ ok(*tparam == 185, "Parameterdata expected not to be changed\n");
pSwitchToFiber(fibers[0]);
}
static void test_ConvertThreadToFiber(void)
{
- fibers[0] = pConvertThreadToFiber(&testparam);
- ok(fibers[0] != 0, "ConvertThreadToFiber failed with error %d\n", GetLastError());
+ if (pConvertThreadToFiber)
+ {
+ fibers[0] = pConvertThreadToFiber(&testparam);
+ ok(fibers[0] != 0, "ConvertThreadToFiber failed with error %d\n", GetLastError());
+ }
+ else
+ {
+ win_skip( "ConvertThreadToFiber not present\n" );
+ }
}
static void test_ConvertFiberToThread(void)
{
- ok(pConvertFiberToThread() , "ConvertThreadToFiber failed with error %d\n", GetLastError());
+ if (pConvertFiberToThread)
+ {
+ ok(pConvertFiberToThread() , "ConvertFiberToThread failed with error %d\n", GetLastError());
+ }
+ else
+ {
+ win_skip( "ConvertFiberToThread not present\n" );
+ }
}
static void test_CreateFiber(void)
@@ -73,9 +85,11 @@ static void test_CreateFiber(void)
START_TEST(fiber)
{
- if (!init_funcs())
+ init_funcs();
+
+ if (!pCreateFiber)
{
- win_skip("Needed functions are not available\n");
+ win_skip( "Fibers not supported by win95\n" );
return;
}
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list