Commit: 97d837ae7875002eed1b1a6993f51e3eaf0933d5 - Osdn (git)

Loweynet

Commit MetaInfo

• Revisão: 97d837ae7875002eed1b1a6993f51e3eaf0933d5 (tree)
• Hora: 2018-01-01 16:59:31
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Add options to add Zone Identifier to downloaded files.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/ffftp.rc
• modified: Resource_eng/resource.h
• modified: src/common.h
• modified: src/ftpproc.c
• modified: src/getput.c
• modified: src/main.c
• modified: src/option.c
• modified: src/registry.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
@@ -1461,6 +1461,7 @@ BEGIN
     CONTROL         "EUC",TRMODE4_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10
     CONTROL         "UTF-8",TRMODE4_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10
     CONTROL         "UTF-8 BOM",TRMODE4_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,69,81,10
+    CONTROL         "ƒCƒ“ƒ^[ƒlƒbƒg‚©‚ç“üŽè‚µ‚½‚à‚Ì‚Æ‚µ‚ătƒ@ƒCƒ‹‚ɏî•ñ‚ð•t‰Á‚·‚é(&I)",TRMODE4_MARK_INTERNET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,196,10
 END
 
 opt_disp2_dlg DIALOG  0, 0, 211, 155

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -474,6 +474,7 @@
 #define TRMODE_LISTERROR                1228
 #define MIRROR_NO_TRANSFER              1229
 #define HSET_NO_PASV_ADRS               1230
+#define TRMODE4_MARK_INTERNET           1231
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -667,7 +668,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        200
 #define _APS_NEXT_COMMAND_VALUE         40183
-#define _APS_NEXT_CONTROL_VALUE         1231
+#define _APS_NEXT_CONTROL_VALUE         1232
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -1502,6 +1502,7 @@ BEGIN
     CONTROL         "EUC",TRMODE4_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10
     CONTROL         "UTF-8",TRMODE4_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10
     CONTROL         "UTF-8 BOM",TRMODE4_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,69,81,10
+    CONTROL         "Add information to files as obtained from the &Internet",TRMODE4_MARK_INTERNET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,196,10
 END
 
 opt_disp2_dlg DIALOG  0, 0, 211, 155

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -474,6 +474,7 @@
 #define TRMODE_LISTERROR                1228
 #define MIRROR_NO_TRANSFER              1229
 #define HSET_NO_PASV_ADRS               1230
+#define TRMODE4_MARK_INTERNET           1231
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -667,7 +668,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        200
 #define _APS_NEXT_COMMAND_VALUE         40183
-#define _APS_NEXT_CONTROL_VALUE         1231
+#define _APS_NEXT_CONTROL_VALUE         1232
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/src/common.h
+++ b/src/common.h
@@ -128,6 +128,9 @@
 // 同時接続対応
 #define WM_RECONNECTSOCKET	(WM_USER+11)
 
+// ゾーンID設定追加
+#define WM_MARKFILEASDOWNLOADEDFROMINTERNET	(WM_USER+12)
+
 /*===== ホスト番号 =====*/
 /* ホスト番号は 0～ の値を取る */
 
@@ -1386,6 +1389,14 @@ typedef struct
 	int Port;
 } REMOVEPORTMAPPINGDATA;
 
+// ゾーンID設定追加
+typedef struct
+{
+	int r;
+	HANDLE h;
+	char* Fname;
+} MARKFILEASDOWNLOADEDFROMINTERNETDATA;
+
 /*=================================================
 *		プロトタイプ
 *=================================================*/
@@ -1794,6 +1805,11 @@ int CheckPathViolation(TRANSPACKET *packet);
 LONGLONG AskTransferSizeLeft(void);
 LONGLONG AskTransferSizeTotal(void);
 int AskTransferErrorDisplay(void);
+// ゾーンID設定追加
+int LoadZoneID();
+void FreeZoneID();
+int IsZoneIDLoaded();
+int MarkFileAsDownloadedFromInternet(char* Fname);
 
 /*===== codecnv.c =====*/
 

--- a/src/ftpproc.c
+++ b/src/ftpproc.c
@@ -113,7 +113,7 @@ extern int MakeAllDir;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
 // ミラーリング設定追加
-extern int MirrorNoTransferContents; 
+extern int MirrorNoTransferContents;
 // タイムスタンプのバグ修正
 extern int DispTimeSeconds;
 

--- a/src/getput.c
+++ b/src/getput.c
@@ -41,6 +41,9 @@
 #include <string.h>
 #include <mbstring.h>
 #include <time.h>
+// ゾーンID設定追加
+#undef _WIN32_IE
+#define _WIN32_IE _WIN32_IE_IE60SP2
 // IPv6対応
 //#include <winsock.h>
 #include <winsock2.h>
@@ -176,6 +179,9 @@ static int TransferErrorNotify = NO;
 static LONGLONG TransferSizeLeft = 0;
 static LONGLONG TransferSizeTotal = 0;
 static int TransferErrorDisplay = 0;
