Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Avoid connecting to the RPC server more than once.

Browse source 
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>

wine commit id 6135b38d7d60e7bceb36a57630cad72d3e7e4b2e by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-12 23:22:08 +01:00 • committed by Mark Jansen
parent 1fa71cf3c5
commit dfdb6d1050
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dll/win32/msi/custom.c
View file

@ -537,6 +537,8 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
TRACE("%s\n", debugstr_guid( guid )); TRACE("%s\n", debugstr_guid( guid ));
if (!rpc_handle)
{
status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str);
if (status != RPC_S_OK) if (status != RPC_S_OK)
{ {
@ -550,6 +552,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
return status; return status;
} }
RpcStringFreeW(&binding_str); RpcStringFreeW(&binding_str);
}
r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package);
if (r != ERROR_SUCCESS) 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(dll);
midl_user_free(proc); midl_user_free(proc);
RpcBindingFree(&rpc_handle);
return r; return r;
} }

2
dll/win32/msi/package.c
View file

@ -344,6 +344,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg)
CloseHandle( package->log_file ); CloseHandle( package->log_file );
if (package->rpc_server_started) if (package->rpc_server_started)
RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE);
if (rpc_handle)
RpcBindingFree(&rpc_handle);
if (package->delete_on_close) DeleteFileW( package->localfile ); if (package->delete_on_close) DeleteFileW( package->localfile );
msi_free( package->localfile ); msi_free( package->localfile );