OSDN > 開發者 >

amalsyah1 > 工作室 > Osdn > 提交

amalsyah1

Fork

Fork origin: amalsyah1 / ffftp

R/O
HTTP
SSH
HTTPS

提交

Commit MetaInfo

修訂	655d3abe20bfad379664c01be9980509564708f3 (tree)
時間	2017-03-25 12:08:45
作者	s_kawamoto <s_kawamoto@user...>
Commiter	s_kawamoto

Log Message

Fix bugs of automatic software update.
Fix bugs of timestamp comparison.
Replace 4 whitespaces at beginning of lines with a tab.

Change Summary

modified: FFFTP_Eng_Release/FFFTP.exe (diff)
modified: FFFTP_Eng_Release_64/FFFTP.exe (diff)
modified: Release/FFFTP.exe (diff)
modified: Release_64/FFFTP.exe (diff)
modified: Resource/FFFTP.rc (diff)
modified: Resource_eng/ffftp.rc (diff)
modified: bookmark.c (diff)
modified: codecnv.c (diff)
modified: common.h (diff)
modified: connect.c (diff)
modified: filelist.c (diff)
modified: ftpproc.c (diff)
modified: getput.c (diff)
modified: hostman.c (diff)
modified: lvtips.c (diff)
modified: main.c (diff)
modified: misc.c (diff)
modified: option.c (diff)
modified: ras.c (diff)
modified: registry.c (diff)
modified: remote.c (diff)
modified: skey.c (diff)
modified: socket.c (diff)
modified: tool.c (diff)
modified: toolmenu.c (diff)
modified: updater.c (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
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-20170320",-1,113,11,90,8
	245	+ CTEXT "FFFTP Ver 1.99a-20170325",-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,12
2217		- PRODUCTVERSION 1,99,1,12
	2216	+ FILEVERSION 1,99,1,13
	2217	+ PRODUCTVERSION 1,99,1,13
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, 12"
	2235	+ VALUE "FileVersion", "1, 99, 1, 13"
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, 12"
	2240	+ VALUE "ProductVersion", "1, 99, 1, 13"
2241	2241	END
2242	2242	END
2243	2243	BLOCK "VarFileInfo"

--- a/Resource_eng/ffftp.rc

+++ b/Resource_eng/ffftp.rc

		@@ -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-20170320",-1,110,11,90,8
	245	+ CTEXT "FFFTP Ver 1.99a-20170325",-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,12
2257		- PRODUCTVERSION 1,99,1,12
	2256	+ FILEVERSION 1,99,1,13
	2257	+ PRODUCTVERSION 1,99,1,13
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, 12"
	2275	+ VALUE "FileVersion", "1, 99, 1, 13"
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, 12"
	2280	+ VALUE "ProductVersion", "1, 99, 1, 13"
2281	2281	END
2282	2282	END
2283	2283	BLOCK "VarFileInfo"

--- a/bookmark.c

+++ b/bookmark.c

		@@ -420,7 +420,7 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
420	420	GetWindowRect(hDlg, &Rect);
421	421	DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
422	422	RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE \| RDW_ERASE \| RDW_ALLCHILDREN);
423		- break;
	423	+ break;
424	424
425	425	case WM_INITDIALOG :
426	426	if(ListFont != NULL)

		@@ -438,7 +438,7 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
438	438	SendDlgItemMessage(hDlg, BMARK_LIST, LB_ADDSTRING, 0, (LPARAM)Tmp);
439	439	}
440	440	DlgSizeInit(hDlg, &DlgSize, &BmarkDlgSize);
441		- return(TRUE);
	441	+ return(TRUE);
442	442
443	443	case WM_COMMAND :
444	444	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -529,10 +529,10 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
529	529
530	530	case WM_SIZING :
531	531	DlgSizeChange(hDlg, &DlgSize, (RECT *)lParam, (int)wParam);
532		- return(TRUE);
	532	+ return(TRUE);
533	533
534	534	}
535		- return(FALSE);
	535	+ return(FALSE);
536	536	}
537	537
538	538

		@@ -625,7 +625,7 @@ static INT_PTR CALLBACK BookMarkEditCallBack(HWND hDlg, UINT iMessage, WPARAM wP
625	625	EndDialog(hDlg, NO);
626	626	break;
627	627	}
628		- return(TRUE);
	628	+ return(TRUE);
629	629	}
630	630	return(FALSE);
631	631	}

--- a/codecnv.c

+++ b/codecnv.c

		@@ -1143,7 +1143,7 @@ int ConvSJIStoSMB_HEX(CODECONVINFO *cInfo)
1143	1143
1144	1144	if((cInfo->StrLen >= 2) &&
1145	1145	((((uchar)Str >= (uchar)0x81) && ((uchar)Str <= (uchar)0x9F)) \|\|
1146		- ((uchar)*Str >= (uchar)0xE0)))
	1146	+ ((uchar)*Str >= (uchar)0xE0)))
