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

switch L"" to TEXT("")

Browse Source
This commit is contained in:
freedom7341
2023-10-10 16:31:06 -06:00
parent c43c176538
commit 1ed794d640
7 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
progmgr/desktop.c
View File

@@ -173,10 +173,10 @@ HWND CreateListView(HWND hWndParent, RECT rc)
{ {
HWND hWndListView; HWND hWndListView;
LVITEM lviTestItem; LVITEM lviTestItem;
WCHAR szTestItem[] = L"Test Item"; WCHAR szTestItem[] = TEXT("Test Item");
// Create the ListView // 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 | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
LVS_ICON | LVS_SINGLESEL, LVS_ICON | LVS_SINGLESEL,
rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,

24
progmgr/dialog.c
View File

@@ -37,16 +37,16 @@ BOOL CALLBACK NewGroupDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM
.dwSignature = GRP_SIGNATURE, .dwSignature = GRP_SIGNATURE,
.wVersion = GRP_VERSION, .wVersion = GRP_VERSION,
.wChecksum = 0, .wChecksum = 0,
.szName = L"", .szName = TEXT(""),
.dwFlags = 0, .dwFlags = 0,
.ftLastWrite = 0, .ftLastWrite = 0,
.szIconPath = L"", .szIconPath = TEXT(""),
.iIconIndex = 0, .iIconIndex = 0,
.cItemArray = 0, .cItemArray = 0,
.pItemArray = NULL .pItemArray = NULL
}; };
BOOL bOKEnabled = FALSE; BOOL bOKEnabled = FALSE;
WCHAR szBuffer[MAX_TITLE_LENGTH] = { L"\0" }; WCHAR szBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") };
HICON hIconDef = NULL; HICON hIconDef = NULL;
HICON hIconDlg = 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) BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
static ITEM itm = { static ITEM itm = {
.szName = L"", .szName = TEXT(""),
.szExecPath = L"", .szExecPath = TEXT(""),
.szWorkPath = L"", .szWorkPath = TEXT(""),
.dwFlags = 0, .dwFlags = 0,
.uiHotkeyModifiers = 0, .uiHotkeyModifiers = 0,
.uiHotkeyVirtualKey = 0, .uiHotkeyVirtualKey = 0,
.szIconPath = L"", .szIconPath = TEXT(""),
.iIconIndex = 0, .iIconIndex = 0,
}; };
BOOL bOKEnabled = FALSE; BOOL bOKEnabled = FALSE;
BOOL bWorkPath = FALSE; BOOL bWorkPath = FALSE;
WCHAR szBuffer[MAX_TITLE_LENGTH] = { L"\0" }; WCHAR szBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") };
HICON hIconDef = NULL; HICON hIconDef = NULL;
HICON hIconDlg = NULL; HICON hIconDlg = NULL;
@@ -255,6 +255,10 @@ BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM l
if (bWorkPath) if (bWorkPath)
bOKEnabled = bOKEnabled && GetDlgItemText(hWndDlg, IDD_WORKPATH, (LPWSTR)&szBuffer, ARRAYSIZE(szBuffer)); 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 // Enable or disable the relevant controls based on the information
EnableWindow(GetDlgItem(hWndDlg, IDD_OK), bOKEnabled); EnableWindow(GetDlgItem(hWndDlg, IDD_OK), bOKEnabled);
} }
@@ -269,8 +273,8 @@ BOOL CALLBACK NewItemDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM l
LPVOID lpData; LPVOID lpData;
DWORD dwVerBuffer = 0; DWORD dwVerBuffer = 0;
UINT uiTitleLen = MAX_TITLE_LENGTH; UINT uiTitleLen = MAX_TITLE_LENGTH;
WCHAR szNameBuffer[MAX_TITLE_LENGTH] = { L"\0" }; WCHAR szNameBuffer[MAX_TITLE_LENGTH] = { TEXT("\0") };
WCHAR szFileBuffer[MAX_PATH] = { L"\0" }; WCHAR szFileBuffer[MAX_PATH] = { TEXT("\0") };
GetDlgItemText(hWndDlg, IDD_PATH, (LPWSTR)&szFileBuffer, ARRAYSIZE(szFileBuffer)); GetDlgItemText(hWndDlg, IDD_PATH, (LPWSTR)&szFileBuffer, ARRAYSIZE(szFileBuffer));

2
progmgr/progmgr.c
View File

@@ -33,7 +33,7 @@ HICON hProgMgrIcon = NULL;
HICON hGroupIcon = NULL; HICON hGroupIcon = NULL;
// Global Strings // Global Strings
WCHAR szAppTitle[64]; WCHAR szAppTitle[64];
WCHAR szProgMgr[] = L"progmgr"; WCHAR szProgMgr[] = TEXT("progmgr");
WCHAR szWebsite[64]; WCHAR szWebsite[64];
WCHAR szClass[16]; WCHAR szClass[16];
// Permissions // Permissions

12
progmgr/registry.c
View File

