X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=toolmenu.c;h=4d58859b62429e3ca0310c219fae9588ae05ddf2;hp=8dde5bb3ce610e854be9d3b3ef50c936ef313160;hb=607cd5899fe0ff3692e440cc5fd27e1b21a6cd77;hpb=1f4ca95ce22d4d2a3e639aaa306f71aee7467267

diff --git a/toolmenu.c b/toolmenu.c
index 8dde5bb..4d58859 100644
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -28,6 +28,8 @@
 /============================================================================*/
 
 #define  STRICT
+// IPv6対応
+#include <winsock2.h>
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +39,8 @@
 #include <windowsx.h>
 #include <commctrl.h>
 #include <stdarg.h>
-#include <winsock.h>
+// IPv6対応
+//#include <winsock.h>
 
 #include "common.h"
 #include "resource.h"
@@ -140,11 +143,13 @@ static TBBUTTON TbarDataMain[] = {
 	{ 20, MENU_L_KNJ_EUC, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 21, MENU_L_KNJ_JIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 28, MENU_L_KNJ_UTF8N, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
+	{ 29, MENU_L_KNJ_UTF8BOM, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 0,  0, TBSTATE_ENABLED, BTNS_SEP, 0, 0 },
 	{ 27, MENU_KNJ_SJIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 20, MENU_KNJ_EUC, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 21, MENU_KNJ_JIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 28, MENU_KNJ_UTF8N, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
+	{ 29, MENU_KNJ_UTF8BOM, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 22, MENU_KNJ_NONE, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 },
 	{ 0,  0, TBSTATE_ENABLED, BTNS_SEP, 0, 0 },
 	{ 23, MENU_KANACNV, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0 },
@@ -195,8 +200,8 @@ static const int HideMenus[] = {
 	MENU_HELP,			MENU_HELP_TROUBLE,	MENU_ABOUT,
 	MENU_REGINIT,
 	MENU_TEXT,			MENU_BINARY,		MENU_AUTO,
-	MENU_KNJ_SJIS,		MENU_KNJ_EUC,		MENU_KNJ_JIS,		MENU_KNJ_UTF8N,		MENU_KNJ_NONE,
-	MENU_L_KNJ_SJIS,	MENU_L_KNJ_EUC,		MENU_L_KNJ_JIS,		MENU_L_KNJ_UTF8N,
+	MENU_KNJ_SJIS,		MENU_KNJ_EUC,		MENU_KNJ_JIS,		MENU_KNJ_UTF8N,		MENU_KNJ_UTF8BOM,	MENU_KNJ_NONE,
+	MENU_L_KNJ_SJIS,	MENU_L_KNJ_EUC,		MENU_L_KNJ_JIS,		MENU_L_KNJ_UTF8N,	MENU_L_KNJ_UTF8BOM,
 	MENU_KANACNV,
 	MENU_LOCAL_UPDIR,	MENU_LOCAL_CHDIR,
 	MENU_REMOTE_UPDIR,	MENU_REMOTE_CHDIR,
@@ -233,7 +238,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarMain = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP | TBSTYLE_FLAT,
 				1,
 				27,
 				hInst,
@@ -247,7 +252,9 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	if(hWndTbarMain != NULL)
 	{
 		/* 2007/09/21 sunasunamix  ここから *********************/
-		pOldTbarMainProc = (WNDPROC)SetWindowLong(hWndTbarMain, GWL_WNDPROC, (DWORD)CountermeasureTbarMainProc);
+		// 64ビット対応
+//		pOldTbarMainProc = (WNDPROC)SetWindowLong(hWndTbarMain, GWL_WNDPROC, (DWORD)CountermeasureTbarMainProc);
+		pOldTbarMainProc = (WNDPROC)SetWindowLongPtr(hWndTbarMain, GWLP_WNDPROC, (LONG_PTR)CountermeasureTbarMainProc);
 		/********************************************* ここまで */
 
 		GetClientRect(hWnd, &Rect1);
@@ -258,7 +265,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarLocal = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,
 				2,
 				2,
 				hInst,
@@ -272,7 +279,9 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	if(hWndTbarLocal != NULL)
 	{
 		/* 2007/09/21 sunasunamix  ここから *********************/
-		pOldTbarLocalProc = (WNDPROC)SetWindowLong(hWndTbarLocal, GWL_WNDPROC, (DWORD)CountermeasureTbarLocalProc);
+		// 64ビット対応
+//		pOldTbarLocalProc = (WNDPROC)SetWindowLong(hWndTbarLocal, GWL_WNDPROC, (DWORD)CountermeasureTbarLocalProc);
+		pOldTbarLocalProc = (WNDPROC)SetWindowLongPtr(hWndTbarLocal, GWLP_WNDPROC, (LONG_PTR)CountermeasureTbarLocalProc);
 		/********************************************* ここまで */
 
 		MoveWindow(hWndTbarLocal, 0, TOOLWIN_HEIGHT, LocalWidth, TOOLWIN_HEIGHT, FALSE);
@@ -280,7 +289,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 		/*===== ローカルのディレクトリ名ウインドウ =====*/
 
 		SendMessage(hWndTbarLocal, TB_GETITEMRECT, 3, (LPARAM)&Rect1);
-#ifndef ENGLISH
+#ifndef FFFTP_ENGLISH
 		DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,SHIFTJIS_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);
 #else
 		DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);
@@ -297,14 +306,16 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 			/* エディットコントロールを探す */
 			hWndDirLocalEdit = GetWindow(hWndDirLocal, GW_CHILD);
 			if(hWndDirLocalEdit != NULL)
-				HistEditBoxProcPtr = (WNDPROC)SetWindowLong(hWndDirLocalEdit, GWL_WNDPROC, (LONG)HistEditBoxWndProc);
+				// 64ビット対応
+//				HistEditBoxProcPtr = (WNDPROC)SetWindowLong(hWndDirLocalEdit, GWL_WNDPROC, (LONG)HistEditBoxWndProc);
+				HistEditBoxProcPtr = (WNDPROC)SetWindowLongPtr(hWndDirLocalEdit, GWLP_WNDPROC, (LONG_PTR)HistEditBoxWndProc);
 
 			SendMessage(hWndDirLocal, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE, 0));
 			SendMessage(hWndDirLocal, CB_LIMITTEXT, FMAX_PATH, 0);
 
 			/* ドライブ名をセットしておく */
 			GetLogicalDriveStrings(FMAX_PATH, Tmp);
-			NoDrives = LoadHideDriveListRegistory();
+			NoDrives = LoadHideDriveListRegistry();
 			Pos = Tmp;
 			while(*Pos != NUL)
 			{
@@ -321,7 +332,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarRemote = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,
 				3,
 				2,
 				hInst,
@@ -335,7 +346,9 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 	if(hWndTbarRemote != NULL)
 	{
 		/* 2007/09/21 sunasunamix  ここから *********************/
-		pOldTbarRemoteProc = (WNDPROC)SetWindowLong(hWndTbarRemote, GWL_WNDPROC, (DWORD)CountermeasureTbarRemoteProc);
+		// 64ビット対応
+//		pOldTbarRemoteProc = (WNDPROC)SetWindowLong(hWndTbarRemote, GWL_WNDPROC, (DWORD)CountermeasureTbarRemoteProc);
+		pOldTbarRemoteProc = (WNDPROC)SetWindowLongPtr(hWndTbarRemote, GWLP_WNDPROC, (LONG_PTR)CountermeasureTbarRemoteProc);
 		/********************************************* ここまで */
 
 		MoveWindow(hWndTbarRemote, LocalWidth + SepaWidth, TOOLWIN_HEIGHT, RemoteWidth, TOOLWIN_HEIGHT, FALSE);
@@ -354,7 +367,9 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 			/* エディットコントロールを探す */
 			hWndDirRemoteEdit = GetWindow(hWndDirRemote, GW_CHILD);
 			if(hWndDirRemoteEdit != NULL)
-				HistEditBoxProcPtr = (WNDPROC)SetWindowLong(hWndDirRemoteEdit, GWL_WNDPROC, (LONG)HistEditBoxWndProc);
+				// 64ビット対応
+//				HistEditBoxProcPtr = (WNDPROC)SetWindowLong(hWndDirRemoteEdit, GWL_WNDPROC, (LONG)HistEditBoxWndProc);
+				HistEditBoxProcPtr = (WNDPROC)SetWindowLongPtr(hWndDirRemoteEdit, GWLP_WNDPROC, (LONG_PTR)HistEditBoxWndProc);
 
 			SendMessage(hWndDirRemote, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE, 0));
 			SendMessage(hWndDirRemote, CB_LIMITTEXT, FMAX_PATH, 0);
@@ -395,6 +410,8 @@ static LRESULT CALLBACK HistEditBoxWndProc(HWND hWnd, UINT message, WPARAM wPara
 				}
 				else
 				{
+					// 同時接続対応
+					CancelFlg = NO;
 					SendMessage(hWndDirRemoteEdit, WM_GETTEXT, FMAX_PATH+1, (LPARAM)Tmp);
 					if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 					{
@@ -1026,6 +1043,10 @@ void SetHostKanjiCode(int Type)
 			TmpHostKanjiCode = KANJI_UTF8N;
 			break;
 
+		case MENU_KNJ_UTF8BOM :
+			TmpHostKanjiCode = KANJI_UTF8BOM;
+			break;
+
 		default :
 			TmpHostKanjiCode = KANJI_NOCNV;
 			break;
@@ -1066,6 +1087,10 @@ void DispHostKanjiCode(void)
 			SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_UTF8N, MAKELONG(TRUE, 0));
 			break;
 
+		case KANJI_UTF8BOM :
+			SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(TRUE, 0));
+			break;
+
 		default :
 			SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_NONE, MAKELONG(TRUE, 0));
 			break;
@@ -1108,6 +1133,7 @@ void HideHostKanjiButton(void)
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_EUC, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_JIS, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8N, MAKELONG(FALSE, 0));
+			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_NONE, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(FALSE, 0));
 			break;
@@ -1117,6 +1143,7 @@ void HideHostKanjiButton(void)
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_EUC, MAKELONG(TRUE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_JIS, MAKELONG(TRUE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8N, MAKELONG(TRUE, 0));
+			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(TRUE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_NONE, MAKELONG(TRUE, 0));
 //			if(TmpHostKanjiCode != KANJI_NOCNV)
 //				SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(TRUE, 0));
@@ -1177,6 +1204,10 @@ void SetLocalKanjiCode(int Type)
 		case MENU_L_KNJ_UTF8N :
 			TmpLocalKanjiCode = KANJI_UTF8N;
 			break;
+
+		case MENU_L_KNJ_UTF8BOM :
+			TmpLocalKanjiCode = KANJI_UTF8BOM;
+			break;
 	}
 	DispLocalKanjiCode();
 	HideLocalKanjiButton();
@@ -1203,6 +1234,10 @@ void DispLocalKanjiCode(void)
 		case KANJI_UTF8N :
 			SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(TRUE, 0));
 			break;
