From 98de8a67c8cbc924c5c308cacd189b62f0bd2865 Mon Sep 17 00:00:00 2001
From: freedom <freedom7341@hotmail.com>
Date: Sat, 22 Jul 2023 02:17:45 -0600
Subject: [PATCH] re-ordered registry crap to make sense

---
 progmgr/registry.c | 14 +++++++-------
 progmgr/registry.h | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/progmgr/registry.c b/progmgr/registry.c
index aa1f1f1..cdea347 100644
--- a/progmgr/registry.c
+++ b/progmgr/registry.c
@@ -120,11 +120,11 @@ BOOL SaveConfig()
 {
 	// Shrink the settings into the bitmask
 	dwSettingsMask =
-		(bSaveSettings * PMS_SAVESETTINGS) |
-		(bShowUsername * PMS_SHOWUSERNAME) |
-		(bTopMost * PMS_TOPMOST) |
+		(bAutoArrange * PMS_AUTOARRANGE) |
 		(bMinOnRun * PMS_MINONRUN) |
-		(bAutoArrange * PMS_AUTOARRANGE);
+		(bTopMost * PMS_TOPMOST) |
+		(bShowUsername * PMS_SHOWUSERNAME) |
+		(bSaveSettings * PMS_SAVESETTINGS);
 
 	// Save settings bitmask
 	if (RegSetValueEx(hKeySettings, pszSettingsMask, 0, REG_DWORD, &dwSettingsMask, sizeof(DWORD)) == ERROR_SUCCESS)
@@ -148,11 +148,11 @@ BOOL LoadConfig()
 	// Load settings bitmask
 	if (RegGetValue(hKeySettings, L"", pszSettingsMask, RRF_RT_DWORD, NULL, &dwSettingsMask, &dwBufferSize))
 	{
+		bAutoArrange = ((dwSettingsMask & PMS_AUTOARRANGE) == PMS_AUTOARRANGE);
+		bMinOnRun = ((dwSettingsMask & PMS_MINONRUN) == PMS_MINONRUN);
+		bTopMost = ((dwSettingsMask & PMS_TOPMOST) == PMS_TOPMOST);
 		bSaveSettings = ((dwSettingsMask & PMS_SAVESETTINGS) == PMS_SAVESETTINGS);
 		bShowUsername = ((dwSettingsMask & PMS_SHOWUSERNAME) == PMS_SHOWUSERNAME);
-		bTopMost = ((dwSettingsMask & PMS_TOPMOST) == PMS_TOPMOST);
-		bMinOnRun = ((dwSettingsMask & PMS_MINONRUN) == PMS_MINONRUN);
-		bAutoArrange = ((dwSettingsMask & PMS_AUTOARRANGE) == PMS_AUTOARRANGE);
 		return TRUE;
 	}
 
diff --git a/progmgr/registry.h b/progmgr/registry.h
index 3820fc9..9871a72 100644
--- a/progmgr/registry.h
+++ b/progmgr/registry.h
@@ -21,11 +21,11 @@
 // #define WINDOWS_KEY  L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"
 #define PROGMGR_KEY  L"Software\\Freedom Desktop\\Program Manager II"
 // Settings Bitmask Values (DWORD)
-#define PMS_SAVESETTINGS 0x00000001
-#define PMS_SHOWUSERNAME 0x00000002
-#define PMS_TOPMOST 0x00000004
-#define PMS_MINONRUN 0x00000008
-#define PMS_AUTOARRANGE 0x00000010
+#define PMS_AUTOARRANGE 0x00000001
+#define PMS_MINONRUN 0x00000002
+#define PMS_TOPMOST 0x00000008
+#define PMS_SHOWUSERNAME 0x00000004
+#define PMS_SAVESETTINGS 0x00000010
 
 /* Global Variables */
 // HKEYs
@@ -33,11 +33,11 @@ extern HKEY	hKeyProgramManager;
 extern HKEY	hkeyProgramGroups;
 extern HKEY	hKeySettings;
 // Settings
-extern BOOL bSaveSettings;
-extern BOOL bShowUsername;
-extern BOOL bTopMost;
-extern BOOL bMinOnRun;
 extern BOOL bAutoArrange;
+extern BOOL bMinOnRun;
+extern BOOL bTopMost;
+extern BOOL bShowUsername;
+extern BOOL bSaveSettings;
 
 /* Function Prototypes */
 BOOL InitializeRegistryKeys(VOID);