\r
/* ホスト設定を保存 */\r
SetNodeLevelAll();\r
- SaveRegistory();\r
+ SaveRegistry();\r
\r
return(Sts);\r
}\r
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
// 再転送対応\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
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
Set->UseMLSD = YES;\r
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
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
{ 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
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
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
SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN144);\r
SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN289);\r
SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN295);\r
+#if defined(HAVE_TANDEM)\r
+ SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN2000);\r
+#endif\r
SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_SETCURSEL, TmpHost.HostType, 0);\r
+#if defined(HAVE_TANDEM)\r
+ if(TmpHost.HostType == 2 || TmpHost.HostType == HTYPE_TANDEM) /* VAX or Tandem */\r
+#else\r
if(TmpHost.HostType == 2)\r
+#endif\r
{\r
EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), FALSE);\r
EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), FALSE);\r
EnableWindow(GetDlgItem(hDlg, HSET_FULLPATH), FALSE);\r
}\r
+#if defined(HAVE_TANDEM)\r
+ else if(Num == HTYPE_TANDEM) /* Tandem */\r
+ {\r
+ /* Tandem を選択すると自動的に LIST にチェックをいれる */\r
+ SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_SETCHECK, 1, 0);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), FALSE);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_FULLPATH), FALSE);\r
+ }\r
+ else\r
+ {\r
+ if(SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0) == 0) {\r
+ EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), TRUE);\r
+ } else {\r
+ EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), TRUE);\r
+ }\r
+ EnableWindow(GetDlgItem(hDlg, HSET_FULLPATH), TRUE);\r
+ }\r
+#else\r
else\r
{\r
EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);\r
EnableWindow(GetDlgItem(hDlg, HSET_LISTCMD), TRUE);\r
EnableWindow(GetDlgItem(hDlg, HSET_FULLPATH), TRUE);\r
}\r
+#endif\r
break;\r
}\r
return(TRUE);\r
SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, BST_UNCHECKED, 0);\r
EnableWindow(GetDlgItem(hDlg, HSET_FTPIS), FALSE);\r
}\r
- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, TmpHost.UseSFTP, 0);\r
- SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_SETTEXT, 0, (LPARAM)TmpHost.PrivateKey);\r
- // TODO: SFTP対応\r
- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, BST_UNCHECKED, 0);\r
- EnableWindow(GetDlgItem(hDlg, HSET_SFTP), FALSE);\r
- EnableWindow(GetDlgItem(hDlg, PKEY_FILE_BR), FALSE);\r
- EnableWindow(GetDlgItem(hDlg, HSET_PRIVATE_KEY), FALSE);\r
+ if(IsPuTTYLoaded())\r
+ {\r
+ SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, TmpHost.UseSFTP, 0);\r
+ SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_SETTEXT, 0, (LPARAM)TmpHost.PrivateKey);\r
+ }\r
+ else\r
+ {\r
+ SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, BST_UNCHECKED, 0);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_SFTP), FALSE);\r
+ EnableWindow(GetDlgItem(hDlg, PKEY_FILE_BR), FALSE);\r
+ EnableWindow(GetDlgItem(hDlg, HSET_PRIVATE_KEY), FALSE);\r
+ }\r
return(TRUE);\r
\r
case WM_NOTIFY:\r
TmpHost.UseFTPES = SendDlgItemMessage(hDlg, HSET_FTPES, BM_GETCHECK, 0, 0);\r
TmpHost.UseFTPIS = SendDlgItemMessage(hDlg, HSET_FTPIS, BM_GETCHECK, 0, 0);\r
}\r
- // TODO: SFTP対応\r
-// TmpHost.UseSFTP = SendDlgItemMessage(hDlg, HSET_SFTP, BM_GETCHECK, 0, 0);\r
- SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_GETTEXT, PRIVATE_KEY_LEN+1, (LPARAM)TmpHost.PrivateKey);\r
+ if(IsPuTTYLoaded())\r
+ {\r
+ TmpHost.UseSFTP = SendDlgItemMessage(hDlg, HSET_SFTP, BM_GETCHECK, 0, 0);\r
+ SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_GETTEXT, PRIVATE_KEY_LEN+1, (LPARAM)TmpHost.PrivateKey);\r
+ }\r
Apply = YES;\r
break;\r
\r
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
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
\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
OSDN Git Service
