Module: wine Branch: master Commit: a3dfd2f251f336f1cc570863edb60251227cdf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3dfd2f251f336f1cc570863e...
Author: Zebediah Figura z.figura12@gmail.com Date: Sun Mar 24 12:06:45 2019 -0500
msi: Don't fail the BindImage action if the BindImage table is absent.
This fixes a regression introduced with 15f852015a0332313821804cc1fbad79216408c6 and observable with several installers, including dotnet472.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46885 Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 b51a21d..e2f91c3 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 9c8652b..27dc83f 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"