ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cabinet: Accept hf == 0 in FDIIsCabinet.

This commit is contained in:
Vincent Povirk 2014-12-02 16:28:59 -06:00 committed by Alexandre Julliard
parent 685c68ba61
commit c97da4c944
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/cabinet/fdi.c
View File

@ -702,11 +702,6 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
if (!fdi) return FALSE; if (!fdi) return FALSE;
if (!hf) {
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
if (!pfdici) { if (!pfdici) {
SetLastError(ERROR_BAD_ARGUMENTS); SetLastError(ERROR_BAD_ARGUMENTS);
return FALSE; return FALSE;

2
dlls/cabinet/tests/fdi.c
View File

@ -727,14 +727,12 @@ static void test_FDIIsCabinet(void)
ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); ZeroMemory(&cabinfo, sizeof(FDICABINETINFO));
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = FDIIsCabinet(hfdi, 0, &cabinfo); ret = FDIIsCabinet(hfdi, 0, &cabinfo);
todo_wine {
ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles);
ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders);
ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID);
ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet);
}
ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet);
fdi_close(static_fdi_handle); fdi_close(static_fdi_handle);