1147	1147	{
1148	1148	sprintf(Put, "%c%02x%c%02x", SAMBA_HEX_TAG, (uchar)Str, SAMBA_HEX_TAG, (uchar)(Str+1));
1149	1149	Str += 2;

--- a/common.h

+++ b/common.h

		@@ -72,16 +72,16 @@
72	72	//#define PROGRAM_VERSION_NUM 1972 /* バージョン */
73	73	// 64ビット対応
74	74	#ifdef _WIN64
75		-#define VER_STR "1.99a-20170320 64bit"
	75	+#define VER_STR "1.99a-20170325 64bit"
76	76	#else
77		-#define VER_STR "1.99a-20170320"
	77	+#define VER_STR "1.99a-20170325"
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 2017032000 /* リリースバージョン */
	84	+#define RELEASE_VERSION_NUM 2017032500 /* リリースバージョン */
85	85
86	86
87	87	// SourceForge.JPによるフォーク

		@@ -448,8 +448,8 @@
448	448
449	449	0 1 2 3 4 5
450	450	-------------------------------------------------------
451		- -rwxrwxrwx SEQ 36203776 01/07/07 12:38:28 ADRS001
452		- -rwxrwxrwx SEQ 70172160 01/07/07 13:59:58 ADRS002
	451	+ -rwxrwxrwx SEQ 36203776 01/07/07 12:38:28 ADRS001
	452	+ -rwxrwxrwx SEQ 70172160 01/07/07 13:59:58 ADRS002
453	453
454	454	*LIST_UNIX_54
455	455	0 1 2 3 4 5 6

		@@ -585,14 +585,14 @@ LIST_UNIX_70
585	585	*LIST_DOS_4
586	586	0 1 2 3
587	587	-------------------------------------------------------
588		- 1998/07/30 15:39:02 <DIR> Linux
589		- 1998/07/30 15:42:19 11623 test.txt
	588	+ 1998/07/30 15:39:02 <DIR> Linux
	589	+ 1998/07/30 15:42:19 11623 test.txt
590	590
591	591	*LIST_ACOS
592	592	0
593	593	-------------------------------------------------------
594	594	test.txt
595		-　　ディレクトリなし、
	595	+ ディレクトリなし、
596	596
597	597	*LIST_AS400
598	598	0 1 2 3 4 5

		@@ -614,8 +614,8 @@ LIST_UNIX_70
614	614	*LIST_CHAMELEON
615	615	0 1 2 3 4 5 6
616	616	-------------------------------------------------------
617		- Linux <DIR> Nov 6 1997 14:21 drw-
618		- test.txt 12 Nov 6 1886 14:21 -rwa
	617	+ Linux <DIR> Nov 6 1997 14:21 drw-
	618	+ test.txt 12 Nov 6 1886 14:21 -rwa
619	619
620	620	*LIST_GP6000
621	621	0 1 2 3 4 5 6

		@@ -626,16 +626,16 @@ LIST_UNIX_70
626	626	*LIST_OS2
627	627	0 1 2 3 4
628	628	-------------------------------------------------------
629		- 345 A 12-02-98 10:59 VirtualDevice.java
630		- 0 DIR 12-09-98 09:43 ディレクトリ
631		- 0 DIR 12-09-100 09:43 ディレクトリ
	629	+ 345 A 12-02-98 10:59 VirtualDevice.java
	630	+ 0 DIR 12-09-98 09:43 ディレクトリ
	631	+ 0 DIR 12-09-100 09:43 ディレクトリ
632	632
633	633	*LIST_MELCOM
634	634	0 1 2 3 4 5 6 7 8
635	635	---------------------------------------------------------------
636		- - RW-RW-RW- 1 TERA 50 DEC 1 1997 AAAJ B(B)
637		- - RW-RW-RW- 1 TERA 1 AUG 7 1998 12345678901234B(B)
638		- d RWXRWXRWX 2 TERA 64 NOV 13 1997 Q2000 -
	636	+ - RW-RW-RW- 1 TERA 50 DEC 1 1997 AAAJ B(B)
	637	+ - RW-RW-RW- 1 TERA 1 AUG 7 1998 12345678901234B(B)
	638	+ d RWXRWXRWX 2 TERA 64 NOV 13 1997 Q2000 -
639	639
640	640	*LIST_VMS
641	641	0 1 2 3 4

		@@ -649,19 +649,19 @@ LIST_UNIX_70
649	649	*LIST_OS7_1
650	650	0 1 2 3
651	651	---------------------------------------------------------------
652		- drwxrwxrwx 99/05/13 11:38:34 APL
	652	+ drwxrwxrwx 99/05/13 11:38:34 APL
653	653	*LIST_OS7_2
654	654	0 1 2 3 4 5
655	655	---------------------------------------------------------------
656		- -rwxrwxrwx SEQ 17408 96/12/06 10:11:27 INIT_CONFIG
	656	+ -rwxrwxrwx SEQ 17408 96/12/06 10:11:27 INIT_CONFIG
657	657
658	658	*LIST_IRMX
659	659	0 1 2 3 4 5 6 7 8 9 10 11
660	660	---------------------------------------------------------------
661		- world DR DLAC 1 416 1,024 1 WORLD 05 FEB 98
662		- world DR 1 416 1,024 1 WORLD 05 FEB 98
663		- name.f38 DRAU 5 4,692 1,024 1 # 0 24 MAR 99
664		- name.f38 5 4,692 1,024 1 # 0 24 MAR 99
	661	+ world DR DLAC 1 416 1,024 1 WORLD 05 FEB 98
	662	+ world DR 1 416 1,024 1 WORLD 05 FEB 98
	663	+ name.f38 DRAU 5 4,692 1,024 1 # 0 24 MAR 99
	664	+ name.f38 5 4,692 1,024 1 # 0 24 MAR 99
665	665
666	666	*LIST_STRATUS
667	667	0 1 2 3 4 5

		@@ -680,26 +680,26 @@ LIST_UNIX_70
680	680	*LIST_OS9
681	681	0 1 2 3 4 5 6
682	682	---------------------------------------------------------------
683		- 0.0 01/02/13 0945 d-----wr 3C0 148724 W_017
684		- 0.0 01/02/13 0945 ------wr C20 48828 W_017.CLG
	683	+ 0.0 01/02/13 0945 d-----wr 3C0 148724 W_017
	684	+ 0.0 01/02/13 0945 ------wr C20 48828 W_017.CLG
685	685
686	686	*LIST_IBM
687	687	0 1 2 3 4 5 6 7 8 9
688	688	---------------------------------------------------------------
689		- JXSIB1 3390 2000/12/27 1 810 FB 240 24000 PO DIRNAME
690		- JXSW01 3390 2000/12/27 1 5 VBA 240 3120 PS FILENAME
	689	+ JXSIB1 3390 2000/12/27 1 810 FB 240 24000 PO DIRNAME
	690	+ JXSW01 3390 2000/12/27 1 5 VBA 240 3120 PS FILENAME
691	691
692	692	*LIST_AGILENT
693	693	0 1 2 3 4 5
694	694	---------------------------------------------------------------
695		- drwxrwxrwx 1 1 1 1024 system
696		- -rw-rw-rw- 1 1 1 1792 abc.aaa
	695	+ drwxrwxrwx 1 1 1 1024 system
	696	+ -rw-rw-rw- 1 1 1 1792 abc.aaa
697	697
698	698	*LIST_SHIBASOKU
699	699	0 1 2 3 4
700	700	---------------------------------------------------------------
701		- 512 Jan-30-2002 14:52:04 DIRNAME <DIR>
702		- 61191 Aug-30-2002 17:30:38 FILENAME.C
	701	+ 512 Jan-30-2002 14:52:04 DIRNAME <DIR>
	702	+ 61191 Aug-30-2002 17:30:38 FILENAME.C
703	703
704	704
705	705	// linux-ftpd

--- a/connect.c

+++ b/connect.c

		@@ -476,7 +476,7 @@ static INT_PTR CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM
476	476	// DoPrintf("EDIT");
477	477	// break;
478	478	}
479		- return(TRUE);
	479	+ return(TRUE);
480	480	}
481	481	return(FALSE);
482	482	}

		@@ -2637,9 +2637,9 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
2637	2637	// IPv6対応
2638	2638	struct sockaddr_in SocksSockAddr; /* SOCKSサーバのアドレス情報 */
2639	2639	struct sockaddr_in CurSockAddr; /* 接続先ホストのアドレス情報 */
2640		- SOCKET listen_skt;
2641		- int iLength;
2642		- char a,p;
	2640	+ SOCKET listen_skt;
	2641	+ int iLength;
	2642	+ char a,p;
2643	2643	struct sockaddr_in saCtrlAddr;
2644	2644	struct sockaddr_in saTmpAddr;
2645	2645	SOCKS4CMD Socks4Cmd;

		@@ -2838,9 +2838,9 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
