Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in process termination code.
Alexandre Julliard
julliard at winehq.org
Tue May 17 12:53:00 CDT 2011
Module: wine
Branch: master
Commit: 10abc15faa8733cafeb916d55491680a0175c49b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10abc15faa8733cafeb916d55491680a0175c49b
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Tue May 17 05:15:13 2011 -0500
taskmgr: Remove all TCHAR macro usage in process termination code.
---
programs/taskmgr/endproc.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c
index 10a8cd4..0095f45 100644
--- a/programs/taskmgr/endproc.c
+++ b/programs/taskmgr/endproc.c
@@ -47,14 +47,15 @@ static void load_message_strings(void)
void ProcessPage_OnEndProcess(void)
{
LVITEMW lvitem;
- ULONG Index;
+ ULONG Index, Count;
DWORD dwProcessId;
HANDLE hProcess;
WCHAR wstrErrorText[256];
load_message_strings();
- for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
+ Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0);
+ for (Index=0; Index<Count; Index++)
{
lvitem.mask = LVIF_STATE;
lvitem.stateMask = LVIS_SELECTED;
@@ -67,9 +68,9 @@ void ProcessPage_OnEndProcess(void)
break;
}
+ Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0);
dwProcessId = PerfDataGetProcessId(Index);
-
- if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0))
+ if ((Count != 1) || (dwProcessId == 0))
return;
if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES)
@@ -96,14 +97,15 @@ void ProcessPage_OnEndProcess(void)
void ProcessPage_OnEndProcessTree(void)
{
LVITEMW lvitem;
- ULONG Index;
+ ULONG Index, Count;
DWORD dwProcessId;
HANDLE hProcess;
WCHAR wstrErrorText[256];
load_message_strings();
- for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
+ Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0);
+ for (Index=0; Index<Count; Index++)
{
lvitem.mask = LVIF_STATE;
lvitem.stateMask = LVIS_SELECTED;
@@ -116,9 +118,9 @@ void ProcessPage_OnEndProcessTree(void)
break;
}
+ Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0);
dwProcessId = PerfDataGetProcessId(Index);
-
- if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0))
+ if ((Count != 1) || (dwProcessId == 0))
return;
if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES)
More information about the wine-cvs
mailing list