Skip to content

W
wine-winehq
Commit e533893d authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard
Browse files
Options

cabinet: Fix two tests that return E_FAIL on win98.

parent c98ca177
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/cabinet/tests/extract.c
View file @ e533893d
...@@ -604,8 +604,8 @@ static void test_Extract(void) ...@@ -604,8 +604,8 @@ static void test_Extract(void)
node = session.FileList; node = session.FileList;
todo_wine todo_wine
{ {
ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL,
"Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res); "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.FileSize == 6, "Expected 6, got %d\n", session.FileSize);
ok(session.Error.erfOper == FDIERROR_USER_ABORT, ok(session.Error.erfOper == FDIERROR_USER_ABORT,
"Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper);
...@@ -644,8 +644,8 @@ static void test_Extract(void) ...@@ -644,8 +644,8 @@ static void test_Extract(void)
res = pExtract(&session, "extract.cab"); res = pExtract(&session, "extract.cab");
todo_wine todo_wine
{ {
ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL,
"Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res); "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.FileSize == 26, "Expected 26, got %d\n", session.FileSize);
ok(session.Error.erfOper == FDIERROR_USER_ABORT, ok(session.Error.erfOper == FDIERROR_USER_ABORT,
"Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment