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

formatting

Browse Source
This commit is contained in:
freedom
2023-07-22 00:33:16 -06:00
parent bb45f056ba
commit 34fae5033b
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
progmgr/progmgr.c
View File

@@ -79,13 +79,20 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
return FALSE; return FALSE;
bIsDefaultShell = IsProgMgrDefaultShell(); bIsDefaultShell = IsProgMgrDefaultShell();
LoadConfig();
// Add username to window title // Add username to window title
GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen);\ GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen);
StringCchCopy(szWindowTitle, ARRAYSIZE(szAppTitle), szAppTitle); 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, if (!CreateWindow(wc.lpszClassName,
szWindowTitle, szWindowTitle,
@@ -97,7 +104,16 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
hMenu = GetMenu(hWndProgMgr); hMenu = GetMenu(hWndProgMgr);
hSystemMenu = GetSystemMenu(hWndProgMgr, FALSE); 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 // Modify the context menus since we're the default shell
DeleteMenu(hSystemMenu, SC_CLOSE, MF_BYCOMMAND); DeleteMenu(hSystemMenu, SC_CLOSE, MF_BYCOMMAND);

6
progmgr/shellint.c
View File

@@ -29,7 +29,8 @@ BOOL RunFileDlg(HWND hWndOwner,
{ {
HMODULE hLib = LoadLibrary(L"shell32.dll"); HMODULE hLib = LoadLibrary(L"shell32.dll");
if (hLib) { if (hLib)
{
FARPROC fLib = GetProcAddress(hLib, MAKEINTRESOURCEA(61)); FARPROC fLib = GetProcAddress(hLib, MAKEINTRESOURCEA(61));
if (fLib(hWndOwner, hIcon, lpszDir, lpszTitle, lpszDesc, dwFlags)) if (fLib(hWndOwner, hIcon, lpszDir, lpszTitle, lpszDesc, dwFlags))
FreeLibrary(hLib); FreeLibrary(hLib);
@@ -49,7 +50,8 @@ BOOL ExitWindowsDialog(HWND hWndOwner)
{ {
HMODULE hLib = LoadLibrary(L"shell32.dll"); HMODULE hLib = LoadLibrary(L"shell32.dll");
if (hLib) { if (hLib)
{
FARPROC fLib = GetProcAddress(hLib, (LPCSTR)60); FARPROC fLib = GetProcAddress(hLib, (LPCSTR)60);
if (fLib(hWndOwner)) if (fLib(hWndOwner))
FreeLibrary(hLib); FreeLibrary(hLib);

22
progmgr/wndproc.c
View File

@@ -24,7 +24,8 @@
\* * * */ \* * * */
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) { switch (message)
{
case WM_CREATE: case WM_CREATE:
{ {
@@ -54,19 +55,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
{ {
if (wParam == IDM_SHUTDOWN) { if (wParam == IDM_SHUTDOWN)
{
CmdProc(hWnd, wParam, lParam); CmdProc(hWnd, wParam, lParam);
break; break;
} }
if (wParam == IDM_TASKMGR) { if (wParam == IDM_TASKMGR)
{
ShellExecute(hWndProgMgr, L"open", L"TASKMGR.EXE", NULL, NULL, SW_NORMAL); ShellExecute(hWndProgMgr, L"open", L"TASKMGR.EXE", NULL, NULL, SW_NORMAL);
break; break;
} }
if (wParam == IDM_FILE_EXIT) { if (wParam == IDM_FILE_EXIT)
{
CmdProc(hWnd, wParam, lParam); CmdProc(hWnd, wParam, lParam);
break; break;
} }
if (wParam == IDM_FILE_RUN) { if (wParam == IDM_FILE_RUN)
{
CmdProc(hWnd, wParam, lParam); CmdProc(hWnd, wParam, lParam);
break; break;
} }
@@ -75,7 +80,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
case WM_COMMAND: case WM_COMMAND:
if (CmdProc(hWnd, wParam, lParam)) { if (CmdProc(hWnd, wParam, lParam))
{
break; break;
} }
goto WndProcDefault; goto WndProcDefault;
@@ -114,6 +120,10 @@ LRESULT CALLBACK CmdProc(HWND hWnd, WPARAM wParam, LPARAM lParam)
PostQuitMessage(0); PostQuitMessage(0);
break; break;
case IDM_OPTIONS_SAVENOW:
SaveConfig();
break;
case IDM_HELP_INDEX: case IDM_HELP_INDEX:
ShellExecute(NULL, L"open", szWebsite, NULL, NULL, SW_SHOWNORMAL); ShellExecute(NULL, L"open", szWebsite, NULL, NULL, SW_SHOWNORMAL);
break; break;