Paul Vriens : ole32/tests: Check for correct return value.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0eeb5727b20ccb4b8689b9f0e0e51d82d833dd31
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0eeb5727b20ccb4b8689b9f0e0...

Author: Paul Vriens 
Date:   Fri May 11 20:33:22 2007 +0200

ole32/tests: Check for correct return value.

---

dlls/ole32/tests/moniker.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c
index 48a5262..14f5018 100644
--- a/dlls/ole32/tests/moniker.c
+++ b/dlls/ole32/tests/moniker.c
@@ -777,12 +777,14 @@ static void test_MkParseDisplayName(void)
     ok_ole_success(hr, CreateBindCtx);

hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk);
-    ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr);
+    ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */,
+        "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr);

/* no special handling of "clsid:" without the string form of the clsid
      * following */
     hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk);
-    ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr);
+    ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */,
+        "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr);

/* shows clsid has higher precedence than a running object */
     hr = CreateFileMoniker(wszDisplayName, &pmk);
@@ -849,7 +851,8 @@ static void test_MkParseDisplayName(void)
     }

hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk);
-    ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName with ProgId without marker should fail with MK_E_CANTOPENFILE instead of 0x%08x\n", hr);
+    ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */,
+        "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr);

hr = CoRevokeClassObject(pdwReg1);
     ok_ole_success(hr, CoRevokeClassObject);