2838	2838	{
2839	2839	struct sockaddr_in6 SocksSockAddr; /* SOCKSサーバのアドレス情報 */
2840	2840	struct sockaddr_in6 CurSockAddr; /* 接続先ホストのアドレス情報 */
2841		- SOCKET listen_skt;
2842		- int iLength;
2843		- char a,p;
	2841	+ SOCKET listen_skt;
	2842	+ int iLength;
	2843	+ char a,p;
2844	2844	struct sockaddr_in6 saCtrlAddr;
2845	2845	struct sockaddr_in6 saTmpAddr;
2846	2846	SOCKS5REQUEST Socks5Cmd;

--- a/filelist.c

+++ b/filelist.c

		@@ -230,9 +230,9 @@ int MakeListWin(HWND hWnd, HINSTANCE hInst)
230	230	// LocalProcPtr = (WNDPROC)SetWindowLong(hWndListLocal, GWL_WNDPROC, (LONG)LocalWndProc);
231	231	LocalProcPtr = (WNDPROC)SetWindowLongPtr(hWndListLocal, GWLP_WNDPROC, (LONG_PTR)LocalWndProc);
232	232
233		- Tmp = SendMessage(hWndListLocal, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
234		- Tmp \|= LVS_EX_FULLROWSELECT;
235		- SendMessage(hWndListLocal, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
	233	+ Tmp = SendMessage(hWndListLocal, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
	234	+ Tmp \|= LVS_EX_FULLROWSELECT;
	235	+ SendMessage(hWndListLocal, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
236	236
237	237	if(ListFont != NULL)
238	238	SendMessage(hWndListLocal, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));

		@@ -287,9 +287,9 @@ int MakeListWin(HWND hWnd, HINSTANCE hInst)
287	287	// RemoteProcPtr = (WNDPROC)SetWindowLong(hWndListRemote, GWL_WNDPROC, (LONG)RemoteWndProc);
288	288	RemoteProcPtr = (WNDPROC)SetWindowLongPtr(hWndListRemote, GWLP_WNDPROC, (LONG_PTR)RemoteWndProc);
289	289
290		- Tmp = SendMessage(hWndListRemote, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
291		- Tmp \|= LVS_EX_FULLROWSELECT;
292		- SendMessage(hWndListRemote, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
	290	+ Tmp = SendMessage(hWndListRemote, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
	291	+ Tmp \|= LVS_EX_FULLROWSELECT;
	292	+ SendMessage(hWndListRemote, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
293	293
294	294	if(ListFont != NULL)
295	295	SendMessage(hWndListRemote, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));

		@@ -819,7 +819,7 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
819	819
820	820	switch (message)
821	821	{
822		- case WM_SYSKEYDOWN:
	822	+ case WM_SYSKEYDOWN:
823	823	if (wParam == 'D') { // Alt+D
824	824	SetFocus(hWndHistEdit);
825	825	break;

		@@ -827,7 +827,7 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
827	827	EraseListViewTips();
828	828	return(CallWindowProc(ProcPtr, hWnd, message, wParam, lParam));
829	829
830		- case WM_KEYDOWN:
	830	+ case WM_KEYDOWN:
831	831	if(wParam == 0x09)
832	832	{
833	833	SetFocus(hWndDst);

		@@ -1162,7 +1162,7 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
1162	1162	case WM_MOUSEWHEEL :
1163	1163	if(Dragging == NO)
1164	1164	{
1165		- short zDelta = (short)HIWORD(wParam);
	1165	+ short zDelta = (short)HIWORD(wParam);
1166	1166
1167	1167	EraseListViewTips();
1168	1168	Point.x = (short)LOWORD(lParam);

		@@ -1187,7 +1187,7 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
1187	1187	default :
1188	1188	return(CallWindowProc(ProcPtr, hWnd, message, wParam, lParam));
1189	1189	}
1190		- return(0L);
	1190	+ return(0L);
1191	1191	}
1192	1192
1193	1193

		@@ -1620,7 +1620,7 @@ static void AddDispFileList(FLISTANCHOR Anchor, char Name, FILETIME *Time, LON
1620	1620	// ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0)) \|\|
1621	1621	//#if defined(HAVE_TANDEM)
1622	1622	// ((AskHostType() == HTYPE_TANDEM) &&
1623		-// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
	1623	+// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
1624	1624	// ((Cmp = Attr - Pos->Attr) < 0)) \|\|
1625	1625	//#endif
1626	1626	// (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&

		@@ -1659,7 +1659,7 @@ static void AddDispFileList(FLISTANCHOR Anchor, char Name, FILETIME *Time, LON
1659	1659	// ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) > 0)) \|\|
1660	1660	//#if defined(HAVE_TANDEM)
1661	1661	// ((AskHostType() == HTYPE_TANDEM) &&
1662		-// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
	1662	+// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
1663	1663	// ((Cmp = Attr - Pos->Attr) > 0)) \|\|
1664	1664	//#endif
1665	1665	// (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&

		@@ -1674,7 +1674,7 @@ static void AddDispFileList(FLISTANCHOR Anchor, char Name, FILETIME *Time, LON
1674	1674	break;
1675	1675	#if defined(HAVE_TANDEM)
1676	1676	if(((AskHostType() == HTYPE_TANDEM) &&
1677		- ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
	1677	+ ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
1678	1678	((Cmp = Attr - Pos->Attr) > 0)))
1679	1679	break;
1680	1680	#endif

		@@ -2116,7 +2116,7 @@ static INT_PTR CALLBACK SelectDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wP
2116	2116	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000061);
2117	2117	break;
2118	2118	}
2119		- return(TRUE);
	2119	+ return(TRUE);
2120	2120	}
2121	2121	return(FALSE);
2122	2122	}

		@@ -3012,6 +3012,8 @@ void MakeDroppedFileList(WPARAM wParam, char Cur, FILELIST *Base)
3012	3012	FILELIST Pkt;
3013	3013	HANDLE fHnd;
3014	3014	WIN32_FIND_DATA Find;
	3015	+ // タイムスタンプのバグ修正
	3016	+ SYSTEMTIME TmpStime;
3015	3017
3016	3018	Max = DragQueryFile((HDROP)wParam, 0xFFFFFFFF, NULL, 0);
3017	3019

		@@ -3040,6 +3042,16 @@ void MakeDroppedFileList(WPARAM wParam, char Cur, FILELIST *Base)
3040	3042	{
3041	3043	FindClose(fHnd);
3042	3044	Pkt.Time = Find.ftLastWriteTime;
	3045	+ // タイムスタンプのバグ修正
	3046	+ if(FileTimeToSystemTime(&Pkt.Time, &TmpStime))
	3047	+ {
	3048	+ if(DispTimeSeconds == NO)
	3049	+ TmpStime.wSecond = 0;
	3050	+ TmpStime.wMilliseconds = 0;
	3051	+ SystemTimeToFileTime(&TmpStime, &Pkt.Time);
	3052	+ }
	3053	+ else
	3054	+ memset(&Pkt.Time, 0, sizeof(FILETIME));
3043	3055	#if defined(HAVE_TANDEM)
3044	3056	Pkt.Size = MakeLongLong(Find.nFileSizeHigh, Find.nFileSizeLow);
3045	3057	Pkt.InfoExist \|= (FINFO_TIME \| FINFO_DATE \| FINFO_SIZE);

		@@ -4285,7 +4297,7 @@ static int CheckUnixType(char Str, char Tmp, int Add1, int Add2, int Day)
4285	4297	(((atoi(Tmp) >= 1) && (atoi(Tmp) <= 9) &&
4286	4298	((unsigned char)Tmp[1] == 0xD4) &&
4287	4299	((unsigned char)Tmp[2] == 0xC2)) \|\|
4288		- ((atoi(Tmp) >= 10) && (atoi(Tmp) <= 12) &&
	4300	+ ((atoi(Tmp) >= 10) && (atoi(Tmp) <= 12) &&
4289	4301	((unsigned char)Tmp[2] == 0xD4) &&
4290	4302	((unsigned char)Tmp[3] == 0xC2))))
4291	4303	{

		@@ -6250,7 +6262,7 @@ static INT_PTR CALLBACK FilterWndProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
6250	6262	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000021);
6251	6263	break;
6252	6264	}
6253		- return(TRUE);
	6265	+ return(TRUE);
6254	6266	}
6255	6267	return(FALSE);
6256	6268	}

--- a/ftpproc.c

+++ b/ftpproc.c

		@@ -114,6 +114,8 @@ extern int MakeAllDir;
114	114	extern int AbortOnListError;
115	115	// ミラーリング設定追加
116	116	extern int MirrorNoTransferContents;
	117	+// タイムスタンプのバグ修正
	118	+extern int DispTimeSeconds;
117	119
118	120	/===== ローカルなワーク =====/
119	121

		@@ -879,6 +881,8 @@ static int CheckLocalFile(TRANSPACKET *Pkt)
879	881	HANDLE fHnd;
880	882	WIN32_FIND_DATA Find;
881	883	int Ret;
	884	+ // タイムスタンプのバグ修正
	885	+ SYSTEMTIME TmpStime;
882	886
883	887	Ret = EXIST_OVW;
884	888	Pkt->ExistSize = 0;

		@@ -904,6 +908,16 @@ static int CheckLocalFile(TRANSPACKET *Pkt)
904	908	if(Ret == EXIST_NEW)
905	909	{
906	910	/ファイル日付チェック /
	911	+ // タイムスタンプのバグ修正
	912	+ if(FileTimeToSystemTime(&Find.ftLastWriteTime, &TmpStime))
	913	+ {
	914	+ if(DispTimeSeconds == NO)
	915	+ TmpStime.wSecond = 0;
	916	+ TmpStime.wMilliseconds = 0;
	917	+ SystemTimeToFileTime(&TmpStime, &Find.ftLastWriteTime);
	918	+ }
	919	+ else
	920	+ memset(&Find.ftLastWriteTime, 0, sizeof(FILETIME));
907	921	if(CompareFileTime(&Find.ftLastWriteTime, &Pkt->Time) < 0)
908	922	Ret = EXIST_OVW;
909	923	else

		@@ -991,7 +1005,7 @@ static INT_PTR CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM
991	1005	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000009);
992	1006	break;
993	1007	}
994		- return(TRUE);
	1008	+ return(TRUE);
995	1009	}
996	1010	return(FALSE);
997	1011	}

		@@ -1866,7 +1880,7 @@ static INT_PTR CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wP
1866	1880	else
1867	1881	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000012);
1868	1882	}
1869		- return(TRUE);
	1883	+ return(TRUE);
1870	1884	}
1871	1885	return(FALSE);
1872	1886	}

		@@ -1913,7 +1927,7 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
1913	1927	GetWindowRect(hDlg, &Rect);
1914	1928	DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
1915	1929	RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE \| RDW_ERASE \| RDW_ALLCHILDREN);
1916		- break;
	1930	+ break;
1917	1931
1918	1932	case WM_INITDIALOG :
1919	1933	Base = (TRANSPACKET **)lParam;

		@@ -2003,11 +2017,11 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
2003	2017	case IDHELP :
2004	2018	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000012);
2005	2019	}
2006		- return(TRUE);
	2020	+ return(TRUE);
2007	2021
2008	2022	case WM_SIZING :
2009	2023	DlgSizeChange(hDlg, &DlgSize, (RECT *)lParam, (int)wParam);
2010		- return(TRUE);
	2024	+ return(TRUE);
2011	2025	}
2012	2026	return(FALSE);
2013	2027	}

		@@ -2296,7 +2310,7 @@ static INT_PTR CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM w
2296	2310	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000011);
2297	2311	break;
2298	2312	}
2299		- return(TRUE);
	2313	+ return(TRUE);
2300	2314	}
2301	2315	return(FALSE);
2302	2316	}

		@@ -2343,7 +2357,7 @@ static INT_PTR CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM
2343	2357	EndDialog(hDlg, NO_ALL);
2344	2358	break;
2345	2359	}
2346		- return(TRUE);
	2360	+ return(TRUE);
