unixaxwell/Program-Manager-II
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

registry saves window position now, fixed saveconfig dying on savesettings (something something bit shifting)

Browse Source
This commit is contained in:
freedom
2023-07-23 19:25:06 -06:00
parent 1ccac6d358
commit 50c38d2b74
4 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
progmgr/registry.c
View File

@@ -119,22 +119,34 @@ BOOL IsProgMgrDefaultShell()
\* * * */
BOOL SaveConfig()
{
// Shrink the settings into the bitmask
BOOL bConfigStatus = TRUE;
WINDOWPLACEMENT wpProgMgr;
RECT rcWindow;
// Shrink the settings into the bitmask and save it
// There's definitely a better way to do this but...
// I'll get to it later :)
dwSettingsMask =
(bAutoArrange * PMS_AUTOARRANGE) |
(bMinOnRun * PMS_MINONRUN) |
(bTopMost * PMS_TOPMOST) |
(bShowUsername * PMS_SHOWUSERNAME) |
(bSaveSettings * PMS_SAVESETTINGS);
(bAutoArrange && PMS_AUTOARRANGE) * PMS_AUTOARRANGE |
(bMinOnRun && PMS_MINONRUN) * PMS_MINONRUN |
(bTopMost && PMS_TOPMOST) * PMS_TOPMOST |
(bShowUsername && PMS_SHOWUSERNAME) * PMS_SHOWUSERNAME |
(bSaveSettings && PMS_SAVESETTINGS) * PMS_SAVESETTINGS;
// Save settings bitmask
if (RegSetValueEx(hKeySettings, pszSettingsMask, 0, REG_DWORD,
&dwSettingsMask, sizeof(DWORD)) == ERROR_SUCCESS)
{
return TRUE;
}
if (!RegSetValueEx(hKeySettings, pszSettingsMask, 0, REG_DWORD,
&dwSettingsMask, sizeof(dwSettingsMask)) == ERROR_SUCCESS)
bConfigStatus = FALSE;
// Get and save window position
wpProgMgr.length = sizeof(WINDOWPLACEMENT);
GetWindowPlacement(hWndProgMgr, &wpProgMgr);
CopyRect(&rcWindow, &wpProgMgr.rcNormalPosition);
return FALSE;
if (!RegSetValueEx(hKeySettings, pszSettingsWindow, 0, REG_BINARY,
&rcWindow, sizeof(rcWindow)) == ERROR_SUCCESS)
bConfigStatus = FALSE;
return bConfigStatus;
}
/* * * *\
@@ -146,20 +158,27 @@ BOOL SaveConfig()
\* * * */
BOOL LoadConfig()
{
BOOL bConfigStatus = TRUE;
DWORD dwType;
DWORD dwBufferSize = sizeof(dwSettingsMask);
DWORD dwRectBufferSize = sizeof(rcMainWindow);
// Load settings bitmask
if (RegQueryValueEx(hKeySettings, pszSettingsMask, 0, &dwType,
if (!RegQueryValueEx(hKeySettings, pszSettingsMask, 0, &dwType,
&dwSettingsMask, &dwBufferSize) == ERROR_SUCCESS)
{
bAutoArrange = (dwSettingsMask & PMS_AUTOARRANGE);
bMinOnRun = (dwSettingsMask & PMS_MINONRUN);
bTopMost = (dwSettingsMask) & (PMS_TOPMOST);
bSaveSettings = (dwSettingsMask & PMS_SAVESETTINGS);
bShowUsername = (dwSettingsMask & PMS_SHOWUSERNAME);
return TRUE;
}
bConfigStatus = FALSE;
// Apply bitmask to booleans
bAutoArrange = (dwSettingsMask & PMS_AUTOARRANGE);
bMinOnRun = (dwSettingsMask & PMS_MINONRUN);
bTopMost = (dwSettingsMask & PMS_TOPMOST);
bSaveSettings = (dwSettingsMask & PMS_SAVESETTINGS);
bShowUsername = (dwSettingsMask & PMS_SHOWUSERNAME);
return FALSE;
// Load window position... and apply it!
if (!RegQueryValueEx(hKeySettings, pszSettingsWindow, 0, &dwType,
&rcMainWindow, &dwRectBufferSize) == ERROR_SUCCESS)
bConfigStatus = FALSE;
return bConfigStatus;
}