marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

taskmgr: Remove all TCHAR macro usage in miscellaneous UI code.

oldstable
Andrew Nguyen 2011-05-17 05:15:28 -05:00 committed by Alexandre Julliard
parent 088d0630d9
commit ec24b87adc
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/taskmgr/column.c
View File

@ -493,9 +493,9 @@ void ProcessPage_OnViewSelectColumns(void)
if (DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK)
{
for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--)
for (i=SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0)-1; i>=0; i--)
{
ListView_DeleteColumn(hProcessPageListCtrl, i);
SendMessageW(hProcessPageListCtrl, LVM_DELETECOLUMN, 0, i);
}
for (i=0; i<25; i++)

12
programs/taskmgr/proclist.c
View File

@ -39,6 +39,7 @@ WNDPROC OldProcessListWndProc;
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HBRUSH hbrBackground;
int count;
RECT rcItem;
RECT rcClip;
HDC hDC;
@ -69,7 +70,7 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
/*
* Get the background brush
*/
hbrBackground = (HBRUSH) GetClassLongPtr(hWnd, GCLP_HBRBACKGROUND);
hbrBackground = (HBRUSH) GetClassLongPtrW(hWnd, GCLP_HBRBACKGROUND);
/*
* Calculate the clip rect by getting the RECT
@ -80,13 +81,14 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
* use icons in this list control.
*/
rcClip.left = LVIR_BOUNDS;
SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip);
SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip);
rcItem.left = LVIR_BOUNDS;
SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM) &rcItem);
count = SendMessageW(hWnd, LVM_GETITEMCOUNT, 0, 0);
SendMessageW(hWnd, LVM_GETITEMRECT, count - 1, (LPARAM) &rcItem);
rcClip.bottom = rcItem.bottom;
rcItem.left = LVIR_ICON;
SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem);
SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem);
rcClip.left = rcItem.right;
/*
@ -117,5 +119,5 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
/*
* We pass on all messages except WM_ERASEBKGND
*/
return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam);
return CallWindowProcW(OldProcessListWndProc, hWnd, message, wParam, lParam);
}

4
programs/taskmgr/trayicon.c
View File

@ -64,8 +64,8 @@ static HICON TrayIcon_GetProcessorUsageIcon(void)
/*
* Load the bitmaps
*/
hBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYICON));
hBitmapMask = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYMASK));
hBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYICON));
hBitmapMask = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYMASK));
if (!hBitmap || !hBitmapMask)
goto done;