OSDN > Entwickler > tom_bouchard > Kammer > ffftp > Commit

ffftp
Fork

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	5ddc02b268762f154a281901e1a5c1a67699394f (tree)
Zeit	2014-06-08 22:04:51
Autor	s_kawamoto <s_kawamoto@user...>
Commiter	s_kawamoto

Log Message

Add routines for automatic software updates.
Fix minor bugs.

Ändern Zusammenfassung

modified: FFFTP_Eng_Release/FFFTP.exe (diff)
modified: Release/FFFTP.exe (diff)
modified: Resource/FFFTP.rc (diff)
modified: Resource/resource.h (diff)
modified: Resource_eng/FFFTP-eng.rc (diff)
modified: Resource_eng/resource.h (diff)
modified: common.h (diff)
modified: main.c (diff)
modified: mesg-eng.h (diff)
modified: mesg-jpn.h (diff)
modified: misc.c (diff)
modified: option.c (diff)
modified: putty/Release/PuTTY.dll (diff)
modified: putty/dllinterface.c (diff)
modified: registry.c (diff)
modified: tool.c (diff)
modified: updater.c (diff)
modified: updater.h (diff)

Diff

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

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

--- a/Resource/FFFTP.rc

+++ b/Resource/FFFTP.rc

		@@ -168,6 +168,8 @@ BEGIN
168	168	MENUITEM "Ú(&C)\tF1", MENU_HELP
169	169	MENUITEM "Q&&AW(C^[lbgÉÚ±µÜ·)(T)", MENU_HELP_TROUBLE
170	170	MENUITEM SEPARATOR
	171	+ MENUITEM "\tgEFAÌXVðmF(&U)...", MENU_UPDATES_CHECK
	172	+ MENUITEM SEPARATOR
171	173	MENUITEM "FFFTPÉÂ¢Ä(&A)...", MENU_ABOUT
172	174	END
173	175	END

		@@ -1465,6 +1467,18 @@ BEGIN
1465	1467	CONTROL "Ã¢àeð\¦µÈ¢(&L)",DISP2_REMOVE_OLD_LOG,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,35,196,10
1466	1468	END
1467	1469
	1470	+opt_updates_dlg DIALOG 0, 0, 211, 155
	1471	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1472	+FONT 9, "MS Shell Dlg"
	1473	+BEGIN
	1474	+ CONTROL "©®IÉ\tgEFAÌXVðmF·é(&C)",UPDATES_AUTO_CHECK,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,7,196,10
	1475	+ CONTROL "©®IÉXVðKp·é(&A)",UPDATES_AUTO_APPLY,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,21,196,10
	1476	+ LTEXT "XVÌmFÌÔu(&I)",-1,7,35,196,8
	1477	+ EDITTEXT UPDATES_INTERVAL,7,45,26,14,ES_AUTOHSCROLL \| ES_NUMBER
	1478	+ CONTROL "Spin1",UPDATES_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT \| UDS_AUTOBUDDY \| UDS_ARROWKEYS \| UDS_NOTHOUSANDS,33,45,9,14
	1479	+ LTEXT "i0`999ú; 0=ñN®ÉmFj",-1,45,49,168,8
	1480	+END
	1481	+
1468	1482
1469	1483	/////////////////////////////////////////////////////////////////////////////
1470	1484	//

		@@ -2144,6 +2158,14 @@ BEGIN
2144	2158	TOPMARGIN, 7
2145	2159	BOTTOMMARGIN, 148
2146	2160	END
	2161	+
	2162	+ opt_updates_dlg, DIALOG
	2163	+ BEGIN
	2164	+ LEFTMARGIN, 7
	2165	+ RIGHTMARGIN, 204
	2166	+ TOPMARGIN, 7
	2167	+ BOTTOMMARGIN, 148
	2168	+ END
2147	2169	END
2148	2170	#endif // APSTUDIO_INVOKED
2149	2171

--- a/Resource/resource.h

+++ b/Resource/resource.h

		@@ -117,6 +117,7 @@
117	117	#define ini_from_reg_dlg 194
118	118	#define opt_trmode4_dlg 195
119	119	#define opt_disp2_dlg 196
	120	+#define opt_updates_dlg 197
120	121	#define TRANS_TIME_BAR 1002
121	122	#define TRANS_TEXT 1003
122	123	#define TRANS_REMOTE 1003

		@@ -461,6 +462,10 @@
461	462	#define TRMODE4_UTF8BOM_CNV 1219
462	463	#define HSET_ERROR_RECONNECT 1220
463	464	#define HSET_FN_UTF8HFSX_CNV 1221
	465	+#define UPDATES_AUTO_CHECK 1222
	466	+#define UPDATES_AUTO_APPLY 1223
	467	+#define UPDATES_INTERVAL 1224
	468	+#define UPDATES_INTERVAL_SPN 1225
464	469	#define MENU_END 40001
465	470	#define MENU_EXIT 40001
466	471	#define MENU_CONNECT 40003

		@@ -643,6 +648,7 @@
643	648	#define MENU_FW_FTP_FILTER 40178
644	649	#define MENU_REMOTE_MOVE_UPDIR 40179
645	650	#define MENU_EXPORT_FILEZILLA_XML 40180
	651	+#define MENU_UPDATES_CHECK 40181
646	652	#define FSNOTIFY_TITLE 65535
647	653	#define HOST_SIZEGRIP 65535
648	654

		@@ -651,8 +657,8 @@
651	657	#ifdef APSTUDIO_INVOKED
652	658	#ifndef APSTUDIO_READONLY_SYMBOLS
653	659	#define _APS_NEXT_RESOURCE_VALUE 197
654		-#define _APS_NEXT_COMMAND_VALUE 40181
655		-#define _APS_NEXT_CONTROL_VALUE 1221
	660	+#define _APS_NEXT_COMMAND_VALUE 40182
	661	+#define _APS_NEXT_CONTROL_VALUE 1226
656	662	#define _APS_NEXT_SYMED_VALUE 101
657	663	#endif
658	664	#endif

--- a/Resource_eng/FFFTP-eng.rc

+++ b/Resource_eng/FFFTP-eng.rc

		@@ -168,6 +168,8 @@ BEGIN
168	168	MENUITEM "&Contents\tF1", MENU_HELP
169	169	MENUITEM "&Q&&A (Connect to Internet)", MENU_HELP_TROUBLE
170	170	MENUITEM SEPARATOR
	171	+ MENUITEM "Check for Software &Updates...", MENU_UPDATES_CHECK
	172	+ MENUITEM SEPARATOR
171	173	MENUITEM "&About FFFTP...", MENU_ABOUT
172	174	END
173	175	END

		@@ -176,7 +178,7 @@ dummy_menu MENU
176	178	BEGIN
177	179	POPUP "dummy"
178	180	BEGIN
179		- MENUITEM "Go up (host)", MENU_REMOTE_UPDIR
	181	+ MENUITEM "Go up (remote)", MENU_REMOTE_UPDIR
180	182	MENUITEM "Go up (local)", MENU_LOCAL_UPDIR
181	183	MENUITEM "Go up (both)", MENU_UPDIR
182	184	MENUITEM "COMBO_LOCAL", COMBO_LOCAL

		@@ -1501,6 +1503,19 @@ BEGIN
1501	1503	CONTROL "Do not show old &logs",DISP2_REMOVE_OLD_LOG,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,35,196,10
1502	1504	END
1503	1505
	1506	+opt_updates_dlg DIALOG 0, 0, 211, 155
	1507	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1508	+FONT 9, "MS Shell Dlg"
	1509	+BEGIN
	1510	+ CONTROL "&Check for software updates automatically",UPDATES_AUTO_CHECK,
	1511	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,7,196,10
	1512	+ CONTROL "&Apply updates automatically",UPDATES_AUTO_APPLY,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,21,196,10
	1513	+ LTEXT "&Interval of checking for updates",-1,7,35,196,8
	1514	+ EDITTEXT UPDATES_INTERVAL,7,45,26,14,ES_AUTOHSCROLL \| ES_NUMBER
	1515	+ CONTROL "Spin1",UPDATES_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT \| UDS_AUTOBUDDY \| UDS_ARROWKEYS \| UDS_NOTHOUSANDS,33,45,9,14
	1516	+ LTEXT "i0`999days; 0=Every time at startupj",-1,45,49,168,8
	1517	+END
	1518	+
1504	1519
1505	1520	/////////////////////////////////////////////////////////////////////////////
1506	1521	//

		@@ -2177,6 +2192,14 @@ BEGIN
2177	2192	TOPMARGIN, 7
2178	2193	BOTTOMMARGIN, 148
2179	2194	END
	2195	+
	2196	+ opt_updates_dlg, DIALOG
	2197	+ BEGIN
	2198	+ LEFTMARGIN, 7
	2199	+ RIGHTMARGIN, 204
	2200	+ TOPMARGIN, 7
	2201	+ BOTTOMMARGIN, 148
	2202	+ END
2180	2203	END
2181	2204	#endif // APSTUDIO_INVOKED
2182	2205

--- a/Resource_eng/resource.h

+++ b/Resource_eng/resource.h

		@@ -117,6 +117,7 @@
117	117	#define ini_from_reg_dlg 194
118	118	#define opt_trmode4_dlg 195
119	119	#define opt_disp2_dlg 196
	120	+#define opt_updates_dlg 197
120	121	#define TRANS_TIME_BAR 1002
121	122	#define TRANS_TEXT 1003
122	123	#define TRANS_REMOTE 1003

		@@ -461,6 +462,10 @@
461	462	#define TRMODE4_UTF8BOM_CNV 1219
462	463	#define HSET_ERROR_RECONNECT 1220
463	464	#define HSET_FN_UTF8HFSX_CNV 1221
	465	+#define UPDATES_AUTO_CHECK 1222
	466	+#define UPDATES_AUTO_APPLY 1223
	467	+#define UPDATES_INTERVAL 1224
	468	+#define UPDATES_INTERVAL_SPN 1225
