Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync advpack with wine 1.1.11

Browse source 
svn path=/trunk/; revision=38384
This commit is contained in:
Christoph von Wittich 2008-12-27 13:04:52 +00:00
parent 653f7f1919
commit da81dbeb59
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/advpack/files.c
View file

@ -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;

6
reactos/dll/win32/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))
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;
}

2
reactos/dll/win32/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))
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 */