From 1ed794d6401fed653850a10cdd01072ed55500c9 Mon Sep 17 00:00:00 2001 From: freedom7341 Date: Tue, 10 Oct 2023 16:31:06 -0600 Subject: [PATCH] switch L"" to TEXT("") --- progmgr/desktop.c | 4 ++-- progmgr/dialog.c | 24 ++++++++++++++---------- progmgr/progmgr.c | 2 +- progmgr/registry.c | 12 ++++++------ progmgr/registry.h | 8 ++++---- progmgr/sysint.c | 6 +++--- progmgr/wndproc.c | 10 +++++----- 7 files changed, 35 insertions(+), 31 deletions(-) diff --git a/progmgr/desktop.c b/progmgr/desktop.c index f313605..c34233c 100644 --- a/progmgr/desktop.c +++ b/progmgr/desktop.c @@ -173,10 +173,10 @@ HWND CreateListView(HWND hWndParent, RECT rc) { HWND hWndListView; LVITEM lviTestItem; - WCHAR szTestItem[] = L"Test Item"; + WCHAR szTestItem[] = TEXT("Test Item"); // Create the ListView - hWndListView = CreateWindowEx(WS_EX_LEFT, WC_LISTVIEW, L"", + hWndListView = CreateWindowEx(WS_EX_LEFT, WC_LISTVIEW, TEXT(""), WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | LVS_ICON | LVS_SINGLESEL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, diff --git a/progmgr/dialog.c b/progmgr/dialog.c index 4273b86..e844d43 100644 --- a/progmgr/dialog.c +++ b/progmgr/dialog.c @@ -37,16 +37,16 @@ BOOL CALLBACK NewGroupDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM .dwSignature = GRP_SIGNATURE, .wVersion = GRP_VERSION, .wChecksum = 0, - .szName = L"", + .szName = TEXT(""), .dwFlags = 0, .ftLastWrite = 0, - .szIconPath = L"", + .szIconPath = TEXT(""), .iIconIndex = 0, .cItemArray = 0, .pItemArray = NULL }; BOOL bOKEnabled = FALSE; - WCHAR szBuffer[MAX_TITLE_LENGTH] = { L"\0" }; + WCHAR szBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") }; HICON hIconDef = NULL; HICON hIconDlg = NULL; @@ -190,18 +190,18 @@ BOOL CALLBACK NewGroupDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM lParam) { static ITEM itm = { - .szName = L"", - .szExecPath = L"", - .szWorkPath = L"", + .szName = TEXT(""), + .szExecPath = TEXT(""), + .szWorkPath = TEXT(""), .dwFlags = 0, .uiHotkeyModifiers = 0, .uiHotkeyVirtualKey = 0, - .szIconPath = L"", + .szIconPath = TEXT(""), .iIconIndex = 0, }; BOOL bOKEnabled = FALSE; BOOL bWorkPath = FALSE; - WCHAR szBuffer[MAX_TITLE_LENGTH] = { L"\0" }; + WCHAR szBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") }; HICON hIconDef = NULL; HICON hIconDlg = NULL; @@ -255,6 +255,10 @@ BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM l if (bWorkPath) bOKEnabled = bOKEnabled && GetDlgItemText(hWndDlg, IDD_WORKPATH, (LPWSTR)&szBuffer, ARRAYSIZE(szBuffer)); + // Check that we have selected an MDI child window as well + if (SendMessage(hWndMDIClient, WM_MDIGETACTIVE, 0, FALSE) == NULL) + bOKEnabled = FALSE; + // Enable or disable the relevant controls based on the information EnableWindow(GetDlgItem(hWndDlg, IDD_OK), bOKEnabled); } @@ -269,8 +273,8 @@ BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM l LPVOID lpData; DWORD dwVerBuffer = 0; UINT uiTitleLen = MAX_TITLE_LENGTH; - WCHAR szNameBuffer[MAX_TITLE_LENGTH] = { L"\0" }; - WCHAR szFileBuffer[MAX_PATH] = { L"\0" }; + WCHAR szNameBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") }; + WCHAR szFileBuffer[MAX_PATH] = { TEXT("\0") }; GetDlgItemText(hWndDlg, IDD_PATH, (LPWSTR)&szFileBuffer, ARRAYSIZE(szFileBuffer)); diff --git a/progmgr/progmgr.c b/progmgr/progmgr.c index c9b29a8..06484a6 100644 --- a/progmgr/progmgr.c +++ b/progmgr/progmgr.c @@ -33,7 +33,7 @@ HICON hProgMgrIcon = NULL; HICON hGroupIcon = NULL; // Global Strings WCHAR szAppTitle[64]; -WCHAR szProgMgr[] = L"progmgr"; +WCHAR szProgMgr[] = TEXT("progmgr"); WCHAR szWebsite[64]; WCHAR szClass[16]; // Permissions diff --git a/progmgr/registry.c b/progmgr/registry.c index f9738e7..c8c3ab4 100644 --- a/progmgr/registry.c +++ b/progmgr/registry.c @@ -36,11 +36,11 @@ DWORD dwSettingsMask = { }; RECT rcMainWindow; // Registry Subkeys -PWSTR pszProgramGroups = L"Program Groups"; -PWSTR pszSettings = L"Settings"; +PWSTR pszProgramGroups = TEXT("Program Groups"); +PWSTR pszSettings = TEXT("Settings"); // Settings Subkeys -PWSTR pszSettingsWindow = L"Window"; -PWSTR pszSettingsMask = L"SettingsMask"; +PWSTR pszSettingsWindow = TEXT("Window"); +PWSTR pszSettingsMask = TEXT("SettingsMask"); // Permissions (Global) /* Functions */ @@ -78,14 +78,14 @@ BOOL InitializeRegistryKeys(VOID) BOOL IsProgMgrDefaultShell(VOID) { HKEY hKeyWinlogon; - WCHAR szShell[HKEYMAXLEN] = L""; + WCHAR szShell[HKEYMAXLEN] = TEXT(""); DWORD dwType; DWORD dwBufferSize = sizeof(szShell); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WINLOGON_KEY, 0, KEY_READ, &hKeyWinlogon) == ERROR_SUCCESS) { - if (RegQueryValueEx(hKeyWinlogon, L"Shell", 0, &dwType, + if (RegQueryValueEx(hKeyWinlogon, TEXT("Shell"), 0, &dwType, (LPBYTE)szShell, &dwBufferSize) == ERROR_SUCCESS) { if (StrStr(szShell, szProgMgr)) diff --git a/progmgr/registry.h b/progmgr/registry.h index f3e9132..4e024aa 100644 --- a/progmgr/registry.h +++ b/progmgr/registry.h @@ -16,10 +16,10 @@ /* Defines */ #define HKEYMAXLEN 261 // Key Paths -#define WINLOGON_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon" -// #define PROGMAN_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Program Manager" -// #define WINDOWS_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows" -#define PROGMGR_KEY L"Software\\Vortesys\\Program Manager II" +#define WINLOGON_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon") +// #define PROGMAN_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Program Manager") +// #define WINDOWS_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows") +#define PROGMGR_KEY TEXT("Software\\Vortesys\\Program Manager II") // Registry configuration error values (DWORD) #define RCE_SUCCESS 0x0000000 #define RCE_FAILURE 0x0000001 diff --git a/progmgr/sysint.c b/progmgr/sysint.c index bb5d957..3165f7f 100644 --- a/progmgr/sysint.c +++ b/progmgr/sysint.c @@ -27,7 +27,7 @@ BOOL RunFileDlg(HWND hWndOwner, LPWSTR lpszDesc, DWORD dwFlags) { - HMODULE hLib = LoadLibrary(L"shell32.dll"); + HMODULE hLib = LoadLibrary(TEXT("shell32.dll")); if (hLib) { @@ -50,7 +50,7 @@ BOOL RunFileDlg(HWND hWndOwner, \* * * */ BOOL ExitWindowsDialog(HWND hWndOwner) { - HMODULE hLib = LoadLibrary(L"shell32.dll"); + HMODULE hLib = LoadLibrary(TEXT("shell32.dll")); if (hLib) { @@ -73,7 +73,7 @@ BOOL ExitWindowsDialog(HWND hWndOwner) \* * * */ BOOL SetShellWindow(HWND hWndShell) { - HMODULE hLib = GetModuleHandle(L"user32.dll"); + HMODULE hLib = GetModuleHandle(TEXT("user32.dll")); if (hLib) { diff --git a/progmgr/wndproc.c b/progmgr/wndproc.c index fa43375..45ced67 100644 --- a/progmgr/wndproc.c +++ b/progmgr/wndproc.c @@ -44,7 +44,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { if (wParam == IDM_TASKMGR) { - ShellExecute(hWndProgMgr, L"open", L"TASKMGR.EXE", NULL, NULL, SW_NORMAL); + ShellExecute(hWndProgMgr, TEXT("open"), TEXT("TASKMGR.EXE"), NULL, NULL, SW_NORMAL); return 0; } @@ -163,7 +163,7 @@ LRESULT CALLBACK CmdProc(HWND hWnd, WPARAM wParam, LPARAM lParam) break; case IDM_HELP_INDEX: - ShellExecute(NULL, L"open", szWebsite, NULL, NULL, SW_SHOWNORMAL); + ShellExecute(NULL, TEXT("open"), szWebsite, NULL, NULL, SW_SHOWNORMAL); break; case IDM_HELP_ABOUT: @@ -219,9 +219,9 @@ VOID UpdateChecks(BOOL bVarMenu, UINT uSubMenu, UINT uID) \* * * */ VOID UpdateWindowTitle(VOID) { - WCHAR szUsername[UNLEN + 1] = L""; + WCHAR szUsername[UNLEN + 1] = TEXT(""); DWORD dwUsernameLen = UNLEN; - WCHAR szWindowTitle[UNLEN + ARRAYSIZE(szAppTitle) + 4] = L""; + WCHAR szWindowTitle[UNLEN + ARRAYSIZE(szAppTitle) + 4] = TEXT(""); // Get user and domain name GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen); @@ -231,7 +231,7 @@ VOID UpdateWindowTitle(VOID) if (bShowUsername) { - StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), L" - "); + StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), TEXT(" - ")); StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), szUsername); }