[ros-diffs] [reactos] 130/360: [WINESYNC] msi: Don't start the custom action server inside of custom_client_thread().

[winesync]

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

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

    [WINESYNC] msi: Don't start the custom action server inside of
custom_client_thread().
    
    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(a)gmail.com>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 3a884c2ef7a5828a5b42bf9d2532422afeac0fd8 by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/custom.c | 61 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c
index e7ee80c689d..3d426190f00 100644
--- a/dll/win32/msi/custom.c
+++ b/dll/win32/msi/custom.c
@@ -389,6 +389,7 @@ typedef struct _msi_custom_action_info {
     LPWSTR action;
     INT type;
     GUID guid;
+    DWORD arch;
 } msi_custom_action_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)
 {
     msi_custom_action_info *info = arg;
-    RPC_STATUS status;
     DWORD64 thread64;
     HANDLE process;
     HANDLE thread;
     HANDLE pipe;
-    DWORD arch;
     DWORD size;
-    BOOL ret;
     UINT rc;
 
     CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */
 
-    if (!info->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 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)
+    if (info->arch == SCS_32BIT_BINARY)
     {
         process = info->package->custom_server_32_process;
         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 )
 {
     msi_custom_action_info *info;
+    RPC_STATUS status;
+    BOOL ret;
 
     info = msi_alloc( sizeof *info );
     if (!info)
@@ -774,6 +748,33 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
     list_add_tail( &msi_pending_custom_actions, &info->entry );
     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);
     if (!info->handle)
     {