+
+		case KANJI_UTF8BOM :
+			SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(TRUE, 0));
+			break;
 	}
 	return;
 }
@@ -1222,6 +1257,7 @@ void HideLocalKanjiButton(void)
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_EUC, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_JIS, MAKELONG(FALSE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(FALSE, 0));
+			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(FALSE, 0));
 			break;
 
 		default :
@@ -1229,6 +1265,7 @@ void HideLocalKanjiButton(void)
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_EUC, MAKELONG(TRUE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_JIS, MAKELONG(TRUE, 0));
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(TRUE, 0));
+			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(TRUE, 0));
 			// 現在カナ変換はShift_JIS、JIS、EUC間でのみ機能する
 			SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(FALSE, 0));
 			switch(TmpHostKanjiCode)
@@ -1809,9 +1846,18 @@ void RemoteRbuttonMenu(int Pos)
 		AppendMenu(hMenu, MF_STRING | Flg1, MENU_DOWNLOAD_ALL, MSGJPN266);
 		AppendMenu(hMenu, MF_STRING | Flg1 | Flg2, MENU_DELETE, MSGJPN267);
 		AppendMenu(hMenu, MF_STRING | Flg1 | Flg2, MENU_RENAME, MSGJPN268);
+#if defined(HAVE_TANDEM)
+		/* HP NonStop Server では CHMOD の仕様が異なるため使用不可 */
+		if (AskRealHostType() != HTYPE_TANDEM)
+#endif
 		AppendMenu(hMenu, MF_STRING | Flg1 | Flg2, MENU_CHMOD, MSGJPN269);
 		AppendMenu(hMenu, MF_STRING | Flg1, MENU_MKDIR, MSGJPN270);
 		AppendMenu(hMenu, MF_STRING | Flg1 | Flg2, MENU_URL_COPY, MSGJPN271);
