From: Perry Rapp <elsapo@users.sourceforge.net>
Date: Sat, 23 Aug 2003 23:10:49 +0000 (+0000)
Subject: Bugfix: Remove several memsets of structures whose size varies with common control... 
X-Git-Tag: 2.16.5~7832
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=17a81a6e7008319051395d012d21ae1a25852118;p=winmerge-jp%2Fwinmerge-jp.git

Bugfix: Remove several memsets of structures whose size varies with common control versions
---

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 2fc475e3c..8f11d8bf8 100644
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -1191,9 +1191,16 @@ BOOL CDirView::OnHeaderEndDrag(LPNMHEADER hdr, LRESULT* pResult)
  */
 void CDirView::FixReordering()
 {
+	// LVCOLUMN.iOrder is present with version 4.70+
+	if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4,70))
+		return;
+
 	LVCOLUMN lvcol;
-	memset(&lvcol, 0, sizeof(lvcol));
 	lvcol.mask = LVCF_ORDER;
+	lvcol.fmt = 0;
+	lvcol.cx = 0;
+	lvcol.pszText = 0;
+	lvcol.iSubItem = 0;
 	for (int i=0; i<m_numcols; ++i)
 	{
 		lvcol.iOrder = i;
@@ -1217,9 +1224,9 @@ void CDirView::LoadColumnHeaderItems()
 	for (int i=0; i<m_dispcols; ++i)
 	{
 		LVCOLUMN lvc;
-		memset(&lvc, 0, sizeof(lvc));
 		lvc.mask = LVCF_FMT+LVCF_SUBITEM+LVCF_TEXT;
 		lvc.fmt = LVCFMT_LEFT;
+		lvc.cx = 0;
 		lvc.pszText = _T("text");
 		lvc.iSubItem = i;
 		m_pList->InsertColumn(i, &lvc);
diff --git a/Src/DirViewColHandler.cpp b/Src/DirViewColHandler.cpp
index f56e9f6ea..e5e828928 100644
--- a/Src/DirViewColHandler.cpp
+++ b/Src/DirViewColHandler.cpp
@@ -100,8 +100,9 @@ int CALLBACK CDirView::CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParam
 int CDirView::AddNewItem(int i)
 {
 	LV_ITEM lvItem;
-	memset(&lvItem, 0, sizeof(lvItem));
+	lvItem.mask = 0;
 	lvItem.iItem = i;
+	lvItem.iSubItem = 0;
 	return GetListCtrl().InsertItem(&lvItem);
   
 }
@@ -110,7 +111,6 @@ int CDirView::AddNewItem(int i)
 void CDirView::SetSubitem(int item, int phy, LPCTSTR sz)
 {
 	LV_ITEM lvItem;
-	memset(&lvItem, 0, sizeof(lvItem));
 	lvItem.mask = LVIF_TEXT;
 	lvItem.iItem = item;
 	lvItem.iSubItem = phy;
diff --git a/Src/readme.txt b/Src/readme.txt
index 41391bc7b..ede3a6973 100644
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -21,6 +21,8 @@
   WinMerge: DirViewColItems.cpp Merge.rc resource.h
  Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
   WinMerge: DirActions.cpp
+ Bugfix: Remove several memsets of structures whose size varies with common control versions
+  WinMerge: DirView.cpp DirViewColHandler.cpp
 
 2003-08-22 Kimmo
  PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)