Commit 8b6f9175 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard

cabinet: Remove useless ERR and turn one ERR into a WARN.

parent 9478e1e1
...@@ -710,7 +710,7 @@ static BOOL FDI_read_entries( ...@@ -710,7 +710,7 @@ static BOOL FDI_read_entries(
} }
/*********************************************************************** /***********************************************************************
* FDIIsCabinet (CABINET.21) * FDIIsCabinet (CABINET.21)
* *
* Informs the caller as to whether or not the provided file handle is * Informs the caller as to whether or not the provided file handle is
* really a cabinet or not, filling out the provided PFDICABINETINFO * really a cabinet or not, filling out the provided PFDICABINETINFO
...@@ -725,7 +725,7 @@ static BOOL FDI_read_entries( ...@@ -725,7 +725,7 @@ static BOOL FDI_read_entries(
* be filled out with information about the cabinet * be filled out with information about the cabinet
* file indicated by hf if, indeed, it is determined * file indicated by hf if, indeed, it is determined
* to be a cabinet. * to be a cabinet.
* *
* RETURNS * RETURNS
* TRUE if the file is a cabinet. The info pointed to by pfdici will * TRUE if the file is a cabinet. The info pointed to by pfdici will
* be provided. * be provided.
...@@ -736,10 +736,7 @@ static BOOL FDI_read_entries( ...@@ -736,10 +736,7 @@ static BOOL FDI_read_entries(
* INCLUDES * INCLUDES
* fdi.c * fdi.c
*/ */
BOOL __cdecl FDIIsCabinet( BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
HFDI hfdi,
INT_PTR hf,
PFDICABINETINFO pfdici)
{ {
BOOL rv; BOOL rv;
FDI_Int *fdi = get_fdi_ptr( hfdi ); FDI_Int *fdi = get_fdi_ptr( hfdi );
...@@ -749,13 +746,11 @@ BOOL __cdecl FDIIsCabinet( ...@@ -749,13 +746,11 @@ BOOL __cdecl FDIIsCabinet(
if (!fdi) return FALSE; if (!fdi) return FALSE;
if (!hf) { if (!hf) {
ERR("(!hf)!\n");
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
return FALSE; return FALSE;
} }
if (!pfdici) { if (!pfdici) {
ERR("(!pfdici)!\n");
SetLastError(ERROR_BAD_ARGUMENTS); SetLastError(ERROR_BAD_ARGUMENTS);
return FALSE; return FALSE;
} }
...@@ -2533,7 +2528,7 @@ BOOL __cdecl FDICopy( ...@@ -2533,7 +2528,7 @@ BOOL __cdecl FDICopy(
/* check if it's really a cabfile. Note that this doesn't implement the bug */ /* check if it's really a cabfile. Note that this doesn't implement the bug */
if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) {
ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper);
fdi->free(decomp_state); fdi->free(decomp_state);
fdi->close(cabhf); fdi->close(cabhf);
return FALSE; return FALSE;
......
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