Fix the update of OpenSSL.

[ffftp/ffftp.git] / hostman.c

diff --git a/hostman.c b/hostman.c
index 0249d1a..996b7e7 100644 (file)
--- a/hostman.c
+++ b/hostman.c
@@ -127,7 +127,7 @@ int SelectHost(int Type)
 \r
        /* ホスト設定を保存 */\r
        SetNodeLevelAll();\r
-       SaveRegistory();\r
+       SaveRegistry();\r
 \r
        return(Sts);\r
 }\r
@@ -319,8 +319,11 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
                                                CurrentHost = Item.lParam;\r
                                                Level1 = IsNodeGroup(CurrentHost);\r
 \r
-                                               if(((Level1 == YES) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(groupdel_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)) ||\r
-                                                  ((Level1 == NO) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(hostdel_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)))\r
+                                               // バグ修正\r
+//                                             if(((Level1 == YES) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(groupdel_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)) ||\r
+//                                                ((Level1 == NO) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(hostdel_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)))\r
+                                               if(((Level1 == YES) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(groupdel_dlg), hDlg, ExeEscDialogProc) == YES)) ||\r
+                                                  ((Level1 == NO) && (DialogBox(GetFtpInst(), MAKEINTRESOURCE(hostdel_dlg), hDlg, ExeEscDialogProc) == YES)))\r
                                                {\r
                                                        DelHostFromList(CurrentHost);\r
                                                        if(CurrentHost >= Hosts)\r
@@ -1060,6 +1063,8 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
                // 再転送対応\r
                Set->TransferErrorMode = Pos->Set.TransferErrorMode;\r
                Set->TransferErrorNotify = Pos->Set.TransferErrorNotify;\r
+               // セッションあたりの転送量制限対策\r
+               Set->TransferErrorReconnect = Pos->Set.TransferErrorReconnect;\r
                Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
@@ -1344,7 +1349,7 @@ void CopyDefaultHost(HOSTDATA *Set)
        strcpy(Set->PrivateKey, "");\r
        // 同時接続対応\r
        Set->MaxThreadCount = 1;\r
-       Set->ReuseCmdSkt = NO;\r
+       Set->ReuseCmdSkt = YES;\r
        Set->NoDisplayUI = NO;\r
        // MLSD対応\r
        Set->Feature = 0;\r
@@ -1353,10 +1358,12 @@ void CopyDefaultHost(HOSTDATA *Set)
        Set->NetType = NTYPE_AUTO;\r
        Set->CurNetType = NTYPE_AUTO;\r
        // 自動切断対策\r
-       Set->NoopInterval = 0;\r
+       Set->NoopInterval = 60;\r
        // 再転送対応\r
        Set->TransferErrorMode = EXIST_OVW;\r
        Set->TransferErrorNotify = YES;\r
+       // セッションあたりの転送量制限対策\r
+       Set->TransferErrorReconnect = NO;\r
        return;\r
 }\r
 \r
@@ -1693,6 +1700,8 @@ static INT_PTR CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
        switch (iMessage)\r
        {\r
                case WM_INITDIALOG :\r
+                       // プロセス保護\r
+                       ProtectAllEditControls(hDlg);\r
                        SendDlgItemMessage(hDlg, HSET_HOST, EM_LIMITTEXT, HOST_NAME_LEN, 0);\r
                        SendDlgItemMessage(hDlg, HSET_ADRS, EM_LIMITTEXT, HOST_ADRS_LEN, 0);\r
                        SendDlgItemMessage(hDlg, HSET_USER, EM_LIMITTEXT, USER_NAME_LEN, 0);\r
@@ -1929,7 +1938,10 @@ static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
                { HSET_FN_EUC_CNV, KANJI_EUC },\r
                { HSET_FN_SMH_CNV, KANJI_SMB_HEX },\r
                { HSET_FN_SMC_CNV, KANJI_SMB_CAP },\r
-               { HSET_FN_UTF8N_CNV, KANJI_UTF8N }              // UTF-8対応\r
+               // UTF-8 HFS+対応\r
+//             { HSET_FN_UTF8N_CNV, KANJI_UTF8N }              // UTF-8対応\r
+               { HSET_FN_UTF8N_CNV, KANJI_UTF8N },             // UTF-8対応\r
+               { HSET_FN_UTF8HFSX_CNV, KANJI_UTF8HFSX }\r
        };\r
        #define NAMEKANJIBUTTONS        (sizeof(NameKanjiButton)/sizeof(RADIOBUTTON))\r
 \r
@@ -1939,6 +1951,9 @@ static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
                        SetRadioButtonByValue(hDlg, TmpHost.KanjiCode, KanjiButton, KANJIBUTTONS);\r
                        SendDlgItemMessage(hDlg, HSET_HANCNV, BM_SETCHECK, TmpHost.KanaCnv, 0);\r
                        SetRadioButtonByValue(hDlg, TmpHost.NameKanjiCode, NameKanjiButton, NAMEKANJIBUTTONS);\r
+                       // UTF-8 HFS+対応\r
+                       if(IsUnicodeNormalizationDllLoaded() == NO)\r
+                               EnableWindow(GetDlgItem(hDlg, HSET_FN_UTF8HFSX_CNV), FALSE);\r
                        SendDlgItemMessage(hDlg, HSET_FN_HANCNV, BM_SETCHECK, TmpHost.NameKanaCnv, 0);\r
                        return(TRUE);\r
 \r
@@ -1989,6 +2004,8 @@ static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
                                case HSET_FN_SMH_CNV :\r
                                case HSET_FN_SMC_CNV :\r
                                case HSET_FN_UTF8N_CNV :        // UTF-8対応\r
+                               // UTF-8 HFS+対応\r
+                               case HSET_FN_UTF8HFSX_CNV :\r
                                        EnableWindow(GetDlgItem(hDlg, HSET_FN_HANCNV), FALSE);\r
                                        break;\r
                        }\r
@@ -2351,6 +2368,7 @@ static INT_PTR CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
                                SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 3, 0);\r
                        else\r
                                SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 0, 0);\r
+                       SendDlgItemMessage(hDlg, HSET_ERROR_RECONNECT, BM_SETCHECK, TmpHost.TransferErrorReconnect, 0);\r
                        return(TRUE);\r
 \r
                case WM_NOTIFY:\r
@@ -2382,6 +2400,7 @@ static INT_PTR CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
                                                TmpHost.TransferErrorNotify = NO;\r
                                                break;\r
                                        }\r
+                                       TmpHost.TransferErrorReconnect = SendDlgItemMessage(hDlg, HSET_ERROR_RECONNECT, BM_GETCHECK, 0, 0);\r
                                        Apply = YES;\r
                                        break;\r
 \r
@@ -2399,7 +2418,7 @@ static INT_PTR CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 \r
 // 暗号化通信対応\r
 // ホストの暗号化設定を更新\r
-int SetHostExcryption(int Num, int UseNoEncryption, int UseFTPES, int UseFTPIS, int UseSFTP)\r
+int SetHostEncryption(int Num, int UseNoEncryption, int UseFTPES, int UseFTPIS, int UseSFTP)\r
 {\r
        int Sts;\r
        HOSTLISTDATA *Pos;\r