[PATCH 0/1] MR6598: regsvr32: Explicitly specify the target machine when relaunching.

[Billy Laws (＠bylaws)]

To start an ARM64X executable in ARM64EC mode the x64 target machine
needs to be explicitly specified. x64 is also not listed in
SupportedProcessorArchitectures on ARM64EC (also the case on Windows) so drop the check that
requires that.

[PATCH 1/1] regsvr32: Explicitly specify the target machine when relaunching.

[Billy Laws]

From: Billy Laws

To start an ARM64X executable in ARM64EC mode the x64 target machine
needs to be explicitly specified. x64 is also not listed in
SupportedProcessorArchitectures on ARM64EC so drop the check that
requires that.
---
 programs/regsvr32/regsvr32.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c
index 18c664f436a..b0889c9034a 100644
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -117,17 +117,18 @@ static void reexec_self( WORD machine )
     LPCWSTR args;
     WCHAR *cmdline;
     HANDLE process = 0;
-    STARTUPINFOW si = {0};
+    STARTUPINFOEXW si = {{ sizeof(si.StartupInfo) }};
     PROCESS_INFORMATION pi;
+    SIZE_T size = 1024;
+    struct _PROC_THREAD_ATTRIBUTE_LIST *list = HeapAlloc( GetProcessHeap(), 0, size );
     void *cookie;
     ULONG i;

NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process),
                                 machines, sizeof(machines), NULL );
     for (i = 0; machines[i].Machine; i++) if (machines[i].Machine == machine) break;
-    if (!machines[i].Machine) return;
-    if (machines[i].Native) machine = IMAGE_FILE_MACHINE_TARGET_HOST;
-    if (!GetSystemWow64Directory2W( app, MAX_PATH, machine )) return;
+    if (!GetSystemWow64Directory2W( app, MAX_PATH, machines[i].WoW64Container ?
+                                    machine : IMAGE_FILE_MACHINE_TARGET_HOST )) return;
     wcscat( app, L"\regsvr32.exe" );

TRACE( "restarting as %s\n", debugstr_w(app) );
@@ -140,10 +141,13 @@ static void reexec_self( WORD machine )
     wcscpy(cmdline, app);
     wcscat(cmdline, args);

-    si.cb = sizeof(si);
+    InitializeProcThreadAttributeList( list, 1, 0, &size );
+    UpdateProcThreadAttribute( list, 0, PROC_THREAD_ATTRIBUTE_MACHINE_TYPE, &machine, sizeof(machine), NULL, NULL );
+    si.StartupInfo.cb = sizeof(si);
+    si.lpAttributeList = list;

Wow64DisableWow64FsRedirection(&cookie);
-    if (CreateProcessW(app, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+    if (CreateProcessW(app, cmdline, NULL, NULL, FALSE, EXTENDED_STARTUPINFO_PRESENT, NULL, NULL, &si.StartupInfo, &pi))
     {
         DWORD exit_code;
         WaitForSingleObject(pi.hProcess, INFINITE);
@@ -156,6 +160,7 @@ static void reexec_self( WORD machine )
     }
     Wow64RevertWow64FsRedirection(cookie);
     HeapFree(GetProcessHeap(), 0, cmdline);
+    HeapFree( GetProcessHeap(), 0, list );
 }

/**

[PATCH 1/1] regsvr32: Explicitly specify the target machine when relaunching.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148802

Your paranoid android.

=== debian11b (64 bit WoW report) ===

msxml3:
httpreq.c:1594: Test failed: Unexpected hr 0x800c0008.

Report validation errors:
msxml3:httpreq crashed (c0000005)