mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 04:51:11 +00:00
cabinet: Pass the session Error to FDICopy.
This commit is contained in:
parent
b76efcb61f
commit
80e149d62c
|
@ -306,7 +306,6 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName)
|
||||||
{
|
{
|
||||||
HRESULT res = S_OK;
|
HRESULT res = S_OK;
|
||||||
HFDI hfdi;
|
HFDI hfdi;
|
||||||
ERF erf;
|
|
||||||
char *str, *path, *name;
|
char *str, *path, *name;
|
||||||
|
|
||||||
TRACE("(%p, %s)\n", dest, szCabName);
|
TRACE("(%p, %s)\n", dest, szCabName);
|
||||||
|
@ -319,7 +318,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName)
|
||||||
fdi_close,
|
fdi_close,
|
||||||
fdi_seek,
|
fdi_seek,
|
||||||
cpuUNKNOWN,
|
cpuUNKNOWN,
|
||||||
&erf);
|
&dest->Error);
|
||||||
|
|
||||||
if (!hfdi)
|
if (!hfdi)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
|
@ -597,10 +597,10 @@ static void test_Extract(void)
|
||||||
"Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", res);
|
"Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", res);
|
||||||
ok(session.Error.erfOper == FDIERROR_CABINET_NOT_FOUND,
|
ok(session.Error.erfOper == FDIERROR_CABINET_NOT_FOUND,
|
||||||
"Expected FDIERROR_CABINET_NOT_FOUND, got %d\n", session.Error.erfOper);
|
"Expected FDIERROR_CABINET_NOT_FOUND, got %d\n", session.Error.erfOper);
|
||||||
ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError);
|
|
||||||
}
|
}
|
||||||
ok(session.FileSize == 0, "Expected 0, got %d\n", session.FileSize);
|
ok(session.FileSize == 0, "Expected 0, got %d\n", session.FileSize);
|
||||||
ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType);
|
ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType);
|
||||||
|
ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError);
|
||||||
ok(session.FileCount == 0, "Expected 0, got %d\n", session.FileCount);
|
ok(session.FileCount == 0, "Expected 0, got %d\n", session.FileCount);
|
||||||
ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES),
|
ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES),
|
||||||
"Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation);
|
"Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation);
|
||||||
|
|
Loading…
Reference in a new issue