mirror of
https://git.freebsd.org/ports.git
synced 2026-06-02 11:08:52 +00:00
Thibault Payet
df20d75c72
Changelog: - Bundled vkd3d upgraded to version 2.0. - XPath support reimplemented without libxml2. - Bundled SQLite library. - Initial support for system threads. - Thread suspension in emulated code on ARM64. - More work on MSXML reimplementation without libxml2. - Improved keyboard layout support using XKBRegistry. - More VBScript compatibility improvements. - Various bug fixes. https://gitlab.winehq.org/wine/wine/-/releases/wine-11.10 https://gitlab.winehq.org/wine/wine/-/releases/wine-11.9 https://gitlab.winehq.org/wine/wine/-/releases/wine-11.8 PR: 295747 Sponsored by: UNIS Labs
28 lines
862 B
C
28 lines
862 B
C
--- dlls/ntdll/unix/loader.c.orig 2026-05-29 20:04:32 UTC
|
|
+++ dlls/ntdll/unix/loader.c
|
|
@@ -415,6 +415,24 @@ char *get_alternate_wineloader( WORD machine )
|
|
BOOL force_wow64 = (arch = getenv( "WINEARCH" )) && !strcmp( arch, "wow64" );
|
|
char *ret = NULL;
|
|
|
|
+ if (machine == current_machine) return NULL;
|
|
+
|
|
+ char* wineserver_path = getenv("WINESERVER");
|
|
+ if (wineserver_path != NULL && wineserver_path[0] == '/') {
|
|
+ char* s = remove_tail(wineserver_path, "server");
|
|
+ if (s != NULL) {
|
|
+ if (machine == IMAGE_FILE_MACHINE_AMD64) {
|
|
+ ret = malloc(strlen(s) + 3);
|
|
+ strcpy(ret, s);
|
|
+ strcat(ret, "64");
|
|
+ } else {
|
|
+ ret = s;
|
|
+ }
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
+
|
|
+
|
|
if (is_win64)
|
|
{
|
|
if (force_wow64) return NULL;
|