From bd93e2288d282ce111417565ff32b3a98754b85e Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Thu, 14 May 2020 04:52:02 -0500
Subject: [PATCH 1/3] enforce verify shared memory structures are align
 properly

---
 src/common/Settings.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/Settings.hpp b/src/common/Settings.hpp
index 4c1b682ae..d5cea4901 100644
--- a/src/common/Settings.hpp
+++ b/src/common/Settings.hpp
@@ -41,6 +41,9 @@ extern uint16_t g_LibVersion_D3D8;
 extern uint16_t g_LibVersion_DSOUND;
 
 #define szSettings_alloc_error "ERROR: Unable to allocate Settings class."
+#define assert_check_shared_memory(type) \
+ "Invalid "#type" size, please verify structure is align, not adding new member, or is using placeholder reserves." \
+ " Otherwise, please perform versioning upgrade and update "#type" sizeof check."
 
 // Cxbx-Reloaded's data storage location.
 typedef enum _CXBX_DATA {
@@ -103,6 +106,7 @@ public:
 		bool Reserved4 = 0;
 		int  Reserved99[10] = { 0 };
 	} m_core;
+	static_assert(sizeof(s_core) == 0x250, assert_check_shared_memory(s_core));
 
 	// Video settings
 	struct s_video {
@@ -116,6 +120,7 @@ public:
 		int  renderScaleFactor = 1;
 		int  Reserved99[9] = { 0 };
 	} m_video;
+	static_assert(sizeof(s_video) == 0x98, assert_check_shared_memory(s_video));
 
 	// Audio settings
 	struct s_audio {
@@ -126,6 +131,7 @@ public:
 		bool mute_on_unfocus;
 		int  Reserved99[14] = { 0 };
 	} m_audio;
+	static_assert(sizeof(s_audio) == 0x4C, assert_check_shared_memory(s_audio));
 
 	struct s_input {
 		int Type;
@@ -146,6 +152,7 @@ public:
 	struct s_network {
 		char adapter_name[MAX_PATH] = "";
 	} m_network;
+	static_assert(sizeof(s_network) == 0x104, assert_check_shared_memory(s_network));
 
 	// Hack settings
 	// NOTE: When removing fields, replace them with place-holders
@@ -162,6 +169,7 @@ public:
 		bool Reserved8 = 0;
 		int  Reserved99[8] = { 0 };
 	} m_hacks;
+	static_assert(sizeof(s_hack) == 0x28, assert_check_shared_memory(s_hack));
 
 private:
 	void RemoveLegacyConfigs(unsigned int CurrentRevision);

From b281861e49e028a8f77f593da77c0c236e621017 Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Thu, 14 May 2020 04:58:07 -0500
Subject: [PATCH 2/3] forgot to update history for loader project

---
 src/common/Settings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Settings.cpp b/src/common/Settings.cpp
index 338fb1c7e..a0b431972 100644
--- a/src/common/Settings.cpp
+++ b/src/common/Settings.cpp
@@ -58,6 +58,7 @@ uint16_t g_LibVersion_DSOUND = 0;
 // * 3: (ergo720),   added logging settings
 // * 4: (LukeUsher), added network settings
 // * 5: (ergo720),   added new input gui settings and revision to core
+// * 6: (RadWolfie), added loader executable member to core, only for clean up loader expertimental setting
 ///////////////////////////
 const unsigned int settings_version = 6;
 

From 9f8e617890b780d1b2210749e89cbcb43e87486d Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Thu, 14 May 2020 05:01:13 -0500
Subject: [PATCH 3/3] fix allowAdminPrivilege not align with other boolean
 members

---
 src/common/Settings.cpp | 3 ++-
 src/common/Settings.hpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/common/Settings.cpp b/src/common/Settings.cpp
index a0b431972..f0c986a2c 100644
--- a/src/common/Settings.cpp
+++ b/src/common/Settings.cpp
@@ -59,8 +59,9 @@ uint16_t g_LibVersion_DSOUND = 0;
 // * 4: (LukeUsher), added network settings
 // * 5: (ergo720),   added new input gui settings and revision to core
 // * 6: (RadWolfie), added loader executable member to core, only for clean up loader expertimental setting
+// * 7: (RadWolfie), fix allowAdminPrivilege not align with other boolean members
 ///////////////////////////
-const unsigned int settings_version = 6;
+const unsigned int settings_version = 7;
 
 Settings* g_Settings = nullptr;
 
diff --git a/src/common/Settings.hpp b/src/common/Settings.hpp
index d5cea4901..b009d2768 100644
--- a/src/common/Settings.hpp
+++ b/src/common/Settings.hpp
@@ -98,15 +98,15 @@ public:
 		DebugMode KrnlDebugMode;
 		char szKrnlDebug[MAX_PATH] = "";
 		char szStorageLocation[MAX_PATH] = "";
-		bool allowAdminPrivilege;
         unsigned int LoggedModules[NUM_INTEGERS_LOG];
 		int LogLevel = 1;
 		bool bUseLoaderExec;
+		bool allowAdminPrivilege;
 		bool Reserved3 = 0;
 		bool Reserved4 = 0;
 		int  Reserved99[10] = { 0 };
 	} m_core;
-	static_assert(sizeof(s_core) == 0x250, assert_check_shared_memory(s_core));
+	static_assert(sizeof(s_core) == 0x24C, assert_check_shared_memory(s_core));
 
 	// Video settings
 	struct s_video {