提交: dc9efb9a37f8901f0b3acc84a4036fe885bea33b - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修訂: dc9efb9a37f8901f0b3acc84a4036fe885bea33b (tree)
• 時間: 2011-10-13 00:43:05
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of host list dialog.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: hostman.c
• modified: mbswrapper.c

差異

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/hostman.c
+++ b/hostman.c
@@ -151,7 +151,9 @@ static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 	int Level2;
 	HOSTLISTDATA *Data1;
 	HOSTLISTDATA *Data2;
-	NM_TREEVIEW *tView;
+	// UTF-8対応
+//	NM_TREEVIEW *tView;
+	NM_TREEVIEWW *tView;
 	HTREEITEM tViewPos;
 	TV_HITTESTINFO HitInfo;
 
@@ -550,7 +552,9 @@ static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 			break;
 
 		case WM_NOTIFY:
-			tView = (NM_TREEVIEW FAR *)lParam;
+			// UTF-8対応
+//			tView = (NM_TREEVIEW FAR *)lParam;
+			tView = (NM_TREEVIEWW FAR *)lParam;
 			switch(tView->hdr.idFrom)
 			{
 				case HOST_LIST :
@@ -558,7 +562,9 @@ static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 					hItem = tView->itemNew.hItem;
 					switch(tView->hdr.code)
 					{
-						case TVN_SELCHANGED :
+						// UTF-8対応
+//						case TVN_SELCHANGED :
+						case TVN_SELCHANGEDW :
 							/* フォルダが選ばれたときは接続、コピーボタンは禁止 */
 							Item.hItem = hItem;
 							Item.mask = TVIF_PARAM;

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -610,6 +610,10 @@ LRESULT SendMessageM(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 	LVFINDINFOW wLVFindInfo;
 	LVCOLUMNA* pmLVColumn;
 	LVCOLUMNW wLVColumn;
+	TVITEMEXA* pmTVItem;
+	TVITEMEXW wTVItem;
+	TVINSERTSTRUCTA* pmTVInsert;
+	TVINSERTSTRUCTW wTVInsert;
 	wchar_t ClassName[MAX_PATH];
 START_ROUTINE
 	switch(Msg)
@@ -887,6 +891,83 @@ START_ROUTINE
 				break;
 			}
 		}
+		else if(_wcsicmp(ClassName, WC_TREEVIEWW) == 0)
+		{
+			switch(Msg)
+			{
+			case TVM_GETITEMA:
+				pmTVItem = (TVITEMEXA*)lParam;
+				wTVItem.mask = pmTVItem->mask;
+				wTVItem.hItem = pmTVItem->hItem;
+				wTVItem.state = pmTVItem->state;
+				wTVItem.stateMask = pmTVItem->stateMask;
+				if(pmTVItem->mask & TVIF_TEXT)
+				{
+					Size = pmTVItem->cchTextMax * 4;
+					pw0 = AllocateStringW(Size);
+					wTVItem.pszText = pw0;
+					wTVItem.cchTextMax = Size;
+				}
+				wTVItem.iImage = pmTVItem->iImage;
+				wTVItem.iSelectedImage = pmTVItem->iSelectedImage;
+				wTVItem.cChildren = pmTVItem->cChildren;
+				wTVItem.lParam = pmTVItem->lParam;
+				wTVItem.iIntegral = pmTVItem->iIntegral;
+//				wTVItem.uStateEx = pmTVItem->uStateEx;
+//				wTVItem.hwnd = pmTVItem->hwnd;
+//				wTVItem.iExpandedImage = pmTVItem->iExpandedImage;
+//				wTVItem.iReserved = pmTVItem->iReserved;
+				r = SendMessageW(hWnd, TVM_GETITEMW, wParam, (LPARAM)&wTVItem);
+				pmTVItem->mask = wTVItem.mask;
+				pmTVItem->hItem = wTVItem.hItem;
+				pmTVItem->state = wTVItem.state;
+				pmTVItem->stateMask = wTVItem.stateMask;
+				if(pmTVItem->mask & TVIF_TEXT)
+				{
+					WtoM(pmTVItem->pszText, pmTVItem->cchTextMax, wTVItem.pszText, -1);
+					TerminateStringM(pmTVItem->pszText, pmTVItem->cchTextMax);
+				}
+				pmTVItem->iImage = wTVItem.iImage;
+				pmTVItem->iSelectedImage = wTVItem.iSelectedImage;
+				pmTVItem->cChildren = wTVItem.cChildren;
+				pmTVItem->lParam = wTVItem.lParam;
+				pmTVItem->iIntegral = wTVItem.iIntegral;
+//				pmTVItem->uStateEx = wTVItem.uStateEx;
+//				pmTVItem->hwnd = wTVItem.hwnd;
+//				pmTVItem->iExpandedImage = wTVItem.iExpandedImage;
+//				pmTVItem->iReserved = wTVItem.iReserved;
+				break;
+			case TVM_INSERTITEMA:
+				pmTVInsert = (TVINSERTSTRUCTA*)lParam;
+				wTVInsert.hParent = pmTVInsert->hParent;
+				wTVInsert.hInsertAfter = pmTVInsert->hInsertAfter;
+				wTVInsert.itemex.mask = pmTVInsert->itemex.mask;
+				wTVInsert.itemex.hItem = pmTVInsert->itemex.hItem;
+				wTVInsert.itemex.state = pmTVInsert->itemex.state;
+				wTVInsert.itemex.stateMask = pmTVInsert->itemex.stateMask;
+				if(pmTVInsert->itemex.mask & TVIF_TEXT)
+				{
+					pw0 = DuplicateMtoW(pmTVInsert->itemex.pszText, -1);
+					wTVInsert.itemex.pszText = pw0;
+					// TODO: cchTextMaxの確認
+					wTVInsert.itemex.cchTextMax = pmTVInsert->itemex.cchTextMax;
+				}
+				wTVInsert.itemex.iImage = pmTVInsert->itemex.iImage;
+				wTVInsert.itemex.iSelectedImage = pmTVInsert->itemex.iSelectedImage;
+				wTVInsert.itemex.cChildren = pmTVInsert->itemex.cChildren;
+				wTVInsert.itemex.lParam = pmTVInsert->itemex.lParam;
+				wTVInsert.itemex.iIntegral = pmTVInsert->itemex.iIntegral;
+//				wTVInsert.itemex.uStateEx = pmTVInsert->itemex.uStateEx;
+//				wTVInsert.itemex.hwnd = pmTVInsert->itemex.hwnd;
+//				wTVInsert.itemex.iExpandedImage = pmTVInsert->itemex.iExpandedImage;
+//				wTVInsert.itemex.iReserved = pmTVInsert->itemex.iReserved;
+				r = SendMessageW(hWnd, TVM_INSERTITEMW, wParam, (LPARAM)&wTVInsert);
+				break;
+			default:
+				r = SendMessageW(hWnd, Msg, wParam, lParam);
+				break;
+			}
+		}
 		else
 			r = SendMessageW(hWnd, Msg, wParam, lParam);
 		break;