Date: Mon, 29 Jul 2024 22:00:03 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ba5653b298e0 - main - emulators/wine-devel: Avoid "NtRaiseException Unhandled exception" Message-ID: <202407292200.46TM0362051322@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba5653b298e084faea153473a2eeefe2d0acd150 commit ba5653b298e084faea153473a2eeefe2d0acd150 Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2024-07-29 21:47:34 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2024-07-29 21:47:34 +0000 emulators/wine-devel: Avoid "NtRaiseException Unhandled exception" Users have been reporting a number of cases of the following error: 002c:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0 x6ffffff8b2b7 0024:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0 Address this by means of a patch borrowed from emulators/wine-proton. PR: 279927, 280000 --- emulators/wine-devel/Makefile | 1 + .../wine-devel/files/patch-include_wine_asm.h | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 968585fa3731..314d778fd415 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 9.12 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.x/ diff --git a/emulators/wine-devel/files/patch-include_wine_asm.h b/emulators/wine-devel/files/patch-include_wine_asm.h new file mode 100644 index 000000000000..3f5494664270 --- /dev/null +++ b/emulators/wine-devel/files/patch-include_wine_asm.h @@ -0,0 +1,24 @@ +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). + + +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407292200.46TM0362051322>