summaryrefslogtreecommitdiff
path: root/emulators/wine-devel/files
diff options
context:
space:
mode:
authorThibault Payet <monwarez@mailoo.org>2025-04-08 23:19:21 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2025-04-09 07:53:44 +0000
commit309d3c189e787b29ab7a81a76716329ca0507c49 (patch)
tree17ab3c8e56ec9817991ee80272c79f4d19ccc50c /emulators/wine-devel/files
parentmultimedia/shotcut-qt6: Update to 25.03.29 (diff)
emulators/wine-devel: Update to Wine 10.2
This is the second snapshot of the Wine 10.x branch. It includes the following changes: - Bundled vkd3d is upgraded to version 1.15. - Support for setting thread priorities. - New Wow64 mode can be enabled dynamically. (Not yet on FreeBSD!) - More progress on the Bluetooth driver. - Various bug fixes. Upstream renamed the wine64 binary to wine; account for that when renaming it to wine64.bin. Revert the support for new WoW64 mode detection at runtime since it is not supported on FreeBSD yet (files/patch-dlls_ntdll_unix_loader.c). PR: 285446
Diffstat (limited to 'emulators/wine-devel/files')
-rw-r--r--emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
index 97f237d79c30..1644d6387c51 100644
--- a/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
+++ b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
@@ -1,9 +1,11 @@
---- dlls/ntdll/unix/loader.c.orig 2024-04-05 17:03:05 UTC
-+++ dlls/ntdll/unix/loader.c
-@@ -480,6 +480,21 @@ char *get_alternate_wineloader( WORD machine )
-
- if (machine == current_machine) return NULL;
+--- dlls/ntdll/unix/loader.c.orig 2025-02-21 21:19:31.000000000 +0000
++++ dlls/ntdll/unix/loader.c 2025-04-08 21:22:55.162201000 +0000
+@@ -503,6 +503,24 @@
+ 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");
@@ -19,6 +21,7 @@
+ }
+ }
+
- /* try the 64-bit loader */
- if (current_machine == IMAGE_FILE_MACHINE_I386 && machine == IMAGE_FILE_MACHINE_AMD64)
++
+ if (is_win64)
{
+ if (force_wow64) return NULL;