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

advpack: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.

This commit is contained in:
Rob Shearman 2008-09-12 13:00:55 +01:00 committed by Alexandre Julliard
parent 19e9b665c6
commit 6bfead8421
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advpack/files.c
View File

@ -627,7 +627,7 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis
struct FILELIST *pNode; struct FILELIST *pNode;
session->Operation |= EXTRACT_FILLFILELIST; session->Operation |= EXTRACT_FILLFILELIST;
if (pExtract(session, szCabName)) if (pExtract(session, szCabName) != S_OK)
{ {
session->Operation &= ~EXTRACT_FILLFILELIST; session->Operation &= ~EXTRACT_FILLFILELIST;
return -1; return -1;

6
dlls/advpack/install.c
View File

@ -91,7 +91,7 @@ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg)
MAX_INF_STRING_LENGTH, &size)) MAX_INF_STRING_LENGTH, &size))
continue; continue;
if (DelNodeW(directory, ADN_DEL_IF_EMPTY)) if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK)
hr = E_FAIL; 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); hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (hm) if (hm)
{ {
if (do_ocx_reg(hm, TRUE)) if (do_ocx_reg(hm, TRUE) != S_OK)
hr = E_FAIL; hr = E_FAIL;
FreeLibrary(hm); FreeLibrary(hm);
@ -196,7 +196,7 @@ static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void *
MAX_INF_STRING_LENGTH, &size)) MAX_INF_STRING_LENGTH, &size))
continue; continue;
if (launch_exe(buffer, info->working_dir, NULL)) if (launch_exe(buffer, info->working_dir, NULL) != S_OK)
hr = E_FAIL; hr = E_FAIL;
} }

2
dlls/advpack/reg.c
View File

@ -230,7 +230,7 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT
if(!create_tmp_ini_file(hm, tmp_ini_path)) if(!create_tmp_ini_file(hm, tmp_ini_path))
return E_FAIL; return E_FAIL;
if (write_predefined_strings(hm, tmp_ini_path)) if (write_predefined_strings(hm, tmp_ini_path) != S_OK)
goto done; goto done;
/* Write the additional string table */ /* Write the additional string table */