Francois Gouget : taskmgr: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e2a11688926c288b5b7f7bf9e0f68db3ec5276a9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e2a11688926c288b5b7f7bf9e0...

Author: Francois Gouget 
Date:   Thu Oct  5 11:02:27 2006 +0200

taskmgr: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually.

---

programs/taskmgr/dbgchnl.c  |   15 +++++++--------
 programs/taskmgr/debug.c    |    3 +--
 programs/taskmgr/endproc.c  |    6 ++----
 programs/taskmgr/priority.c |    3 +--
 programs/taskmgr/procpage.c |    3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c
index f1ebdfa..9671469 100644
--- a/programs/taskmgr/dbgchnl.c
+++ b/programs/taskmgr/dbgchnl.c
@@ -86,11 +86,10 @@ static DWORD    get_selected_pid(void)

for (Index = 0; Index < (ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
     {
-        memset(&lvitem, 0, sizeof(LVITEM));
-
         lvitem.mask = LVIF_STATE;
         lvitem.stateMask = LVIS_SELECTED;
         lvitem.iItem = Index;
+        lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);

@@ -109,16 +108,16 @@ static int     list_channel_CB(HANDLE hP
 {
     int         j;
     char        val[2];
-    LVITEMA     lvi;
+    LVITEMA     lvitem;
     int         index;
     HWND        hChannelLV = (HWND)user;

-    memset(&lvi, 0, sizeof(lvi));
-
-    lvi.mask = LVIF_TEXT;
-    lvi.pszText = channel->name;
+    lvitem.mask = LVIF_TEXT;
+    lvitem.pszText = channel->name;
+    lvitem.iItem = 0;
+    lvitem.iSubItem = 0;

-    index = ListView_InsertItem(hChannelLV, &lvi);
+    index = ListView_InsertItem(hChannelLV, &lvitem);
     if (index == -1) return 0;

val[1] = '\0';
diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c
index 6db70bb..198fa56 100644
--- a/programs/taskmgr/debug.c
+++ b/programs/taskmgr/debug.c
@@ -49,11 +49,10 @@ void ProcessPage_OnDebug(void)

for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
     {
-        memset(&lvitem, 0, sizeof(LVITEM));
-
         lvitem.mask = LVIF_STATE;
         lvitem.stateMask = LVIS_SELECTED;
         lvitem.iItem = Index;
+        lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);

diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c
index 519f1a6..5708dd3 100644
--- a/programs/taskmgr/endproc.c
+++ b/programs/taskmgr/endproc.c
@@ -43,11 +43,10 @@ void ProcessPage_OnEndProcess(void)

for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
     {
-        memset(&lvitem, 0, sizeof(LVITEM));
-
         lvitem.mask = LVIF_STATE;
         lvitem.stateMask = LVIS_SELECTED;
         lvitem.iItem = Index;
+        lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);

@@ -91,11 +90,10 @@ void ProcessPage_OnEndProcessTree(void)

for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
     {
-        memset(&lvitem, 0, sizeof(LVITEM));
-
         lvitem.mask = LVIF_STATE;
         lvitem.stateMask = LVIS_SELECTED;
         lvitem.iItem = Index;
+        lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);

diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c
index fb99c94..c27c765 100644
--- a/programs/taskmgr/priority.c
+++ b/programs/taskmgr/priority.c
@@ -43,11 +43,10 @@ static void DoSetPriority(DWORD priority

for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
     {
-        memset(&lvitem, 0, sizeof(LVITEM));
-
         lvitem.mask = LVIF_STATE;
         lvitem.stateMask = LVIS_SELECTED;
         lvitem.iItem = Index;
+        lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM)&lvitem);

diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c
index 15cf666..04921c0 100644
--- a/programs/taskmgr/procpage.c
+++ b/programs/taskmgr/procpage.c
@@ -322,11 +322,10 @@ #endif

for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++)
             {
-                memset(&lvitem, 0, sizeof(LVITEM));
-
                 lvitem.mask = LVIF_STATE;
                 lvitem.stateMask = LVIS_SELECTED;
                 lvitem.iItem = Index;
+                lvitem.iSubItem = 0;

SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);