• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

FFFTPのソースコードです。


Commit MetaInfo

Revision95d60f5c65ef1f7b5ef1ebe4c30f8d64ab69a927 (tree)
Zeit2015-11-29 16:22:47
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Fix bugs of option dialog.

Ändern Zusammenfassung

Diff

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
973973 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
974974 CONTROL "切断時にQUITコマンドを送る(&Q)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10
975975 CONTROL "RASの制御を行わない(&R)",CONNECT_NORAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10
976- CONTROL "非PASVモード時にUPnPを制御を試行する(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
976+ CONTROL "非PASVモード時にUPnPの制御を試行する(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
977977 END
978978
979979 rasnotify_dlg DIALOG 0, 0, 158, 46
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
84-#define RELEASE_VERSION_NUM 2015103001 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2015112900 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/option.c
+++ b/option.c
@@ -1012,6 +1012,7 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
10121012 SetMultiTextToList(hDlg, MIRROR_NODEL_LIST, MirrorNoDel);
10131013 SendDlgItemMessage(hDlg, MIRROR_LOW, BM_SETCHECK, MirrorFnameCnv, 0);
10141014 SendDlgItemMessage(hDlg, MIRROR_UPDEL_NOTIFY, BM_SETCHECK, MirUpDelNotify, 0);
1015+ SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_SETCHECK, MirDownDelNotify, 0);
10151016 // ミラーリング設定追加
10161017 SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);
10171018 return(TRUE);
@@ -1349,8 +1350,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
13491350 SendQuit = SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_GETCHECK, 0, 0);
13501351 NoRasControl = SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_GETCHECK, 0, 0);
13511352 // UPnP対応
1352- if(IsUPnPLoaded() == YES)
1353- UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);
1353+ UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);
13541354 break;
13551355
13561356 case PSN_RESET :
--- a/socket.c
+++ b/socket.c
@@ -1362,22 +1362,28 @@ int LoadUPnP()
13621362 {
13631363 int Sts;
13641364 Sts = FFFTP_FAIL;
1365- if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)
1365+ if(IsMainThread())
13661366 {
1367- if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)
1368- Sts = FFFTP_SUCCESS;
1367+ if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)
1368+ {
1369+ if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)
1370+ Sts = FFFTP_SUCCESS;
1371+ }
13691372 }
13701373 return Sts;
13711374 }
13721375
13731376 void FreeUPnP()
13741377 {
1375- if(pUPnPMap != NULL)
1376- pUPnPMap->lpVtbl->Release(pUPnPMap);
1377- pUPnPMap = NULL;
1378- if(pUPnPNAT != NULL)
1379- pUPnPNAT->lpVtbl->Release(pUPnPNAT);
1380- pUPnPNAT = NULL;
1378+ if(IsMainThread())
1379+ {
1380+ if(pUPnPMap != NULL)
1381+ pUPnPMap->lpVtbl->Release(pUPnPMap);
1382+ pUPnPMap = NULL;
1383+ if(pUPnPNAT != NULL)
1384+ pUPnPNAT->lpVtbl->Release(pUPnPNAT);
1385+ pUPnPNAT = NULL;
1386+ }
13811387 }
13821388
13831389 int IsUPnPLoaded()