提交: 95d60f5c65ef1f7b5ef1ebe4c30f8d64ab69a927 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修訂: 95d60f5c65ef1f7b5ef1ebe4c30f8d64ab69a927 (tree)
• 時間: 2015-11-29 16:22:47
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of option dialog.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: common.h
• modified: option.c
• modified: socket.c

差異

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

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

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

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

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -973,7 +973,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
     CONTROL         "切断時にQUITコマンドを送る(&Q)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10
     CONTROL         "RASの制御を行わない(&R)",CONNECT_NORAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10
-    CONTROL         "非PASVモード時にUPnPを制御を試行する(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
+    CONTROL         "非PASVモード時にUPnPの制御を試行する(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
 END
 
 rasnotify_dlg DIALOG  0, 0, 158, 46

--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2015103001	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2015112900	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク

--- a/option.c
+++ b/option.c
@@ -1012,6 +1012,7 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
 			SetMultiTextToList(hDlg, MIRROR_NODEL_LIST, MirrorNoDel);
 			SendDlgItemMessage(hDlg, MIRROR_LOW, BM_SETCHECK, MirrorFnameCnv, 0);
 			SendDlgItemMessage(hDlg, MIRROR_UPDEL_NOTIFY, BM_SETCHECK, MirUpDelNotify, 0);
+			SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_SETCHECK, MirDownDelNotify, 0);
 			// ミラーリング設定追加
 			SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);
 		    return(TRUE);
@@ -1349,8 +1350,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
 					SendQuit = SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_GETCHECK, 0, 0);
 					NoRasControl = SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_GETCHECK, 0, 0);
 					// UPnP対応
-					if(IsUPnPLoaded() == YES)
-						UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);
+					UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/socket.c
+++ b/socket.c
@@ -1362,22 +1362,28 @@ int LoadUPnP()
 {
 	int Sts;
 	Sts = FFFTP_FAIL;
-	if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)
+	if(IsMainThread())
 	{
-		if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)
-			Sts = FFFTP_SUCCESS;
+		if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)
+		{
+			if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)
+				Sts = FFFTP_SUCCESS;
+		}
 	}
 	return Sts;
 }
 
 void FreeUPnP()
 {
-	if(pUPnPMap != NULL)
-		pUPnPMap->lpVtbl->Release(pUPnPMap);
-	pUPnPMap = NULL;
-	if(pUPnPNAT != NULL)
-		pUPnPNAT->lpVtbl->Release(pUPnPNAT);
-	pUPnPNAT = NULL;
+	if(IsMainThread())
+	{
+		if(pUPnPMap != NULL)
+			pUPnPMap->lpVtbl->Release(pUPnPMap);
+		pUPnPMap = NULL;
+		if(pUPnPNAT != NULL)
+			pUPnPNAT->lpVtbl->Release(pUPnPNAT);
+		pUPnPNAT = NULL;
+	}
 }
 
 int IsUPnPLoaded()