+#if defined(HAVE_TANDEM)
+		/* OSS モードのときに表示されるように AskRealHostType() を使用する */
+		if (AskRealHostType() == HTYPE_TANDEM)
+			AppendMenu(hMenu, MF_STRING | Flg1, MENU_SWITCH_OSS, MSGJPN2001);
+#endif
 		AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
 		AppendMenu(hMenu, MF_STRING | Flg1, MENU_FILESIZE, MSGJPN272);
 		AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
@@ -1850,7 +1896,9 @@ static void AddOpenMenu(HMENU hMenu, UINT Flg)
 	char Tmp[FMAX_PATH+1];
 	int i;
 
-	AppendMenu(hMenu, MF_STRING | Flg, MENU_DCLICK, MSGJPN274);
+	// ローカルフォルダを開く
+//	AppendMenu(hMenu, MF_STRING | Flg, MENU_DCLICK, MSGJPN274);
+	AppendMenu(hMenu, MF_STRING | Flg, MENU_OPEN, MSGJPN274);
 	for(i = 0; i < VIEWERS; i++)
 	{
 		if(strlen(ViewerName[i]) != 0)
@@ -1872,7 +1920,9 @@ static LRESULT CALLBACK CountermeasureTbarMainProc(HWND hWnd,UINT uMessage,WPARA
 {
 	switch (uMessage) {
 	case WM_DESTROY :
-		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarMainProc);
+		// 64ビット対応
+//		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarMainProc);
+		SetWindowLongPtr(hWnd,GWLP_WNDPROC,(LONG_PTR)pOldTbarMainProc);
 		break;
 	case WM_RBUTTONDBLCLK :
 	case WM_RBUTTONDOWN :
@@ -1889,7 +1939,9 @@ static LRESULT CALLBACK CountermeasureTbarLocalProc(HWND hWnd,UINT uMessage,WPAR
 {
 	switch (uMessage) {
 	case WM_DESTROY :
-		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarLocalProc);
+		// 64ビット対応
+//		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarLocalProc);
+		SetWindowLongPtr(hWnd,GWLP_WNDPROC,(LONG_PTR)pOldTbarLocalProc);
 		break;
 	case WM_RBUTTONDBLCLK :
 	case WM_RBUTTONDOWN :
@@ -1906,7 +1958,9 @@ static LRESULT CALLBACK CountermeasureTbarRemoteProc(HWND hWnd,UINT uMessage,WPA
 {
 	switch (uMessage) {
 	case WM_DESTROY :
-		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarRemoteProc);
+		// 64ビット対応
+//		SetWindowLong(hWnd,GWL_WNDPROC,(DWORD)pOldTbarRemoteProc);
+		SetWindowLongPtr(hWnd,GWLP_WNDPROC,(LONG_PTR)pOldTbarRemoteProc);
 		break;
 	case WM_RBUTTONDBLCLK :
 	case WM_RBUTTONDOWN :