From da81dbeb591569089d2df754ca2d5dfa2ebddcab Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 27 Dec 2008 13:04:52 +0000 Subject: [PATCH] sync advpack with wine 1.1.11 svn path=/trunk/; revision=38384 --- reactos/dll/win32/advpack/files.c | 2 +- reactos/dll/win32/advpack/install.c | 6 +++--- reactos/dll/win32/advpack/reg.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c index 3aabc082c16..63f4080b934 100644 --- a/reactos/dll/win32/advpack/files.c +++ b/reactos/dll/win32/advpack/files.c @@ -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; diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c index 0ec5ceb4add..129ea828146 100644 --- a/reactos/dll/win32/advpack/install.c +++ b/reactos/dll/win32/advpack/install.c @@ -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; } diff --git a/reactos/dll/win32/advpack/reg.c b/reactos/dll/win32/advpack/reg.c index bcb6cb9d596..9a430159ecc 100644 --- a/reactos/dll/win32/advpack/reg.c +++ b/reactos/dll/win32/advpack/reg.c @@ -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 */