2347	2361	}
2348	2362	return(FALSE);
2349	2363	}

		@@ -2393,7 +2407,7 @@ static INT_PTR CALLBACK UpDownAsWithExtDialogCallBack(HWND hDlg, UINT iMessage,
2393	2407	EndDialog(hDlg, NO_ALL);
2394	2408	break;
2395	2409	}
2396		- return(TRUE);
	2410	+ return(TRUE);
2397	2411	}
2398	2412	return(FALSE);
2399	2413	}

		@@ -2656,7 +2670,7 @@ static INT_PTR CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wP
2656	2670	EndDialog(hDlg, NO_ALL);
2657	2671	break;
2658	2672	}
2659		- return(TRUE);
	2673	+ return(TRUE);
2660	2674	}
2661	2675	return(FALSE);
2662	2676	}

		@@ -2914,7 +2928,7 @@ static INT_PTR CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wP
2914	2928	EndDialog(hDlg, NO_ALL);
2915	2929	break;
2916	2930	}
2917		- return(TRUE);
	2931	+ return(TRUE);
2918	2932	}
2919	2933	return(FALSE);
2920	2934	}

		@@ -3290,7 +3304,7 @@ INT_PTR CALLBACK ChmodDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LP
3290	3304	hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000017);
3291	3305	break;
3292	3306	}
3293		- return(TRUE);
	3307	+ return(TRUE);
3294	3308	}
3295	3309	return(FALSE);
3296	3310	}

		@@ -3513,7 +3527,7 @@ static LRESULT CALLBACK SizeNotifyDlgWndProc(HWND hDlg, UINT message, WPARAM wPa
3513	3527	}
3514	3528	return(TRUE);
3515	3529	}
3516		- return(FALSE);
	3530	+ return(FALSE);
3517	3531	}
3518	3532
3519	3533

		@@ -3556,7 +3570,7 @@ static LRESULT CALLBACK SizeDlgWndProc(HWND hDlg, UINT message, WPARAM wParam, L
3556	3570	}
3557	3571	return(TRUE);
3558	3572	}
3559		- return(FALSE);
	3573	+ return(FALSE);
3560	3574	}
3561	3575
3562	3576

--- a/getput.c

+++ b/getput.c

		@@ -2573,7 +2573,7 @@ static INT_PTR CALLBACK UpDownErrorDialogProc(HWND hDlg, UINT message, WPARAM wP
2573	2573	// hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000009);
2574	2574	break;
2575	2575	}
2576		- return(TRUE);
	2576	+ return(TRUE);
2577	2577	}
2578	2578	return(FALSE);
2579	2579	}

		@@ -2667,7 +2667,7 @@ static INT_PTR CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam,
2667	2667	EndDialog(hDlg, NO_ALL);
2668	2668	break;
2669	2669	}
2670		- return(TRUE);
	2670	+ return(TRUE);
2671	2671	}
2672	2672	return(FALSE);
2673	2673	}

		@@ -4366,7 +4366,7 @@ static INT_PTR CALLBACK MirrorDeleteDialogCallBack(HWND hDlg, UINT iMessage, WPA
4366	4366	EndDialog(hDlg, NO_ALL);
4367	4367	break;
4368	4368	}
4369		- return(TRUE);
	4369	+ return(TRUE);
4370	4370	}
4371	4371	return(FALSE);
4372	4372	}

--- a/hostman.c

+++ b/hostman.c

		@@ -183,7 +183,7 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
183	183	GetWindowRect(hDlg, &Rect);
184	184	DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
185	185	RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE \| RDW_ERASE \| RDW_ALLCHILDREN);
186		- break;
	186	+ break;
187	187
188	188	case WM_INITDIALOG :
189	189	/* TreeViewでのダブルクリックをつかまえるため */

		@@ -213,7 +213,7 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
213	213	CurrentHost = ConnectingHost;
214	214	SendAllHostNames(GetDlgItem(hDlg, HOST_LIST), CurrentHost);
215	215	DlgSizeInit(hDlg, &DlgSize, &HostDlgSize);
216		- return(TRUE);
	216	+ return(TRUE);
217	217
218	218	case WM_COMMAND :
219	219	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -574,7 +574,7 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
574	574
575	575	case WM_SIZING :
576	576	DlgSizeChange(hDlg, &DlgSize, (RECT *)lParam, (int)wParam);
577		- return(TRUE);
	577	+ return(TRUE);
578	578
579	579	case WM_SELECT_HOST :
580	580	HitInfo.pt.x = LOWORD(lParam);

		@@ -624,7 +624,7 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
624	624	}
625	625	break;
626	626	}
627		- return(FALSE);
	627	+ return(FALSE);
628	628	}
629	629
630	630

		@@ -1878,7 +1878,7 @@ static INT_PTR CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
1878	1878	}
1879	1879	break;
1880	1880	}
1881		- return(TRUE);
	1881	+ return(TRUE);
1882	1882	}
1883	1883	return(FALSE);
1884	1884	}

--- a/lvtips.c

+++ b/lvtips.c

		@@ -129,7 +129,7 @@ void DeleteListViewTips(void)
129	129	void EraseListViewTips(void)
130	130	{
131	131	ReleaseCapture();
132		- ShowWindow(hWndTips, SW_HIDE);
	132	+ ShowWindow(hWndTips, SW_HIDE);
133	133	return;
134	134	}
135	135

		@@ -176,8 +176,8 @@ void CheckTipsDisplay(HWND hWnd, LPARAM lParam)
176	176	if(InRect == NO)
177	177	{
178	178	row = CellRectFromPoint(hWnd, Point, &cellrect, &col);
179		- if(row != -1)
180		- {
	179	+ if(row != -1)
	180	+ {
181	181	cur_rect=cellrect;
182	182	offset = 6;
183	183	offset2 = offset;

		@@ -225,13 +225,13 @@ static void TipsShow(HWND hWnd, RECT rectTitle, LPCTSTR lpszTitleText, int xoffs
225	225	{
226	226	HDC dc;
227	227	HFONT pFont;
228		- HFONT pFontDC;
	228	+ HFONT pFontDC;
229	229	RECT rectDisplay;
230	230	SIZE size;
231	231
232	232	if(InRect == NO)
233	233	{
234		- if(GetFocus() != NULL)
	234	+ if(GetFocus() != NULL)
235	235	{
236	236	RectClientToScreen(hWnd, &rectTitle);
237	237

		@@ -255,7 +255,7 @@ static void TipsShow(HWND hWnd, RECT rectTitle, LPCTSTR lpszTitleText, int xoffs
255	255	{
256	256	rectDisplay.right += 1;
257	257
258		- SetWindowPos(hWndTips, HWND_TOPMOST,
	258	+ SetWindowPos(hWndTips, HWND_TOPMOST,
259	259	rectDisplay.left, rectDisplay.top,
260	260	rectDisplay.right - rectDisplay.left,
261	261	rectDisplay.bottom - rectDisplay.top,

		@@ -263,7 +263,7 @@ static void TipsShow(HWND hWnd, RECT rectTitle, LPCTSTR lpszTitleText, int xoffs
263	263
264	264	TextOut(dc, 0, 0, lpszTitleText, strlen(lpszTitleText));
265	265
266		- SetCapture(hWnd);
	266	+ SetCapture(hWnd);
267	267	}
268	268
269	269	SelectObject(dc, pFontDC);

		@@ -328,7 +328,7 @@ static int CellRectFromPoint(HWND hWnd, POINT point, RECT cellrect, int col)
328	328	if(rect.right > rectClient.right)
329	329	rect.right = rectClient.right;
330	330	*cellrect = rect;
331		- *col = colnum;
	331	+ *col = colnum;
332	332	Ret = row;
333	333	break;
334	334	}

--- a/main.c

+++ b/main.c

		@@ -313,7 +313,7 @@ int FwallNoSaveUser = NO;
313	313
314	314	int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int cmdShow)
315	315	{
316		- MSG Msg;
	316	+ MSG Msg;
317	317	int Ret;
318	318	BOOL Sts;
319	319	// プロセス保護

		@@ -519,7 +519,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
519	519	}
520	520	Ret = Msg.wParam;
521	521	}
522		- UnregisterClass(FtpClassStr, hInstFtp);
	522	+ UnregisterClass(FtpClassStr, hInstFtp);
523	523	// FTPS対応
524	524	#ifdef USE_OPENSSL
525	525	FreeOpenSSL();

		@@ -2088,8 +2088,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
2088	2088	break;
2089	2089
2090	2090	case WM_PAINT :
2091		- BeginPaint(hWnd, (LPPAINTSTRUCT) &ps);
2092		- EndPaint(hWnd, (LPPAINTSTRUCT) &ps);
	2091	+ BeginPaint(hWnd, (LPPAINTSTRUCT) &ps);
	2092	+ EndPaint(hWnd, (LPPAINTSTRUCT) &ps);
2093	2093	break;
2094	2094
2095	2095	case WM_DESTROY :

		@@ -2122,7 +2122,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
2122	2122	default :
2123	2123	return(DefWindowProc(hWnd, message, wParam, lParam));
2124	2124	}
2125		- return(0L);
	2125	+ return(0L);
2126	2126	}
2127	2127
2128	2128

		@@ -3320,7 +3320,7 @@ static INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam,
3320	3320	}
3321	3321	return(TRUE);
3322	3322	}
3323		- return(FALSE);
	3323	+ return(FALSE);
3324	3324	}
3325	3325
3326	3326

		@@ -3414,7 +3414,7 @@ int AskForceIni(void)
3414	3414
3415	3415	int BackgrndMessageProc(void)
3416	3416	{
3417		- MSG Msg;
	3417	+ MSG Msg;
3418	3418	int Ret;
3419	3419
3420	3420	Ret = NO;

--- a/misc.c

+++ b/misc.c

		@@ -179,7 +179,7 @@ static INT_PTR CALLBACK InputDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
179	179	SendDlgItemMessage(hDlg, INP_INPSTR, WM_SETTEXT, 0, (LPARAM)Tmp);
180	180	break;
181	181	}
182		- return(TRUE);
	182	+ return(TRUE);
183	183	}
184	184	return(FALSE);
185	185	}

		@@ -219,7 +219,7 @@ INT_PTR CALLBACK ExeEscDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
219	219	}
220	220	return(TRUE);
221	221	}
222		- return(FALSE);
	222	+ return(FALSE);
