[PATCH] msi: Don't fail the BindImage action if the BindImage table is absent.
Zebediah Figura
z.figura12 at gmail.com
Sun Mar 24 12:06:45 CDT 2019
This fixes a regression introduced with
15f852015a0332313821804cc1fbad79216408c6 and observable with several
installers, including dotnet472.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/action.c | 4 ++--
dlls/msi/tests/install.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index b51a21d457..e2f91c3774 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -7809,10 +7809,10 @@ static UINT ACTION_BindImage( MSIPACKAGE *package )
r = MSI_DatabaseOpenViewW( package->db, query, &view );
if (r == ERROR_SUCCESS)
{
- r = MSI_IterateRecords( view, NULL, ITERATE_BindImage, package );
+ MSI_IterateRecords( view, NULL, ITERATE_BindImage, package );
msiobj_release( &view->hdr );
}
- return r;
+ return ERROR_SUCCESS;
}
static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table )
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 3c040e350c..e348f32701 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -135,6 +135,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
"ResolveSource\t\t950\n"
"MoveFiles\t\t1700\n"
"InstallFiles\t\t4000\n"
+ "BindImage\t\t4100\n"
"DuplicateFiles\t\t4500\n"
"WriteEnvironmentStrings\t\t4550\n"
"CreateShortcuts\t\t4600\n"
--
2.17.1
More information about the wine-devel
mailing list