From nobody Sat Aug 03 10:07:25 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wbdfk15ntz5S9CV; Sat, 03 Aug 2024 10:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wbdfk0WLfz4qpx; Sat, 3 Aug 2024 10:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722679646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9aFm34BQ79L/aQ/y+KoDiN71NC6EtzU+Ca5lWirU6Y=; b=lc7rR/j8DB3AN1mtIbH1Jxaxc6xX+ssxebpvSSrC5EV4F0U1RQWeWwAzPqErl1OS+udWh4 thgnXNEvOnXOTJspbdKKPquRf83E2CC64sOgLQmRm+4TQ0BYDugKGz3piw1kaY0dMO2R8I iIlp7BA8Z3NcTfhf6Ozmg0FvZO6Qm28Ljvf3aXJlkItIkAAPuM9QWsHFRZ13P6H66ljEKP C24nh95/VXTSGhBF3VPr7xvs2BEoRsS7cFB7ryl9R2xxhxojPPxw2G54alJ00HC6bWQY/6 onj8vcDaCgIA3hfUBmQkiHdFrGmGuRgE6m6FamuHcqkqvSUPBGGZ8f+VWoD7LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722679646; a=rsa-sha256; cv=none; b=AtGb9B+RnuC0Un50VkSYHbgjYGoY6zfJnIAzXUk7vWh3qGgziih2upGWbdLkKqDK9FlHp+ OmaT+WRdMrlyA9HJi97GiwguFH9bIzhbcHZ4A9jGyP04zBScK0aY/KXHWeilP3tBI/+3/O u7I76017gMdeSMd4P/bpxCk/2SUe2cv+86vWOiYKjqsSFE98w+ritPxycL2afBUeILOcHB q/CAnNyFbWwERhlINdGZciXyevzNKwSZ6XvXgL5MXML7FXOB5eQy+bSCbasK7+ihPTqFeC i0gNhCBKHa96XzN+ElM5a4PVtNU1dPn/WFeYQv2+bY1oLC+y9JU34sAiLnII1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722679646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9aFm34BQ79L/aQ/y+KoDiN71NC6EtzU+Ca5lWirU6Y=; b=ORZn6OFU1+0tFKOQskVqS6brGBy/QzUqZZOpD6qOpKS9B4eilWMhy9+b9zKQSJPybR/7pk NNns/U3UxQ2goHjimuFuHyU/wudjIUZENb5uyrxpQsvAhbQYz+VV4Ux/Py64Z0zPZLWlqc m4DjD1AkdNfV0hm2PfxjxF3pRoSQn6ic9fG79mr3BZIU07Mh4gECUiKtP5XT7lAAtel7Y8 J9nr/SgvEcKuvJ4H3qdTESpvQPiSAV/lCl8pUO+gbp+f69tf+E4o48iPoIyNgo5/xLtA6Q sZOK/8CC1lIMfx+i6gC73IkBJXYBASQURncdui66vXl8PbeXCEvZm5gGsMX3Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wbdfj6qhXz173r; Sat, 3 Aug 2024 10:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473A7PCV055225; Sat, 3 Aug 2024 10:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473A7PHK055222; Sat, 3 Aug 2024 10:07:25 GMT (envelope-from git) Date: Sat, 3 Aug 2024 10:07:25 GMT Message-Id: <202408031007.473A7PHK055222@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 33856e566b10 - main - emulators/wine: Avoid "NtRaiseException Unhandled exception" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33856e566b1098a567e48acba1add66ccc3ee4e4 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=33856e566b1098a567e48acba1add66ccc3ee4e4 commit 33856e566b1098a567e48acba1add66ccc3ee4e4 Author: Gerald Pfeifer AuthorDate: 2024-08-03 10:06:17 +0000 Commit: Gerald Pfeifer CommitDate: 2024-08-03 10:06:38 +0000 emulators/wine: Avoid "NtRaiseException Unhandled exception" This backports commit ba5653b298e084faea153473a2eeefe2d0acd150 Author: Gerald Pfeifer 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 --- emulators/wine/Makefile | 2 +- emulators/wine/files/patch-include_wine_asm.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index af0135ab95e2..f34ff18eacac 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -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/ diff --git a/emulators/wine/files/patch-include_wine_asm.h b/emulators/wine/files/patch-include_wine_asm.h new file mode 100644 index 000000000000..3e3f76da8d7e --- /dev/null +++ b/emulators/wine/files/patch-include_wine_asm.h @@ -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