464	469	#define MENU_END 40001
465	470	#define MENU_EXIT 40001
466	471	#define MENU_CONNECT 40003

		@@ -643,6 +648,7 @@
643	648	#define MENU_FW_FTP_FILTER 40178
644	649	#define MENU_REMOTE_MOVE_UPDIR 40179
645	650	#define MENU_EXPORT_FILEZILLA_XML 40180
	651	+#define MENU_UPDATES_CHECK 40181
646	652	#define FSNOTIFY_TITLE 65535
647	653	#define HOST_SIZEGRIP 65535
648	654

		@@ -651,8 +657,8 @@
651	657	#ifdef APSTUDIO_INVOKED
652	658	#ifndef APSTUDIO_READONLY_SYMBOLS
653	659	#define _APS_NEXT_RESOURCE_VALUE 197
654		-#define _APS_NEXT_COMMAND_VALUE 40181
655		-#define _APS_NEXT_CONTROL_VALUE 1221
	660	+#define _APS_NEXT_COMMAND_VALUE 40182
	661	+#define _APS_NEXT_CONTROL_VALUE 1226
656	662	#define _APS_NEXT_SYMED_VALUE 101
657	663	#endif
658	664	#endif

--- a/common.h

+++ b/common.h

		@@ -1389,6 +1389,8 @@ int IsTaskbarList3Loaded();
1389	1389	void UpdateTaskbarProgress();
1390	1390	// 高DPI対応
1391	1391	int AskToolWinHeight(void);
	1392	+// ソフトウェア自動更新
	1393	+void UpdateSoftware(int NoError, int NoConfirm);
1392	1394
1393	1395	/===== filelist.c =====/
1394	1396

--- a/main.c

+++ b/main.c

		@@ -153,7 +153,9 @@ HANDLE ChangeNotification = INVALID_HANDLE_VALUE;
153	153	// タスクバー進捗表示
154	154	static ITaskbarList3* pTaskbarList3;
155	155	// 高DPI対応
156		-int ToolWinHeight;
	156	+static int ToolWinHeight;
	157	+// ソフトウェア自動更新
	158	+static int ApplyUpdatesOnExit = NO;
157	159
158	160
159	161	/===== グローバルなワーク =====/

		@@ -276,6 +278,11 @@ int AutoRefreshFileList = YES;
276	278	int RemoveOldLog = NO;
277	279	// バージョン確認
278	280	int ReadOnlySettings = NO;
	281	+// ソフトウェア自動更新
	282	+int AutoCheckForUpdates = YES;
	283	+int AutoApplyUpdates = NO;
	284	+int AutoCheckForUptatesInterval = 7;
	285	+time_t LastAutoCheckForUpdates = 0;
279	286
280	287
281	288

		@@ -300,6 +307,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
300	307	BOOL Sts;
301	308	// ソフトウェア自動更新
302	309	char UpdateDir[FMAX_PATH+1];
	310	+ char Path[FMAX_PATH+1];
	311	+ char Command[FMAX_PATH+1];
	312	+ char* p;
303	313
304	314	// プロセス保護
305	315	#ifdef ENABLE_PROCESS_PROTECTION

		@@ -311,25 +321,28 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
311	321	pCommand = lpszCmdLine;
312	322	while(pCommand = GetToken(pCommand, Option))
313	323	{
314		- if(strcmp(Option, "--protect") == 0)
315		- {
316		- ProtectLevel = PROCESS_PROTECTION_DEFAULT;
317		- break;
318		- }
319		- else if(strcmp(Option, "--protect-high") == 0)
320		- {
321		- ProtectLevel = PROCESS_PROTECTION_HIGH;
322		- break;
323		- }
324		- else if(strcmp(Option, "--protect-medium") == 0)
325		- {
326		- ProtectLevel = PROCESS_PROTECTION_MEDIUM;
327		- break;
328		- }
329		- else if(strcmp(Option, "--protect-low") == 0)
	324	+ if(Option[0] == '-')
330	325	{
331		- ProtectLevel = PROCESS_PROTECTION_LOW;
332		- break;
	326	+ if(strcmp(&Option[1], "-protect") == 0)
	327	+ {
	328	+ ProtectLevel = PROCESS_PROTECTION_DEFAULT;
	329	+ break;
	330	+ }
	331	+ else if(strcmp(&Option[1], "-protect-high") == 0)
	332	+ {
	333	+ ProtectLevel = PROCESS_PROTECTION_HIGH;
	334	+ break;
	335	+ }
	336	+ else if(strcmp(&Option[1], "-protect-medium") == 0)
	337	+ {
	338	+ ProtectLevel = PROCESS_PROTECTION_MEDIUM;
	339	+ break;
	340	+ }
	341	+ else if(strcmp(&Option[1], "-protect-low") == 0)
	342	+ {
	343	+ ProtectLevel = PROCESS_PROTECTION_LOW;
	344	+ break;
	345	+ }
333	346	}
334	347	}
335	348	if(ProtectLevel != PROCESS_PROTECTION_NONE)

		@@ -368,18 +381,19 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
368	381	#endif
369	382
370	383	// ソフトウェア自動更新
371		- if(GetTokenAfterOption(lpszCmdLine, UpdateDir, "--software-update", "--software-update"))
	384	+ if(GetTokenAfterOption(lpszCmdLine, UpdateDir, "-software-update", "-software-update"))
372	385	{
373		- if(!StartUpdateProcessAsAdministrator(lpszCmdLine, " --restart"))
	386	+ if(!RestartUpdateProcessAsAdministrator(lpszCmdLine, " --restart"))
374	387	{
375		- if(ApplyUpdates(UpdateDir))
	388	+ Sleep(1000);
	389	+ if(ApplyUpdates(UpdateDir, "updatebackup"))
376	390	MessageBox(NULL, MSGJPN359, "FFFTP", MB_OK);
377	391	else
378		- MessageBox(NULL, MSGJPN360, "FFFTP", MB_OK);
	392	+ MessageBox(NULL, MSGJPN360, "FFFTP", MB_OK \| MB_ICONERROR);
379	393	}
380	394	return 0;
381	395	}
382		- else if(GetTokenAfterOption(lpszCmdLine, UpdateDir, "--software-cleanup", "--software-cleanup"))
	396	+ else if(GetTokenAfterOption(lpszCmdLine, UpdateDir, "-software-cleanup", "-software-cleanup"))
383	397	{
384	398	CleanupUpdates(UpdateDir);
385	399	}

		@@ -458,6 +472,26 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
458	472	FreeUPnP();
459	473	CoUninitialize();
460	474	OleUninitialize();
	475	+ // ソフトウェア自動更新
	476	+ if(ApplyUpdatesOnExit == YES)
	477	+ {
	478	+ Sts = FALSE;
	479	+ if(GetModuleFileName(NULL, UpdateDir, FMAX_PATH) > 0)
	480	+ {
	481	+ if(p = strrchr(UpdateDir, '\\'))
	482	+ {
	483	+ *p = '\0';
	484	+ strcpy(Path, TmpPath);
	485	+ SetYenTail(Path);
	486	+ strcat(Path, "update");
	487	+ sprintf(Command, "-%s \"%s\"", "-software-update", UpdateDir);
	488	+ if(StartUpdateProcess(Path, Command))
	489	+ Sts = TRUE;
	490	+ }
	491	+ }
	492	+ if(!Sts)
	493	+ MessageBox(NULL, MSGJPN360, "FFFTP", MB_OK \| MB_ICONERROR);
	494	+ }
461	495	return(Ret);
462	496	}
463	497

		@@ -702,6 +736,10 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
702	736	MakeButtonsFocus();
703	737	DispTransferFiles();
704	738
	739	+ // ソフトウェア自動更新
	740	+ if(AutoCheckForUptatesInterval == 0)
	741	+ UpdateSoftware(YES, AutoApplyUpdates);
	742	+
705	743	StartupProc(lpszCmdLine);
706	744	sts = FFFTP_SUCCESS;
707	745

		@@ -1026,14 +1064,17 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1026	1064	{
1027	1065	// ローカル側自動更新
1028	1066	// タスクバー進捗表示
	1067	+ // ソフトウェア自動更新
1029	1068	case WM_CREATE :
1030	1069	SetTimer(hWnd, 1, 1000, NULL);
1031	1070	SetTimer(hWnd, 2, 100, NULL);
	1071	+ SetTimer(hWnd, 3, 60000, NULL);
1032	1072	break;
1033	1073
1034	1074	// ローカル側自動更新
1035	1075	// 自動切断対策
1036	1076	// タスクバー進捗表示
	1077	+ // ソフトウェア自動更新
1037	1078	case WM_TIMER :
1038	1079	switch(wParam)
1039	1080	{

		@@ -1070,6 +1111,13 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1070	1111	if(IsTaskbarList3Loaded() == YES)
1071	1112	UpdateTaskbarProgress();
1072	1113	break;
	1114	+ case 3:
	1115	+ if(AskUserOpeDisabled() == NO && AskTransferNow() == NO)
	1116	+ {
	1117	+ if(AutoCheckForUptatesInterval > 0 && time(NULL) - LastAutoCheckForUpdates >= AutoCheckForUptatesInterval * 86400)
	1118	+ UpdateSoftware(YES, AutoApplyUpdates);
	1119	+ }
	1120	+ break;
1073	1121	}
1074	1122	break;
1075	1123

		@@ -1623,7 +1671,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1623	1671	SetMasterPassword(NULL);
1624	1672	while(ValidateMasterPassword() == YES && GetMasterPasswordStatus() == PASSWORD_UNMATCH)
1625	1673	{
1626		- if(EnterMasterPasswordAndSet(masterpasswd_dlg, NULL) == 0)
	1674	+ if(EnterMasterPasswordAndSet(masterpasswd_dlg, hWnd) == 0)
1627	1675	break;
1628	1676	}
1629	1677	if(GetMasterPasswordStatus() == PASSWORD_OK && EnterMasterPasswordAndSet(newmasterpasswd_dlg, hWnd) != 0)

		@@ -1695,7 +1743,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1695	1743	SetMasterPassword(NULL);
1696	1744	while(ValidateMasterPassword() == YES && GetMasterPasswordStatus() == PASSWORD_UNMATCH)
1697	1745	{
1698		- if(EnterMasterPasswordAndSet(masterpasswd_dlg, NULL) == 0)
	1746	+ if(EnterMasterPasswordAndSet(masterpasswd_dlg, hWnd) == 0)
1699	1747	break;
1700	1748	}
1701	1749	if(GetMasterPasswordStatus() == PASSWORD_OK)

		@@ -1708,6 +1756,11 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1708	1756	}
