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@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Avoid connecting to the RPC server more than once.
6135b38d · Zebediah Figura · Alexandre Julliard · 7908d6ee · 6135b38d · 6135b38d
Commit 6135b38d authored Jul 10, 2018 by Zebediah Figura Committed by Alexandre Julliard Jul 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 13 deletions

custom.c dlls/msi/custom.c +14 -13

package.c dlls/msi/package.c +2 -0

No files found.
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -522,19 +522,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 (!rpc_handle)
-    if (status != RPC_S_OK)
    {
-        ERR("RpcStringBindingCompose failed: %#x\n", status);
+        status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str);
-        return status;
+        if (status != RPC_S_OK)
-    }
+        {
-    status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
+            ERR("RpcStringBindingCompose failed: %#x\n", status);
-    if (status != RPC_S_OK)
+            return status;
-    {
+        }
-        ERR("RpcBindingFromStringBinding failed: %#x\n", status);
+        status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
-        return status;
+        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)
@@ -582,8 +585,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
    midl_user_free(dll);
    midl_user_free(proc);
-    RpcBindingFree(&rpc_handle);
    return r;
 }

--- a/dlls/msi/package.c
+++ b/dlls/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 );