• 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

Revisiona517496df34bd20052d2adeeb9cdb715c4b9b8b0 (tree)
Zeit2016-05-14 00:10:18
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Supported specification changes of the server for automatic software update.
Fix bugs that an useless dialog was popped up on importing from the registry.
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
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,133,294,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99-20160504",-1,113,11,90,8
245+ CTEXT "FFFTP Ver 1.99a",-1,113,11,90,8
246246 CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
247247 CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)",-1,7,25,305,44,SS_NOPREFIX
248248 CTEXT "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22132213 //
22142214
22152215 VS_VERSION_INFO VERSIONINFO
2216- FILEVERSION 1,99,0,0
2217- PRODUCTVERSION 1,99,0,0
2216+ FILEVERSION 1,99,1,0
2217+ PRODUCTVERSION 1,99,1,0
22182218 FILEFLAGSMASK 0x3fL
22192219 #ifdef _DEBUG
22202220 FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
22322232 VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
22332233 VALUE "CompanyName", "Sota, FFFTP Project"
22342234 VALUE "FileDescription", "FFFTP"
2235- VALUE "FileVersion", "1, 99, 0, 0"
2235+ VALUE "FileVersion", "1, 99, 1, 0"
22362236 VALUE "InternalName", "FFFTP"
22372237 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)."
22382238 VALUE "OriginalFilename", "FFFTP.exe"
22392239 VALUE "ProductName", "FFFTP"
2240- VALUE "ProductVersion", "1, 99, 0, 0"
2240+ VALUE "ProductVersion", "1, 99, 1, 0"
22412241 END
22422242 END
22432243 BLOCK "VarFileInfo"
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,132,296,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99-20160504",-1,110,11,90,8
245+ CTEXT "FFFTP Ver 1.99a",-1,110,11,90,8
246246 CTEXT "FFFTP is freeware",-1,7,281,301,8
247247 CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44
248248 CTEXT "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22532253 //
22542254
22552255 VS_VERSION_INFO VERSIONINFO
2256- FILEVERSION 1,99,0,0
2257- PRODUCTVERSION 1,99,0,0
2256+ FILEVERSION 1,99,1,0
2257+ PRODUCTVERSION 1,99,1,0
22582258 FILEFLAGSMASK 0x3fL
22592259 #ifdef _DEBUG
22602260 FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
22722272 VALUE "Comments", "This software is Free Software"
22732273 VALUE "CompanyName", "Sota, FFFTP Project"
22742274 VALUE "FileDescription", "FFFTP"
2275- VALUE "FileVersion", "1, 99, 0, 0"
2275+ VALUE "FileVersion", "1, 99, 1, 0"
22762276 VALUE "InternalName", "FFFTP"
22772277 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)."
22782278 VALUE "OriginalFilename", "FFFTP.exe"
22792279 VALUE "ProductName", "FFFTP"
2280- VALUE "ProductVersion", "1, 99, 0, 0"
2280+ VALUE "ProductVersion", "1, 99, 1, 0"
22812281 END
22822282 END
22832283 BLOCK "VarFileInfo"
--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
7272 //#define PROGRAM_VERSION_NUM 1972 /* バージョン */
7373 // 64ビット対応
7474 #ifdef _WIN64
75-#define VER_STR "1.99-20160504 64bit"
75+#define VER_STR "1.99a 64bit"
7676 #else
77-#define VER_STR "1.99-20160504"
77+#define VER_STR "1.99a"
7878 #endif
7979 #define VER_NUM 1990 /* 設定バージョン */
8080 #define PROGRAM_VERSION_NUM 1990 /* バージョン */
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
84-#define RELEASE_VERSION_NUM 2016050400 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2016051400 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
@@ -1955,6 +1955,8 @@ void QueryDisplayDPI();
19551955 int CalcPixelX(int x);
19561956 int CalcPixelY(int y);
19571957 HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNumerator, int ScaleDenominator);
1958+// ソフトウェア自動更新
1959+void DecodeLineFeed(char* Str);
19581960
19591961 /*===== dlgsize.c =====*/
19601962
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -1,5 +1,5 @@
11 ============================================================
2-[Software Name] FFFTP Ver.1.99 (FTP Client software)
2+[Software Name] FFFTP Ver.1.99a (FTP Client software)
33 [Copyright] Copyright(C) 1997-2010 Sota & cooperators
44 Copyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen).
55 [Environment] Windows 10, 8.1, 8, 7, Vista, XP, 2000
@@ -28,86 +28,25 @@ following menu.
2828 File ->@Settings -> Change Master password
2929
3030
31-Changes in Ver.1.99
31+Changes in Ver.1.99a
3232 --------------------
3333
34--- Tested on Windows 8.1 (32bit/64bit).
34+The lists of this and newer versions include changes applied by automatic
35+software updates.
3536
36--- Tested on Windows 10 (32bit/64bit).
37+-- Supported specification changes of the server for automatic software update.
38+ Please update your copy of FFFTP to this version manually because older
39+ versions cannot update automatically now.
3740
38--- 64bit version is now available.
39- This works around the certain restriction on 64bit Windows.
41+-- Fixed bugs that it could not display some file names if its encoding was
42+ other than UTF-8.
4043
41--- Added the feature of automatic software update (Windows XP SP3 or later
42- only).
43- It will connect to the dedicated server to check whether there are updates
44- every 7 days by default, and then confirm whether to apply them.
44+-- Fixed bugs that an useless dialog was popped up on ZIP versions while
45+ settings were imported from the registry.
4546
46--- Added a feature to encrypt the all settings with the master password.
47- This prevents malwares and third parties from skimming personal information.
48- Please note that 1.98g or former versions cannot read encrypted settings.
49- This feature is disabled by default.
47+-- Updated OpenSSL.
5048
51--- Fixed bugs that the apprication did not start when the INI file was modified
52- and BOM was inserted in it.
53-
54--- Fixed bugs that user names which were sent to hosts were always encoded into
55- UTF-8.
56-
57--- Fixed bugs of recognition of MLSD responses that include uppercase letters.
58-
59--- Added an option to disable automatic refresh of the local view.
60-
61--- Added an option to dispose old logs automatically.
62-
63--- Supported UTF-8 HFS+ file name encoding (Windows Vista or later only).
64-
65--- Improved automatic detection of Kanji code of filenames.
66-
67--- Fixed bugs of Select dialog.
68-
69--- Changed to confirm how the settings will be saved when the settings of a
70- future version exist in the registry.
71-
72--- Changed to display file sizes with units of GB or larger.
73-
74--- Changed to display the encryption status of the current connection.
75-
76--- Changed to display the progress of file transfer on the taskbar (Windows 7
77- or later only).
78-
79--- Added a function to move remote files to their parent directory.
80-
81--- Supported high DPI displays.
82- The interface such as the menu will look smooth on high DPI displays.
83-
84--- Added a feature to export settings as FileZilla XML format.
85-
86--- Added an option not to use weak encryption methods for each host.
87- This refuses SSL 3.0 or older and encryption algorithms whose keys are
88- shorter than 128 bits.
89- This feature is enabled by default.
90-
91--- Added the default settings to the host list.
92- This is used for the initial state of new hosts and Quick Connect.
93-
94--- Added an option to abort file transfer if failed in obtaining file lists
95- before it.
96- This feature is enabled by default.
97-
98--- Changed to enable reconnection after transfer errors by default.
99-
100--- Fixed bugs to fail in controlling UPnP with simultaneous connections.
101-
102--- Fixed bugs to crash if certain operations are performed immediately after
103- drag-and-drop from the remote file view.
104-
105--- Fixed bugs to fail in recognizing file names that contain 2 or more spaces
106- in Windows Server 2008 R2 file list format.
107-
108--- Added an option not to save the user name and password of the firewall.
109-
110--- Fixed bugs to disturb the view after resizing of a dialog.
49+-- Updated SSL/TLS root CAs.
11150
11251
11352 Outline
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -1,5 +1,25 @@
11 FFFTP version history.
22
3+Changes in Ver.1.99a
4+--------------------
5+
6+The lists of this and newer versions include changes applied by automatic
7+software updates.
8+
9+-- Supported specification changes of the server for automatic software update.
10+ Please update your copy of FFFTP to this version manually because older
11+ versions cannot update automatically now.
12+
13+-- Fixed bugs that it could not display some file names if its encoding was
14+ other than UTF-8.
15+
16+-- Fixed bugs that an useless dialog was popped up on ZIP versions while
17+ settings were imported from the registry.
18+
19+-- Updated OpenSSL.
20+
21+-- Updated SSL/TLS root CAs.
22+
323 Changes in Ver.1.99
424 --------------------
525
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -1,5 +1,5 @@
11 ============================================================
2-yƒ\ƒtƒg–¼z@FTPƒNƒ‰ƒCƒAƒ“ƒg FFFTPiOSDN”Łj Ver 1.99
2+yƒ\ƒtƒg–¼z@FTPƒNƒ‰ƒCƒAƒ“ƒg FFFTPiOSDN”Łj Ver 1.99a
33 y“®ìŠm”FŠÂ‹«z@Windows 10, 8.1, 8, 7, Vista, XP, 2000
44 yƒTƒ|[ƒgz@http://osdn.jp/projects/ffftp/
55 ============================================================
@@ -27,90 +27,24 @@ FFFTP Ver.1.96d+009
2727 ƒ}ƒXƒ^[ƒpƒXƒ[ƒh‚Ì“ü—Í‚ª‹‚ß‚ç‚ê‚Ü‚·‚̂ŁA“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B
2828
2929
30-Ver 1.99‚ł̕ύX“_
30+Ver 1.99a‚ł̕ύX“_
3131 -------------------
3232
33-EWindows 8.1 (32bit/64bit)‚Å“®ì‚ðŠm”F‚µ‚Ü‚µ‚½B
33+¡‰ñ‚̃o[ƒWƒ‡ƒ“‚æ‚èAŽ©“®XV‹@”\‚őΉž‚µ‚½“à—e‚ðŠÜ‚ß‚Ä‹LÚ‚µ‚Ü‚·B
3434
35-EWindows 10 (32bit/64bit)‚Å“®ì‚ðŠm”F‚µ‚Ü‚µ‚½B
35+EŽ©“®XV‹@”\—pƒT[ƒo[‚ÌŽd—l•ÏX‚ɑΉž‚µ‚Ü‚µ‚½B
36+@ˆÈ‘O‚̃o[ƒWƒ‡ƒ“‚Å‚ÍŽ©“®XV‹@”\‚ªŽg—p‚Å‚«‚È‚­‚È‚Á‚½‚½‚߁A
37+@‚±‚̃o[ƒWƒ‡ƒ“‚ւ̍XV‚ÍŽè“®‚É‚Ä‚¨Šè‚¢‚µ‚Ü‚·B
3638
37-E64bit”Å‚ª—˜—p‰Â”\‚É‚È‚è‚Ü‚µ‚½B
38-@‚±‚ê‚É‚æ‚è64bit”ÅWindows‚Å“Á’è‚Ì‘€ì‚ª§ŒÀ‚³‚ê‚é‚Ì‚ð‰ñ”ð‚Å‚«‚Ü‚·B
39+Eƒtƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh‚ªUTF-8ˆÈŠO‚̏ꍇ‚É“Á’è‚̃tƒ@ƒCƒ‹–¼‚ª³‚µ‚­•\Ž¦
40+@‚³‚ê‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
3941
40-Eƒ\ƒtƒgƒEƒFƒA‚ÌŽ©“®XV‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½iWindows XP SP3ˆÈ~‚̂݁jB
41-@Šù’è‚Å‚Í7“ú‚²‚Ƃɐê—p‚̃T[ƒo[‚ɐڑ±‚µ‚čXV‚ª‚ ‚é‚©‚Ç‚¤‚©Šm”F‚µA
42-@XV‚ª‚ ‚ê‚΍XV‚ð“K—p‚·‚é‚©‚Ç‚¤‚©ƒ†[ƒU[‚ÉŠm”F‚µ‚Ü‚·B
42+EZIP”łŏ«—ˆ‚̃o[ƒWƒ‡ƒ“‚̐ݒè‚ðƒŒƒWƒXƒgƒŠ‚©‚çƒCƒ“ƒ|[ƒg‚µ‚½Û‚É—]•ª‚È
43+@ƒ_ƒCƒAƒƒO‚ª•\Ž¦‚³‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
4344
44-Eƒ}ƒXƒ^[ƒpƒXƒ[ƒh‚ð—p‚¢‚Ä‘S‚Ă̐ݒè‚ðˆÃ†‰»‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B
45-@ƒ}ƒ‹ƒEƒFƒA‚â‘æŽOŽÒ‚É‚æ‚èÝ’è‚©‚çŒÂlî•ñ‚ð“Ç‚ÝŽæ‚ç‚ê‚È‚­‚È‚è‚Ü‚·‚ªA
46-@1.98gˆÈ‘O‚ł͐ݒè‚ð“ǂݍž‚ß‚È‚è‚Ü‚·‚Ì‚Å’ˆÓ‚µ‚Ä‚­‚¾‚³‚¢B
47-@‚±‚Ì‹@”\‚ÍŠù’è‚Å‚Í–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B
45+EOpenSSL‚ðXV‚µ‚Ü‚µ‚½B
4846
49-EINIƒtƒ@ƒCƒ‹‚ª‰ü•Ï‚³‚êBOM‚ª•t‰Á‚³‚ê‚Ä‚¢‚éê‡‚ɃNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚ð
50-@C³‚µ‚Ü‚µ‚½B
51-
52-EÚ‘±Žž‚Ƀ†[ƒU[–¼‚ªí‚ÉUTF-8‚ŃzƒXƒg‚É‘—M‚³‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
53-@1.98ˆÈ~‚Å”¼Šp‰p”ŽšˆÈŠO‚Ì•¶Žš‚ªŠÜ‚Ü‚ê‚郆[ƒU[–¼‚эƒOƒCƒ“‚Å‚«‚È‚¢
54-@–â‘肪‰ðŒˆ‚³‚ê‚Ü‚·B
55-
56-EMLSDƒRƒ}ƒ“ƒh‚̉ž“š‚ª‘啶Žš‚ðŠÜ‚ޏꍇ‚É”FŽ¯‚µ‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
57-
58-Eƒ[ƒJƒ‹‘¤‚̃tƒ@ƒCƒ‹ˆê——‚ÌŽ©“®XV‚𖳌ø‚É‚·‚éÝ’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
59-
60-Eˆ—“à—e‚ðŽ©“®“I‚Ɍ¢s‚©‚çíœ‚·‚éÝ’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
61-@ˆê•”‚̊‹«‚Å’·ŽžŠÔ‘€ì‚µ‚½ê‡‚É“®ì‚ªd‚­‚È‚é–â‘肪ŠÉ˜a‚³‚ê‚Ü‚·B
62-
63-EƒzƒXƒg‚̃tƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh‚Æ‚µ‚ÄUTF-8 HFS+‚ɑΉž‚µ‚Ü‚µ‚½
64-@iWindows VistaˆÈ~‚̂݁jB
65-@Mac OS Xã‚Å“®ì‚·‚éƒzƒXƒg‚ƃtƒ@ƒCƒ‹‚ð‘—ŽóM‚·‚éÛ‚Ƀtƒ@ƒCƒ‹–¼‚Ì
66-@‚Ђ炪‚È‚âƒJƒ^ƒJƒi‚Ì‘÷“_‚┼‘÷“_‚ª³‚µ‚­ˆµ‚í‚ê‚é‚悤‚É‚È‚è‚Ü‚·B
67-
68-EƒzƒXƒg‚̃tƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh‚ÌŽ©“®”»•Ê‚̐¸“x‚ð‰ü‘P‚µ‚Ü‚µ‚½B
69-
70-E‘I‘ðƒ_ƒCƒAƒƒO‚ª³í‚É‹@”\‚µ‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
71-
72-EƒŒƒWƒXƒgƒŠ‚ɏ«—ˆ‚̃o[ƒWƒ‡ƒ“‚̐ݒ肪‘¶Ý‚·‚éê‡‚ɐݒè‚Ì•Û‘¶•û–@‚ð
73-@Šm”F‚·‚é‚悤‚É‚µ‚Ü‚µ‚½B
74-
75-Eƒtƒ@ƒCƒ‹ƒTƒCƒY•\‹L‚ÉGBˆÈã‚Ì’PˆÊ‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚µ‚½B
76-
77-Eƒ^ƒCƒgƒ‹ƒo[‚ÉŒ»Ý‚̐ڑ±‚̈͆‰»ó‘Ô‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚µ‚½B
78-
79-Eƒ^ƒXƒNƒo[‚Ƀtƒ@ƒCƒ‹“]‘—‚̐i’»ó‹µ‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚µ‚½
80-@iWindows 7ˆÈ~‚̂݁jB
81-
82-EƒŠƒ‚[ƒg‘¤‚̃tƒ@ƒCƒ‹‚ð‚»‚Ìˆê‚ã‚̃fƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚é‹@”\‚ð’ljÁ
83-@‚µ‚Ü‚µ‚½B
84-
85-E‚DPIƒfƒBƒXƒvƒŒƒC‚ɑΉž‚µ‚Ü‚µ‚½B
86-@‚DPIƒfƒBƒXƒvƒŒƒC‚É•\Ž¦‚·‚éÛ‚Ƀƒjƒ…[‚È‚Ç‚Ì•\Ž¦‚ªŠŠ‚ç‚©‚É‚È‚è‚Ü‚·B
87-
88-EÝ’è‚ðFileZilla XMLŒ`Ž®‚ɃGƒNƒXƒ|[ƒg‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B
89-
90-EƒzƒXƒg‚̐ݒè‚ÉŽã‚¢ˆÃ†‰»•ûŽ®‚ðŽg—p‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
91-@SSL 3.0ˆÈ‘O‚⌮‚Ì‹­“x‚ª128ƒrƒbƒg–¢–ž‚̈͆‚ð‹‘”Û‚·‚é‚悤‚É‚È‚è‚Ü‚·B
92-@‚±‚Ì‹@”\‚ÍŠù’è‚Å‚Í—LŒø‚É‚È‚è‚Ü‚·B
93-
94-EƒzƒXƒgˆê——‚ÉŠù’è‚̐ݒè‚ð’ljÁ‚µ‚Ü‚µ‚½B
95-@V‹KƒzƒXƒg‚̍쐬Žž‚âƒNƒCƒbƒNÚ‘±Žž‚̏‰Šúó‘Ô‚Æ‚µ‚ÄŽg—p‚³‚ê‚Ü‚·B
96-
97-Eƒtƒ@ƒCƒ‹“]‘—‘O‚̃tƒ@ƒCƒ‹ˆê——Žæ“¾Žž‚ɃGƒ‰[‚ª”­¶‚µ‚½ê‡‚É“]‘—‚ð
98-@’†Ž~‚·‚éÝ’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
99-@‚±‚Ì‹@”\‚ÍŠù’è‚Å‚Í—LŒø‚É‚È‚è‚Ü‚·B
100-
101-Eƒtƒ@ƒCƒ‹‚Ì“]‘—‚ÉŽ¸”s‚µ‚½ê‡‚ɍĐڑ±‚·‚éÝ’è‚ðŠù’è‚Å—LŒø‚É‚µ‚Ü‚µ‚½B
102-
103-E“¯ŽžÚ‘±Žž‚ÉUPnP‚̐§Œä‚ÉŽ¸”s‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
104-
105-EƒŠƒ‚[ƒg‘¤‚̃tƒ@ƒCƒ‹ˆê——‚©‚çƒhƒ‰ƒbƒOƒAƒ“ƒhƒhƒƒbƒv‚µ‚½’¼Œã‚É“Á’è‚Ì
106-@‘€ì‚ðs‚¤‚ƃNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
107-
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-
113-Eƒ_ƒCƒAƒƒO‚̃TƒCƒY•ÏXŽž‚É•\Ž¦‚ª—‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
47+ESSL/TLS‚̃‹[ƒgØ–¾‘‚ðXV‚µ‚Ü‚µ‚½B
11448
11549
11650 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -1,5 +1,23 @@
11 FFFTP@‰ü”ŃŠƒXƒg
22
3+¡Ver 1.99a
4+
5+¡‰ñ‚̃o[ƒWƒ‡ƒ“‚æ‚èAŽ©“®XV‹@”\‚őΉž‚µ‚½“à—e‚ðŠÜ‚ß‚Ä‹LÚ‚µ‚Ü‚·B
6+
7+EŽ©“®XV‹@”\—pƒT[ƒo[‚ÌŽd—l•ÏX‚ɑΉž‚µ‚Ü‚µ‚½B
8+@ˆÈ‘O‚̃o[ƒWƒ‡ƒ“‚Å‚ÍŽ©“®XV‹@”\‚ªŽg—p‚Å‚«‚È‚­‚È‚Á‚½‚½‚߁A
9+@‚±‚̃o[ƒWƒ‡ƒ“‚ւ̍XV‚ÍŽè“®‚É‚Ä‚¨Šè‚¢‚µ‚Ü‚·B
10+
11+Eƒtƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh‚ªUTF-8ˆÈŠO‚̏ꍇ‚É“Á’è‚̃tƒ@ƒCƒ‹–¼‚ª³‚µ‚­•\Ž¦
12+@‚³‚ê‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
13+
14+EZIP”łŏ«—ˆ‚̃o[ƒWƒ‡ƒ“‚̐ݒè‚ðƒŒƒWƒXƒgƒŠ‚©‚çƒCƒ“ƒ|[ƒg‚µ‚½Û‚É—]•ª‚È
15+@ƒ_ƒCƒAƒƒO‚ª•\Ž¦‚³‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
16+
17+EOpenSSL‚ðXV‚µ‚Ü‚µ‚½B
18+
19+ESSL/TLS‚̃‹[ƒgØ–¾‘‚ðXV‚µ‚Ü‚µ‚½B
20+
321 ¡Ver 1.99
422
523 EWindows 8.1 (32bit/64bit)‚Å“®ì‚ðŠm”F‚µ‚Ü‚µ‚½B
Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ
--- a/htmlhelp/HTML/H0000001.HTM
+++ b/htmlhelp/HTML/H0000001.HTM
@@ -4,9 +4,9 @@
44 <META name=GENERATOR content="MSHTML 8.00.7600.16490"></HEAD>
55 <BODY>
66 <P align=center><FONT face="‚l‚r ƒSƒVƒbƒN">&nbsp;<FONT color=#0000ff
7-size=6>‚e‚e‚e‚s‚o</FONT>@Ver 1.99</FONT><FONT face="‚l‚r ƒSƒVƒbƒN"><BR></FONT>(“®ìŠm”FŠÂ‹«
7+size=6>FFFTP</FONT> Ver 1.99a</FONT><FONT face="‚l‚r ƒSƒVƒbƒN"><BR></FONT>(“®ìŠm”FŠÂ‹«
88 <STRONG>Windows 10, 8.1, 8, 7, Vista, XP, 2000</STRONG>)</P>
9-<P><BR>‚f‚t‚h‚È‚e‚s‚oƒNƒ‰ƒCƒAƒ“ƒgƒc[ƒ‹‚Å‚·B</P><STRONG>
9+<P><BR>GUI‚ÈFTPƒNƒ‰ƒCƒAƒ“ƒgƒc[ƒ‹‚Å‚·B</P><STRONG>
1010 <P style="MARGIN-RIGHT: 0px" dir=ltr><STRONG><FONT
1111 color=#ff0000>‚¨Žg‚¢‚Ì‘O‚É</FONT></STRONG></P>
1212 <P>ˆÈ‰º‚̍€–ڂ͏d—v‚Å‚·B‚¨“Ç‚Ý‚­‚¾‚³‚¢B</P>
--- a/main.c
+++ b/main.c
@@ -439,7 +439,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
439439 if(pCommand = GetToken(pCommand, ListFile))
440440 {
441441 if(pCommand = GetToken(pCommand, Description))
442+ {
443+ DecodeLineFeed(Description);
442444 BuildUpdates(PrivateKeyFile, Password, ServerPath, HashFile, ListFile, RELEASE_VERSION_NUM, VER_STR, Description);
445+ }
443446 }
444447 }
445448 }
@@ -628,20 +631,23 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
628631 }
629632 }
630633 // バージョン確認
631- if(ReadSettingsVersion() > VER_NUM)
634+ if(PortableVersion == NO)
632635 {
633- if(IsRegAvailable() == YES && IsIniAvailable() == NO)
636+ if(ReadSettingsVersion() > VER_NUM)
634637 {
635- switch(MessageBox(GetMainHwnd(), MSGJPN350, "FFFTP", MB_YESNOCANCEL | MB_DEFBUTTON2))
638+ if(IsRegAvailable() == YES && IsIniAvailable() == NO)
636639 {
637- case IDCANCEL:
638- ReadOnlySettings = YES;
639- break;
640- case IDYES:
641- break;
642- case IDNO:
643- ImportPortable = YES;
644- break;
640+ switch(MessageBox(GetMainHwnd(), MSGJPN350, "FFFTP", MB_YESNOCANCEL | MB_DEFBUTTON2))
641+ {
642+ case IDCANCEL:
643+ ReadOnlySettings = YES;
644+ break;
645+ case IDYES:
646+ break;
647+ case IDNO:
648+ ImportPortable = YES;
649+ break;
650+ }
645651 }
646652 }
647653 }
--- a/misc.c
+++ b/misc.c
@@ -2060,3 +2060,14 @@ HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNum
20602060 return hDstBitmap;
20612061 }
20622062
2063+// ソフトウェア自動更新
2064+void DecodeLineFeed(char* Str)
2065+{
2066+ char* p;
2067+ p = Str;
2068+ while(p = strstr(p, "\\n"))
2069+ {
2070+ strncpy(p, "\r\n", 2);
2071+ }
2072+}
2073+
--- a/updater.h
+++ b/updater.h
@@ -11,19 +11,19 @@
1111 #define UPDATE_SERVER "osdn.jp"
1212 #if defined(_M_IX86)
1313 #if !defined(FFFTP_ENGLISH)
14-#define UPDATE_HASH_PATH "/dl/ffftp/update+jpn+hash"
15-#define UPDATE_LIST_PATH "/dl/ffftp/update+jpn+list"
14+#define UPDATE_HASH_PATH "/dl/ffftp/update.jpn.hash"
15+#define UPDATE_LIST_PATH "/dl/ffftp/update.jpn.list"
1616 #else
17-#define UPDATE_HASH_PATH "/dl/ffftp/update+eng+hash"
18-#define UPDATE_LIST_PATH "/dl/ffftp/update+eng+list"
17+#define UPDATE_HASH_PATH "/dl/ffftp/update.eng.hash"
18+#define UPDATE_LIST_PATH "/dl/ffftp/update.eng.list"
1919 #endif
2020 #elif defined(_M_AMD64)
2121 #if !defined(FFFTP_ENGLISH)
22-#define UPDATE_HASH_PATH "/dl/ffftp/update+amd64+jpn+hash"
23-#define UPDATE_LIST_PATH "/dl/ffftp/update+amd64+jpn+list"
22+#define UPDATE_HASH_PATH "/dl/ffftp/update.amd64.jpn.hash"
23+#define UPDATE_LIST_PATH "/dl/ffftp/update.amd64.jpn.list"
2424 #else
25-#define UPDATE_HASH_PATH "/dl/ffftp/update+amd64+eng+hash"
26-#define UPDATE_LIST_PATH "/dl/ffftp/update+amd64+eng+list"
25+#define UPDATE_HASH_PATH "/dl/ffftp/update.amd64.eng.hash"
26+#define UPDATE_LIST_PATH "/dl/ffftp/update.amd64.eng.list"
2727 #endif
2828 #endif
2929 #define UPDATE_RSA_PUBLIC_KEY \