advpack: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
This commit is contained in:
parent
19e9b665c6
commit
6bfead8421
|
@ -627,7 +627,7 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis
|
|||
struct FILELIST *pNode;
|
||||
|
||||
session->Operation |= EXTRACT_FILLFILELIST;
|
||||
if (pExtract(session, szCabName))
|
||||
if (pExtract(session, szCabName) != S_OK)
|
||||
{
|
||||
session->Operation &= ~EXTRACT_FILLFILELIST;
|
||||
return -1;
|
||||
|
|
|
@ -91,7 +91,7 @@ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg)
|
|||
MAX_INF_STRING_LENGTH, &size))
|
||||
continue;
|
||||
|
||||
if (DelNodeW(directory, ADN_DEL_IF_EMPTY))
|
||||
if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK)
|
||||
hr = E_FAIL;
|
||||
}
|
||||
|
||||
|
@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg)
|
|||
hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
|
||||
if (hm)
|
||||
{
|
||||
if (do_ocx_reg(hm, TRUE))
|
||||
if (do_ocx_reg(hm, TRUE) != S_OK)
|
||||
hr = E_FAIL;
|
||||
|
||||
FreeLibrary(hm);
|
||||
|
@ -196,7 +196,7 @@ static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void *
|
|||
MAX_INF_STRING_LENGTH, &size))
|
||||
continue;
|
||||
|
||||
if (launch_exe(buffer, info->working_dir, NULL))
|
||||
if (launch_exe(buffer, info->working_dir, NULL) != S_OK)
|
||||
hr = E_FAIL;
|
||||
}
|
||||
|
||||
|
|
|
@ -230,7 +230,7 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT
|
|||
if(!create_tmp_ini_file(hm, tmp_ini_path))
|
||||
return E_FAIL;
|
||||
|
||||
if (write_predefined_strings(hm, tmp_ini_path))
|
||||
if (write_predefined_strings(hm, tmp_ini_path) != S_OK)
|
||||
goto done;
|
||||
|
||||
/* Write the additional string table */
|
||||
|
|
Loading…
Reference in New Issue