Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 20:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Don't start the custom action server inside of custom_client_thread().

Browse source 
Asynchronous custom actions don't wait for custom_client_thread() to
terminate, so it's possible for two consecutive actions to both try to start
the server at once, causing failures when the second action e.g. receives
ERROR_PIPE_BUSY from CreateNamedPipe().

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 3a884c2ef7a5828a5b42bf9d2532422afeac0fd8 by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-12 23:50:40 +01:00 committed by Mark Jansen
parent 55b4e50af8
commit eca4d999d6
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -389,6 +389,7 @@ typedef struct _msi_custom_action_info {
LPWSTR action; LPWSTR action;
INT type; INT type;
GUID guid; GUID guid;
DWORD arch;
} msi_custom_action_info; } msi_custom_action_info;
static void release_custom_action_data( msi_custom_action_info *info ) static void release_custom_action_data( msi_custom_action_info *info )
@ -677,45 +678,16 @@ void custom_stop_server(HANDLE process, HANDLE pipe)
static DWORD WINAPI custom_client_thread(void *arg) static DWORD WINAPI custom_client_thread(void *arg)
{ {
msi_custom_action_info *info = arg; msi_custom_action_info *info = arg;
RPC_STATUS status;
DWORD64 thread64; DWORD64 thread64;
HANDLE process; HANDLE process;
HANDLE thread; HANDLE thread;
HANDLE pipe; HANDLE pipe;
DWORD arch;
DWORD size; DWORD size;
BOOL ret;
UINT rc; UINT rc;
CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */
if (!info->package->rpc_server_started) if (info->arch == SCS_32BIT_BINARY)
{
status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
endpoint_lrpcW, NULL);
if (status != RPC_S_OK)
{
ERR("RpcServerUseProtseqEp failed: %#x\n", status);
return status;
}
status = RpcServerRegisterIfEx((RPC_IF_HANDLE)s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL,
RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL);
if (status != RPC_S_OK)
{
ERR("RpcServerRegisterIfEx failed: %#x\n", status);
return status;
}
info->package->rpc_server_started = 1;
}
ret = GetBinaryTypeW(info->source, &arch);
if (!ret)
arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);
custom_start_server(info->package, arch);
if (arch == SCS_32BIT_BINARY)
{ {
process = info->package->custom_server_32_process; process = info->package->custom_server_32_process;
pipe = info->package->custom_server_32_pipe; pipe = info->package->custom_server_32_pipe;
@ -756,6 +728,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action )
{ {
msi_custom_action_info *info; msi_custom_action_info *info;
RPC_STATUS status;
BOOL ret;
info = msi_alloc( sizeof *info ); info = msi_alloc( sizeof *info );
if (!info) if (!info)
@ -774,6 +748,33 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
list_add_tail( &msi_pending_custom_actions, &info->entry ); list_add_tail( &msi_pending_custom_actions, &info->entry );
LeaveCriticalSection( &msi_custom_action_cs ); LeaveCriticalSection( &msi_custom_action_cs );
if (!package->rpc_server_started)
{
status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
endpoint_lrpcW, NULL);
if (status != RPC_S_OK)
{
ERR("RpcServerUseProtseqEp failed: %#x\n", status);
return NULL;
}
status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL,
RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL);
if (status != RPC_S_OK)
{
ERR("RpcServerRegisterIfEx failed: %#x\n", status);
return NULL;
}
info->package->rpc_server_started = 1;
}
ret = GetBinaryTypeW(source, &info->arch);
if (!ret)
info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);
custom_start_server(package, info->arch);
info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);
if (!info->handle) if (!info->handle)
{ {