223	223	}
224	224
225	225

		@@ -258,7 +258,7 @@ INT_PTR CALLBACK ExeEscTextDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP
258	258	}
259	259	return(TRUE);
260	260	}
261		- return(FALSE);
	261	+ return(FALSE);
262	262	}
263	263
264	264

		@@ -280,7 +280,7 @@ INT_PTR CALLBACK AnyButtonDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPA
280	280	}
281	281	return(TRUE);
282	282	}
283		- return(FALSE);
	283	+ return(FALSE);
284	284	}
285	285
286	286	/*----- 文字列の最後に "\" を付ける -------------------------------------------

		@@ -345,7 +345,7 @@ void RemoveYenTail(char *Str)
345	345	void SetSlashTail(char *Str)
346	346	{
347	347	#if defined(HAVE_TANDEM)
348		- /* Tandem では / の代わりに . を追加 */
	348	+ /* Tandem では / の代わりに . を追加 */
349	349	if(AskHostType() == HTYPE_TANDEM) {
350	350	if(_mbscmp(_mbsninc(Str, _mbslen(Str) - 1), ".") != 0)
351	351	strcat(Str, ".");

		@@ -1141,8 +1141,8 @@ int TimeString2FileTime(char Time, FILETIME Buf)
1141	1141	int Ret;
1142	1142
1143	1143	Ret = NO;
1144		- Buf->dwLowDateTime = 0;
1145		- Buf->dwHighDateTime = 0;
	1144	+ Buf->dwLowDateTime = 0;
	1145	+ Buf->dwHighDateTime = 0;
1146	1146
1147	1147	if(strlen(Time) >= 16)
1148	1148	{

		@@ -1560,8 +1560,8 @@ int SelectDir(HWND hWnd, char *Buf, int MaxLen)
1560	1560	strncpy(Buf, Tmp, MaxLen-1);
1561	1561	Sts = TRUE;
1562	1562	lpMalloc->lpVtbl->Free(lpMalloc, lpIdll);
1563		- }
1564		- lpMalloc->lpVtbl->Release(lpMalloc);
	1563	+ }
	1564	+ lpMalloc->lpVtbl->Release(lpMalloc);
1565	1565	SetCurrentDirectory(Cur);
1566	1566	}
1567	1567	return(Sts);

--- a/option.c

+++ b/option.c

		@@ -490,7 +490,7 @@ static INT_PTR CALLBACK UserSettingProc(HWND hDlg, UINT message, WPARAM wParam,
490	490	case WM_INITDIALOG :
491	491	SendDlgItemMessage(hDlg, USER_ADRS, EM_LIMITTEXT, PASSWORD_LEN, 0);
492	492	SendDlgItemMessage(hDlg, USER_ADRS, WM_SETTEXT, 0, (LPARAM)UserMailAdrs);
493		- return(TRUE);
	493	+ return(TRUE);
494	494
495	495	case WM_NOTIFY:
496	496	pnmhdr = (NMHDR FAR *)lParam;

		@@ -509,7 +509,7 @@ static INT_PTR CALLBACK UserSettingProc(HWND hDlg, UINT message, WPARAM wParam,
509	509	}
510	510	break;
511	511	}
512		- return(FALSE);
	512	+ return(FALSE);
513	513	}
514	514
515	515

		@@ -556,7 +556,7 @@ static INT_PTR CALLBACK Trmode1SettingProc(HWND hDlg, UINT message, WPARAM wPara
556	556
557	557	SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(TRMODE_EXT_LIST, 0), 0);
558	558
559		- return(TRUE);
	559	+ return(TRUE);
560	560
561	561	case WM_NOTIFY:
562	562	pnmhdr = (NMHDR FAR *)lParam;

		@@ -613,7 +613,7 @@ static INT_PTR CALLBACK Trmode1SettingProc(HWND hDlg, UINT message, WPARAM wPara
613	613	}
614	614	return(TRUE);
615	615	}
616		- return(FALSE);
	616	+ return(FALSE);
617	617	}
618	618
619	619

		@@ -655,7 +655,7 @@ static INT_PTR CALLBACK Trmode2SettingProc(HWND hDlg, UINT message, WPARAM wPara
655	655	sprintf(Tmp, "%d", TimeOut);
656	656	SendDlgItemMessage(hDlg, TRMODE2_TIMEOUT, WM_SETTEXT, 0, (LPARAM)Tmp);
657	657	SendDlgItemMessage(hDlg, TRMODE2_TIMEOUT_SPN, UDM_SETRANGE, 0, MAKELONG(300, 0));
658		- return(TRUE);
	658	+ return(TRUE);
659	659
660	660	case WM_NOTIFY:
661	661	pnmhdr = (NMHDR FAR *)lParam;

		@@ -690,7 +690,7 @@ static INT_PTR CALLBACK Trmode2SettingProc(HWND hDlg, UINT message, WPARAM wPara
690	690	}
691	691	return(TRUE);
692	692	}
693		- return(FALSE);
	693	+ return(FALSE);
694	694	}
695	695
696	696

		@@ -722,9 +722,9 @@ static INT_PTR CALLBACK Trmode3SettingProc(HWND hDlg, UINT message, WPARAM wPara
722	722	switch (message)
723	723	{
724	724	case WM_INITDIALOG :
725		- Tmp = SendDlgItemMessage(hDlg, TRMODE3_LIST, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
726		- Tmp \|= LVS_EX_FULLROWSELECT;
727		- SendDlgItemMessage(hDlg, TRMODE3_LIST, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
	725	+ Tmp = SendDlgItemMessage(hDlg, TRMODE3_LIST, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
	726	+ Tmp \|= LVS_EX_FULLROWSELECT;
	727	+ SendDlgItemMessage(hDlg, TRMODE3_LIST, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, (LPARAM)Tmp);
728	728
729	729	GetClientRect(GetDlgItem(hDlg, TRMODE3_LIST), &Rect);
730	730

		@@ -756,7 +756,7 @@ static INT_PTR CALLBACK Trmode3SettingProc(HWND hDlg, UINT message, WPARAM wPara
756	756	SendDlgItemMessage(hDlg, TRMODE3_FOLDER_ATTR, EM_LIMITTEXT, (WPARAM)5, 0);
757	757	sprintf(TmpStr, "%03d", FolderAttrNum);
758	758	SendDlgItemMessage(hDlg, TRMODE3_FOLDER_ATTR, WM_SETTEXT, 0, (LPARAM)TmpStr);
759		- return(TRUE);
	759	+ return(TRUE);
760	760
761	761	case WM_NOTIFY:
762	762	pnmhdr = (NMHDR FAR *)lParam;

		@@ -803,7 +803,7 @@ static INT_PTR CALLBACK Trmode3SettingProc(HWND hDlg, UINT message, WPARAM wPara
803	803	}
804	804	return(TRUE);
805	805	}
806		- return(FALSE);
	806	+ return(FALSE);
807	807	}
808	808
809	809

		@@ -826,7 +826,7 @@ static INT_PTR CALLBACK Trmode4SettingProc(HWND hDlg, UINT message, WPARAM wPara
826	826	case WM_INITDIALOG :
827	827	SetRadioButtonByValue(hDlg, AskLocalKanjiCode(), KanjiButton, KANJIBUTTONS);
828	828
829		- return(TRUE);
	829	+ return(TRUE);
830	830
831	831	case WM_NOTIFY:
832	832	pnmhdr = (NMHDR FAR *)lParam;

		@@ -846,7 +846,7 @@ static INT_PTR CALLBACK Trmode4SettingProc(HWND hDlg, UINT message, WPARAM wPara
846	846	}
847	847	break;
848	848	}
849		- return(FALSE);
	849	+ return(FALSE);
850	850	}
851	851
852	852

		@@ -875,7 +875,7 @@ static INT_PTR CALLBACK DefAttrDlgProc(HWND hDlg, UINT message, WPARAM wParam, L
875	875	AttrSet = (ATTRSET *)lParam;
876	876	SendDlgItemMessage(hDlg, DEFATTR_FNAME, EM_LIMITTEXT, (WPARAM)FMAX_PATH, 0);
877	877	SendDlgItemMessage(hDlg, DEFATTR_ATTR, EM_LIMITTEXT, (WPARAM)4, 0);
878		- return(TRUE);
	878	+ return(TRUE);
879	879
880	880	case WM_COMMAND :
881	881	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -898,7 +898,7 @@ static INT_PTR CALLBACK DefAttrDlgProc(HWND hDlg, UINT message, WPARAM wParam, L
898	898	}
899	899	return(TRUE);
900	900	}
901		- return(FALSE);
	901	+ return(FALSE);
902	902	}
903	903
904	904

		@@ -1017,7 +1017,7 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
1017	1017	SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_SETCHECK, MirDownDelNotify, 0);
1018	1018	// ミラーリング設定追加
1019	1019	SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);
1020		- return(TRUE);
	1020	+ return(TRUE);
