• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

FFFTPのソースコードです。


Commit MetaInfo

Revision1a874222c5beffc74f9f6363060c1a6a1b462f87 (tree)
Zeit2016-02-20 18:54:34
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Fix bugs of file list type detection.
Add options not to save firewall user settings for shared computers.
Modify documents.

Ä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
@@ -619,7 +619,7 @@ BEGIN
619619 COMBOBOX FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
620620 LTEXT "FireWallƒzƒXƒg(&H)",-1,7,32,80,8
621621 EDITTEXT FIRE_HOST,7,41,150,12,ES_AUTOHSCROLL
622- LTEXT "ƒ|[ƒg(&X)",-1,168,32,36,8
622+ LTEXT "ƒ|[ƒg(&O)",-1,168,32,36,8
623623 EDITTEXT FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER
624624 LTEXT "FireWallƒ†[ƒU[–¼(&U)",-1,7,56,76,8
625625 EDITTEXT FIRE_USER,7,65,68,12,ES_AUTOHSCROLL
@@ -629,10 +629,11 @@ BEGIN
629629 EDITTEXT FIRE_DELIMIT,169,65,35,12,ES_AUTOHSCROLL
630630 LTEXT "ƒZƒLƒ…ƒŠƒeƒB(&Q)",-1,7,80,63,8
631631 COMBOBOX FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
632- CONTROL "ƒzƒXƒg‚ÌŒŸõ‚ÍSOCKSƒT[ƒo[‚É”C‚¹‚é(&S)",FIRE_RESOLV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10
632+ CONTROL "ƒzƒXƒg‚ÌŒŸõ‚ÍSOCKSƒT[ƒo[‚É”C‚¹‚é(&R)",FIRE_RESOLV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10
633633 CONTROL "OPEN/SITEƒRƒ}ƒ“ƒh‚ð¬•¶Žš‚É‚·‚é(&L)",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10
634- CONTROL "ƒzƒXƒgˆê——‚É–¢“o˜^‚̃zƒXƒg‚ÍFireWall‚ðŽg‚Á‚Đڑ±(&C)",FIRE_USEIT,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10
634+ CONTROL "ƒzƒXƒgˆê——‚É–¢“o˜^‚̃zƒXƒg‚ÍFireWall‚ðŽg‚Á‚Đڑ±(&E)",FIRE_USEIT,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10
635635 CONTROL "ƒzƒXƒgˆê——‚É–¢“o˜^‚̃zƒXƒg‚ÍPASVƒ‚[ƒh‚ðŽg‚¤(&V)",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10
636+ CONTROL "FireWallƒ†[ƒU[–¼/ƒpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢(&N)",FIRE_SHARED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,135,197,10
636637 END
637638
638639 hset_adv_dlg DIALOG 0, 0, 207, 155
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -229,6 +229,7 @@
229229 #define CONNECT_CLOSE_NOTIFY 1015
230230 #define DISP2_PERMIT_NUM 1015
231231 #define MISC_ENCRYPT_SETTINGS 1015
232+#define FIRE_SHARED 1015
232233 #define PERM_O_EXEC 1016
233234 #define TOOL_EDITOR2_BR 1016
234235 #define CONNECT_QUICK_ANONY 1016
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -623,22 +623,23 @@ BEGIN
623623 COMBOBOX FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
624624 LTEXT "Firewall &Hostname",-1,7,32,80,8
625625 EDITTEXT FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL
626- LTEXT "&Port",-1,168,32,36,8
626+ LTEXT "P&ort",-1,168,32,36,8
627627 EDITTEXT FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER
628628 LTEXT "Firewall &Username",-1,7,56,72,8
629629 EDITTEXT FIRE_USER,7,65,70,12,ES_AUTOHSCROLL
630- LTEXT "Firewall P&assword",-1,81,56,70,8
630+ LTEXT "Firewall &Password",-1,81,56,70,8
631631 EDITTEXT FIRE_PASS,81,65,70,12,ES_PASSWORD | ES_AUTOHSCROLL
632+ LTEXT "Replace @ by",-1,154,55,50,8
633+ EDITTEXT FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL
632634 LTEXT "&Security",-1,7,80,63,8
633635 COMBOBOX FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
634636 CONTROL "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,
635637 "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10
636- CONTROL "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10
638+ CONTROL "Use &lowercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10
637639 CONTROL "Us&e the firewall for undefined hosts",FIRE_USEIT,
638640 "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10
639641 CONTROL "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10
640- LTEXT "Replace @ by",-1,154,55,50,8
641- EDITTEXT FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL
642+ CONTROL "Do &not save firewall username/password",FIRE_SHARED,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,135,197,10
642643 END
643644
644645 hset_adv_dlg DIALOG 0, 0, 207, 155
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -229,6 +229,7 @@
229229 #define CONNECT_CLOSE_NOTIFY 1015
230230 #define DISP2_PERMIT_NUM 1015
231231 #define MISC_ENCRYPT_SETTINGS 1015
232+#define FIRE_SHARED 1015
232233 #define PERM_O_EXEC 1016
233234 #define TOOL_EDITOR2_BR 1016
234235 #define CONNECT_QUICK_ANONY 1016
--- 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 2016013000 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2016022000 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -101,6 +101,11 @@ Changes in Ver.1.99
101101 -- Fixed bugs to crash if certain operations are performed immediately after
102102 drag-and-drop from the remote file view.
103103
104+-- Fixed bugs to fail in recognizing file names that contain 2 or more spaces
105+ in Windows Server 2008 R2 file list format.
106+
107+-- Added an option not to save the user name and password of the firewall.
108+
104109
105110 Outline
106111 -------
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -73,6 +73,11 @@ Changes in Ver.1.99
7373 -- Fixed bugs to crash if certain operations are performed immediately after
7474 drag-and-drop from the remote file view.
7575
76+-- Fixed bugs to fail in recognizing file names that contain 2 or more spaces
77+ in Windows Server 2008 R2 file list format.
78+
79+-- Added an option not to save the user name and password of the firewall.
80+
7681 Changes in Ver.1.98g2
7782 --------------------
7883
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -105,6 +105,11 @@ Ver 1.99
105105 EƒŠƒ‚[ƒg‘¤‚̃tƒ@ƒCƒ‹ˆê——‚©‚çƒhƒ‰ƒbƒOƒAƒ“ƒhƒhƒƒbƒv‚µ‚½’¼Œã‚É“Á’è‚Ì
106106 @‘€ì‚ðs‚¤‚ƃNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
107107
108+EWindows Server 2008 R2‚̃tƒ@ƒCƒ‹ˆê——Œ`Ž®‚Å”¼ŠpƒXƒy[ƒX‚ð2ŒÂˆÈãŠÜ‚Þ
109+@ƒtƒ@ƒCƒ‹–¼‚ð”FŽ¯‚Å‚«‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
110+
111+EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
112+
108113
109114 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
110115 -----------------------
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -77,6 +77,11 @@ FFFTP
7777 EƒŠƒ‚[ƒg‘¤‚̃tƒ@ƒCƒ‹ˆê——‚©‚çƒhƒ‰ƒbƒOƒAƒ“ƒhƒhƒƒbƒv‚µ‚½’¼Œã‚É“Á’è‚Ì
7878 @‘€ì‚ðs‚¤‚ƃNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
7979
80+EWindows Server 2008 R2‚̃tƒ@ƒCƒ‹ˆê——Œ`Ž®‚Å”¼ŠpƒXƒy[ƒX‚ð2ŒÂˆÈãŠÜ‚Þ
81+@ƒtƒ@ƒCƒ‹–¼‚ð”FŽ¯‚Å‚«‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
82+
83+EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
84+
8085 ¡Ver 1.98g2
8186
8287 EƒCƒ“ƒXƒg[ƒ‰”Å‚ÉZIP”ł̃tƒ@ƒCƒ‹‚ª¬“ü‚µ‚Ä‚¢‚½–â‘è‚ðC³‚µ‚Ü‚µ‚½B
--- a/filelist.c
+++ b/filelist.c
@@ -3737,7 +3737,9 @@ static int AnalyzeFileInfo(char *Str)
37373737 }
37383738 }
37393739
3740- if(strlen(Tmp) >= 10)
3740+ // バグ修正
3741+// if(strlen(Tmp) >= 10)
3742+ if((strlen(Tmp) >= 10) && (strchr("+-dfl", Tmp[0]) != NULL))
37413743 {
37423744 Add1 = 0;
37433745 if((strlen(Tmp) > 10) && (IsDigit(Tmp[10]) != 0))
Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ
--- a/htmlhelp/HTML/H0000049.HTM
+++ b/htmlhelp/HTML/H0000049.HTM
@@ -64,4 +64,6 @@
6464 <P><STRONG>¡ƒzƒXƒgˆê——‚É–¢“o˜^‚̃zƒXƒg‚ÍFireWall‚ðŽg‚Á‚Đڑ±</STRONG></P>
6565 <P>ƒNƒCƒbƒNÚ‘±A‚ ‚é‚¢‚̓Rƒ}ƒ“ƒhƒ‰ƒCƒ“‚ŃzƒXƒg‚ðŽw’肵‚Đڑ±‚·‚é‚Æ‚«AFireWall‚ðŽg‚¤‚©‚Ç‚¤‚©‚ðÝ’肵‚Ü‚·B</P>
6666 <P><STRONG>¡ƒzƒXƒgˆê——‚É–¢“o˜^‚̃zƒXƒg‚ÍPASVƒ‚[ƒh‚ðŽg‚¤</STRONG></P>
67-<P>ƒNƒCƒbƒNÚ‘±A‚ ‚é‚¢‚̓Rƒ}ƒ“ƒhƒ‰ƒCƒ“‚ŃzƒXƒg‚ðŽw’肵‚Đڑ±‚·‚é‚Æ‚«APASVƒ‚[ƒh‚ðŽg‚¤‚©‚Ç‚¤‚©‚ðÝ’肵‚Ü‚·B<BR></P></BODY></HTML>
67+<P>ƒNƒCƒbƒNÚ‘±A‚ ‚é‚¢‚̓Rƒ}ƒ“ƒhƒ‰ƒCƒ“‚ŃzƒXƒg‚ðŽw’肵‚Đڑ±‚·‚é‚Æ‚«APASVƒ‚[ƒh‚ðŽg‚¤‚©‚Ç‚¤‚©‚ðÝ’肵‚Ü‚·B<BR></P>
68+<P><STRONG>¡FireWallƒ†[ƒU[–¼/ƒpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢</STRONG></P>
69+<P>FireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚̐ݒè‚Æ‚µ‚Ä•Û‘¶‚µ‚Ü‚¹‚ñB<BR>‹¤—p‚̃Rƒ“ƒsƒ…[ƒ^‚ÅŽg—p‚·‚éê‡‚âAFireWall‚ц[ƒU[‚ðŠÇ—‚µ‚Ä‚¢‚éê‡‚É‚¨Žg‚¢‚­‚¾‚³‚¢B<BR></P></BODY></HTML>
Binary files a/htmlhelp/pic/dlg_downmirror_list.png and b/htmlhelp/pic/dlg_downmirror_list.png differ
Binary files a/htmlhelp/pic/dlg_opt_fwall.png and b/htmlhelp/pic/dlg_opt_fwall.png differ
--- a/main.c
+++ b/main.c
@@ -287,6 +287,8 @@ time_t LastAutoCheckForUpdates = 0;
287287 int AbortOnListError = YES;
288288 // ミラーリング設定追加
289289 int MirrorNoTransferContents = NO;
290+// FireWall設定追加
291+int FwallNoSaveUser = NO;
290292
291293
292294
--- a/option.c
+++ b/option.c
@@ -196,6 +196,8 @@ extern int AutoCheckForUptatesInterval;
196196 extern int AbortOnListError;
197197 // ミラーリング設定追加
198198 extern int MirrorNoTransferContents;
199+// FireWall設定追加
200+extern int FwallNoSaveUser;
199201
200202
201203 /*----- オプションのプロパティシート ------------------------------------------
@@ -1458,6 +1460,10 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
14581460 SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN215);
14591461 SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN216);
14601462 SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_SETCURSEL, FwallSecurity, 0);
1463+
1464+ // FireWall設定追加
1465+ SendDlgItemMessage(hDlg, FIRE_SHARED, BM_SETCHECK, FwallNoSaveUser, 0);
1466+
14611467 return(TRUE);
14621468
14631469 case WM_NOTIFY:
@@ -1479,6 +1485,8 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
14791485 FwallResolve = SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_GETCHECK, 0, 0);
14801486 FwallLower = SendDlgItemMessage(hDlg, FIRE_LOWER, BM_GETCHECK, 0, 0);
14811487 FwallSecurity = SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_GETCURSEL, 0, 0);
1488+ // FireWall設定追加
1489+ FwallNoSaveUser = SendDlgItemMessage(hDlg, FIRE_SHARED, BM_GETCHECK, 0, 0);
14821490 break;
14831491
14841492 case PSN_RESET :
--- a/registry.c
+++ b/registry.c
@@ -241,6 +241,8 @@ extern time_t LastAutoCheckForUpdates;
241241 extern int AbortOnListError;
242242 // ミラーリング設定追加
243243 extern int MirrorNoTransferContents;
244+// FireWall設定追加
245+extern int FwallNoSaveUser;
244246
245247 /*----- マスタパスワードの設定 ----------------------------------------------
246248 *
@@ -544,8 +546,19 @@ void SaveRegistry(void)
544546 WriteIntValueToReg(hKey4, "ListDrv", DispDrives);
545547
546548 WriteStringToReg(hKey4, "FwallHost", FwallHost);
547- WriteStringToReg(hKey4, "FwallUser", FwallUser);
548- EncodePassword(FwallPass, Str);
549+ // FireWall設定追加
550+// WriteStringToReg(hKey4, "FwallUser", FwallUser);
551+// EncodePassword(FwallPass, Str);
552+ if(FwallNoSaveUser == YES)
553+ {
554+ WriteStringToReg(hKey4, "FwallUser", "");
555+ EncodePassword("", Str);
556+ }
557+ else
558+ {
559+ WriteStringToReg(hKey4, "FwallUser", FwallUser);
560+ EncodePassword(FwallPass, Str);
561+ }
549562 WriteStringToReg(hKey4, "FwallPass", Str);
550563 WriteIntValueToReg(hKey4, "FwallPort", FwallPort);
551564 WriteIntValueToReg(hKey4, "FwallType", FwallType);
@@ -845,6 +858,8 @@ void SaveRegistry(void)
845858 WriteIntValueToReg(hKey4, "AbortListErr", AbortOnListError);
846859 // ミラーリング設定追加
847860 WriteIntValueToReg(hKey4, "MirNoTransfer", MirrorNoTransferContents);
861+ // FireWall設定追加
862+ WriteIntValueToReg(hKey4, "FwallShared", FwallNoSaveUser);
848863 }
849864 CloseSubKey(hKey4);
850865 }
@@ -1435,6 +1450,8 @@ int LoadRegistry(void)
14351450 ReadIntValueFromReg(hKey4, "AbortListErr", &AbortOnListError);
14361451 // ミラーリング設定追加
14371452 ReadIntValueFromReg(hKey4, "MirNoTransfer", &MirrorNoTransferContents);
1453+ // FireWall設定追加
1454+ ReadIntValueFromReg(hKey4, "FwallShared", &FwallNoSaveUser);
14381455
14391456 CloseSubKey(hKey4);
14401457 }