James Hawkins : cabinet: Fix two tests that return E_FAIL on win98.

Alexandre Julliard julliard at winehq.org
Fri Oct 26 08:34:43 CDT 2007


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

Author: James Hawkins <truiken at gmail.com>
Date:   Thu Oct 25 15:19:17 2007 -0500

cabinet: Fix two tests that return E_FAIL on win98.

---

 dlls/cabinet/tests/extract.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c
index 5ce5ba8..2cf5154 100644
--- a/dlls/cabinet/tests/extract.c
+++ b/dlls/cabinet/tests/extract.c
@@ -604,8 +604,8 @@ static void test_Extract(void)
     node = session.FileList;
     todo_wine
     {
-        ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED),
-           "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res);
+        ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL,
+           "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res);
         ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize);
         ok(session.Error.erfOper == FDIERROR_USER_ABORT,
            "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper);
@@ -644,8 +644,8 @@ static void test_Extract(void)
     res = pExtract(&session, "extract.cab");
     todo_wine
     {
-        ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED),
-           "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res);
+        ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL,
+           "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res);
         ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize);
         ok(session.Error.erfOper == FDIERROR_USER_ABORT,
            "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper);




More information about the wine-cvs mailing list