1021	1021
1022	1022	case WM_NOTIFY:
1023	1023	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1069,7 +1069,7 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
1069	1069	}
1070	1070	return(TRUE);
1071	1071	}
1072		- return(FALSE);
	1072	+ return(FALSE);
1073	1073	}
1074	1074
1075	1075

		@@ -1123,7 +1123,7 @@ static INT_PTR CALLBACK NotifySettingProc(HWND hDlg, UINT message, WPARAM wParam
1123	1123	SetRadioButtonByValue(hDlg, SendMode, UpButton, UPBUTTONS);
1124	1124	SetRadioButtonByValue(hDlg, DclickOpen, DclickButton, DCLICKBUTTONS);
1125	1125	SetRadioButtonByValue(hDlg, MoveMode, MoveButton, MOVEBUTTONS);
1126		- return(TRUE);
	1126	+ return(TRUE);
1127	1127
1128	1128	case WM_NOTIFY:
1129	1129	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1145,7 +1145,7 @@ static INT_PTR CALLBACK NotifySettingProc(HWND hDlg, UINT message, WPARAM wParam
1145	1145	}
1146	1146	break;
1147	1147	}
1148		- return(FALSE);
	1148	+ return(FALSE);
1149	1149	}
1150	1150
1151	1151

		@@ -1181,7 +1181,7 @@ static INT_PTR CALLBACK Disp1SettingProc(HWND hDlg, UINT message, WPARAM wParam,
1181	1181	SendDlgItemMessage(hDlg, DISP_ICON, BM_SETCHECK, DispFileIcon, 0);
1182	1182	// タイムスタンプのバグ修正
1183	1183	SendDlgItemMessage(hDlg, DISP_SECOND, BM_SETCHECK, DispTimeSeconds, 0);
1184		- return(TRUE);
	1184	+ return(TRUE);
1185	1185
1186	1186	case WM_NOTIFY:
1187	1187	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1220,7 +1220,7 @@ static INT_PTR CALLBACK Disp1SettingProc(HWND hDlg, UINT message, WPARAM wParam,
1220	1220	}
1221	1221	return(TRUE);
1222	1222	}
1223		- return(FALSE);
	1223	+ return(FALSE);
1224	1224	}
1225	1225
1226	1226

		@@ -1237,7 +1237,7 @@ static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam,
1237	1237	SendDlgItemMessage(hDlg, DISP2_PERMIT_NUM, BM_SETCHECK, DispPermissionsNumber, 0);
1238	1238	SendDlgItemMessage(hDlg, DISP2_AUTO_REFRESH, BM_SETCHECK, AutoRefreshFileList, 0);
1239	1239	SendDlgItemMessage(hDlg, DISP2_REMOVE_OLD_LOG, BM_SETCHECK, RemoveOldLog, 0);
1240		- return(TRUE);
	1240	+ return(TRUE);
1241	1241
1242	1242	case WM_NOTIFY:
1243	1243	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1258,7 +1258,7 @@ static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam,
1258	1258	}
1259	1259	break;
1260	1260	}
1261		- return(FALSE);
	1261	+ return(FALSE);
1262	1262	}
1263	1263
1264	1264

		@@ -1334,7 +1334,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
1334	1334	SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_SETCHECK, NoRasControl, 0);
1335	1335	// UPnP対応
1336	1336	SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, UPnPEnabled, 0);
1337		- return(TRUE);
	1337	+ return(TRUE);
1338	1338
1339	1339	case WM_NOTIFY:
1340	1340	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1376,7 +1376,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
1376	1376	}
1377	1377	return(TRUE);
1378	1378	}
1379		- return(FALSE);
	1379	+ return(FALSE);
1380	1380	}
1381	1381
1382	1382

		@@ -1464,7 +1464,7 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1464	1464	// FireWall設定追加
1465	1465	SendDlgItemMessage(hDlg, FIRE_SHARED, BM_SETCHECK, FwallNoSaveUser, 0);
1466	1466
1467		- return(TRUE);
	1467	+ return(TRUE);
1468	1468
1469	1469	case WM_NOTIFY:
1470	1470	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1513,7 +1513,7 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1513	1513	}
1514	1514	return(TRUE);
1515	1515	}
1516		- return(FALSE);
	1516	+ return(FALSE);
1517	1517	}
1518	1518
1519	1519

		@@ -1545,7 +1545,7 @@ static INT_PTR CALLBACK ToolSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1545	1545	SendDlgItemMessage(hDlg, TOOL_EDITOR1, WM_SETTEXT, 0, (LPARAM)ViewerName[0]);
1546	1546	SendDlgItemMessage(hDlg, TOOL_EDITOR2, WM_SETTEXT, 0, (LPARAM)ViewerName[1]);
1547	1547	SendDlgItemMessage(hDlg, TOOL_EDITOR3, WM_SETTEXT, 0, (LPARAM)ViewerName[2]);
1548		- return(TRUE);
	1548	+ return(TRUE);
1549	1549
1550	1550	case WM_NOTIFY:
1551	1551	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1594,7 +1594,7 @@ static INT_PTR CALLBACK ToolSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1594	1594	}
1595	1595	return(TRUE);
1596	1596	}
1597		- return(FALSE);
	1597	+ return(FALSE);
1598	1598	}
1599	1599
1600	1600

		@@ -1630,7 +1630,7 @@ static INT_PTR CALLBACK SoundSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1630	1630	SendDlgItemMessage(hDlg, SOUND_CONNECT_WAV, WM_SETTEXT, 0, (LPARAM)Sound[SND_CONNECT].Fname);
1631	1631	SendDlgItemMessage(hDlg, SOUND_TRANS_WAV, WM_SETTEXT, 0, (LPARAM)Sound[SND_TRANS].Fname);
1632	1632	SendDlgItemMessage(hDlg, SOUND_ERROR_WAV, WM_SETTEXT, 0, (LPARAM)Sound[SND_ERROR].Fname);
1633		- return(TRUE);
	1633	+ return(TRUE);
1634	1634
1635	1635	case WM_NOTIFY:
1636	1636	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1697,7 +1697,7 @@ static INT_PTR CALLBACK SoundSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1697	1697	}
1698	1698	return(TRUE);
1699	1699	}
1700		- return(FALSE);
	1700	+ return(FALSE);
1701	1701	}
1702	1702
1703	1703

		@@ -1751,7 +1751,7 @@ static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1751	1751
1752	1752	SendDlgItemMessage(hDlg, MISC_CACHEDIR, EM_LIMITTEXT, (WPARAM)FMAX_PATH, 0);
1753	1753	SendDlgItemMessage(hDlg, MISC_CACHEDIR, WM_SETTEXT, 0, (LPARAM)TmpPath);
1754		- return(TRUE);
	1754	+ return(TRUE);
1755	1755
1756	1756	case WM_NOTIFY:
1757	1757	pnmhdr = (NMHDR FAR *)lParam;

		@@ -1815,7 +1815,7 @@ static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1815	1815	}
