From 22d64437aadf2f393f3ad464198e4d6845a2919a Mon Sep 17 00:00:00 2001
From: robert-yates <robert-yates@users.noreply.github.com>
Date: Sat, 23 Nov 2024 19:00:53 +0100
Subject: [PATCH] update includes

---
 src/analyzer/std_include.hpp                  | 53 +------------------
 src/bad-sample/bad.cpp                        |  5 +-
 src/fuzzer/std_include.hpp                    | 51 +-----------------
 src/fuzzing-engine/random_generator.hpp       |  1 +
 src/unicorn-emulator/unicorn_x64_emulator.hpp |  5 +-
 src/windows-emulator/registry/hive_parser.hpp |  3 ++
 src/windows-emulator/std_include.hpp          | 26 ++-------
 7 files changed, 17 insertions(+), 127 deletions(-)

diff --git a/src/analyzer/std_include.hpp b/src/analyzer/std_include.hpp
index 05e56c34..57332229 100644
--- a/src/analyzer/std_include.hpp
+++ b/src/analyzer/std_include.hpp
@@ -1,37 +1,5 @@
 #pragma once
 
-#ifdef _WIN32
-#pragma warning(push)
-#pragma warning(disable: 4005)
-#pragma warning(disable: 4127)
-#pragma warning(disable: 4201)
-#pragma warning(disable: 4244)
-#pragma warning(disable: 4245)
-#pragma warning(disable: 4324)
-#pragma warning(disable: 4458)
-#pragma warning(disable: 4471)
-#pragma warning(disable: 4505)
-#pragma warning(disable: 4702)
-#pragma warning(disable: 4996)
-#pragma warning(disable: 5054)
-#pragma warning(disable: 6011)
-#pragma warning(disable: 6297)
-#pragma warning(disable: 6385)
-#pragma warning(disable: 6386)
-#pragma warning(disable: 6387)
-#pragma warning(disable: 26110)
-#pragma warning(disable: 26451)
-#pragma warning(disable: 26444)
-#pragma warning(disable: 26451)
-#pragma warning(disable: 26489)
-#pragma warning(disable: 26495)
-#pragma warning(disable: 26498)
-#pragma warning(disable: 26812)
-#pragma warning(disable: 28020)
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-
 #include <map>
 #include <set>
 #include <list>
@@ -57,23 +25,6 @@
 
 #include <cassert>
 
-#define NTDDI_WIN11_GE 0
-#define PHNT_VERSION PHNT_WIN11
-#include <phnt_windows.h>
-#include <phnt.h>
-#include <ntgdi.h>
+#include <platform/platform.hpp>
 
-#ifdef _WIN32
-#pragma warning(pop)
-#endif
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-#endif
-
-using namespace std::literals;
+using namespace std::literals;
\ No newline at end of file
diff --git a/src/bad-sample/bad.cpp b/src/bad-sample/bad.cpp
index 50aa3646..adabd48b 100644
--- a/src/bad-sample/bad.cpp
+++ b/src/bad-sample/bad.cpp
@@ -1,10 +1,11 @@
 #include <cstdint>
 #include <cstdio>
-#include <Windows.h>
+#include <cstring>
+#include <platform/compiler.hpp>
 
 #define THE_SIZE 30
 
