Alexandre Julliard : ntdll: Add a helper function to return the alternate 32/64 loader.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bdc11ee079878fdd3fa3ed8ac274cbd6effba59d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bdc11ee079878fdd3fa3ed8ac274cbd...

Author: Alexandre Julliard 
Date:   Tue Mar 28 11:57:34 2023 +0200

ntdll: Add a helper function to return the alternate 32/64 loader.

---

dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 119de56e204..0d719979046 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -653,6 +653,32 @@ static void init_paths( char *argv[] )
 }

+/***********************************************************************
+ *           get_alternate_wineloader
+ */
+static char *get_alternate_wineloader( WORD machine )
+{
+    char *ret = NULL;
+
+    if (machine == current_machine) return NULL;
+
+    if (machine == IMAGE_FILE_MACHINE_AMD64)  /* try the 64-bit loader */
+    {
+        size_t len = strlen(wineloader);
+
+        if (len <= 2 || strcmp( wineloader + len - 2, "64" ))
+        {
+            ret = malloc( len + 3 );
+            strcpy( ret, wineloader );
+            strcat( ret, "64" );
+        }
+        return ret;
+    }
+
+    return remove_tail( wineloader, "64" );
+}
+
+
 static void preloader_exec( char **argv )
 {
     if (use_preloader)
@@ -686,22 +712,7 @@ static void preloader_exec( char **argv )
 /* exec the appropriate wine loader for the specified machine */
 static NTSTATUS loader_exec( char **argv, WORD machine )
 {
-    if (machine != current_machine)
-    {
-        if (machine == IMAGE_FILE_MACHINE_AMD64)  /* try the 64-bit loader */
-        {
-            size_t len = strlen(wineloader);
-
-            if (len <= 2 || strcmp( wineloader + len - 2, "64" ))
-            {
-                argv[1] = malloc( len + 3 );
-                strcpy( argv[1], wineloader );
-                strcat( argv[1], "64" );
-                preloader_exec( argv );
-            }
-        }
-        else if ((argv[1] = remove_tail( wineloader, "64" ))) preloader_exec( argv );
-    }
+    if (((argv[1] = get_alternate_wineloader( machine )))) preloader_exec( argv );

argv[1] = strdup( wineloader );
     preloader_exec( argv );