From 95c17cae64e9e56f08f6c2411dafbbb05384dc62 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Fri, 20 Mar 2026 18:47:15 +0700 Subject: [PATCH] winnt.h: remove dead ARM64 CONTEXT fallback code The fallback CONTEXT definition at lines 2073-2124 was unreachable dead code. The guard '#if defined(__aarch64__) && !defined(_ARM64_CONTEXT_DECLARED)' could never be true because: 1. Line 50-51: __aarch64__ automatically defines _ARM64_ 2. Line 1426: #if defined(_ARM64_) || defined(__aarch64__) always enters 3. Line 1473: _ARM64_CONTEXT_DECLARED is always defined inside that block 4. Line 2073: The fallback guard is therefore always false This 52-line duplicate was a maintenance hazard that could silently diverge from the official ARM64_NT_CONTEXT definition. Remove it entirely. --- win32/include/winapi/winnt.h | 53 ------------------------------------ 1 file changed, 53 deletions(-) diff --git a/win32/include/winapi/winnt.h b/win32/include/winapi/winnt.h index 27e2895b..b5ef864a 100644 --- a/win32/include/winapi/winnt.h +++ b/win32/include/winapi/winnt.h @@ -2070,59 +2070,6 @@ typedef DWORD LCID; DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; } EXCEPTION_RECORD64,*PEXCEPTION_RECORD64; -#if defined(__aarch64__) && !defined(_ARM64_CONTEXT_DECLARED) -#define _ARM64_CONTEXT_DECLARED - typedef struct DECLSPEC_ALIGN(16) _CONTEXT { - ULONG ContextFlags; - ULONG Cpsr; - union { - struct { - DWORD64 X0; - DWORD64 X1; - DWORD64 X2; - DWORD64 X3; - DWORD64 X4; - DWORD64 X5; - DWORD64 X6; - DWORD64 X7; - DWORD64 X8; - DWORD64 X9; - DWORD64 X10; - DWORD64 X11; - DWORD64 X12; - DWORD64 X13; - DWORD64 X14; - DWORD64 X15; - DWORD64 X16; - DWORD64 X17; - DWORD64 X18; - DWORD64 X19; - DWORD64 X20; - DWORD64 X21; - DWORD64 X22; - DWORD64 X23; - DWORD64 X24; - DWORD64 X25; - DWORD64 X26; - DWORD64 X27; - DWORD64 X28; - DWORD64 Fp; - DWORD64 Lr; - } DUMMYSTRUCTNAME; - DWORD64 X[31]; - } DUMMYUNIONNAME; - DWORD64 Sp; - DWORD64 Pc; - ARM64_NT_NEON128 V[32]; - DWORD Fpcr; - DWORD Fpsr; - DWORD Bcr[8]; - DWORD64 Bvr[8]; - DWORD Wcr[2]; - DWORD64 Wvr[2]; - } CONTEXT,*PCONTEXT; -#endif - typedef struct _EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord; PCONTEXT ContextRecord;