This version is stable.

[ffftp/ffftp.git] / hostman.c

diff --git a/hostman.c b/hostman.c
index 8b590b9..b1e0343 100644 (file)
--- a/hostman.c
+++ b/hostman.c
@@ -69,6 +69,8 @@ static BOOL CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
 // 暗号化通信対応\r
 static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+// 同時接続対応\r
+static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
 \r
 /*===== 外部参照 =====*/\r
 \r
@@ -1025,6 +1027,8 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
                Set->UseFTPES = Pos->Set.UseFTPES;\r
                Set->UseFTPIS = Pos->Set.UseFTPIS;\r
                Set->UseSFTP = Pos->Set.UseSFTP;\r
+               // 同時接続対応\r
+               Set->MaxThreadCount = Pos->Set.MaxThreadCount;\r
                Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
@@ -1303,6 +1307,8 @@ void CopyDefaultHost(HOSTDATA *Set)
        Set->UseFTPES = YES;\r
        Set->UseFTPIS = YES;\r
        Set->UseSFTP = YES;\r
+       // 同時接続対応\r
+       Set->MaxThreadCount = 1;\r
        return;\r
 }\r
 \r
@@ -1514,9 +1520,10 @@ void ImportFromWSFTP(void)
 \r
 static int DispHostSetDlg(HWND hDlg)\r
 {\r
-// SFTP、FTPES、FTPIS対応\r
+       // SFTP、FTPES、FTPIS対応\r
+       // 同時接続対応\r
 //     PROPSHEETPAGE psp[5];\r
-       PROPSHEETPAGE psp[6];\r
+       PROPSHEETPAGE psp[7];\r
        PROPSHEETHEADER psh;\r
 \r
        psp[0].dwSize = sizeof(PROPSHEETPAGE);\r
@@ -1569,7 +1576,7 @@ static int DispHostSetDlg(HWND hDlg)
        psp[4].lParam = 0;\r
        psp[4].pfnCallback = NULL;\r
 \r
-// SFTP、FTPES、FTPIS対応\r
+       // SFTP、FTPES、FTPIS対応\r
        psp[5].dwSize = sizeof(PROPSHEETPAGE);\r
        psp[5].dwFlags = PSP_USETITLE | PSP_HASHELP;\r
        psp[5].hInstance = GetFtpInst();\r
@@ -1580,6 +1587,17 @@ static int DispHostSetDlg(HWND hDlg)
        psp[5].lParam = 0;\r
        psp[5].pfnCallback = NULL;\r
 \r
+       // 同時接続対応\r
+       psp[6].dwSize = sizeof(PROPSHEETPAGE);\r
+       psp[6].dwFlags = PSP_USETITLE | PSP_HASHELP;\r
+       psp[6].hInstance = GetFtpInst();\r
+       psp[6].pszTemplate = MAKEINTRESOURCE(hset_adv3_dlg);\r
+       psp[6].pszIcon = NULL;\r
+       psp[6].pfnDlgProc = Adv3SettingProc;\r
+       psp[6].pszTitle = MSGJPN320;\r
+       psp[6].lParam = 0;\r
+       psp[6].pfnCallback = NULL;\r
+\r
        psh.dwSize = sizeof(PROPSHEETHEADER);\r
        psh.dwFlags = PSH_HASHELP | PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE;\r
        psh.hwndParent = hDlg;\r
@@ -2159,4 +2177,39 @@ static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
        return(FALSE);\r
 }\r
 \r
+// 同時接続対応\r
+static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+{\r
+       NMHDR *pnmhdr;\r
+       int Num;\r
+\r
+       switch (iMessage)\r
+       {\r
+               case WM_INITDIALOG :\r
+                       SendDlgItemMessage(hDlg, HSET_THREAD_COUNT, EM_LIMITTEXT, (WPARAM)1, 0);\r
+                       SetDecimalText(hDlg, HSET_THREAD_COUNT, TmpHost.MaxThreadCount);\r
+                       SendDlgItemMessage(hDlg, HSET_THREAD_COUNT_SPN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(MAX_DATA_CONNECTION, 1));\r
+                       return(TRUE);\r
+\r
+               case WM_NOTIFY:\r
+                       pnmhdr = (NMHDR FAR *)lParam;\r
+                       switch(pnmhdr->code)\r
+                       {\r
+                               case PSN_APPLY :\r
+                                       TmpHost.MaxThreadCount = GetDecimalText(hDlg, HSET_THREAD_COUNT);\r
+                                       CheckRange2(&TmpHost.MaxThreadCount, MAX_DATA_CONNECTION, 1);\r
+                                       Apply = YES;\r
+                                       break;\r
+\r
+                               case PSN_RESET :\r
+                                       break;\r
+\r
+                               case PSN_HELP :\r
+                                       hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000066);\r
+                                       break;\r
+                       }\r
+                       break;\r
+       }\r
+       return(FALSE);\r
+}\r
 \r