From: GreyMerlin <GreyMerlin7@gmail.com>
Date: Mon, 25 Jun 2018 21:54:08 +0000 (-0700)
Subject: Improvements to CSuperComboBox
X-Git-Tag: 2.16.4+-jp-10~170^2~66^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ebf509b3e34c31d78238228496db123330b799d;p=winmerge-jp%2Fwinmerge-jp.git

Improvements to CSuperComboBox
---

diff --git a/Src/Common/SuperComboBox.cpp b/Src/Common/SuperComboBox.cpp
index d34b9874a..95bb0d423 100644
--- a/Src/Common/SuperComboBox.cpp
+++ b/Src/Common/SuperComboBox.cpp
@@ -145,6 +145,7 @@ int CSuperComboBox::InsertString(int nIndex, LPCTSTR lpszItem)
 		cbitem.mask = CBEIF_TEXT |
 			(m_bHasImageList ? CBEIF_IMAGE|CBEIF_SELECTEDIMAGE : 0);
 		cbitem.pszText = (LPTSTR)lpszItem;
+		cbitem.cchTextMax = (int)_tcslen(lpszItem);
 		cbitem.iItem = nIndex;
 		cbitem.iImage = I_IMAGECALLBACK;
 		cbitem.iSelectedImage = I_IMAGECALLBACK;
@@ -459,7 +460,7 @@ void CSuperComboBox::OnDropFiles(const std::vector<String>& files)
 
 static DWORD WINAPI SHGetFileInfoThread(LPVOID pParam)
 {
-	TCHAR szPath[MAX_PATH];
+	TCHAR szPath[MAX_PATH_FULL];
 	lstrcpy(szPath, (LPCTSTR)pParam);
 
 	SHFILEINFO sfi = {0};