From 0b533513c63d34f742ad890367f64bc502b55580 Mon Sep 17 00:00:00 2001
From: Paul Vriens <Paul.Vriens.Wine@gmail.com>
Date: Fri, 19 Jun 2009 12:30:46 +0200
Subject: [PATCH] mapi32/tests: Don't run tests if ScInitMapiUtil() fails.

---
 dlls/mapi32/tests/util.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c
index 6cb7770203..af4fc57c7a 100644
--- a/dlls/mapi32/tests/util.c
+++ b/dlls/mapi32/tests/util.c
@@ -51,8 +51,7 @@ static void test_SwapPword(void)
     shorts[1] = 0x10ff;
     shorts[2] = 0x2001;
     pSwapPword(shorts, 2);
-    ok((shorts[0] == 0x01ff && shorts[1] == 0xff10 && shorts[2] == 0x2001) ||
-       broken(shorts[0] == 0xff01 && shorts[1] == 0x10ff && shorts[2] == 0x2001) /* Win9x */,
+    ok((shorts[0] == 0x01ff && shorts[1] == 0xff10 && shorts[2] == 0x2001),
        "Expected {0x01ff,0xff10,0x2001}, got {0x%04x,0x%04x,0x%04x}\n",
        shorts[0], shorts[1], shorts[2]);
 }
@@ -69,8 +68,7 @@ static void test_SwapPlong(void)
     longs[1] = 0x1000ffff;
     longs[2] = 0x20000001;
     pSwapPlong(longs, 2);
-    ok((longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001) ||
-       broken(longs[0] == 0xffff0001 && longs[1] == 0x1000ffff && longs[2] == 0x20000001) /* Win9x */,
+    ok((longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001),
        "Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08x,0x%08x,0x%08x}\n",
        longs[0], longs[1], longs[2]);
 }
@@ -153,7 +151,7 @@ static void test_CbOfEncoded(void)
         memset(buff, '\0', sizeof(buff));
         memset(buff, '?', i);
         ulRet = pCbOfEncoded(buff);
-        ok(ulRet == ulExpected || broken(ulRet == 0) /* Win9x */,
+        ok(ulRet == ulExpected,
            "CbOfEncoded(length %d): expected %d, got %d\n",
            i, ulExpected, ulRet);
     }
@@ -193,6 +191,12 @@ START_TEST(util)
         FreeLibrary(hMapi32);
         return;
     }
+    else if ((ret == E_FAIL) && (GetLastError() == ERROR_INVALID_HANDLE))
+    {
+        win_skip("ScInitMapiUtil doesn't work on some Win98 and WinME systems\n");
+        FreeLibrary(hMapi32);
+        return;
+    }
 
     test_SwapPword();
     test_SwapPlong();