1816	1816	return(TRUE);
1817	1817	}
1818		- return(FALSE);
	1818	+ return(FALSE);
1819	1819	}
1820	1820
1821	1821

		@@ -1920,7 +1920,7 @@ static INT_PTR CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1920	1920
1921	1921	SendDlgItemMessage(hDlg, SORT_SAVEHOST, BM_SETCHECK, AskSaveSortToHost(), 0);
1922	1922
1923		- return(TRUE);
	1923	+ return(TRUE);
1924	1924
1925	1925	case WM_COMMAND :
1926	1926	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -1963,7 +1963,7 @@ static INT_PTR CALLBACK SortSettingProc(HWND hDlg, UINT message, WPARAM wParam,
1963	1963	}
1964	1964	return(TRUE);
1965	1965	}
1966		- return(FALSE);
	1966	+ return(FALSE);
1967	1967	}
1968	1968
1969	1969

		@@ -1992,7 +1992,7 @@ static INT_PTR CALLBACK UpdatesSettingProc(HWND hDlg, UINT message, WPARAM wPara
1992	1992	EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL), FALSE);
1993	1993	EnableWindow(GetDlgItem(hDlg, UPDATES_INTERVAL_SPN), FALSE);
1994	1994	}
1995		- return(TRUE);
	1995	+ return(TRUE);
1996	1996
1997	1997	case WM_NOTIFY:
1998	1998	pnmhdr = (NMHDR FAR *)lParam;

		@@ -2034,7 +2034,7 @@ static INT_PTR CALLBACK UpdatesSettingProc(HWND hDlg, UINT message, WPARAM wPara
2034	2034	}
2035	2035	return(TRUE);
2036	2036	}
2037		- return(FALSE);
	2037	+ return(FALSE);
2038	2038	}
2039	2039
2040	2040	/*----- ダイアログのコントロールから１０進数を取得 ----------------------------

--- a/ras.c

+++ b/ras.c

		@@ -218,9 +218,9 @@ static int GetCurConnections(RASCONN **Buf)
218	218	RasConn->dwSize = sizeof(RASCONN);
219	219	Sts = (*m_RasEnumConnections)(RasConn, &Size, &Num);
220	220	if((Sts == ERROR_BUFFER_TOO_SMALL) \|\| (Sts == ERROR_NOT_ENOUGH_MEMORY))
221		- {
	221	+ {
222	222	if((Tmp = realloc(RasConn, Size)) != NULL)
223		- {
	223	+ {
224	224	RasConn = Tmp;
225	225	Sts = (*m_RasEnumConnections)(RasConn, &Size, &Num);
226	226	}

		@@ -358,7 +358,7 @@ int SetRasEntryToComboBox(HWND hDlg, int Item, char *CurName)
358	358	if((Sts == ERROR_BUFFER_TOO_SMALL) \|\| (Sts == ERROR_NOT_ENOUGH_MEMORY))
359	359	{
360	360	if((Tmp = realloc(Entry, Size)) != NULL)
361		- {
	361	+ {
362	362	Entry = Tmp;
363	363	Sts = (*m_RasEnumEntries)(NULL, NULL, Entry, &Size, &Num);
364	364	}

		@@ -521,8 +521,8 @@ static BOOL CALLBACK DialCallBackProc(HWND hDlg, UINT message, WPARAM wParam, LP
521	521	SendMessage(hDlg, WM_SETTEXT, 0, (LPARAM)Tmp);
522	522	Sts = (*m_RasDial)(NULL, NULL, Param, 0, &RasDialFunc, &hRasConn);
523	523	if(Sts != 0)
524		- EndDialog(hDlg, NO);
525		- return(TRUE);
	524	+ EndDialog(hDlg, NO);
	525	+ return(TRUE);
526	526
527	527	case WM_COMMAND :
528	528	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -591,58 +591,58 @@ static VOID WINAPI RasDialFunc(UINT unMsg, RASCONNSTATE rasconnstate, DWORD dwEr
591	591
592	592	static void MakeRasConnMsg(char Phone, RASCONNSTATE rasconn, char Buf)
593	593	{
594		- switch( rasconn )
595		- {
596		- case RASCS_OpenPort:
597		- strcpy(Buf, MSGJPN226);
	594	+ switch( rasconn )
	595	+ {
	596	+ case RASCS_OpenPort:
	597	+ strcpy(Buf, MSGJPN226);
598	598	break;
599		- case RASCS_PortOpened:
600		- strcpy(Buf, MSGJPN227);
	599	+ case RASCS_PortOpened:
	600	+ strcpy(Buf, MSGJPN227);
601	601	break;
602		- case RASCS_ConnectDevice:
603		- sprintf(Buf, MSGJPN228);
	602	+ case RASCS_ConnectDevice:
	603	+ sprintf(Buf, MSGJPN228);
604	604	break;
605		- case RASCS_DeviceConnected:
606		- strcpy(Buf, MSGJPN229);
	605	+ case RASCS_DeviceConnected:
	606	+ strcpy(Buf, MSGJPN229);
607	607	break;
608		- case RASCS_AllDevicesConnected:
609		- strcpy(Buf, MSGJPN230);
	608	+ case RASCS_AllDevicesConnected:
	609	+ strcpy(Buf, MSGJPN230);
610	610	break;
611		- case RASCS_Authenticate:
612		- case RASCS_AuthNotify:
613		- strcpy(Buf, MSGJPN231);
	611	+ case RASCS_Authenticate:
	612	+ case RASCS_AuthNotify:
	613	+ strcpy(Buf, MSGJPN231);
614	614	break;
615		- case RASCS_AuthRetry:
616		- case RASCS_ReAuthenticate:
617		- strcpy(Buf, MSGJPN232);
	615	+ case RASCS_AuthRetry:
	616	+ case RASCS_ReAuthenticate:
	617	+ strcpy(Buf, MSGJPN232);
618	618	break;
619		- case RASCS_AuthChangePassword:
620		- strcpy(Buf, MSGJPN233);
	619	+ case RASCS_AuthChangePassword:
	620	+ strcpy(Buf, MSGJPN233);
621	621	break;
622		- case RASCS_Authenticated:
623		- strcpy(Buf, MSGJPN234);
	622	+ case RASCS_Authenticated:
	623	+ strcpy(Buf, MSGJPN234);
624	624	break;
625		- case RASCS_Connected:
626		- strcpy(Buf, MSGJPN235);
	625	+ case RASCS_Connected:
	626	+ strcpy(Buf, MSGJPN235);
627	627	break;
628		- case RASCS_Disconnected:
629		- strcpy(Buf, MSGJPN236);
	628	+ case RASCS_Disconnected:
	629	+ strcpy(Buf, MSGJPN236);
630	630	break;
631		- case RASCS_AuthCallback:
632		- case RASCS_PrepareForCallback:
633		- case RASCS_WaitForModemReset:
634		- case RASCS_WaitForCallback:
635		- case RASCS_Interactive:
636		- case RASCS_RetryAuthentication:
637		- case RASCS_CallbackSetByCaller:
638		- case RASCS_PasswordExpired:
639		- case RASCS_AuthProject:
640		- case RASCS_AuthLinkSpeed:
641		- case RASCS_AuthAck:
642		- default:
643		- strcpy(Buf, MSGJPN237);
	631	+ case RASCS_AuthCallback:
	632	+ case RASCS_PrepareForCallback:
	633	+ case RASCS_WaitForModemReset:
	634	+ case RASCS_WaitForCallback:
	635	+ case RASCS_Interactive:
	636	+ case RASCS_RetryAuthentication:
	637	+ case RASCS_CallbackSetByCaller:
	638	+ case RASCS_PasswordExpired:
	639	+ case RASCS_AuthProject:
	640	+ case RASCS_AuthLinkSpeed:
	641	+ case RASCS_AuthAck:
	642	+ default:
	643	+ strcpy(Buf, MSGJPN237);
644	644	break;
645		- }
	645	+ }
646	646	return;
647	647	}
648	648

		@@ -674,7 +674,7 @@ static BOOL CALLBACK DialPassCallBackProc(HWND hDlg, UINT message, WPARAM wParam
674	674	SendDlgItemMessage(hDlg, RASPASS_PASS, EM_LIMITTEXT, PWLEN, 0);
675	675	SendDlgItemMessage(hDlg, RASPASS_USER, WM_SETTEXT, 0, (LPARAM)Param->szUserName);
676	676	SendDlgItemMessage(hDlg, RASPASS_PASS, WM_SETTEXT, 0, (LPARAM)Param->szPassword);
677		- return(TRUE);
	677	+ return(TRUE);
678	678
679	679	case WM_COMMAND :
680	680	switch(GET_WM_COMMAND_ID(wParam, lParam))

--- a/registry.c

+++ b/registry.c

		@@ -2340,11 +2340,11 @@ static int CreateAesKey(unsigned char AesKey, const char Key)
2340	2340
2341	2341	strcpy(HashKey, Key);
2342	2342	strcat(HashKey, ">g^r=@N7=//z<[`:");
2343		- sha_memory((uchar *)HashKey, HashKeyLen, results);
	2343	+ sha_memory((uchar *)HashKey, HashKeyLen, results);
2344	2344
2345	2345	strcpy(HashKey, Key);
2346	2346	strcat(HashKey, "VG77dO1#EyC]$\|C@");
2347		- sha_memory((uchar *)HashKey, HashKeyLen, results + 5);
	2347	+ sha_memory((uchar *)HashKey, HashKeyLen, results + 5);
2348	2348
2349	2349	KeyIndex = 0;
2350	2350	ResIndex = 0;

--- a/remote.c

+++ b/remote.c

		@@ -494,8 +494,8 @@ int DoMDTM(SOCKET cSkt, char Path, FILETIME Time, int *CancelCheckWork)
494	494	char Tmp[1024];
495	495	SYSTEMTIME sTime;
496	496
497		- Time->dwLowDateTime = 0;
498		- Time->dwHighDateTime = 0;
	497	+ Time->dwLowDateTime = 0;
	498	+ Time->dwHighDateTime = 0;
499	499
500	500	// 同時接続対応
501	501	// ホスト側の日時取得

--- a/skey.c

+++ b/skey.c

		@@ -353,10 +353,10 @@ static int keycrunch(char result, char seed, char *passwd, int Type)
353	353	}
354	354	else
355	355	{
356		- sha_memory((uchar *)buf, buflen, results);
357		- results [0] ^= results [2];
358		- results [1] ^= results [3];
359		- results [0] ^= results [4];
	356	+ sha_memory((uchar *)buf, buflen, results);
	357	+ results [0] ^= results [2];
	358	+ results [1] ^= results [3];
	359	+ results [0] ^= results [4];
360	360	}
361	361	free(buf);
362	362

		@@ -392,10 +392,10 @@ static void secure_hash(char *x, int Type)
392	392	}
393	393	else
394	394	{
395		- sha_memory((uchar *)x, 8, results);
396		- results [0] ^= results [2];
397		- results [1] ^= results [3];
398		- results [0] ^= results [4];
	395	+ sha_memory((uchar *)x, 8, results);
	396	+ results [0] ^= results [2];
	397	+ results [1] ^= results [3];
	398	+ results [0] ^= results [4];
399	399	}
400	400
401	401	/* Only works on byte-addressed little-endian machines!! */