1709	1757	break;
1710	1758
	1759	+ // ソフトウェア自動更新
	1760	+ case MENU_UPDATES_CHECK :
	1761	+ UpdateSoftware(NO, NO);
	1762	+ break;
	1763	+
1711	1764	default :
1712	1765	if((LOWORD(wParam) >= MENU_BMARK_TOP) &&
1713	1766	(LOWORD(wParam) < MENU_BMARK_TOP+100))

		@@ -1970,6 +2023,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
1970	2023	FindCloseChangeNotification(ChangeNotification);
1971	2024	// タスクバー進捗表示
1972	2025	KillTimer(hWnd, 2);
	2026	+ // ソフトウェア自動更新
	2027	+ KillTimer(hWnd, 3);
1973	2028	// WSACleanup();
1974	2029	// DestroyWindow(hWndFtp);
1975	2030	PostQuitMessage(0);

		@@ -2209,19 +2264,19 @@ static int AnalyzeComLine(char Str, int AutoConnect, int CmdOption, char unc
2209	2264	}
2210	2265	// プロセス保護
2211	2266	#ifdef ENABLE_PROCESS_PROTECTION
2212		- else if(strcmp(Tmp, "--restart") == 0)
	2267	+ else if(strcmp(&Tmp[1], "-restart") == 0)
2213	2268	{
2214	2269	}
2215		- else if(strcmp(Tmp, "--protect") == 0)
	2270	+ else if(strcmp(&Tmp[1], "-protect") == 0)
2216	2271	{
2217	2272	}
2218		- else if(strcmp(Tmp, "--protect-high") == 0)
	2273	+ else if(strcmp(&Tmp[1], "-protect-high") == 0)
2219	2274	{
2220	2275	}
2221		- else if(strcmp(Tmp, "--protect-medium") == 0)
	2276	+ else if(strcmp(&Tmp[1], "-protect-medium") == 0)
2222	2277	{
2223	2278	}
2224		- else if(strcmp(Tmp, "--protect-low") == 0)
	2279	+ else if(strcmp(&Tmp[1], "-protect-low") == 0)
