From 34fae5033b0b2d917da1f907669db3643182c802 Mon Sep 17 00:00:00 2001
From: freedom <freedom7341@hotmail.com>
Date: Sat, 22 Jul 2023 00:33:16 -0600
Subject: [PATCH] formatting

---
 progmgr/progmgr.c  | 24 ++++++++++++++++++++----
 progmgr/shellint.c |  6 ++++--
 progmgr/wndproc.c  | 22 ++++++++++++++++------
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/progmgr/progmgr.c b/progmgr/progmgr.c
index 0dd850a..c15e243 100644
--- a/progmgr/progmgr.c
+++ b/progmgr/progmgr.c
@@ -79,13 +79,20 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
 		return FALSE;
 
 	bIsDefaultShell = IsProgMgrDefaultShell();
+
+	LoadConfig();
 	
 	// Add username to window title
-	GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen);\
+	GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen);
 
 	StringCchCopy(szWindowTitle, ARRAYSIZE(szAppTitle), szAppTitle);
-	StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), L" - ");
-	StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), szUsername);
+
+	if (bShowUsername)
+	{
+		StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), L" - ");
+		StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), szUsername);
+	}
+		
 
 	if (!CreateWindow(wc.lpszClassName,
 		szWindowTitle,
@@ -97,7 +104,16 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
 	hMenu = GetMenu(hWndProgMgr);
 	hSystemMenu = GetSystemMenu(hWndProgMgr, FALSE);
 
-	if (bIsDefaultShell) {
+	// Use our configuration to update our menu checkmarks
+	if (bAutoArrange)
+		CheckMenuItem(hMenu, IDM_OPTIONS_AUTOARRANGE, MF_CHECKED);
+	if (bMinOnRun)
+		CheckMenuItem(hMenu, IDM_OPTIONS_MINONRUN, MF_CHECKED);
+	if (bSaveSettings)
+		CheckMenuItem(hMenu, IDM_OPTIONS_SAVESETTINGS, MF_CHECKED);
+
+	if (bIsDefaultShell)
+	{
 		// Modify the context menus since we're the default shell
 		DeleteMenu(hSystemMenu, SC_CLOSE, MF_BYCOMMAND);
 
diff --git a/progmgr/shellint.c b/progmgr/shellint.c
index 0cf10ad..b95dc68 100644
--- a/progmgr/shellint.c
+++ b/progmgr/shellint.c
@@ -29,7 +29,8 @@ BOOL RunFileDlg(HWND hWndOwner,
 {
 	HMODULE hLib = LoadLibrary(L"shell32.dll");
 
-	if (hLib) {
+	if (hLib)
+	{
 		FARPROC fLib = GetProcAddress(hLib, MAKEINTRESOURCEA(61));
 		if (fLib(hWndOwner, hIcon, lpszDir, lpszTitle, lpszDesc, dwFlags))
 			FreeLibrary(hLib);
@@ -49,7 +50,8 @@ BOOL ExitWindowsDialog(HWND hWndOwner)
 {
 	HMODULE hLib = LoadLibrary(L"shell32.dll");
 
-	if (hLib) {
+	if (hLib)
+	{
 		FARPROC fLib = GetProcAddress(hLib, (LPCSTR)60);
 		if (fLib(hWndOwner))
 			FreeLibrary(hLib);
diff --git a/progmgr/wndproc.c b/progmgr/wndproc.c
index 8d02c9f..b856c96 100644
--- a/progmgr/wndproc.c
+++ b/progmgr/wndproc.c
@@ -24,7 +24,8 @@
 \* * * */
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	switch (message) {
+	switch (message)
+	{
 
 	case WM_CREATE:
 	{
@@ -54,19 +55,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	case WM_SYSCOMMAND:
 	{
-		if (wParam == IDM_SHUTDOWN) {
+		if (wParam == IDM_SHUTDOWN)
+		{
 			CmdProc(hWnd, wParam, lParam);
 			break;
 		}
-		if (wParam == IDM_TASKMGR) {
+		if (wParam == IDM_TASKMGR)
+		{
 			ShellExecute(hWndProgMgr, L"open", L"TASKMGR.EXE", NULL, NULL, SW_NORMAL);
 			break;
 		}
-		if (wParam == IDM_FILE_EXIT) {
+		if (wParam == IDM_FILE_EXIT)
+		{
 			CmdProc(hWnd, wParam, lParam);
 			break;
 		}
-		if (wParam == IDM_FILE_RUN) {
+		if (wParam == IDM_FILE_RUN)
+		{
 			CmdProc(hWnd, wParam, lParam);
 			break;
 		}
@@ -75,7 +80,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	}
 
 	case WM_COMMAND:
-		if (CmdProc(hWnd, wParam, lParam)) {
+		if (CmdProc(hWnd, wParam, lParam))
+		{
 			break;
 		}
 		goto WndProcDefault;
@@ -114,6 +120,10 @@ LRESULT CALLBACK CmdProc(HWND hWnd, WPARAM wParam, LPARAM lParam)
 		PostQuitMessage(0);
 		break;
 
+	case IDM_OPTIONS_SAVENOW:
+		SaveConfig();
+		break;
+
 	case IDM_HELP_INDEX:
 		ShellExecute(NULL, L"open", szWebsite, NULL, NULL, SW_SHOWNORMAL);
 		break;