@@ -36,11 +36,11 @@ DWORD dwSettingsMask = {
}; };
RECT rcMainWindow; RECT rcMainWindow;
// Registry Subkeys // Registry Subkeys
PWSTR pszProgramGroups = L"Program Groups"; PWSTR pszProgramGroups = TEXT("Program Groups");
PWSTR pszSettings = L"Settings"; PWSTR pszSettings = TEXT("Settings");
// Settings Subkeys // Settings Subkeys
PWSTR pszSettingsWindow = L"Window"; PWSTR pszSettingsWindow = TEXT("Window");
PWSTR pszSettingsMask = L"SettingsMask"; PWSTR pszSettingsMask = TEXT("SettingsMask");
// Permissions (Global) // Permissions (Global)
/* Functions */ /* Functions */
@@ -78,14 +78,14 @@ BOOL InitializeRegistryKeys(VOID)
BOOL IsProgMgrDefaultShell(VOID) BOOL IsProgMgrDefaultShell(VOID)
{ {
HKEY hKeyWinlogon; HKEY hKeyWinlogon;
WCHAR szShell[HKEYMAXLEN] = L""; WCHAR szShell[HKEYMAXLEN] = TEXT("");
DWORD dwType; DWORD dwType;
DWORD dwBufferSize = sizeof(szShell); DWORD dwBufferSize = sizeof(szShell);
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WINLOGON_KEY, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WINLOGON_KEY,
0, KEY_READ, &hKeyWinlogon) == ERROR_SUCCESS) 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) (LPBYTE)szShell, &dwBufferSize) == ERROR_SUCCESS)
{ {
if (StrStr(szShell, szProgMgr)) if (StrStr(szShell, szProgMgr))

8
progmgr/registry.h
View File

@@ -16,10 +16,10 @@
/* Defines */ /* Defines */
#define HKEYMAXLEN 261 #define HKEYMAXLEN 261
// Key Paths // Key Paths
#define WINLOGON_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon" #define WINLOGON_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon")
// #define PROGMAN_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Program Manager" // #define PROGMAN_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Program Manager")
// #define WINDOWS_KEY L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows" // #define WINDOWS_KEY TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows")
#define PROGMGR_KEY L"Software\\Vortesys\\Program Manager II" #define PROGMGR_KEY TEXT("Software\\Vortesys\\Program Manager II")
// Registry configuration error values (DWORD) // Registry configuration error values (DWORD)
#define RCE_SUCCESS 0x0000000 #define RCE_SUCCESS 0x0000000
#define RCE_FAILURE 0x0000001 #define RCE_FAILURE 0x0000001

6
progmgr/sysint.c
View File

@@ -27,7 +27,7 @@ BOOL RunFileDlg(HWND hWndOwner,
LPWSTR lpszDesc, LPWSTR lpszDesc,
DWORD dwFlags) DWORD dwFlags)
{ {
HMODULE hLib = LoadLibrary(L"shell32.dll"); HMODULE hLib = LoadLibrary(TEXT("shell32.dll"));
if (hLib) if (hLib)
{ {
@@ -50,7 +50,7 @@ BOOL RunFileDlg(HWND hWndOwner,
\* * * */ \* * * */
BOOL ExitWindowsDialog(HWND hWndOwner) BOOL ExitWindowsDialog(HWND hWndOwner)
{ {
HMODULE hLib = LoadLibrary(L"shell32.dll"); HMODULE hLib = LoadLibrary(TEXT("shell32.dll"));
if (hLib) if (hLib)
{ {
@@ -73,7 +73,7 @@ BOOL ExitWindowsDialog(HWND hWndOwner)
\* * * */ \* * * */
BOOL SetShellWindow(HWND hWndShell) BOOL SetShellWindow(HWND hWndShell)
{ {
HMODULE hLib = GetModuleHandle(L"user32.dll"); HMODULE hLib = GetModuleHandle(TEXT("user32.dll"));
if (hLib) if (hLib)
{ {

10
progmgr/wndproc.c
View File

@@ -44,7 +44,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
if (wParam == IDM_TASKMGR) 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; return 0;
} }
@@ -163,7 +163,7 @@ LRESULT CALLBACK CmdProc(HWND hWnd, WPARAM wParam, LPARAM lParam)
break; break;
case IDM_HELP_INDEX: case IDM_HELP_INDEX:
ShellExecute(NULL, L"open", szWebsite, NULL, NULL, SW_SHOWNORMAL); ShellExecute(NULL, TEXT("open"), szWebsite, NULL, NULL, SW_SHOWNORMAL);
break; break;
case IDM_HELP_ABOUT: case IDM_HELP_ABOUT:
@@ -219,9 +219,9 @@ VOID UpdateChecks(BOOL bVarMenu, UINT uSubMenu, UINT uID)
\* * * */ \* * * */
VOID UpdateWindowTitle(VOID) VOID UpdateWindowTitle(VOID)
{ {
WCHAR szUsername[UNLEN + 1] = L""; WCHAR szUsername[UNLEN + 1] = TEXT("");
DWORD dwUsernameLen = UNLEN; DWORD dwUsernameLen = UNLEN;
WCHAR szWindowTitle[UNLEN + ARRAYSIZE(szAppTitle) + 4] = L""; WCHAR szWindowTitle[UNLEN + ARRAYSIZE(szAppTitle) + 4] = TEXT("");
// Get user and domain name // Get user and domain name
GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen); GetUserNameEx(NameSamCompatible, szUsername, &dwUsernameLen);
@@ -231,7 +231,7 @@ VOID UpdateWindowTitle(VOID)
if (bShowUsername) if (bShowUsername)
{ {
StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), L" - "); StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), TEXT(" - "));
StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), szUsername); StringCchCat(szWindowTitle, ARRAYSIZE(szWindowTitle), szUsername);
} }