--- a/socket.c

+++ b/socket.c

		@@ -314,7 +314,7 @@ static LRESULT CALLBACK SocketWndProc(HWND hWnd, UINT message, WPARAM wParam, LP
314	314	default :
315	315	return(DefWindowProc(hWnd, message, wParam, lParam));
316	316	}
317		- return(0);
	317	+ return(0);
318	318	}
319	319
320	320

--- a/tool.c

+++ b/tool.c

		@@ -112,7 +112,7 @@ static INT_PTR CALLBACK OtpCalcWinProc(HWND hDlg, UINT message, WPARAM wParam, L
112	112	SendDlgItemMessage(hDlg, OTPCALC_KEY, EM_LIMITTEXT, 40, 0);
113	113	SendDlgItemMessage(hDlg, OTPCALC_PASS, EM_LIMITTEXT, PASSWORD_LEN, 0);
114	114	SetRadioButtonByValue(hDlg, MD4, AlgoButton, ALGOBUTTONS);
115		- return(TRUE);
	115	+ return(TRUE);
116	116
117	117	case WM_COMMAND :
118	118	switch(GET_WM_COMMAND_ID(wParam, lParam))

		@@ -158,7 +158,7 @@ static INT_PTR CALLBACK OtpCalcWinProc(HWND hDlg, UINT message, WPARAM wParam, L
158	158	}
159	159	return(TRUE);
160	160	}
161		- return(FALSE);
	161	+ return(FALSE);
162	162	}
163	163
164	164

--- a/toolmenu.c

+++ b/toolmenu.c

		@@ -532,7 +532,7 @@ static LRESULT CALLBACK HistEditBoxWndProc(HWND hWnd, UINT message, WPARAM wPara
532	532	default :
533	533	return(CallWindowProc(HistEditBoxProcPtr, hWnd, message, wParam, lParam));
534	534	}
535		- return(0L);
	535	+ return(0L);
536	536	}
537	537
538	538

--- a/updater.c

+++ b/updater.c

		@@ -89,33 +89,30 @@ BOOL ReadFileViaHTTPW(void* pOut, DWORD Length, DWORD* pLength, LPCWSTR UserAgen
89	89	}
90	90	else if(WinHttpGetIEProxyConfigForCurrentUser(&ProxyConfig))
91	91	{
92		- if(!ProxyConfig.fAutoDetect)
	92	+ if(ProxyConfig.lpszAutoConfigUrl)
93	93	{
94		- if(ProxyConfig.lpszAutoConfigUrl)
95		- {
96		- memset(&AutoProxyOptions, 0, sizeof(WINHTTP_AUTOPROXY_OPTIONS));
97		- AutoProxyOptions.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
98		- AutoProxyOptions.lpszAutoConfigUrl = ProxyConfig.lpszAutoConfigUrl;
99		- AutoProxyOptions.fAutoLogonIfChallenged = TRUE;
100		- memset(&ProxyInfo, 0, sizeof(WINHTTP_PROXY_INFO));
101		- if(WinHttpGetProxyForUrl(hSession, Url, &AutoProxyOptions, &ProxyInfo))
102		- {
103		- WinHttpSetOption(hRequest, WINHTTP_OPTION_PROXY, &ProxyInfo, sizeof(WINHTTP_PROXY_INFO));
104		- if(ProxyInfo.lpszProxy)
105		- GlobalFree(ProxyInfo.lpszProxy);
106		- if(ProxyInfo.lpszProxyBypass)
107		- GlobalFree(ProxyInfo.lpszProxyBypass);
108		- }
109		- }
110		- else
	94	+ memset(&AutoProxyOptions, 0, sizeof(WINHTTP_AUTOPROXY_OPTIONS));
	95	+ AutoProxyOptions.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
	96	+ AutoProxyOptions.lpszAutoConfigUrl = ProxyConfig.lpszAutoConfigUrl;
	97	+ AutoProxyOptions.fAutoLogonIfChallenged = TRUE;
	98	+ memset(&ProxyInfo, 0, sizeof(WINHTTP_PROXY_INFO));
	99	+ if(WinHttpGetProxyForUrl(hSession, Url, &AutoProxyOptions, &ProxyInfo))
111	100	{
112		- memset(&ProxyInfo, 0, sizeof(WINHTTP_PROXY_INFO));
113		- ProxyInfo.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
114		- ProxyInfo.lpszProxy = ProxyConfig.lpszProxy;
115		- ProxyInfo.lpszProxyBypass = ProxyConfig.lpszProxyBypass;
116	101	WinHttpSetOption(hRequest, WINHTTP_OPTION_PROXY, &ProxyInfo, sizeof(WINHTTP_PROXY_INFO));
	102	+ if(ProxyInfo.lpszProxy)
	103	+ GlobalFree(ProxyInfo.lpszProxy);
	104	+ if(ProxyInfo.lpszProxyBypass)
	105	+ GlobalFree(ProxyInfo.lpszProxyBypass);
117	106	}
118	107	}
	108	+ else if(ProxyConfig.lpszProxy)
	109	+ {
	110	+ memset(&ProxyInfo, 0, sizeof(WINHTTP_PROXY_INFO));
	111	+ ProxyInfo.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
	112	+ ProxyInfo.lpszProxy = ProxyConfig.lpszProxy;
	113	+ ProxyInfo.lpszProxyBypass = ProxyConfig.lpszProxyBypass;
	114	+ WinHttpSetOption(hRequest, WINHTTP_OPTION_PROXY, &ProxyInfo, sizeof(WINHTTP_PROXY_INFO));
	115	+ }
119	116	if(ProxyConfig.lpszAutoConfigUrl)
120	117	GlobalFree(ProxyConfig.lpszAutoConfigUrl);
121	118	if(ProxyConfig.lpszProxy)

ffftp.http://sabah.net/ Fork

提交

標籤

Frequently used words (click to add to your profile)

Commit MetaInfo

Log Message

Change Summary

差異

ffftp.http://sabah.net/
Fork