X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=main.c;h=2c162f2a02e1e8cf7d4df148d180a0a2ee6496db;hb=54e22287e55f2b2a890a8fdda61bb128be5f787f;hp=36e3d1db2e1e35fbbb316760807794809ecf949b;hpb=7677acb145ecb0ef18f09f561740f08841f36f62;p=ffftp%2Fffftp.git

diff --git a/main.c b/main.c
index 36e3d1d..2c162f2 100644
--- a/main.c
+++ b/main.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"
@@ -127,6 +130,9 @@ static int SuppressRefresh = 0;
 
 static DWORD dwCookie;
 
+// 暗号化通信対応
+static char SSLRootCAFilePath[FMAX_PATH+1];
+
 
 /*===== グローバルなワーク =====*/
 
@@ -135,12 +141,20 @@ HWND hHelpWin = NULL;
 /* 設定値 */
 int WinPosX = CW_USEDEFAULT;
 int WinPosY = 0;
-int WinWidth = 630;
-int WinHeight = 393;
-int LocalWidth = 309;
-int TaskHeight = 50;
-int LocalTabWidth[4] = { 120, 90, 60, 37 };
-int RemoteTabWidth[6] = { 120, 90, 60, 37, 60, 60 };
+// 機能が増えたためサイズ変更
+// VGAサイズに収まるようになっていたのをSVGAサイズに引き上げ
+//int WinWidth = 630;
+//int WinHeight = 393;
+//int LocalWidth = 309;
+//int TaskHeight = 50;
+//int LocalTabWidth[4] = { 120, 90, 60, 37 };
+//int RemoteTabWidth[6] = { 120, 90, 60, 37, 60, 60 };
+int WinWidth = 790;
+int WinHeight = 513;
+int LocalWidth = 389;
+int TaskHeight = 100;
+int LocalTabWidth[4] = { 160, 110, 60, 37 };
+int RemoteTabWidth[6] = { 160, 110, 60, 37, 60, 60 };
 char UserMailAdrs[USER_MAIL_LEN+1] = { "who@example.com" };
 char ViewerName[VIEWERS][FMAX_PATH+1] = { { "notepad" }, { "" }, { "" } };
 HFONT ListFont = NULL;
@@ -210,10 +224,9 @@ int MirUpDelNotify = YES;
 int MirDownDelNotify = YES; 
 int FolderAttr = NO;
 int FolderAttrNum = 777;
-// 同時接続対応
-int MaxThreadCount = 1;
 // 暗号化通信対応
 BYTE CertificateCacheHash[MAX_CERT_CACHE_HASH][20];
+BYTE SSLRootCAFileHash[20];
 
 
 
@@ -463,6 +476,9 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 			// 暗号化通信対応
 			SetSSLTimeoutCallback(TimeOut * 1000, SSLTimeoutCallback);
 			SetSSLConfirmCallback(SSLConfirmCallback);
+			GetModuleFileName(NULL, SSLRootCAFilePath, FMAX_PATH);
+			strcpy(GetFileName(SSLRootCAFilePath), "ssl.pem");
+			LoadSSLRootCAFile();
 
 			LoadJre();
 			if(NoRasControl == NO)