-extern "C" __declspec(noinline) __declspec(dllexport)
+extern "C" NO_INLINE EXPORT_SYMBOL
 void vulnerable(const uint8_t* data, const size_t size)
 {
 	if (size < 10)
diff --git a/src/fuzzer/std_include.hpp b/src/fuzzer/std_include.hpp
index 05e56c34..43df7c99 100644
--- a/src/fuzzer/std_include.hpp
+++ b/src/fuzzer/std_include.hpp
@@ -1,37 +1,5 @@
 #pragma once
 
-#ifdef _WIN32
-#pragma warning(push)
-#pragma warning(disable: 4005)
-#pragma warning(disable: 4127)
-#pragma warning(disable: 4201)
-#pragma warning(disable: 4244)
-#pragma warning(disable: 4245)
-#pragma warning(disable: 4324)
-#pragma warning(disable: 4458)
-#pragma warning(disable: 4471)
-#pragma warning(disable: 4505)
-#pragma warning(disable: 4702)
-#pragma warning(disable: 4996)
-#pragma warning(disable: 5054)
-#pragma warning(disable: 6011)
-#pragma warning(disable: 6297)
-#pragma warning(disable: 6385)
-#pragma warning(disable: 6386)
-#pragma warning(disable: 6387)
-#pragma warning(disable: 26110)
-#pragma warning(disable: 26451)
-#pragma warning(disable: 26444)
-#pragma warning(disable: 26451)
-#pragma warning(disable: 26489)
-#pragma warning(disable: 26495)
-#pragma warning(disable: 26498)
-#pragma warning(disable: 26812)
-#pragma warning(disable: 28020)
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-
 #include <map>
 #include <set>
 #include <list>
@@ -57,23 +25,6 @@
 
 #include <cassert>
 
-#define NTDDI_WIN11_GE 0
-#define PHNT_VERSION PHNT_WIN11
-#include <phnt_windows.h>
-#include <phnt.h>
-#include <ntgdi.h>
-
-#ifdef _WIN32
-#pragma warning(pop)
-#endif
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-#endif
+#include <platform/platform.hpp>
 
 using namespace std::literals;
diff --git a/src/fuzzing-engine/random_generator.hpp b/src/fuzzing-engine/random_generator.hpp
index 357c5eb5..37a61689 100644
--- a/src/fuzzing-engine/random_generator.hpp
+++ b/src/fuzzing-engine/random_generator.hpp
@@ -2,6 +2,7 @@
 #include <span>
 #include <random>
 #include <cstdint>
+#include <cstring>
 
 namespace fuzzer
 {
diff --git a/src/unicorn-emulator/unicorn_x64_emulator.hpp b/src/unicorn-emulator/unicorn_x64_emulator.hpp
index f349cf53..ca57015b 100644
--- a/src/unicorn-emulator/unicorn_x64_emulator.hpp
+++ b/src/unicorn-emulator/unicorn_x64_emulator.hpp
@@ -2,11 +2,12 @@
 
 #include <memory>
 #include <x64_emulator.hpp>
+#include "platform/platform.hpp"
 
 #ifdef UNICORN_EMULATOR_IMPL
-#define UNICORN_EMULATOR_DLL_STORAGE __declspec(dllexport)
+#define UNICORN_EMULATOR_DLL_STORAGE EXPORT_SYMBOL
 #else
-#define UNICORN_EMULATOR_DLL_STORAGE __declspec(dllimport)
+#define UNICORN_EMULATOR_DLL_STORAGE IMPORT_SYMBOL
 #endif
 
 namespace unicorn
diff --git a/src/windows-emulator/registry/hive_parser.hpp b/src/windows-emulator/registry/hive_parser.hpp
index 462557d9..5746e389 100644
--- a/src/windows-emulator/registry/hive_parser.hpp
+++ b/src/windows-emulator/registry/hive_parser.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <ranges>
 #include <fstream>
+#include <algorithm>
+
 #include <utils/container.hpp>
 
 struct hive_value
diff --git a/src/windows-emulator/std_include.hpp b/src/windows-emulator/std_include.hpp
index e2fe6334..166540e7 100644
--- a/src/windows-emulator/std_include.hpp
+++ b/src/windows-emulator/std_include.hpp
@@ -28,9 +28,8 @@
 #pragma warning(disable: 26498)
 #pragma warning(disable: 26812)
 #pragma warning(disable: 28020)
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
+#pragma warning(pop)
+#endif
 
 #include <map>
 #include <set>
@@ -56,25 +55,8 @@
 #include <condition_variable>
 
 #include <cassert>
+#include <cstdarg>
 
-#define NTDDI_WIN11_GE 0
-#define PHNT_VERSION PHNT_WIN11
-#include <phnt_windows.h>
-#include <phnt.h>
-#include <ntgdi.h>
-#include <ws2def.h>
-
-#ifdef _WIN32
-#pragma warning(pop)
-#endif
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-#endif
+#include "platform/platform.hpp"
 
 using namespace std::literals;