[ros-diffs] [reactos] 121/360: [WINESYNC] msi: Avoid connecting to the RPC server more than once.

[winesync]

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

commit dfdb6d105098e693ddbbdc721f22e4244096c60e
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 23:22:08 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:57 2022 +0100

    [WINESYNC] msi: Avoid connecting to the RPC server more than once.
    
    This is a no-op as is, but is necessary as of the next patch in the case of
    nested custom actions.
    
    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 6135b38d7d60e7bceb36a57630cad72d3e7e4b2e by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/custom.c  | 27 ++++++++++++++-------------
 dll/win32/msi/package.c |  2 ++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c
index 216a9bece8f..4202f255973 100644
--- a/dll/win32/msi/custom.c
+++ b/dll/win32/msi/custom.c
@@ -537,19 +537,22 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
 
     TRACE("%s\n", debugstr_guid( guid ));
 
-    status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL,
&binding_str);
-    if (status != RPC_S_OK)
+    if (!rpc_handle)
     {
-        ERR("RpcStringBindingCompose failed: %#x\n", status);
-        return status;
-    }
-    status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
-    if (status != RPC_S_OK)
-    {
-        ERR("RpcBindingFromStringBinding failed: %#x\n", status);
-        return status;
+        status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL,
&binding_str);
+        if (status != RPC_S_OK)
+        {
+            ERR("RpcStringBindingCompose failed: %#x\n", status);
+            return status;
+        }
+        status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
+        if (status != RPC_S_OK)
+        {
+            ERR("RpcBindingFromStringBinding failed: %#x\n", status);
+            return status;
+        }
+        RpcStringFreeW(&binding_str);
     }
-    RpcStringFreeW(&binding_str);
 
     r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package);
     if (r != ERROR_SUCCESS)
@@ -597,8 +600,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
     midl_user_free(dll);
     midl_user_free(proc);
 
-    RpcBindingFree(&rpc_handle);
-
     return r;
 }
 
diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c
index 7cc9444a0f0..03927046190 100644
--- a/dll/win32/msi/package.c
+++ b/dll/win32/msi/package.c
@@ -344,6 +344,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg)
     CloseHandle( package->log_file );
     if (package->rpc_server_started)
         RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE);
+    if (rpc_handle)
+        RpcBindingFree(&rpc_handle);
 
     if (package->delete_on_close) DeleteFileW( package->localfile );
     msi_free( package->localfile );