1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

emulators/wine: Avoid "NtRaiseException Unhandled exception"

This backports
  commit ba5653b298
  Author: Gerald Pfeifer <gerald@FreeBSD.org>
  Date:   Mon Jul 29 21:47:34 2024 +0000
from emulators/wine-devel.

Users have been reporting a number of cases of the following error:
  002c:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0x6ffffff8b2b7
  0024:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0

PR:		279927, 280000
This commit is contained in:
Gerald Pfeifer 2024-08-03 10:06:17 +00:00
parent 53c61c505d
commit 33856e566b
2 changed files with 26 additions and 1 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= wine
DISTVERSION= 9.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/9.0/

View File

@ -0,0 +1,25 @@
This patch is borrowed from emulators/wine-proton. According to several
users confirming in PR 279927 and PR 280000 this fixes
002c:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0x6ffffff8b2b7
0024:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0x6ffffff8b2b7
for them. Of course this should better be addressed via upstream (which
we'll try to do).
--- UTC
--- include/wine/asm.h.orig 2024-02-24 10:23:40.551780000 +0300
+++ include/wine/asm.h 2024-02-24 10:23:43.285931000 +0300
@@ -242,9 +242,9 @@
".byte 0x75,0x03\n\t" /* jne 1f */ \
".byte 0x0f,0x05\n\t" /* syscall */ \
".byte 0xc3\n\t" /* ret */ \
- "jmp 1f\n\t" \
+ ".byte 0xeb,0x01\n\t" /* jmp 1f */ \
".byte 0xc3\n" /* ret */ \
- "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \
+ ".byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \
".long 0x7ffe1000\n\t" \
"ret" )
# else