2225	2280	{
2226	2281	}
2227	2282	#endif

		@@ -2237,14 +2292,14 @@ static int AnalyzeComLine(char Str, int AutoConnect, int CmdOption, char unc
2237	2292	else if((strcmp(&Tmp[1], "u8n") == 0) \|\| (strcmp(&Tmp[1], "-utf8name") == 0))
2238	2293	*CmdOption \|= OPT_UTF8N_NAME;
2239	2294	// ソフトウェア自動更新
2240		- else if(strcmp(Tmp, "--software-update") == 0)
	2295	+ else if(strcmp(&Tmp[1], "-software-update") == 0)
2241	2296	{
2242	2297	if((Str = GetToken(Str, Tmp)) == NULL)
2243	2298	{
2244	2299	Ret = -1;
2245	2300	}
2246	2301	}
2247		- else if(strcmp(Tmp, "--software-cleanup") == 0)
	2302	+ else if(strcmp(&Tmp[1], "-software-cleanup") == 0)
2248	2303	{
2249	2304	if((Str = GetToken(Str, Tmp)) == NULL)
2250	2305	{

		@@ -2363,7 +2418,7 @@ static char GetToken(char Str, char *Buf)
2363	2418	InQuote = 0;
2364	2419	while(*Str != NUL)
2365	2420	{
2366		- if(*Str == 0x22)
	2421	+ if(*Str == '\"')
2367	2422	InQuote = !InQuote;
2368	2423	else
2369	2424	{

		@@ -3574,3 +3629,42 @@ int AskToolWinHeight(void)
3574	3629	return(ToolWinHeight);
3575	3630	}
3576	3631
	3632	+// ソフトウェア自動更新
	3633	+void UpdateSoftware(int NoError, int NoConfirm)
	3634	+{
	3635	+ DWORD Version;
	3636	+ char VersionString[32];
	3637	+ char Tmp[FMAX_PATH+1];
	3638	+ // 念のためマスターパスワードの一致を確認
	3639	+ if(GetMasterPasswordStatus() == PASSWORD_OK)
	3640	+ {
	3641	+ Version = RELEASE_VERSION_NUM;
	3642	+ LastAutoCheckForUpdates = time(NULL);
	3643	+ if(CheckForUpdates(FALSE, NULL, &Version, VersionString))
	3644	+ {
	3645	+ if(Version > RELEASE_VERSION_NUM)
	3646	+ {
	3647	+ sprintf(Tmp, MSGJPN362, VER_STR, VersionString);
	3648	+ if(NoConfirm == YES \|\| MessageBox(GetMainHwnd(), Tmp, "FFFTP", MB_YESNO) == IDYES)
	3649	+ {
	3650	+ strcpy(Tmp, TmpPath);
	3651	+ SetYenTail(Tmp);
	3652	+ strcat(Tmp, "update");
	3653	+ _mkdir(Tmp);
	3654	+ if(CheckForUpdates(TRUE, Tmp, &Version, VersionString))
	3655	+ {
	3656	+ MessageBox(GetMainHwnd(), MSGJPN365, "FFFTP", MB_OK);
	3657	+ ApplyUpdatesOnExit = YES;
	3658	+ }
	3659	+ else if(NoError == NO)
	3660	+ MessageBox(GetMainHwnd(), MSGJPN363, "FFFTP", MB_OK \| MB_ICONERROR);
	3661	+ }
	3662	+ }
	3663	+ else if(NoError == NO)
	3664	+ MessageBox(GetMainHwnd(), MSGJPN364, "FFFTP", MB_OK);
	3665	+ }
	3666	+ else if(NoError == NO)
	3667	+ MessageBox(GetMainHwnd(), MSGJPN363, "FFFTP", MB_OK \| MB_ICONERROR);
	3668	+ }
	3669	+}
	3670	+

--- a/mesg-eng.h

+++ b/mesg-eng.h

		@@ -4,16 +4,16 @@
4	4	#define MSGJPN003 _Tu8("\r\nReconnect.\r\n", "\r\nReconnect.\r\n")
5	5	#define MSGJPN004 _Tu8("Disconnect.", "Disconnect.")
6	6	#define MSGJPN005 _Tu8("Connection was killed.", "Connection was killed.")
7		-#define MSGJPN006 _Tu8("Can't login to Firewall.", "Can't login to Firewall.")
8		-#define MSGJPN007 _Tu8("Can't connect to host %s.", "Can't connect to host %s.")
9		-#define MSGJPN008 _Tu8("Can't login.", "Can't login.")
10		-#define MSGJPN009 _Tu8("Can't connect.", "Can't connect.")
	7	+#define MSGJPN006 _Tu8("Cannnot login to Firewall.", "Cannnot login to Firewall.")
	8	+#define MSGJPN007 _Tu8("Cannnot connect to host %s.", "Cannnot connect to host %s.")
	9	+#define MSGJPN008 _Tu8("Cannnot login.", "Cannnot login.")
	10	+#define MSGJPN009 _Tu8("Cannnot connect.", "Cannnot connect.")
11	11	#define MSGJPN010 _Tu8("Firewall host not specified.", "Firewall host not specified.")
12	12	#define MSGJPN011 _Tu8("Host not specified.", "Host not specified.")
13	13	#define MSGJPN012 _Tu8("MD5 used.", "MD5 used.")
14	14	#define MSGJPN013 _Tu8("SHA-1 used.", "SHA-1 used.")
15	15	#define MSGJPN014 _Tu8("MD4(S/KEY) used.", "MD4(S/KEY) used.")
16		-#define MSGJPN015 _Tu8("Can't process One-time Password.", "Can't process One-time Password.")
	16	+#define MSGJPN015 _Tu8("Cannnot process One-time Password.", "Cannnot process One-time Password.")
17	17	#define MSGJPN016 _Tu8("Searching host %s. (%s)", "Searching host %s. (%s)")
18	18	#define MSGJPN017 _Tu8("Connecting %sto host %s (%s (%d)). (%s)", "Connecting %sto host %s (%s (%d)). (%s)")
19	19	#define MSGJPN018 _Tu8("Connecting %sto host %s (%d). (%s)", "Connecting %sto host %s (%d). (%s)")

		@@ -21,19 +21,19 @@
21	21	#define MSGJPN020 _Tu8("Connecting %sto host %s (%d). (%s)", "Connecting %sto host %s (%d). (%s)")
22	22	#define MSGJPN021 _Tu8("SOCKS server %s not found. (%s)", "SOCKS server %s not found. (%s)")
23	23	#define MSGJPN022 _Tu8("Connecting to SOCKS server %s (%d). (%s)", "Connecting to SOCKS server %s (%d). (%s)")
24		-#define MSGJPN023 _Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
25		-#define MSGJPN024 _Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
	24	+#define MSGJPN023 _Tu8("Cannnot connect to SOCKS server. (Err=%d) (%s)", "Cannnot connect to SOCKS server. (Err=%d) (%s)")
	25	+#define MSGJPN024 _Tu8("Cannnot connect to SOCKS server. (Err=%d) (%s)", "Cannnot connect to SOCKS server. (Err=%d) (%s)")
26	26	#define MSGJPN025 _Tu8("Connected. (%s)", "Connected. (%s)")
27		-#define MSGJPN026 _Tu8("Can't connected. (%s)", "Can't connected. (%s)")
28		-#define MSGJPN027 _Tu8("Can't create socket. (%s)", "Can't create socket. (%s)")
29		-#define MSGJPN028 _Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
30		-#define MSGJPN029 _Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
31		-#define MSGJPN030 _Tu8("Can't create listen socket. (%s)", "Can't create listen socket. (%s)")
	27	+#define MSGJPN026 _Tu8("Cannnot connected. (%s)", "Cannnot connected. (%s)")
	28	+#define MSGJPN027 _Tu8("Cannnot create socket. (%s)", "Cannnot create socket. (%s)")
	29	+#define MSGJPN028 _Tu8("Cannnot connect to SOCKS server. (Err=%d) (%s)", "Cannnot connect to SOCKS server. (Err=%d) (%s)")
	30	+#define MSGJPN029 _Tu8("Cannnot connect to SOCKS server. (Err=%d) (%s)", "Cannnot connect to SOCKS server. (Err=%d) (%s)")
	31	+#define MSGJPN030 _Tu8("Cannnot create listen socket. (%s)", "Cannnot create listen socket. (%s)")
32	32	#define MSGJPN031 _Tu8("PORT command not accepted. (%s)", "PORT command not accepted. (%s)")
33	33	#define MSGJPN032 _Tu8("Connection is cancelled by user.", "Connection is cancelled by user.")
34		-#define MSGJPN033 _Tu8("Can't send SOCKS command. (Cmd = %04X)", "Can't send SOCKS command. (Cmd = %04X)")
35		-#define MSGJPN034 _Tu8("Can't receive SOCKS5 reply.", "Can't receive SOCKS5 reply.")
36		-#define MSGJPN035 _Tu8("Can't receive SOCKS4 reply.", "Can't receive SOCKS4 reply.")
	34	+#define MSGJPN033 _Tu8("Cannnot send SOCKS command. (Cmd = %04X)", "Cannnot send SOCKS command. (Cmd = %04X)")
	35	+#define MSGJPN034 _Tu8("Cannnot receive SOCKS5 reply.", "Cannnot receive SOCKS5 reply.")
	36	+#define MSGJPN035 _Tu8("Cannnot receive SOCKS4 reply.", "Cannnot receive SOCKS4 reply.")
37	37	#define MSGJPN036 _Tu8("SOCKS certification method not match.", "SOCKS certification method not match.")
38	38	#define MSGJPN037 _Tu8("Certification failed by SOCKS server.", "Certification failed by SOCKS server.")
39	39	#define MSGJPN038 _Tu8("Name", "Name")

		@@ -46,7 +46,7 @@
46	46	#define MSGJPN045 _Tu8("Ext", "Ext")
47	47	#define MSGJPN046 _Tu8("Permissions", "Permissions")
48	48	#define MSGJPN047 _Tu8("Owner", "Owner")
49		-#define MSGJPN048 _Tu8("Can't read temporary file.", "Can't read temporary file.")
	49	+#define MSGJPN048 _Tu8("Cannnot read temporary file.", "Cannnot read temporary file.")
50	50	#define MSGJPN049 _Tu8("Failed to getting file list.", "Failed to getting file list.")
51	51	#define MSGJPN050 _Tu8("Find (Local)", "Find (Local)")
52	52	#define MSGJPN051 _Tu8("Find (Host)", "Find (Host)")

		@@ -83,7 +83,7 @@
83	83	#define MSGJPN082 _Tu8("New Folder", "New Folder")
84	84	#define MSGJPN083 _Tu8("Delete Folder", "Delete Folder")
85	85	#define MSGJPN084 _Tu8("Delete File", "Delete File")
86		-#define MSGJPN085 _Tu8("Can't download named %s.", "Can't download named %s.")
	86	+#define MSGJPN085 _Tu8("Cannnot download named %s.", "Cannnot download named %s.")
87	87	#define MSGJPN086 _Tu8("Download", "Download")
88	88	#define MSGJPN087 _Tu8("File List", "File List")
89	89	#define MSGJPN088 _Tu8("Skip", "Skip")

		@@ -91,9 +91,9 @@
91	91	#define MSGJPN090 _Tu8("Command not accepted.", "Command not accepted.")
92	92	#define MSGJPN091 _Tu8("for download ", "for download ")
93	93	#define MSGJPN092 _Tu8("Command not accepted.", "Command not accepted.")
94		-#define MSGJPN093 _Tu8("Can't get address.", "Can't get address.")
	94	+#define MSGJPN093 _Tu8("Cannnot get address.", "Cannnot get address.")
95	95	#define MSGJPN094 _Tu8("Time out error.", "Time out error.")
96		-#define MSGJPN095 _Tu8("Can't create file %s.", "Can't create file %s.")
	96	+#define MSGJPN095 _Tu8("Cannnot create file %s.", "Cannnot create file %s.")
97	97	#define MSGJPN096 _Tu8("Disk full", "Disk full")
98	98	#define MSGJPN097 _Tu8("Cancel to getting file list", "Cancel to getting file list")
99	99	#define MSGJPN098 _Tu8("File List", "File List")

		@@ -103,14 +103,14 @@
103	103	#define MSGJPN102 _Tu8("Download successful. (%d Sec. %d B/S).", "Download successful. (%d Sec. %d B/S).")
104	104	#define MSGJPN103 _Tu8("Download successful. (%d Bytes)", "Download successful. (%d Bytes)")
105	105	#define MSGJPN104 _Tu8("Upload", "Upload")
106		-#define MSGJPN105 _Tu8("Can't read file %s.", "Can't read file %s.")
	106	+#define MSGJPN105 _Tu8("Cannnot read file %s.", "Cannnot read file %s.")
107	107	#define MSGJPN106 _Tu8("Skip", "Skip")
108	108	#define MSGJPN107 _Tu8("File %s is skipped.", "File %s is skipped.")
109	109	#define MSGJPN108 _Tu8("Command not accepted.", "Command not accepted.")
110	110	#define MSGJPN109 _Tu8("for upload ", "for upload ")
111	111	#define MSGJPN110 _Tu8("Command not accepted.", "Command not accepted.")
112		-#define MSGJPN111 _Tu8("Can't get address.", "Can't get address.")
113		-#define MSGJPN112 _Tu8("Can't open file %s.", "Can't open file %s.")
	112	+#define MSGJPN111 _Tu8("Cannnot get address.", "Cannnot get address.")
	113	+#define MSGJPN112 _Tu8("Cannnot open file %s.", "Cannnot open file %s.")
114	114	#define MSGJPN113 _Tu8("Upload cancelled. (%d Sec. %d B/S).", "Upload cancelled. (%d Sec. %d B/S).")
115	115	#define MSGJPN114 _Tu8("Upload cancelled.", "Upload cancelled.")
116	116	#define MSGJPN115 _Tu8("Upload successful. (%d Sec. %d B/S).", "Upload successful. (%d Sec. %d B/S).")

		@@ -143,13 +143,13 @@
143	143	#define MSGJPN142 _Tu8("IRMX", "IRMX")
144	144	#define MSGJPN143 _Tu8("ACOS-4", "ACOS-4")
145	145	#define MSGJPN144 _Tu8("Stratus", "Stratus")
146		-#define MSGJPN145 _Tu8("Can't change folder.", "Can't change folder.")
147		-#define MSGJPN146 _Tu8("Can't create folder.", "Can't create folder.")
148		-#define MSGJPN147 _Tu8("Can't delete folder.", "Can't delete folder.")
149		-#define MSGJPN148 _Tu8("Can't delete folder.", "Can't delete folder.")
150		-#define MSGJPN149 _Tu8("Can't delete file.", "Can't delete file.")
151		-#define MSGJPN150 _Tu8("Can't delete file.", "Can't delete file.")
152		-#define MSGJPN151 _Tu8("Can't rename file.", "Can't rename file.")
	146	+#define MSGJPN145 _Tu8("Cannnot change folder.", "Cannnot change folder.")
	147	+#define MSGJPN146 _Tu8("Cannnot create folder.", "Cannnot create folder.")
	148	+#define MSGJPN147 _Tu8("Cannnot delete folder.", "Cannnot delete folder.")
	149	+#define MSGJPN148 _Tu8("Cannnot delete folder.", "Cannnot delete folder.")
	150	+#define MSGJPN149 _Tu8("Cannnot delete file.", "Cannnot delete file.")
	151	+#define MSGJPN150 _Tu8("Cannnot delete file.", "Cannnot delete file.")
	152	+#define MSGJPN151 _Tu8("Cannnot rename file.", "Cannnot rename file.")
153	153	#define MSGJPN152 _Tu8("Temporary folder '%s' not found.", "Temporary folder '%s' not found.")
154	154	#define MSGJPN153 _Tu8("Folder '%s' is used.", "Folder '%s' is used.")
155	155	#define MSGJPN154 _Tu8("Connect", "Connect")

		@@ -220,7 +220,7 @@
220	220	#define MSGJPN219 _Tu8("Wave file", "Wave file")
221	221	#define MSGJPN220 _Tu8("Disconencting dialup.", "Disconencting dialup.")
222	222	#define MSGJPN221 _Tu8("Connecting dialup.", "Connecting dialup.")
223		-#define MSGJPN222 _Tu8("Can't use dialup. (RasDialDlg)", "Can't use dialup. (RasDialDlg)")
	223	+#define MSGJPN222 _Tu8("Cannnot use dialup. (RasDialDlg)", "Cannnot use dialup. (RasDialDlg)")
224	224	#define MSGJPN223 _Tu8("Connecting to %s...", "Connecting to %s...")
225	225	#define MSGJPN224 _Tu8("Unknown error", "Unknown error")
226	226	#define MSGJPN225 _Tu8("Dialup connection", "Dialup connection")

		@@ -238,7 +238,7 @@
238	238	#define MSGJPN237 _Tu8("Connecting...", "Connecting...")
239	239	#define MSGJPN238 _Tu8("Connecting to %s", "Connecting to %s")
240	240	#define MSGJPN239 _Tu8("# Do not edit this file.\n", "# Do not edit this file.\n")
241		-#define MSGJPN240 _Tu8("Can't save to INI file", "Can't save to INI file")
	241	+#define MSGJPN240 _Tu8("Cannnot save to INI file", "Cannnot save to INI file")
242	242	#define MSGJPN241 _Tu8("Failed transmit cause of timeout", "Failed transmit cause of timeout")
243	243	#define MSGJPN242 _Tu8("Failed receive cause of timeout", "Failed receive cause of timeout")
244	244	#define MSGJPN243 _Tu8("Failed receive cause of timeout", "Failed receive cause of timeout")

		@@ -277,9 +277,9 @@
277	277	#define MSGJPN276 _Tu8("WS_FTP.INI\0ws_ftp.ini\0All file(.)\0\0", "WS_FTP.INI\0ws_ftp.ini\0All file(.)\0\0")
278	278	#define MSGJPN277 _Tu8("Wave file\0.wav\0All file\0\0", "Wave file\0.wav\0All file\0\0")
279	279	#define MSGJPN278 _Tu8("Reason: %s", "Reason: %s")
280		-#define MSGJPN279 _Tu8("Can't get Listen Socket", "Can't get Listen Socket")
281		-#define MSGJPN280 _Tu8("Can't get Data Socket", "Can't get Data Socket")
282		-#define MSGJPN281 _Tu8("Can't connect with PASV mode", "Can't connect with PASV mode")
	280	+#define MSGJPN279 _Tu8("Cannnot get Listen Socket", "Cannnot get Listen Socket")
	281	+#define MSGJPN280 _Tu8("Cannnot get Data Socket", "Cannnot get Data Socket")
	282	+#define MSGJPN281 _Tu8("Cannnot connect with PASV mode", "Cannnot connect with PASV mode")
283	283	#define MSGJPN282 _Tu8("INI filename is not specified", "INI filename is not specified")
284	284	#define MSGJPN283 _Tu8("INI file: ", "INI file: ")
285	285	#define MSGJPN284 _Tu8("http://sourceforge.jp/projects/ffftp/", "http://sourceforge.jp/projects/ffftp/")

		@@ -359,6 +359,11 @@
359	359	#define MSGJPN358 _Tu8("Failed to export the settings.\nPlease change saving path or format.", "Failed to export the settings.\nPlease change saving path or format.")
360	360	#define MSGJPN359 _Tu8("Software update has been completed.", "Software update has been completed.")
361	361	#define MSGJPN360 _Tu8("Failed to update the software.\nPlease get the latest version from our web site and update it manually.", "Failed to update the software.\nPlease get the latest version from our web site and update it manually.")
	362	+#define MSGJPN361 _Tu8("Updates", "Updates")
	363	+#define MSGJPN362 _Tu8("There is a new version.\n\nCurrent version: %s\nNew version: %s\n\nIt takes a few minutes to download the updates.\nDo you want to update now?\n", "There is a new version.\n\nCurrent version: %s\nNew version: %s\n\nIt takes a few minutes to download the updates.\nDo you want to update now?\n")
	364	+#define MSGJPN363 _Tu8("Failed to update the software.\nCannot connect to the server or the data is corrupted.", "Failed to update the software.\nCannot connect to the server or the data is corrupted.")
	365	+#define MSGJPN364 _Tu8("Your version is already up-to-date.", "Your version is already up-to-date.")
	366	+#define MSGJPN365 _Tu8("Preparing for the software update has been completed.\nIt will be applied on exit.", "Preparing for the software update has been completed.\nIt will be applied on exit.")
362	367	#if defined(HAVE_TANDEM)
363	368	#define MSGJPN2000 _Tu8("NonStop Server", "NonStop Server")
364	369	#define MSGJPN2001 _Tu8("OSS<->GUARDIAN Switch(&O)", "OSS<->GUARDIAN Switch(&O)")

--- a/mesg-jpn.h

+++ b/mesg-jpn.h

		@@ -298,9 +298,9 @@
298	298	#define MSGJPN297 _Tu8("%s は不正なファイル名です.\r\nこのファイルはダウンロードされません.", "%s \xE3\x81\xAF\xE4\xB8\x8D\xE6\xAD\xA3\xE3\x81\xAA\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE5\x90\x8D\xE3\x81\xA7\xE3\x81\x99.\r\n\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x81\xAF\xE3\x83\x80\xE3\x82\xA6\xE3\x83\xB3\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
299	299	#define MSGJPN298 _Tu8("OLEの初期化に失敗しました.", "OLE\xE3\x81\xAE\xE5\x88\x9D\xE6\x9C\x9F\xE5\x8C\x96\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.")
300	300	#define MSGJPN299 _Tu8("コマンドラインにマスターパスワードが指定されていません", "\xE3\x82\xB3\xE3\x83\x9E\xE3\x83\xB3\xE3\x83\x89\xE3\x83\xA9\xE3\x82\xA4\xE3\x83\xB3\xE3\x81\xAB\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE6\x8C\x87\xE5\xAE\x9A\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93")
301		-#define MSGJPN300 _Tu8("デフォルトのマスターパスワードが使われます.\r\nマルウェアの攻撃を防ぐため，固有のマスターパスワードを設定することをおすすめします", "\xE3\x83\x87\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x88\xE3\x81\xAE\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE4\xBD\xBF\xE3\x82\x8F\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x99.\r\n\xE3\x83\x9E\xE3\x83\xAB\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x94\xBB\xE6\x92\x83\xE3\x82\x92\xE9\x98\xB2\xE3\x81\x90\xE3\x81\x9F\xE3\x82\x81\xEF\xBC\x8C\xE5\x9B\xBA\xE6\x9C\x89\xE3\x81\xAE\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x82\x92\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x99\xE3\x82\x8B\xE3\x81\x93\xE3\x81\xA8\xE3\x82\x92\xE3\x81\x8A\xE3\x81\x99\xE3\x81\x99\xE3\x82\x81\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99")
	301	+#define MSGJPN300 _Tu8("デフォルトのマスターパスワードが使われます.\r\nマルウェアの攻撃を防ぐため,固有のマスターパスワードを設定することをおすすめします", "\xE3\x83\x87\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x88\xE3\x81\xAE\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE4\xBD\xBF\xE3\x82\x8F\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x99.\r\n\xE3\x83\x9E\xE3\x83\xAB\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x94\xBB\xE6\x92\x83\xE3\x82\x92\xE9\x98\xB2\xE3\x81\x90\xE3\x81\x9F\xE3\x82\x81,\xE5\x9B\xBA\xE6\x9C\x89\xE3\x81\xAE\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x82\x92\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x99\xE3\x82\x8B\xE3\x81\x93\xE3\x81\xA8\xE3\x82\x92\xE3\x81\x8A\xE3\x81\x99\xE3\x81\x99\xE3\x82\x81\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99")
302	302	#define MSGJPN301 _Tu8("マスターパスワードが設定と一致しません.安全のため設定の保存を行いません.", "\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\xA8\xE4\xB8\x80\xE8\x87\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.\xE5\xAE\x89\xE5\x85\xA8\xE3\x81\xAE\xE3\x81\x9F\xE3\x82\x81\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\xAE\xE4\xBF\x9D\xE5\xAD\x98\xE3\x82\x92\xE8\xA1\x8C\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
303		-#define MSGJPN302 _Tu8("確認用データが壊れているため，マスターパスワードの正当性を確認できませんでした.", "\xE7\xA2\xBA\xE8\xAA\x8D\xE7\x94\xA8\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF\xE3\x81\x8C\xE5\xA3\x8A\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x82\x8B\xE3\x81\x9F\xE3\x82\x81\xEF\xBC\x8C\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAE\xE6\xAD\xA3\xE5\xBD\x93\xE6\x80\xA7\xE3\x82\x92\xE7\xA2\xBA\xE8\xAA\x8D\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
	303	+#define MSGJPN302 _Tu8("確認用データが壊れているため,マスターパスワードの正当性を確認できませんでした.", "\xE7\xA2\xBA\xE8\xAA\x8D\xE7\x94\xA8\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF\xE3\x81\x8C\xE5\xA3\x8A\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x82\x8B\xE3\x81\x9F\xE3\x82\x81,\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAE\xE6\xAD\xA3\xE5\xBD\x93\xE6\x80\xA7\xE3\x82\x92\xE7\xA2\xBA\xE8\xAA\x8D\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
304	304	#define MSGJPN303 _Tu8("マスターパスワードを変更しました", "\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x82\x92\xE5\xA4\x89\xE6\x9B\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F")
305	305	#define MSGJPN304 _Tu8("指定されたマスターパスワードが登録されたものと一致しません.\r\n再度入力しますか？\r\n「いいえ」を選ぶと記憶されたFTPパスワードは利用できません.", "\xE6\x8C\x87\xE5\xAE\x9A\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE7\x99\xBB\xE9\x8C\xB2\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\xE3\x82\x82\xE3\x81\xAE\xE3\x81\xA8\xE4\xB8\x80\xE8\x87\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.\r\n\xE5\x86\x8D\xE5\xBA\xA6\xE5\x85\xA5\xE5\x8A\x9B\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99\xE3\x81\x8B\xEF\xBC\x9F\r\n\xE3\x80\x8C\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE3\x81\xB6\xE3\x81\xA8\xE8\xA8\x98\xE6\x86\xB6\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\x46TP\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAF\xE5\x88\xA9\xE7\x94\xA8\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
306	306	#define MSGJPN305 _Tu8("Shift_JIS", "Shift_JIS")

		@@ -349,7 +349,7 @@
349	349	#define MSGJPN348 _Tu8("EUC", "EUC")
350	350	#define MSGJPN349 _Tu8("UTF-8", "UTF-8")
351	351	#define MSGJPN350 _Tu8("UTF-8 HFS+", "UTF-8 HFS+")
352		-#define MSGJPN351 _Tu8("新しいバージョンの設定が検出されました.\nこのバージョンでは一部の設定が正しく読み込まれない、またはこのバージョンで設定を上書きすると設定が変化する可能性があります.\nこのバージョン用に設定を上書きして保存するには「はい」を選択してください.\n設定をレジストリではなくINIファイルに保存するには「いいえ」を選択してください.\n読み取り専用で設定を読み込むには「キャンセル」を選択してください.", "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE6\xA4\x9C\xE5\x87\xBA\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xA7\xE3\x81\xAF\xE4\xB8\x80\xE9\x83\xA8\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE6\xAD\xA3\xE3\x81\x97\xE3\x81\x8F\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x81\xBE\xE3\x82\x8C\xE3\x81\xAA\xE3\x81\x84\xE3\x80\x81\xE3\x81\xBE\xE3\x81\x9F\xE3\x81\xAF\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xA7\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE4\xB8\x8A\xE6\x9B\xB8\xE3\x81\x8D\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xA8\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE5\xA4\x89\xE5\x8C\x96\xE3\x81\x99\xE3\x82\x8B\xE5\x8F\xAF\xE8\x83\xBD\xE6\x80\xA7\xE3\x81\x8C\xE3\x81\x82\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x99.\n\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE7\x94\xA8\xE3\x81\xAB\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE4\xB8\x8A\xE6\x9B\xB8\xE3\x81\x8D\xE3\x81\x97\xE3\x81\xA6\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x81\xAF\xE3\x81\x84\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.\n\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE3\x83\xAC\xE3\x82\xB8\xE3\x82\xB9\xE3\x83\x88\xE3\x83\xAA\xE3\x81\xA7\xE3\x81\xAF\xE3\x81\xAA\xE3\x81\x8FINI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x81\xAB\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.\n\xE8\xAA\xAD\xE3\x81\xBF\xE5\x8F\x96\xE3\x82\x8A\xE5\xB0\x82\xE7\x94\xA8\xE3\x81\xA7\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x82\x80\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x82\xAD\xE3\x83\xA3\xE3\x83\xB3\xE3\x82\xBB\xE3\x83\xAB\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
	352	+#define MSGJPN351 _Tu8("新しいバージョンの設定が検出されました.\nこのバージョンでは一部の設定が正しく読み込まれない,またはこのバージョンで設定を上書きすると設定が変化する可能性があります.\nこのバージョン用に設定を上書きして保存するには「はい」を選択してください.\n設定をレジストリではなくINIファイルに保存するには「いいえ」を選択してください.\n読み取り専用で設定を読み込むには「キャンセル」を選択してください.", "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE6\xA4\x9C\xE5\x87\xBA\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xA7\xE3\x81\xAF\xE4\xB8\x80\xE9\x83\xA8\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE6\xAD\xA3\xE3\x81\x97\xE3\x81\x8F\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x81\xBE\xE3\x82\x8C\xE3\x81\xAA\xE3\x81\x84,\xE3\x81\xBE\xE3\x81\x9F\xE3\x81\xAF\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xA7\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE4\xB8\x8A\xE6\x9B\xB8\xE3\x81\x8D\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xA8\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE5\xA4\x89\xE5\x8C\x96\xE3\x81\x99\xE3\x82\x8B\xE5\x8F\xAF\xE8\x83\xBD\xE6\x80\xA7\xE3\x81\x8C\xE3\x81\x82\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x99.\n\xE3\x81\x93\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE7\x94\xA8\xE3\x81\xAB\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE4\xB8\x8A\xE6\x9B\xB8\xE3\x81\x8D\xE3\x81\x97\xE3\x81\xA6\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x81\xAF\xE3\x81\x84\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.\n\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE3\x83\xAC\xE3\x82\xB8\xE3\x82\xB9\xE3\x83\x88\xE3\x83\xAA\xE3\x81\xA7\xE3\x81\xAF\xE3\x81\xAA\xE3\x81\x8FINI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x81\xAB\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.\n\xE8\xAA\xAD\xE3\x81\xBF\xE5\x8F\x96\xE3\x82\x8A\xE5\xB0\x82\xE7\x94\xA8\xE3\x81\xA7\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x82\x92\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x82\x80\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x82\xAD\xE3\x83\xA3\xE3\x83\xB3\xE3\x82\xBB\xE3\x83\xAB\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
353	353	#define MSGJPN352 _Tu8("警告: 暗号化されていません", "\xE8\xAD\xA6\xE5\x91\x8A: \xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93")
354	354	#define MSGJPN353 _Tu8("暗号化されています: FTPES", "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99: FTPES")
355	355	#define MSGJPN354 _Tu8("暗号化されています: FTPIS", "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99: FTPIS")

		@@ -359,6 +359,11 @@
359	359	#define MSGJPN358 _Tu8("設定のエクスポートに失敗しました.\n保存する場所や形式を変更してください.", "\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\xAE\xE3\x82\xA8\xE3\x82\xAF\xE3\x82\xB9\xE3\x83\x9D\xE3\x83\xBC\xE3\x83\x88\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE5\xA0\xB4\xE6\x89\x80\xE3\x82\x84\xE5\xBD\xA2\xE5\xBC\x8F\xE3\x82\x92\xE5\xA4\x89\xE6\x9B\xB4\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
360	360	#define MSGJPN359 _Tu8("ソフトウェアの更新が完了しました.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x8C\xE5\xAE\x8C\xE4\xBA\x86\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.")
361	361	#define MSGJPN360 _Tu8("ソフトウェアの更新に失敗しました.\nWebサイトから最新版を入手して手動で更新してください.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\nWeb\xE3\x82\xB5\xE3\x82\xA4\xE3\x83\x88\xE3\x81\x8B\xE3\x82\x89\xE6\x9C\x80\xE6\x96\xB0\xE7\x89\x88\xE3\x82\x92\xE5\x85\xA5\xE6\x89\x8B\xE3\x81\x97\xE3\x81\xA6\xE6\x89\x8B\xE5\x8B\x95\xE3\x81\xA7\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
	362	+#define MSGJPN361 _Tu8("更新", "\xE6\x9B\xB4\xE6\x96\xB0")
	363	+#define MSGJPN362 _Tu8("新しいバージョンがあります.\n\n現在のバージョン: %s\n新しいバージョン: %s\n\n更新のダウンロードには数分間かかります.\n今すぐ更新しますか.", "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\x8C\xE3\x81\x82\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x99.\n\n\xE7\x8F\xBE\xE5\x9C\xA8\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3: %s\n\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3: %s\n\n\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAE\xE3\x83\x80\xE3\x82\xA6\xE3\x83\xB3\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAB\xE3\x81\xAF\xE6\x95\xB0\xE5\x88\x86\xE9\x96\x93\xE3\x81\x8B\xE3\x81\x8B\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x99.\n\xE4\xBB\x8A\xE3\x81\x99\xE3\x81\x90\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99\xE3\x81\x8B.")
	364	+#define MSGJPN363 _Tu8("ソフトウェアの更新に失敗しました.\nサーバーに接続できないかデータが破損しています.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xAA\xE3\x81\x84\xE3\x81\x8B\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF\xE3\x81\x8C\xE7\xA0\xB4\xE6\x90\x8D\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
	365	+#define MSGJPN364 _Tu8("お使いのバージョンはすでに最新です.", "\xE3\x81\x8A\xE4\xBD\xBF\xE3\x81\x84\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xAF\xE3\x81\x99\xE3\x81\xA7\xE3\x81\xAB\xE6\x9C\x80\xE6\x96\xB0\xE3\x81\xA7\xE3\x81\x99.")
	366	+#define MSGJPN365 _Tu8("ソフトウェアの更新の準備が完了しました.\nFFFTPの終了時に更新が適用されます.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAE\xE6\xBA\x96\xE5\x82\x99\xE3\x81\x8C\xE5\xAE\x8C\xE4\xBA\x86\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\nFFFTP\xE3\x81\xAE\xE7\xB5\x82\xE4\xBA\x86\xE6\x99\x82\xE3\x81\xAB\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x8C\xE9\x81\xA9\xE7\x94\xA8\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x99.")
362	367	#if defined(HAVE_TANDEM)
363	368	#define MSGJPN2000 _Tu8("NonStop Server", "NonStop Server")
364	369	#define MSGJPN2001 _Tu8("OSS<->GUARDIAN 切り替え(&O)", "OSS<->GUARDIAN \xE5\x88\x87\xE3\x82\x8A\xE6\x9B\xBF\xE3\x81\x88(&O)")

--- a/misc.c

+++ b/misc.c

		@@ -1422,7 +1422,7 @@ void FormatIniString(char *Str)
1422	1422
1423	1423	while(*Str != NUL)
1424	1424	{
1425		- if((Str != 0x22) && (Str != '\n'))
	1425	+ if((Str != '\"') && (Str != '\n'))
1426	1426	Put++ = Str;
1427	1427	Str++;
1428	1428	}

--- a/option.c

+++ b/option.c

		@@ -88,6 +88,8 @@ static INT_PTR CALLBACK ToolSettingProc(HWND hDlg, UINT message, WPARAM wParam,
88	88	static INT_PTR CALLBACK SoundSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
89	89	static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
90	90	static INT_PTR CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
	91	+// ソフトウェア自動更新
	92	+static INT_PTR CALLBACK UpdatesSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
91	93	// hostman.cで使用
92	94	//static int GetDecimalText(HWND hDlg, int Ctrl);
93	95	//static void SetDecimalText(HWND hDlg, int Ctrl, int Num);

		@@ -186,6 +188,10 @@ extern int EncryptAllSettings;
186	188	extern int AutoRefreshFileList;
187	189	// 古い処理内容を消去
188	190	extern int RemoveOldLog;
	191	+// ソフトウェア自動更新
	192	+extern int AutoCheckForUpdates;
	193	+extern int AutoApplyUpdates;
	194	+extern int AutoCheckForUptatesInterval;
189	195
190	196
191	197	/*----- オプションのプロパティシート ------------------------------------------

		@@ -201,7 +207,7 @@ void SetOption(int Start)
201	207	{
202	208	// UTF-8対応
203	209	// PROPSHEETPAGE psp[12];
204		- PROPSHEETPAGE psp[14];
	210	+ PROPSHEETPAGE psp[15];
205	211	PROPSHEETHEADER psh;
206	212
207	213	// 変数が未初期化のバグ修正

		@@ -422,13 +428,23 @@ void SetOption(int Start)
422	428	psp[13].dwSize = sizeof(PROPSHEETPAGE);
423	429	psp[13].dwFlags = PSP_USETITLE \| PSP_HASHELP;
424	430	psp[13].hInstance = GetFtpInst();
425		- psp[13].pszTemplate = MAKEINTRESOURCE(opt_misc_dlg);
	431	+ psp[13].pszTemplate = MAKEINTRESOURCE(opt_updates_dlg);
426	432	psp[13].pszIcon = NULL;
427		- psp[13].pfnDlgProc = MiscSettingProc;
428		- psp[13].pszTitle = MSGJPN197;
	433	+ psp[13].pfnDlgProc = UpdatesSettingProc;
	434	+ psp[13].pszTitle = MSGJPN361;
429	435	psp[13].lParam = 0;
430	436	psp[13].pfnCallback = NULL;
431	437
	438	+ psp[14].dwSize = sizeof(PROPSHEETPAGE);
	439	+ psp[14].dwFlags = PSP_USETITLE \| PSP_HASHELP;
	440	+ psp[14].hInstance = GetFtpInst();
	441	+ psp[14].pszTemplate = MAKEINTRESOURCE(opt_misc_dlg);
	442	+ psp[14].pszIcon = NULL;
	443	+ psp[14].pfnDlgProc = MiscSettingProc;
	444	+ psp[14].pszTitle = MSGJPN197;
	445	+ psp[14].lParam = 0;
	446	+ psp[14].pfnCallback = NULL;
	447	+
432	448	psh.dwSize = sizeof(PROPSHEETHEADER);
433	449	psh.dwFlags = PSH_HASHELP \| PSH_NOAPPLYNOW \| PSH_PROPSHEETPAGE;
434	450	psh.hwndParent = GetMainHwnd();

		@@ -1932,6 +1948,76 @@ static INT_PTR CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1932	1948	}
1933	1949
1934	1950
	1951	+// ソフトウェア自動更新
	1952	+static INT_PTR CALLBACK UpdatesSettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
	1953	+{
	1954	+ NMHDR *pnmhdr;
	1955	+
	1956	+ switch (message)
	1957	+ {
	1958	+ case WM_INITDIALOG :
	1959	+ SendDlgItemMessage(hDlg, UPDATES_AUTO_CHECK, BM_SETCHECK, AutoCheckForUpdates, 0);
	1960	+ SendDlgItemMessage(hDlg, UPDATES_AUTO_APPLY, BM_SETCHECK, AutoApplyUpdates, 0);
	1961	+ SendDlgItemMessage(hDlg, UPDATES_INTERVAL, EM_LIMITTEXT, (WPARAM)3, 0);
	1962	+ SetDecimalText(hDlg, UPDATES_INTERVAL, AutoCheckForUptatesInterval);
	1963	+ SendDlgItemMessage(hDlg, UPDATES_INTERVAL_SPN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(999, 0));
	1964	+ if(AutoCheckForUpdates == YES)
	1965	+ {
	1966	+ EnableWindow(GetDlgItem(hDlg, UPDATES_AUTO_APPLY), TRUE);
	1967	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL), TRUE);
	1968	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL_SPN), TRUE);
	1969	+ }
	1970	+ else
	1971	+ {
	1972	+ EnableWindow(GetDlgItem(hDlg, UPDATES_AUTO_APPLY), FALSE);
	1973	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL), FALSE);
	1974	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL_SPN), FALSE);
	1975	+ }
	1976	+ return(TRUE);
	1977	+
	1978	+ case WM_NOTIFY:
	1979	+ pnmhdr = (NMHDR FAR *)lParam;
	1980	+ switch(pnmhdr->code)
	1981	+ {
	1982	+ case PSN_APPLY :
	1983	+ AutoCheckForUpdates = SendDlgItemMessage(hDlg, UPDATES_AUTO_CHECK, BM_GETCHECK, 0, 0);
	1984	+ AutoApplyUpdates = SendDlgItemMessage(hDlg, UPDATES_AUTO_APPLY, BM_GETCHECK, 0, 0);
	1985	+ AutoCheckForUptatesInterval = GetDecimalText(hDlg, UPDATES_INTERVAL);
	1986	+ CheckRange2(&AutoCheckForUptatesInterval, 999, 0);
	1987	+ break;
	1988	+
	1989	+ case PSN_RESET :
	1990	+ break;
	1991	+
	1992	+ case PSN_HELP :
	1993	+// hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000069);
	1994	+ break;
	1995	+ }
	1996	+ break;
	1997	+
	1998	+ case WM_COMMAND :
	1999	+ switch(GET_WM_COMMAND_ID(wParam, lParam))
	2000	+ {
	2001	+ case UPDATES_AUTO_CHECK :
	2002	+ if(SendDlgItemMessage(hDlg, UPDATES_AUTO_CHECK, BM_GETCHECK, 0, 0) == 1)
	2003	+ {
	2004	+ EnableWindow(GetDlgItem(hDlg, UPDATES_AUTO_APPLY), TRUE);
	2005	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL), TRUE);
	2006	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL_SPN), TRUE);
	2007	+ }
	2008	+ else
	2009	+ {
	2010	+ EnableWindow(GetDlgItem(hDlg, UPDATES_AUTO_APPLY), FALSE);
	2011	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL), FALSE);
	2012	+ EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL_SPN), FALSE);
	2013	+ }
	2014	+ break;
	2015	+ }
	2016	+ return(TRUE);
	2017	+ }
	2018	+ return(FALSE);
	2019	+}
	2020	+
1935	2021	/*----- ダイアログのコントロールから１０進数を取得 ----------------------------
1936	2022	*
1937	2023	* Parameter

Binary files a/putty/Release/PuTTY.dll and b/putty/Release/PuTTY.dll differ

--- a/putty/dllinterface.c

+++ b/putty/dllinterface.c

		@@ -20,7 +20,7 @@ __declspec(dllexport) SFTPSTATUS* SFTP_Create()
20	20	SFTP_InitializeIOBuffer(&p->DataInBuffer, 1048576);
21	21	SFTP_InitializeIOBuffer(&p->DataOutBuffer, 1048576);
22	22	memset(&p->FilePosition, 0, sizeof(LARGE_INTEGER));
23		- CreateThread(NULL, 0, SFTP_ThreadProc, NULL, 0, &p->ThreadId);
	23	+ CloseHandle(CreateThread(NULL, 0, SFTP_ThreadProc, NULL, 0, &p->ThreadId));
24	24	}
25	25	return p;
26	26	}

--- a/registry.c

+++ b/registry.c

		@@ -226,6 +226,11 @@ extern int AutoRefreshFileList;
226	226	extern int RemoveOldLog;
227	227	// バージョン確認
228	228	extern int ReadOnlySettings;
	229	+// ソフトウェア自動更新
	230	+extern int AutoCheckForUpdates;
	231	+extern int AutoApplyUpdates;
	232	+extern int AutoCheckForUptatesInterval;
	233	+extern time_t LastAutoCheckForUpdates;
229	234
230	235	/*----- マスタパスワードの設定 ----------------------------------------------
231	236	*

		@@ -692,6 +697,11 @@ void SaveRegistry(void)
692	697	WriteIntValueToReg(hKey4, "ListRefresh", AutoRefreshFileList);
693	698	// 古い処理内容を消去
694	699	WriteIntValueToReg(hKey4, "OldLog", RemoveOldLog);
	700	+ // ソフトウェア自動更新
	701	+ WriteIntValueToReg(hKey4, "UpdCheck", AutoCheckForUpdates);
	702	+ WriteIntValueToReg(hKey4, "UpdApply", AutoApplyUpdates);
	703	+ WriteIntValueToReg(hKey4, "UpdInterval", AutoCheckForUptatesInterval);
	704	+ WriteBinaryToReg(hKey4, "UpdLastCheck", &LastAutoCheckForUpdates, sizeof(LastAutoCheckForUpdates));
695	705	}
696	706	CloseSubKey(hKey4);
697	707	}

		@@ -1174,6 +1184,11 @@ int LoadRegistry(void)
1174	1184	ReadIntValueFromReg(hKey4, "ListRefresh", &AutoRefreshFileList);
1175	1185	// 古い処理内容を消去
1176	1186	ReadIntValueFromReg(hKey4, "OldLog", &RemoveOldLog);
	1187	+ // ソフトウェア自動更新
	1188	+ ReadIntValueFromReg(hKey4, "UpdCheck", &AutoCheckForUpdates);
	1189	+ ReadIntValueFromReg(hKey4, "UpdApply", &AutoApplyUpdates);
	1190	+ ReadIntValueFromReg(hKey4, "UpdInterval", &AutoCheckForUptatesInterval);
	1191	+ ReadBinaryFromReg(hKey4, "UpdLastCheck", &LastAutoCheckForUpdates, sizeof(LastAutoCheckForUpdates));
1177	1192
1178	1193	CloseSubKey(hKey4);
1179	1194	}

		@@ -1401,7 +1416,7 @@ void SaveSettingsToFile(void)
1401	1416	{
1402	1417	if(ShellExecute(NULL, "open", "regedit", Tmp, NULL, SW_SHOW) <= (HINSTANCE)32)
1403	1418	{
1404		- MessageBox(NULL, MSGJPN285, "FFFTP", MB_OK);
	1419	+ MessageBox(GetMainHwnd(), MSGJPN285, "FFFTP", MB_OK \| MB_ICONERROR);
1405	1420	}
1406	1421	SetCurrentDirectory(CurDir);
1407	1422	}

		@@ -1465,7 +1480,7 @@ int LoadSettingsFromFile(void)
1465	1480	{
1466	1481	if(ShellExecute(NULL, "open", "regedit", Tmp, NULL, SW_SHOW) <= (HINSTANCE)32)
1467	1482	{
1468		- MessageBox(NULL, MSGJPN285, "FFFTP", MB_OK);
	1483	+ MessageBox(GetMainHwnd(), MSGJPN285, "FFFTP", MB_OK \| MB_ICONERROR);
1469	1484	}
1470	1485	else
1471	1486	{

		@@ -1484,7 +1499,9 @@ int LoadSettingsFromFile(void)
1484	1499	Ret = YES;
1485	1500	}
1486	1501	else
1487		- MessageBox(NULL, MSGJPN293, "FFFTP", MB_OK);
	1502	+ // バグ修正
	1503	+// MessageBox(NULL, MSGJPN293, "FFFTP", MB_OK);
	1504	+ MessageBox(GetMainHwnd(), MSGJPN293, "FFFTP", MB_OK \| MB_ICONERROR);
1488	1505	}
1489	1506	return(Ret);
1490	1507	}

		@@ -2313,7 +2330,9 @@ static BOOL WriteOutRegToFile(REGDATATBL *Pos)
2313	2330	Ret = TRUE;
2314	2331	}
2315	2332	else
2316		- MessageBox(NULL, MSGJPN240, "FFFTP", MB_OK);
	2333	+ // バグ修正
	2334	+// MessageBox(NULL, MSGJPN240, "FFFTP", MB_OK);
	2335	+ MessageBox(GetMainHwnd(), MSGJPN240, "FFFTP", MB_OK \| MB_ICONERROR);
2317	2336
2318	2337	return(Ret);
2319	2338	}

		@@ -3682,7 +3701,7 @@ void SaveSettingsToFileZillaXml()
3682	3701	fclose(f);
3683	3702	}
3684	3703	else
3685		- MessageBox(NULL, MSGJPN358, "FFFTP", MB_OK);
	3704	+ MessageBox(GetMainHwnd(), MSGJPN358, "FFFTP", MB_OK \| MB_ICONERROR);
3686	3705	}
3687	3706	}
3688	3707

--- a/tool.c

+++ b/tool.c

		@@ -180,7 +180,7 @@ void TurnStatefulFTPFilter()
180	180	{
181	181	if(ShellExecute(NULL, "runas", "netsh", ID == IDYES ? "advfirewall set global statefulftp enable" : "advfirewall set global statefulftp disable", NULL, SW_SHOW) <= (HINSTANCE)32)
182	182	{
183		- MessageBox(NULL, MSGJPN342, "FFFTP", MB_OK);
	183	+ MessageBox(GetMainHwnd(), MSGJPN342, "FFFTP", MB_OK \| MB_ICONERROR);
184	184	}
185	185	SetCurrentDirectory(CurDir);
186	186	}

--- a/updater.c

+++ b/updater.c

		@@ -264,11 +264,12 @@ BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir)
264	264	}
265	265
266	266	// FFFTPを更新
267		-BOOL ApplyUpdates(LPCTSTR DestinationDir)
	267	+BOOL ApplyUpdates(LPCTSTR DestinationDir, LPCTSTR BackupDirName)
268	268	{
269	269	BOOL bResult;
270	270	TCHAR Source[MAX_PATH];
271	271	TCHAR Backup[MAX_PATH];
	272	+ TCHAR DestinationBackup[MAX_PATH];
272	273	TCHAR* p;
273	274	bResult = FALSE;
274	275	if(GetModuleFileName(NULL, Source, MAX_PATH) > 0)

		@@ -276,19 +277,24 @@ BOOL ApplyUpdates(LPCTSTR DestinationDir)
276	277	if(p = _tcsrchr(Source, _T('\\')))
277	278	*p = _T('\0');
278	279	_tcscpy(Backup, Source);
279		- _tcscat(Backup, _T("\\updatebackup"));
	280	+ _tcscat(Backup, _T("\\"));
	281	+ _tcscat(Backup, BackupDirName);
280	282	DeleteDirectoryAndContents(Backup);
281	283	if(CopyAllFilesInDirectory(DestinationDir, Backup))
282	284	{
	285	+ _tcscpy(DestinationBackup, DestinationDir);
	286	+ _tcscat(DestinationBackup, _T("\\"));
	287	+ _tcscat(DestinationBackup, BackupDirName);
283	288	if(CopyAllFilesInDirectory(Source, DestinationDir))
284	289	{
	290	+ DeleteDirectoryAndContents(DestinationBackup);
285	291	bResult = TRUE;
286		- _tcscpy(Backup, DestinationDir);
287		- _tcscat(Backup, _T("\\updatebackup"));
288		- DeleteDirectoryAndContents(Backup);
289	292	}
290	293	else
	294	+ {
	295	+ DeleteDirectoryAndContents(DestinationBackup);
291	296	CopyAllFilesInDirectory(Backup, DestinationDir);
	297	+ }
292	298	}
293	299	}
294	300	return bResult;

		@@ -305,18 +311,31 @@ BOOL CleanupUpdates(LPCTSTR DownloadDir)
305	311	}
306	312
307	313	// 更新用のプロセスを起動
308		-BOOL StartUpdateProcess(LPCTSTR Path, LPCTSTR CommandLine)
	314	+BOOL StartUpdateProcess(LPCTSTR DownloadDir, LPCTSTR CommandLine)
309	315	{
310	316	BOOL bResult;
	317	+ TCHAR Name[MAX_PATH];
	318	+ TCHAR* p;
	319	+ TCHAR Path[MAX_PATH];
311	320	bResult = FALSE;
312		- if(ShellExecute(NULL, "open", Path, CommandLine, NULL, SW_SHOW) > (HINSTANCE)32)
313		- bResult = TRUE;
	321	+ if(GetModuleFileName(NULL, Name, MAX_PATH) > 0)
	322	+ {
	323	+ if(p = _tcsrchr(Name, _T('\\')))
	324	+ p++;
	325	+ else
	326	+ p = Name;
	327	+ _tcscpy(Path, DownloadDir);
	328	+ _tcscat(Path, _T("\\"));
	329	+ _tcscat(Path, p);
	330	+ if(ShellExecute(NULL, _T("open"), Path, CommandLine, NULL, SW_SHOW) > (HINSTANCE)32)
	331	+ bResult = TRUE;
	332	+ }
314	333	return bResult;
315	334	}
316	335
317	336	// 更新用のプロセスを管理者権限で起動
318	337	// Windows XP以前など起動できない場合は現在のプロセスで処理を続行
319		-BOOL StartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword)
	338	+BOOL RestartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword)
320	339	{
321	340	BOOL bResult;
322	341	TCHAR* NewCommandLine;

		@@ -329,19 +348,21 @@ BOOL StartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword)
329	348	{
330	349	_tcscpy(NewCommandLine, CommandLine);
331	350	_tcscat(NewCommandLine, Keyword);
332		- GetModuleFileName(NULL, Path, MAX_PATH);
333		- memset(&Info, 0, sizeof(SHELLEXECUTEINFO));
334		- Info.cbSize = sizeof(SHELLEXECUTEINFO);
335		- Info.fMask = SEE_MASK_NOCLOSEPROCESS;
336		- Info.lpVerb = "runas";
337		- Info.lpFile = Path;
338		- Info.lpParameters = NewCommandLine;
339		- Info.nShow = SW_SHOW;
340		- if(ShellExecuteEx(&Info))
	351	+ if(GetModuleFileName(NULL, Path, MAX_PATH) > 0)
341	352	{
342		- WaitForSingleObject(Info.hProcess, INFINITE);
343		- CloseHandle(Info.hProcess);
344		- bResult = TRUE;
	353	+ memset(&Info, 0, sizeof(SHELLEXECUTEINFO));
	354	+ Info.cbSize = sizeof(SHELLEXECUTEINFO);
	355	+ Info.fMask = SEE_MASK_NOCLOSEPROCESS;
	356	+ Info.lpVerb = _T("runas");
	357	+ Info.lpFile = Path;
	358	+ Info.lpParameters = NewCommandLine;
	359	+ Info.nShow = SW_SHOW;
	360	+ if(ShellExecuteEx(&Info))
	361	+ {
	362	+ WaitForSingleObject(Info.hProcess, INFINITE);
	363	+ CloseHandle(Info.hProcess);
	364	+ bResult = TRUE;
	365	+ }
345	366	}
346	367	free(NewCommandLine);
347	368	}

--- a/updater.h

+++ b/updater.h

		@@ -35,10 +35,10 @@
35	35
36	36	BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir, DWORD* pVersion, LPTSTR pVersionString);
37	37	BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir);
38		-BOOL ApplyUpdates(LPCTSTR DestinationDir);
	38	+BOOL ApplyUpdates(LPCTSTR DestinationDir, LPCTSTR BackupDirName);
39	39	BOOL CleanupUpdates(LPCTSTR DownloadDir);
40		-BOOL StartUpdateProcess(LPCTSTR CommandLine, LPCTSTR Keyword);
41		-BOOL StartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword);
	40	+BOOL StartUpdateProcess(LPCTSTR DownloadDir, LPCTSTR CommandLine);
	41	+BOOL RestartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword);
42	42
43	43	#endif
44	44

ffftp Fork