From ad34f78243ff213c8fd557f327ce232dffa760d5 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Tue, 4 Mar 2025 05:03:31 -0800
Subject: [PATCH] Fix Xex2ImportDescriptor

Thanks to @ran-j for pointing this out!
---
 XenonUtils/xex.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/XenonUtils/xex.h b/XenonUtils/xex.h
index 2da0b96..4da99df 100644
--- a/XenonUtils/xex.h
+++ b/XenonUtils/xex.h
@@ -218,10 +218,20 @@ struct Xex2ImportLibrary
     be<uint16_t> numberOfImports;
 };
 
+// https://github.com/emoose/idaxex/blob/198b1d52414d35926644bbeec607b3feac5f44e7/formats/pe_structs.hpp#L140-L150
 struct Xex2ImportDescriptor 
 {
-    be<uint32_t> firstThunk; // VA XEX_THUNK_DATA
+    union
+    {
+        be<uint32_t> characteristics;
+        be<uint32_t> originalFirstThunk;
+    };
+    be<uint32_t> timeDateStamp;
+    be<uint32_t> forwarderChainId;
+    be<uint32_t> moduleName;
+    be<uint32_t> firstThunk;
 };
+static_assert(sizeof(Xex2ImportDescriptor) == 0x14, "Xex2ImportDescriptor");
 
 struct Xex2ThunkData 
 {