@@ -831,6 +847,12 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 	switch (message)
 	{
+		// 自動切断対策
+		case WM_TIMER :
+			if(wParam == 1)
+				NoopProc();
+			break;
+
 		case WM_COMMAND :
 			// 同時接続対応
 			// 中断後に受信バッファに応答が残っていると次のコマンドの応答が正しく処理できない
@@ -839,11 +861,21 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 			switch(LOWORD(wParam))
 			{
 				case MENU_CONNECT :
+					// 自動切断対策
+					KillTimer(hWnd, 1);
 					ConnectProc(DLG_TYPE_CON, -1);
+					// 自動切断対策
+					if(AskNoopInterval() > 0)
+						SetTimer(hWnd, 1, AskNoopInterval() * 1000, NULL);
 					break;
 
 				case MENU_CONNECT_NUM :
+					// 自動切断対策
+					KillTimer(hWnd, 1);
 					ConnectProc(DLG_TYPE_CON, (int)lParam);
+					// 自動切断対策
+					if(AskNoopInterval() > 0)
+						SetTimer(hWnd, 1, AskNoopInterval() * 1000, NULL);
 					if(AskConnecting() == YES)
 					{
 						if(HIWORD(wParam) & OPT_MIRROR)
@@ -864,11 +896,21 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 					break;
 
 				case MENU_SET_CONNECT :
+					// 自動切断対策
+					KillTimer(hWnd, 1);
 					ConnectProc(DLG_TYPE_SET, -1);
+					// 自動切断対策
+					if(AskNoopInterval() > 0)
+						SetTimer(hWnd, 1, AskNoopInterval() * 1000, NULL);
 					break;
 
 				case MENU_QUICK :
+					// 自動切断対策
+					KillTimer(hWnd, 1);
 					QuickConnectProc();
+					// 自動切断対策
+					if(AskNoopInterval() > 0)
+						SetTimer(hWnd, 1, AskNoopInterval() * 1000, NULL);
 					break;
 
 				case MENU_DISCONNECT :
@@ -902,7 +944,12 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_HIST_18 :
 				case MENU_HIST_19 :
 				case MENU_HIST_20 :
+					// 自動切断対策
+					KillTimer(hWnd, 1);
 					HistoryConnectProc(LOWORD(wParam));
+					// 自動切断対策
+					if(AskNoopInterval() > 0)
+						SetTimer(hWnd, 1, AskNoopInterval() * 1000, NULL);
 					break;
 
 				case MENU_UPDIR :
@@ -1148,6 +1195,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_KNJ_EUC :
 				case MENU_KNJ_JIS :
 				case MENU_KNJ_UTF8N :
+				case MENU_KNJ_UTF8BOM :
 				case MENU_KNJ_NONE :
 					SetHostKanjiCode(LOWORD(wParam));
 					break;
@@ -1156,6 +1204,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_L_KNJ_EUC :
 				case MENU_L_KNJ_JIS :
 				case MENU_L_KNJ_UTF8N :
+				case MENU_L_KNJ_UTF8BOM :
 					SetLocalKanjiCode(LOWORD(wParam));
 					break;
 
@@ -1220,7 +1269,9 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 					break;
 
 				case MENU_HELP_TROUBLE :
-					ShellExecute(NULL, "open", MYWEB_URL, NULL, ".", SW_SHOW);
+					// 任意のコードが実行されるバグ修正
+//					ShellExecute(NULL, "open", MYWEB_URL, NULL, ".", SW_SHOW);
+					ShellExecute(NULL, "open", MYWEB_URL, NULL, NULL, SW_SHOW);
 					break;
 
 				case MENU_BMARK_ADD :
@@ -1446,6 +1497,10 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 							lpttt->lpszText = MSGJPN308;
 							break;
 
+						case MENU_KNJ_UTF8BOM :
+							lpttt->lpszText = MSGJPN330;
+							break;
+
 						case MENU_KNJ_NONE :
 							lpttt->lpszText = MSGJPN173;
 							break;
@@ -1466,6 +1521,10 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 							lpttt->lpszText = MSGJPN312;
 							break;
 
+						case MENU_L_KNJ_UTF8BOM :
+							lpttt->lpszText = MSGJPN331;
+							break;
+
 						case MENU_KANACNV :
 							lpttt->lpszText = MSGJPN174;
 							break;
@@ -2455,7 +2514,10 @@ void ExecViewer(char *Fname, int App)
 
 	AskLocalCurDir(CurDir, FMAX_PATH);
 
-	if((App == -1) && (FindExecutable(Fname, NULL, AssocProg) > (HINSTANCE)32))
+	// 任意のコードが実行されるバグ修正
+	// 拡張子が無いと補完されるため
+//	if((App == -1) && (FindExecutable(Fname, NULL, AssocProg) > (HINSTANCE)32))
+	if((App == -1) && (strlen(GetFileExt(GetFileName(Fname))) > 0) && (FindExecutable(Fname, NULL, AssocProg) > (HINSTANCE)32))
 	{
 		DoPrintf("ShellExecute - %s", Fname);
 		ShellExecute(NULL, "open", Fname, NULL, CurDir, SW_SHOW);
@@ -2926,3 +2988,35 @@ BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certif
 	return bResult;
 }
 
+BOOL LoadSSLRootCAFile()
+{
+	BOOL bResult;
+	HANDLE hFile;
+	DWORD Size;
+	BYTE* pBuffer;
+	uint32 Hash[5];
+	bResult = FALSE;
+	if((hFile = CreateFile(SSLRootCAFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE)
+	{
+		Size = GetFileSize(hFile, NULL);
+		if(pBuffer = (BYTE*)malloc(Size))
+		{
+			if(ReadFile(hFile, pBuffer, Size, &Size, NULL))
+			{
+				sha_memory((char*)pBuffer, (uint32)Size, (uint32*)&Hash);
+				// 同梱する"ssl.pem"に合わせてSHA1ハッシュ値を変更すること
+				if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 20) == 0
+					|| DialogBox(GetFtpInst(), MAKEINTRESOURCE(updatesslroot_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
+				{
+					memcpy(&SSLRootCAFileHash, &Hash, 20);
+					if(SetSSLRootCertificate(pBuffer, Size))
+						bResult = TRUE;
+				}
+			}
+			free(pBuffer);
+		}
+		CloseHandle(hFile);
+	}
+	return bResult;
+}
+