From a70cbbed56d56f48748601982fea7e74c9854d35 Mon Sep 17 00:00:00 2001 From: sourcehold Date: Sat, 7 Mar 2026 00:26:18 +0100 Subject: [PATCH 1/3] resolve #14 --- src/precomp/common.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/precomp/common.hpp b/src/precomp/common.hpp index 49101d5..89f34e0 100644 --- a/src/precomp/common.hpp +++ b/src/precomp/common.hpp @@ -1,12 +1,17 @@ #pragma once +#include "framework.h" +#include "winnt.h" +#include "wtypes.h" +#include + namespace Ghidra { typedef void* pointer; typedef void* pointer32; typedef unsigned char undefined; // typedef unsigned char bool; -typedef unsigned char byte; +// typedef unsigned char byte; typedef unsigned int dword; // typedef unsigned long long GUID; // different then the Windows one? typedef pointer32 ImageBaseOffset32; @@ -20,7 +25,7 @@ typedef unsigned long ulong; typedef unsigned long long ulonglong; typedef unsigned char undefined1; typedef unsigned short undefined2; -typedef unsigned char undefined3[3]; +typedef unsigned char undefined3[3]; // This is valid in struct-contexts only typedef unsigned int undefined4; typedef unsigned long long undefined6; typedef unsigned long long undefined8; From 56912ed6031f0acecb712d0128ef8810218363da Mon Sep 17 00:00:00 2001 From: Gynt Date: Wed, 11 Mar 2026 08:58:21 +0100 Subject: [PATCH 2/3] remove framework.h in favor of Windows.h in pch.h --- src/precomp/common.hpp | 5 +---- src/precomp/framework.h | 4 ---- src/precomp/pch.h | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 src/precomp/framework.h diff --git a/src/precomp/common.hpp b/src/precomp/common.hpp index 89f34e0..3c56cce 100644 --- a/src/precomp/common.hpp +++ b/src/precomp/common.hpp @@ -1,9 +1,6 @@ #pragma once -#include "framework.h" -#include "winnt.h" -#include "wtypes.h" -#include + namespace Ghidra { typedef void* pointer; diff --git a/src/precomp/framework.h b/src/precomp/framework.h deleted file mode 100644 index 5cb4cbf..0000000 --- a/src/precomp/framework.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define WIN32_LEAN_AND_MEAN -#include diff --git a/src/precomp/pch.h b/src/precomp/pch.h index dd70bef..86fe2bf 100644 --- a/src/precomp/pch.h +++ b/src/precomp/pch.h @@ -7,7 +7,7 @@ #include "FunctionResolver.h" #include "StructResolver.h" #include "TypeUtility.h" +#include "Windows.h" #include "addresses-SHC-3BB0A8C1.hpp" #include "common.hpp" -#include "framework.h" #include "polyfills/assertion.h" From e04361cbfcea796c9056511bc2b3f009642782d9 Mon Sep 17 00:00:00 2001 From: Gynt Date: Wed, 11 Mar 2026 09:03:32 +0100 Subject: [PATCH 3/3] fix style issue in common.hpp --- src/precomp/common.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/precomp/common.hpp b/src/precomp/common.hpp index 3c56cce..e641a3d 100644 --- a/src/precomp/common.hpp +++ b/src/precomp/common.hpp @@ -1,7 +1,5 @@ #pragma once - - namespace Ghidra { typedef void* pointer; typedef void* pointer32;