+// ゾーンID設定追加
+IZoneIdentifier* pZoneIdentifier;
+IPersistFile* pPersistFile;
 
 /*===== 外部参照 =====*/
 
@@ -192,6 +198,8 @@ extern int FolderAttrNum;
 extern int SendQuit;
 // 自動切断対策
 extern time_t LastDataConnectionTime;
+// ゾーンID設定追加
+extern int MarkAsInternet;
 
 
 /*----- ファイル転送スレッドを起動する ----------------------------------------
@@ -959,9 +967,12 @@ static ULONG WINAPI TransferThread(void *Dummy)
 						// ミラーリング設定追加
 						if(Pos->NoTransfer == NO)
 						{
-								Sts = DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]) / 100;
-								if(Sts != FTP_COMPLETE)
-									LastError = YES;
+							Sts = DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]) / 100;
+							if(Sts != FTP_COMPLETE)
+								LastError = YES;
+							// ゾーンID設定追加
+							if(MarkAsInternet == YES && IsZoneIDLoaded() == YES)
+								MarkFileAsDownloadedFromInternet(Pos->LocalFile);
 						}
 
 						// ミラーリング設定追加
@@ -993,9 +1004,9 @@ static ULONG WINAPI TransferThread(void *Dummy)
 					// ミラーリング設定追加
 					if(Pos->NoTransfer == NO)
 					{
-							Sts = DoUpload(TrnSkt, Pos) / 100;
-							if(Sts != FTP_COMPLETE)
-								LastError = YES;
+						Sts = DoUpload(TrnSkt, Pos) / 100;
+						if(Sts != FTP_COMPLETE)
+							LastError = YES;
 					}
 
 					// ホスト側の日時設定
@@ -4527,3 +4538,77 @@ int AskTransferErrorDisplay(void)
 	return(TransferErrorDisplay);
 }
 
+// ゾーンID設定追加
+int LoadZoneID()
+{
+	int Sts;
+	Sts = FFFTP_FAIL;
+	if(IsMainThread())
+	{
+		if(CoCreateInstance(&CLSID_PersistentZoneIdentifier, NULL, CLSCTX_ALL, &IID_IZoneIdentifier, (void**)&pZoneIdentifier) == S_OK)
+		{
+			if(pZoneIdentifier->lpVtbl->SetId(pZoneIdentifier, URLZONE_INTERNET) == S_OK)
+			{
+				if(pZoneIdentifier->lpVtbl->QueryInterface(pZoneIdentifier, &IID_IPersistFile, (void**)&pPersistFile) == S_OK)
+					Sts = FFFTP_SUCCESS;
+			}
+		}
+	}
+	return Sts;
+}
+
+void FreeZoneID()
+{
+	if(IsMainThread())
+	{
+		if(pPersistFile != NULL)
+			pPersistFile->lpVtbl->Release(pPersistFile);
+		pPersistFile = NULL;
+		if(pZoneIdentifier != NULL)
+			pZoneIdentifier->lpVtbl->Release(pZoneIdentifier);
+		pZoneIdentifier = NULL;
+	}
+}
+
+int IsZoneIDLoaded()
+{
+	int Sts;
+	Sts = NO;
+	if(pZoneIdentifier != NULL && pPersistFile != NULL)
+		Sts = YES;
+	return Sts;
+}
+
+int MarkFileAsDownloadedFromInternet(char* Fname)
+{
+	int Sts;
+	WCHAR Tmp1[FMAX_PATH+1];
+	BSTR Tmp2;
+	MARKFILEASDOWNLOADEDFROMINTERNETDATA Data;
+	Sts = FFFTP_FAIL;
+	if(IsMainThread())
+	{
+		MtoW(Tmp1, FMAX_PATH, Fname, -1);
+		if((Tmp2 = SysAllocString(Tmp1)) != NULL)
+		{
+			if(pPersistFile->lpVtbl->Save(pPersistFile, Tmp2, FALSE) == S_OK)
+				Sts = FFFTP_SUCCESS;
+			SysFreeString(Tmp2);
+		}
+	}
+	else
+	{
+		if(Data.h = CreateEvent(NULL, TRUE, FALSE, NULL))
+		{
+			Data.Fname = Fname;
+			if(PostMessage(GetMainHwnd(), WM_MARKFILEASDOWNLOADEDFROMINTERNET, 0, (LPARAM)&Data))
+			{
+				if(WaitForSingleObject(Data.h, INFINITE) == WAIT_OBJECT_0)
+					Sts = Data.r;
+			}
+			CloseHandle(Data.h);
+		}
+	}
+	return Sts;
+}
+

--- a/src/main.c
+++ b/src/main.c
@@ -294,6 +294,8 @@ int AbortOnListError = YES;
 int MirrorNoTransferContents = NO; 
 // FireWall設定追加
 int FwallNoSaveUser = NO; 
+// ゾーンID設定追加
+int MarkAsInternet = NO; 
 
 
 
@@ -416,6 +418,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 	LoadUPnP();
 	// タスクバー進捗表示
 	LoadTaskbarList3();
+	// ゾーンID設定追加
+	LoadZoneID();
 
 	// UTF-8対応
 	LoadUnicodeNormalizationDll();
@@ -524,6 +528,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 #ifdef USE_OPENSSL
 	FreeOpenSSL();
 #endif
+	// ゾーンID設定追加
+	FreeZoneID();
 	// タスクバー進捗表示
 	FreeTaskbarList3();
 	// UPnP対応
@@ -2117,6 +2123,12 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 			ReconnectProc();
 			break;
 
+		// ゾーンID設定追加
+		case WM_MARKFILEASDOWNLOADEDFROMINTERNET :
+			((MARKFILEASDOWNLOADEDFROMINTERNETDATA*)lParam)->r = MarkFileAsDownloadedFromInternet(((MARKFILEASDOWNLOADEDFROMINTERNETDATA*)lParam)->Fname);
+			SetEvent(((MARKFILEASDOWNLOADEDFROMINTERNETDATA*)lParam)->h);
+			break;
+
 		case WM_PAINT :
 			BeginPaint(hWnd, (LPPAINTSTRUCT) &ps);
 			EndPaint(hWnd, (LPPAINTSTRUCT) &ps);
@@ -2746,6 +2758,9 @@ void DoubleClickProc(int Win, int Mode, int App)
 									// 同時接続対応
 									CancelFlg = NO;
 									Sts = DoDownload(AskCmdCtrlSkt(), &MainTransPkt, NO, &CancelFlg);
+									// ゾーンID設定追加
+									if(MarkAsInternet == YES && IsZoneIDLoaded() == YES)
+										MarkFileAsDownloadedFromInternet(Remote);
 //								}
 							}
 

--- a/src/option.c
+++ b/src/option.c
@@ -195,9 +195,11 @@ extern int AutoCheckForUptatesInterval;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
 // ミラーリング設定追加
-extern int MirrorNoTransferContents; 
+extern int MirrorNoTransferContents;
 // FireWall設定追加
-extern int FwallNoSaveUser; 
+extern int FwallNoSaveUser;
+// ゾーンID設定追加
+extern int MarkAsInternet;
 
 
 /*----- オプションのプロパティシート ------------------------------------------
@@ -825,6 +827,14 @@ static INT_PTR CALLBACK Trmode4SettingProc(HWND hDlg, UINT message, WPARAM wPara
 	{
 		case WM_INITDIALOG :
 			SetRadioButtonByValue(hDlg, AskLocalKanjiCode(), KanjiButton, KANJIBUTTONS);
+			// ゾーンID設定追加
+			if(IsZoneIDLoaded())
+				SendDlgItemMessage(hDlg, TRMODE4_MARK_INTERNET, BM_SETCHECK, MarkAsInternet, 0);
+			else
+			{
+				SendDlgItemMessage(hDlg, TRMODE4_MARK_INTERNET, BM_SETCHECK, BST_UNCHECKED, 0);
+				EnableWindow(GetDlgItem(hDlg, TRMODE4_MARK_INTERNET), FALSE);
+			}
 
 			return(TRUE);
 
@@ -835,6 +845,9 @@ static INT_PTR CALLBACK Trmode4SettingProc(HWND hDlg, UINT message, WPARAM wPara
 				case PSN_APPLY :
 					SetLocalKanjiCodeImm(AskRadioButtonValue(hDlg, KanjiButton, KANJIBUTTONS));
 					SaveLocalKanjiCode();
+					// ゾーンID設定追加
+					if(IsZoneIDLoaded())
+						MarkAsInternet = SendDlgItemMessage(hDlg, TRMODE4_MARK_INTERNET, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/src/registry.c
+++ b/src/registry.c
@@ -240,9 +240,11 @@ extern time_t LastAutoCheckForUpdates;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
 // ミラーリング設定追加
-extern int MirrorNoTransferContents; 
+extern int MirrorNoTransferContents;
 // FireWall設定追加
-extern int FwallNoSaveUser; 
+extern int FwallNoSaveUser;
+// ゾーンID設定追加
+extern int MarkAsInternet;
 
 /*----- マスタパスワードの設定 ----------------------------------------------
 *
@@ -865,6 +867,8 @@ void SaveRegistry(void)
 				WriteIntValueToReg(hKey4, "MirNoTransfer", MirrorNoTransferContents);
 				// FireWall設定追加
 				WriteIntValueToReg(hKey4, "FwallShared", FwallNoSaveUser);
+				// ゾーンID設定追加
+				WriteIntValueToReg(hKey4, "MarkDFile", MarkAsInternet);
 			}
 			CloseSubKey(hKey4);
 		}
@@ -1462,6 +1466,8 @@ int LoadRegistry(void)
 			ReadIntValueFromReg(hKey4, "MirNoTransfer", &MirrorNoTransferContents);
 			// FireWall設定追加
 			ReadIntValueFromReg(hKey4, "FwallShared", &FwallNoSaveUser);
+			// ゾーンID設定追加
+			ReadIntValueFromReg(hKey4, "MarkDFile", &MarkAsInternet);
 
 			CloseSubKey(hKey4);
 		}