Loweynet
修訂 | fb60b11223517040606aa6b531a1e59102d7704b (tree) |
---|---|
時間 | 2017-10-29 17:30:42 |
作者 | s_kawamoto <s_kawamoto@user...> |
Commiter | s_kawamoto |
Fix bugs of host switching.
@@ -11,8 +11,8 @@ set PREFIX_JPN=update.jpn.file. | ||
11 | 11 | set PREFIX_ENG=update.eng.file. |
12 | 12 | set PREFIX_AMD64_JPN=update.amd64.jpn.file. |
13 | 13 | set PREFIX_AMD64_ENG=update.amd64.eng.file. |
14 | -set DESC_JPN="]¸sÉÄÚ±Å«È¢êª éoOðC³µÜµ½B\nØfÉt@CÌ]Ò¿ªð³êÈ¢oOðC³µÜµ½B\n]̧I¹ª@\µÈ¢êª éoOðC³µÜµ½B\n]̧I¹ª@\µÈ¢êª éoOðC³µÜµ½B\nóM~ðNbNµ½ãÌ®ª¨©µÈéoOðC³µÜµ½B" | |
15 | -set DESC_ENG="Fixed bugs that sometimes it cannot reconnect after transfer failure.\nFixed bugs that the queue of file transfer is not released on disconnection.\nFixed bugs that sometimes Force Exit does not work while transfer.\nFixed bugs that the behavior is strange after clicking Stop button." | |
14 | +set DESC_JPN="¯Ú±ª1æèå«¢zXg©çØfµ½¼ãÉÊÌzXgÅ]ɸs·éoOðC³µÜµ½B" | |
15 | +set DESC_ENG="Fixed bugs that transfer fails at a host right after disconnection from another host whose number of simultaneous connections is more than 1." | |
16 | 16 | set DESC_AMD64_JPN=%DESC_JPN% |
17 | 17 | set DESC_AMD64_ENG=%DESC_ENG% |
18 | 18 |
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 | ||
242 | 242 | BEGIN |
243 | 243 | DEFPUSHBUTTON "OK",IDOK,133,294,50,14 |
244 | 244 | ICON ffftp,-1,7,4,20,20 |
245 | - CTEXT "FFFTP Ver 1.99a-20171028",-1,113,11,90,8 | |
245 | + CTEXT "FFFTP Ver 1.99a-20171029",-1,113,11,90,8 | |
246 | 246 | CTEXT "FFFTPÍfreewareÅ·",-1,7,279,305,8 |
247 | 247 | CTEXT "Copyright(C) 1997-2010 Sota & ²¦Í¢½¾¢½ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ¤È[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Ó¤¹ñ)",-1,7,25,305,44,SS_NOPREFIX |
248 | 248 | CTEXT "",ABOUT_JRE,7,96,305,8 |
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur" | ||
2213 | 2213 | // |
2214 | 2214 | |
2215 | 2215 | VS_VERSION_INFO VERSIONINFO |
2216 | - FILEVERSION 1,99,1,17 | |
2217 | - PRODUCTVERSION 1,99,1,17 | |
2216 | + FILEVERSION 1,99,1,18 | |
2217 | + PRODUCTVERSION 1,99,1,18 | |
2218 | 2218 | FILEFLAGSMASK 0x3fL |
2219 | 2219 | #ifdef _DEBUG |
2220 | 2220 | FILEFLAGS 0x1L |
@@ -2232,12 +2232,12 @@ BEGIN | ||
2232 | 2232 | VALUE "Comments", "±êÍt[\tgEGAÅ·B" |
2233 | 2233 | VALUE "CompanyName", "Sota, FFFTP Project" |
2234 | 2234 | VALUE "FileDescription", "FFFTP" |
2235 | - VALUE "FileVersion", "1, 99, 1, 17" | |
2235 | + VALUE "FileVersion", "1, 99, 1, 18" | |
2236 | 2236 | VALUE "InternalName", "FFFTP" |
2237 | 2237 | VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ²¦Í¢½¾¢½ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ¤È[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Ó¤¹ñ)." |
2238 | 2238 | VALUE "OriginalFilename", "FFFTP.exe" |
2239 | 2239 | VALUE "ProductName", "FFFTP" |
2240 | - VALUE "ProductVersion", "1, 99, 1, 17" | |
2240 | + VALUE "ProductVersion", "1, 99, 1, 18" | |
2241 | 2241 | END |
2242 | 2242 | END |
2243 | 2243 | BLOCK "VarFileInfo" |
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 | ||
242 | 242 | BEGIN |
243 | 243 | DEFPUSHBUTTON "OK",IDOK,132,296,50,14 |
244 | 244 | ICON ffftp,-1,7,4,20,20 |
245 | - CTEXT "FFFTP Ver 1.99a-20171028",-1,110,11,90,8 | |
245 | + CTEXT "FFFTP Ver 1.99a-20171029",-1,110,11,90,8 | |
246 | 246 | CTEXT "FFFTP is freeware",-1,7,281,301,8 |
247 | 247 | CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44 |
248 | 248 | CTEXT "",ABOUT_JRE,7,93,301,8 |
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur" | ||
2253 | 2253 | // |
2254 | 2254 | |
2255 | 2255 | VS_VERSION_INFO VERSIONINFO |
2256 | - FILEVERSION 1,99,1,17 | |
2257 | - PRODUCTVERSION 1,99,1,17 | |
2256 | + FILEVERSION 1,99,1,18 | |
2257 | + PRODUCTVERSION 1,99,1,18 | |
2258 | 2258 | FILEFLAGSMASK 0x3fL |
2259 | 2259 | #ifdef _DEBUG |
2260 | 2260 | FILEFLAGS 0x1L |
@@ -2272,12 +2272,12 @@ BEGIN | ||
2272 | 2272 | VALUE "Comments", "This software is Free Software" |
2273 | 2273 | VALUE "CompanyName", "Sota, FFFTP Project" |
2274 | 2274 | VALUE "FileDescription", "FFFTP" |
2275 | - VALUE "FileVersion", "1, 99, 1, 17" | |
2275 | + VALUE "FileVersion", "1, 99, 1, 18" | |
2276 | 2276 | VALUE "InternalName", "FFFTP" |
2277 | 2277 | VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)." |
2278 | 2278 | VALUE "OriginalFilename", "FFFTP.exe" |
2279 | 2279 | VALUE "ProductName", "FFFTP" |
2280 | - VALUE "ProductVersion", "1, 99, 1, 17" | |
2280 | + VALUE "ProductVersion", "1, 99, 1, 18" | |
2281 | 2281 | END |
2282 | 2282 | END |
2283 | 2283 | BLOCK "VarFileInfo" |
@@ -72,16 +72,16 @@ | ||
72 | 72 | //#define PROGRAM_VERSION_NUM 1972 /* バージョン */ |
73 | 73 | // 64ビット対応 |
74 | 74 | #ifdef _WIN64 |
75 | -#define VER_STR "1.99a-20171028 64bit" | |
75 | +#define VER_STR "1.99a-20171029 64bit" | |
76 | 76 | #else |
77 | -#define VER_STR "1.99a-20171028" | |
77 | +#define VER_STR "1.99a-20171029" | |
78 | 78 | #endif |
79 | 79 | #define VER_NUM 1990 /* 設定バージョン */ |
80 | 80 | #define PROGRAM_VERSION_NUM 1990 /* バージョン */ |
81 | 81 | // ソフトウェア自動更新 |
82 | 82 | // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする |
83 | 83 | // 2014年7月31日中の30個目のリリースは2014073129 |
84 | -#define RELEASE_VERSION_NUM 2017102800 /* リリースバージョン */ | |
84 | +#define RELEASE_VERSION_NUM 2017102900 /* リリースバージョン */ | |
85 | 85 | |
86 | 86 | |
87 | 87 | // SourceForge.JPによるフォーク |
@@ -792,8 +792,7 @@ static ULONG WINAPI TransferThread(void *Dummy) | ||
792 | 792 | } |
793 | 793 | if(AskReuseCmdSkt() == YES && ThreadCount == 0) |
794 | 794 | { |
795 | - if(TransPacketBase && ThreadCount < AskMaxThreadCount()) | |
796 | - TrnSkt = AskTrnCtrlSkt(); | |
795 | + TrnSkt = AskTrnCtrlSkt(); | |
797 | 796 | // セッションあたりの転送量制限対策 |
798 | 797 | if(TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES) |
799 | 798 | { |
@@ -859,7 +858,7 @@ static ULONG WINAPI TransferThread(void *Dummy) | ||
859 | 858 | { |
860 | 859 | // 同時ログイン数制限対策 |
861 | 860 | // 60秒間使用されなければログアウト |
862 | - if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO) | |
861 | + if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO || ThreadCount >= AskMaxThreadCount()) | |
863 | 862 | { |
864 | 863 | ReleaseMutex(hListAccMutex); |
865 | 864 | DoQUIT(TrnSkt, &Canceled[ThreadCount]); |