Reece Dunn : shlwapi/tests: Skip SHCreateStreamOnFileA/ W configurations not supported on Win98 SE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1571337c0366b27e819851d7cdec4a7bc1ce7690
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1571337c0366b27e819851d7cd...

Author: Reece Dunn 
Date:   Tue Feb 23 07:39:05 2010 +0000

shlwapi/tests: Skip SHCreateStreamOnFileA/W configurations not supported on Win98 SE.

---

dlls/shlwapi/tests/istream.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c
index 67d1fe2..9501cd8 100644
--- a/dlls/shlwapi/tests/istream.c
+++ b/dlls/shlwapi/tests/istream.c
@@ -208,12 +208,16 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm)
     /* invalid arguments */

stream = NULL;
-    /* NT: ERROR_PATH_NOT_FOUND, 9x: ERROR_BAD_PATHNAME */
     ret = (*pSHCreateStreamOnFileA)(NULL, mode | stgm, &stream);
-    ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) ||
-        ret == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME),
-        "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)"
-        "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret);
+    if (ret == E_INVALIDARG) /* Win98 SE */ {
+        win_skip("Not supported\n");
+        return;
+    }
+
+    ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) /* NT */ ||
+       ret == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* 9x */,
+       "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) "
+       "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret);
     ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream);

#if 0 /* This test crashes on WinXP SP2 */
@@ -342,6 +346,11 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm)

stream = NULL;
     ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream);
+    if (ret == E_INVALIDARG) /* Win98 SE */ {
+        win_skip("Not supported\n");
+        return;
+    }
+
     ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret);
     ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream);