[ros-diffs] [reactos] 212/360: [WINESYNC] msi: Don't fail the BindImage action if the BindImage table is absent.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e89ff1f99ba97d46bb2bd…

commit e89ff1f99ba97d46bb2bd914373e07e79fbff761
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 01:17:51 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:15 2022 +0100

    [WINESYNC] 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(a)gmail.com>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id a3dfd2f251f336f1cc570863edb60251227cdf5d by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/action.c                   | 4 ++--
 modules/rostests/winetests/msi/install.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c
index 38ce1d0a62f..626e6c9032d 100644
--- a/dll/win32/msi/action.c
+++ b/dll/win32/msi/action.c
@@ -7827,10 +7827,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/modules/rostests/winetests/msi/install.c
b/modules/rostests/winetests/msi/install.c
index 9c8652b353c..27dc83f87e2 100644
--- a/modules/rostests/winetests/msi/install.c
+++ b/modules/rostests/winetests/msi/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"