From nobody Mon Jul 29 22:00:03 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 4WXsjH2rl4z5S4g9; Mon, 29 Jul 2024 22:00:03 +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 4WXsjH24csz3x95; Mon, 29 Jul 2024 22:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722290403; 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=Abv3mjEi17+2orF+5b1LzKTqFYxU9wvbrgi2TuX473Y=; b=uP54fgy8/OTCWHB1/QeRVDDb5Oj4/uuqvUu6dsfH4/zuo64esqTzgDykuq1O9LWXojZZ+g CEBoRPchnJbHxu2G4EJRVnehnGiOyBHW0Cyb+yqSy2S7zvkKYCfjHUUUwNnmiSOBXrjn4P 36oiCNgKPxh4xPeA9AS4n7UtxGrXTqdAR/c+uvK7ebIcqzY+ICad8igVe+ksn8u9JWQMgU KjKDmeNmfE2q73nZpjkrNluciXbZ7o689PIqDCGqUizUXnWDUu4CuV5BcK8mWJobQH/REn qUGkwvqyw/m/oxYyMZeltVuYSXZRl8znTlrxJVW91AvRoR0vDWGDHLFMftlVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722290403; a=rsa-sha256; cv=none; b=xJXWNxqk+g85jyGD8CTc1SinEp8MlE1hxmDpre5okw/iFvefFc3ZkOcQ3PFbE2BEORwi2P U3scenBTyzdQXJ2vxU2Q/QwWyl+j88AHjXd8iBQIOTcKDx1reOI8jYmbI8dB97Mf5K4g8J hlMg7sd6o4ppDNc0ZyzPltsWxjbRJ+MZoksLJkYSaf62VpJudeahJsRQY/68Wr8/3hajdY o4mUx9udvGvL5Fo1txag+zgv3uHp/k3FQ/BCTXEcXIuo3ozQ1v0unCbTyUL6UaCLL75sBL FxknBMOPoRT/nCufxB1iTnyaTkg6ITDpHamQ6p6iFVHb3nTs2UHJQ7SSHfplvg== 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=1722290403; 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=Abv3mjEi17+2orF+5b1LzKTqFYxU9wvbrgi2TuX473Y=; b=uk9qwM8NiEVF1VmIpHoIgYhQcfARWPs1gp2gSApEpmQ2U93hJ4slomxP3V7B8Eln6KDE6A F/Iykl3T2UfwYtLqALLljt73UosYRn2FCWtYIVu1iygptxHIzp69fiqjyysSOuXsTE0Iqn RkzoCrU9oWCWWCyOeujRoIdd0DboFcMgC5t8mDJ1/CnYPRf9eFqCyAW8vSA1AAPMORbE1y xU6/e78CX4YRMRmxbyECZtWw26hQAnT7mPamNuZ/pzN3RorF0TadurECULn/68iyhrtP+b Uj7pix3LjI0EQpZJs5LpqJbpeylEmwUqUZiRqd3EKDwvXb95yF+a0Qxmx+gXuw== 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 4WXsjH1NqJzrg7; Mon, 29 Jul 2024 22:00:03 +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 46TM03oF051331; Mon, 29 Jul 2024 22:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TM0362051322; Mon, 29 Jul 2024 22:00:03 GMT (envelope-from git) Date: Mon, 29 Jul 2024 22:00:03 GMT Message-Id: <202407292200.46TM0362051322@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: ba5653b298e0 - main - emulators/wine-devel: 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: ba5653b298e084faea153473a2eeefe2d0acd150 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba5653b298e084faea153473a2eeefe2d0acd150 commit ba5653b298e084faea153473a2eeefe2d0acd150 Author: Gerald Pfeifer AuthorDate: 2024-07-29 21:47:34 +0000 Commit: Gerald Pfeifer 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