ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

taskmgr: Remove all TCHAR macro usage in main taskmgr code.

This commit is contained in:
Andrew Nguyen 2011-05-17 05:15:34 -05:00 committed by Alexandre Julliard
parent ec24b87adc
commit eb4b262c89
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
programs/taskmgr/taskmgr.c
View File

@ -58,7 +58,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings;
void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr) void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr)
{ {
SetBkColor(hDC, clr); SetBkColor(hDC, clr);
ExtTextOut(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL);
} }
static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr)
@ -70,7 +70,7 @@ static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr)
rect.top = y; rect.top = y;
rect.right = x + cx; rect.right = x + cx;
rect.bottom = y + cy; rect.bottom = y + cy;
ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
} }
static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight)
@ -89,7 +89,7 @@ void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y)
int i; int i;
hFontDC = CreateCompatibleDC(hDC); hFontDC = CreateCompatibleDC(hDC);
hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT));
hOldBitmap = SelectObject(hFontDC, hFontBitmap); hOldBitmap = SelectObject(hFontDC, hFontBitmap);
for (i = 0; lpwszText[i]; i++) { for (i = 0; lpwszText[i]; i++) {
@ -130,11 +130,11 @@ static BOOL OnCreate(HWND hWnd)
LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR));
LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR));
SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER)));
SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL,
(LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER), IMAGE_ICON, (LPARAM)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER), IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
LR_SHARED)); LR_SHARED));
/* Initialize the Windows Common Controls DLL */ /* Initialize the Windows Common Controls DLL */
InitCommonControls(); InitCommonControls();
@ -269,10 +269,10 @@ static BOOL OnCreate(HWND hWnd)
CheckMenuRadioItem(hCPUHistoryMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHALL, MF_BYCOMMAND); CheckMenuRadioItem(hCPUHistoryMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHALL, MF_BYCOMMAND);
nActivePage = TaskManagerSettings.ActiveTabPage; nActivePage = TaskManagerSettings.ActiveTabPage;
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 0); SendMessageW(hTabWnd, TCM_SETCURFOCUS, 0, 0);
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 1); SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0);
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2); SendMessageW(hTabWnd, TCM_SETCURFOCUS, 2, 0);
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage); SendMessageW(hTabWnd, TCM_SETCURFOCUS, nActivePage, 0);
if (TaskManagerSettings.UpdateSpeed == 1) if (TaskManagerSettings.UpdateSpeed == 1)
SetTimer(hWnd, 1, 1000, NULL); SetTimer(hWnd, 1, 1000, NULL);
@ -504,8 +504,8 @@ static void TaskManager_OnRestoreMainWindow(void)
{ {
BOOL OnTop; BOOL OnTop;
OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OnTop = (GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0;
OpenIcon(hMainWnd); OpenIcon(hMainWnd);
SetForegroundWindow(hMainWnd); SetForegroundWindow(hMainWnd);
SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW);
@ -541,7 +541,7 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd)
nParts[1] = 210; nParts[1] = 210;
nParts[2] = rc.right; nParts[2] = rc.right;
SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts);
SendMessageW(hStatusWnd, SB_SETTEXT, 0, 0); SendMessageW(hStatusWnd, SB_SETTEXTW, 0, 0);
wsprintfW(text, wszCPU_Usage, PerfDataGetProcessorUsage()); wsprintfW(text, wszCPU_Usage, PerfDataGetProcessorUsage());
SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text); SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text);
wsprintfW(text, wszProcesses, PerfDataGetProcessCount()); wsprintfW(text, wszProcesses, PerfDataGetProcessCount());
@ -654,7 +654,7 @@ static void TaskManager_OnTabWndSelChange(void)
hMenu = GetMenu(hMainWnd); hMenu = GetMenu(hMainWnd);
hViewMenu = GetSubMenu(hMenu, 2); hViewMenu = GetSubMenu(hMenu, 2);
hOptionsMenu = GetSubMenu(hMenu, 1); hOptionsMenu = GetSubMenu(hMenu, 1);
TaskManagerSettings.ActiveTabPage = TabCtrl_GetCurSel(hTabWnd); TaskManagerSettings.ActiveTabPage = SendMessageW(hTabWnd, TCM_GETCURSEL, 0, 0);
for (i = GetMenuItemCount(hViewMenu) - 1; i > 2; i--) { for (i = GetMenuItemCount(hViewMenu) - 1; i > 2; i--) {
hSubMenu = GetSubMenu(hViewMenu, i); hSubMenu = GetSubMenu(hViewMenu, i);
if (hSubMenu) if (hSubMenu)
@ -843,7 +843,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
ProcessPage_OnViewSelectColumns(); ProcessPage_OnViewSelectColumns();
break; break;
case ID_VIEW_REFRESH: case ID_VIEW_REFRESH:
PostMessage(hDlg, WM_TIMER, 0, 0); PostMessageW(hDlg, WM_TIMER, 0, 0);
break; break;
case ID_WINDOWS_TILEHORIZONTALLY: case ID_WINDOWS_TILEHORIZONTALLY:
ApplicationPage_OnWindowsTileHorizontally(); ApplicationPage_OnWindowsTileHorizontally();
@ -928,7 +928,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
GetCursorPos(&pt); GetCursorPos(&pt);
OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OnTop = (GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0;
hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP)); hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP));
hPopupMenu = GetSubMenu(hMenu, 0); hPopupMenu = GetSubMenu(hMenu, 0);
@ -1030,8 +1030,8 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
TaskManagerSettings.Maximized = TRUE; TaskManagerSettings.Maximized = TRUE;
else else
TaskManagerSettings.Maximized = FALSE; TaskManagerSettings.Maximized = FALSE;
return DefWindowProc(hDlg, message, wParam, lParam); return DefWindowProcW(hDlg, message, wParam, lParam);
case WM_TIMER: case WM_TIMER:
/* Refresh the performance data */ /* Refresh the performance data */
PerfDataRefresh(); PerfDataRefresh();
@ -1078,8 +1078,10 @@ int APIENTRY WinMain(HINSTANCE hInstance,
/* Get a token for this process. */ /* Get a token for this process. */
if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) {
static const WCHAR SeDebugPrivilegeW[] = {'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0};
/* Get the LUID for the debug privilege. */ /* Get the LUID for the debug privilege. */
LookupPrivilegeValue(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid); LookupPrivilegeValueW(NULL, SeDebugPrivilegeW, &tkp.Privileges[0].Luid);
tkp.PrivilegeCount = 1; /* one privilege to set */ tkp.PrivilegeCount = 1; /* one privilege to set */
tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;