/============================================================================*/\r
\r
#define STRICT\r
+// IPv6対応\r
+#include <winsock2.h>\r
#include <windows.h>\r
#include <stdio.h>\r
#include <stdlib.h>\r
\r
/*===== プロトタイプ =====*/\r
\r
-static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
+// 64ビット対応\r
+//static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
static LRESULT CALLBACK HostListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);\r
static HOSTLISTDATA *GetNextNode(HOSTLISTDATA *Pos);\r
static int GetNodeLevel(int Num);\r
static void SendAllHostNames(HWND hWnd, int Cur);\r
static int IsNodeGroup(int Num);\r
static int DispHostSetDlg(HWND hDlg);\r
-static BOOL CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
-static BOOL CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
-static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
-static BOOL CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
-static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+// 64ビット対応\r
+//static BOOL CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+//static BOOL CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+//static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+//static BOOL CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+//static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static INT_PTR 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
+static INT_PTR 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
+static INT_PTR CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
\r
/*===== 外部参照 =====*/\r
\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
{\r
static DIALOGSIZE DlgSize = {\r
{ HOST_NEW, HOST_FOLDER, HOST_SET, HOST_COPY, HOST_DEL, HOST_DOWN, HOST_UP, IDHELP, HOST_SIZEGRIP, -1 },\r
int Level2;\r
HOSTLISTDATA *Data1;\r
HOSTLISTDATA *Data2;\r
- NM_TREEVIEW *tView;\r
+ // UTF-8対応\r
+// NM_TREEVIEW *tView;\r
+ NM_TREEVIEWW *tView;\r
HTREEITEM tViewPos;\r
TV_HITTESTINFO HitInfo;\r
\r
{\r
case WM_INITDIALOG :\r
/* TreeViewでのダブルクリックをつかまえるため */\r
- HostListProcPtr = (WNDPROC)SetWindowLong(GetDlgItem(hDlg, HOST_LIST), GWL_WNDPROC, (LONG)HostListWndProc);\r
+ // 64ビット対応\r
+// HostListProcPtr = (WNDPROC)SetWindowLong(GetDlgItem(hDlg, HOST_LIST), GWL_WNDPROC, (LONG)HostListWndProc);\r
+ HostListProcPtr = (WNDPROC)SetWindowLongPtr(GetDlgItem(hDlg, HOST_LIST), GWLP_WNDPROC, (LONG_PTR)HostListWndProc);\r
\r
\r
// SetClassLong(hDlg, GCL_HICON, (LONG)LoadIcon(GetFtpInst(), MAKEINTRESOURCE(ffftp)));\r
break;\r
\r
case WM_NOTIFY:\r
- tView = (NM_TREEVIEW FAR *)lParam;\r
+ // UTF-8対応\r
+// tView = (NM_TREEVIEW FAR *)lParam;\r
+ tView = (NM_TREEVIEWW FAR *)lParam;\r
switch(tView->hdr.idFrom)\r
{\r
case HOST_LIST :\r
hItem = tView->itemNew.hItem;\r
switch(tView->hdr.code)\r
{\r
- case TVN_SELCHANGED :\r
+ // UTF-8対応\r
+// case TVN_SELCHANGED :\r
+ case TVN_SELCHANGEDW :\r
/* フォルダが選ばれたときは接続、コピーボタンは禁止 */\r
Item.hItem = hItem;\r
Item.mask = TVIF_PARAM;\r
Set->LastDir = Pos->Set.LastDir;\r
Set->TimeZone = Pos->Set.TimeZone;\r
// 暗号化通信対応\r
+ Set->UseNoEncryption = Pos->Set.UseNoEncryption;\r
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
+ Set->ReuseCmdSkt = Pos->Set.ReuseCmdSkt;\r
// MLSD対応\r
Set->UseMLSD = Pos->Set.UseMLSD;\r
+ // IPv6対応\r
+ Set->NetType = Pos->Set.NetType;\r
+ // 自動切断対策\r
+ Set->NoopInterval = Pos->Set.NoopInterval;\r
+ // 再転送対応\r
+ Set->TransferErrorMode = Pos->Set.TransferErrorMode;\r
+ Set->TransferErrorNotify = Pos->Set.TransferErrorNotify;\r
Sts = FFFTP_SUCCESS;\r
}\r
return(Sts);\r
Set->KanjiCode = KANJI_NOCNV;\r
Set->KanaCnv = YES;\r
Set->NameKanjiCode = KANJI_NOCNV;\r
+ // UTF-8対応\r
+ Set->CurNameKanjiCode = KANJI_NOCNV;\r
Set->NameKanaCnv = NO;\r
Set->Pasv = YES;\r
Set->FireWall = NO;\r
strcpy(Set->DialEntry, "");\r
// 暗号化通信対応\r
Set->CryptMode = CRYPT_NONE;\r
+ Set->UseNoEncryption = YES;\r
Set->UseFTPES = YES;\r
Set->UseFTPIS = YES;\r
Set->UseSFTP = YES;\r
+ strcpy(Set->PrivateKey, "");\r
// 同時接続対応\r
Set->MaxThreadCount = 1;\r
+ Set->ReuseCmdSkt = NO;\r
+ Set->NoDisplayUI = NO;\r
// MLSD対応\r
Set->Feature = 0;\r
Set->UseMLSD = YES;\r
+ // IPv6対応\r
+ Set->NetType = NTYPE_AUTO;\r
+ Set->CurNetType = NTYPE_AUTO;\r
+ // 自動切断対策\r
+ Set->NoopInterval = 0;\r
+ // 再転送対応\r
+ Set->TransferErrorMode = EXIST_OVW;\r
+ Set->TransferErrorNotify = YES;\r
return;\r
}\r
\r
PROPSHEETPAGE psp[7];\r
PROPSHEETHEADER psh;\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&psp, 0, sizeof(psp));\r
+ memset(&psh, 0, sizeof(psh));\r
+\r
psp[0].dwSize = sizeof(PROPSHEETPAGE);\r
psp[0].dwFlags = PSP_USETITLE | PSP_HASHELP;\r
psp[0].hInstance = GetFtpInst();\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
- long wStyle;\r
+ // 64ビット対応\r
+// long wStyle;\r
+ LONG_PTR wStyle;\r
char Tmp[FMAX_PATH+1];\r
NMHDR *pnmhdr;\r
\r
if(SendDlgItemMessage(hDlg, HSET_ANONYMOUS, BM_GETCHECK, 0, 0) == 1)\r
{\r
SendDlgItemMessage(hDlg, HSET_USER, WM_SETTEXT, 0, (LPARAM)"anonymous");\r
- wStyle = GetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
+ // 64ビット対応\r
+// wStyle = GetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
+ wStyle = GetWindowLongPtr(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
wStyle &= ~ES_PASSWORD;\r
- SetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
+ // 64ビット対応\r
+// SetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
+ SetWindowLongPtr(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
SendDlgItemMessage(hDlg, HSET_PASS, WM_SETTEXT, 0, (LPARAM)UserMailAdrs);\r
}\r
else\r
{\r
SendDlgItemMessage(hDlg, HSET_USER, WM_SETTEXT, 0, (LPARAM)"");\r
- wStyle = GetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
+ // 64ビット対応\r
+// wStyle = GetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
+ wStyle = GetWindowLongPtr(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE);\r
wStyle |= ES_PASSWORD;\r
- SetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
+ // 64ビット対応\r
+// SetWindowLong(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
+ SetWindowLongPtr(GetDlgItem(hDlg, HSET_PASS), GWL_STYLE, wStyle);\r
SendDlgItemMessage(hDlg, HSET_PASS, WM_SETTEXT, 0, (LPARAM)"");\r
}\r
break;\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK AdvSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
char Tmp[20];\r
SendDlgItemMessage(hDlg, HSET_SECURITY, CB_SETCURSEL, TmpHost.Security, 0);\r
SendDlgItemMessage(hDlg, HSET_INITCMD, EM_LIMITTEXT, INITCMD_LEN, 0);\r
SendDlgItemMessage(hDlg, HSET_INITCMD, WM_SETTEXT, 0, (LPARAM)TmpHost.InitCmd);\r
+ // IPv6対応\r
+ SendDlgItemMessage(hDlg, HSET_NETTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN332);\r
+ SendDlgItemMessage(hDlg, HSET_NETTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN333);\r
+ SendDlgItemMessage(hDlg, HSET_NETTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN334);\r
+ SendDlgItemMessage(hDlg, HSET_NETTYPE, CB_SETCURSEL, TmpHost.NetType, 0);\r
return(TRUE);\r
\r
case WM_NOTIFY:\r
TmpHost.TimeZone = SendDlgItemMessage(hDlg, HSET_TIMEZONE, CB_GETCURSEL, 0, 0) - 12;\r
TmpHost.Security = SendDlgItemMessage(hDlg, HSET_SECURITY, CB_GETCURSEL, 0, 0);\r
SendDlgItemMessage(hDlg, HSET_INITCMD, WM_GETTEXT, INITCMD_LEN+1, (LPARAM)TmpHost.InitCmd);\r
+ // IPv6対応\r
+ TmpHost.NetType = SendDlgItemMessage(hDlg, HSET_NETTYPE, CB_GETCURSEL, 0, 0);\r
Apply = YES;\r
break;\r
\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
\r
{ HSET_SJIS_CNV, KANJI_SJIS },\r
{ HSET_JIS_CNV, KANJI_JIS },\r
{ HSET_EUC_CNV, KANJI_EUC },\r
- { HSET_UTF8N_CNV, KANJI_UTF8N }\r
+ { HSET_UTF8N_CNV, KANJI_UTF8N },\r
+ { HSET_UTF8BOM_CNV, KANJI_UTF8BOM }\r
};\r
#define KANJIBUTTONS (sizeof(KanjiButton)/sizeof(RADIOBUTTON))\r
\r
case WM_COMMAND :\r
switch(GET_WM_COMMAND_ID(wParam, lParam))\r
{\r
+ case HSET_SJIS_CNV :\r
case HSET_JIS_CNV :\r
case HSET_EUC_CNV :\r
EnableWindow(GetDlgItem(hDlg, HSET_HANCNV), TRUE);\r
// UTF-8対応\r
case HSET_NO_CNV :\r
case HSET_UTF8N_CNV :\r
+ case HSET_UTF8BOM_CNV :\r
EnableWindow(GetDlgItem(hDlg, HSET_HANCNV), FALSE);\r
break;\r
\r
- case HSET_SJIS_CNV :\r
case HSET_FN_JIS_CNV :\r
case HSET_FN_EUC_CNV :\r
EnableWindow(GetDlgItem(hDlg, HSET_FN_HANCNV), TRUE);\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK DialupSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
\r
* BOOL TRUE/FALSE\r
*----------------------------------------------------------------------------*/\r
\r
-static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+// 64ビット対応\r
+//static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
int Num;\r
SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_SETCHECK, TmpHost.ListCmdOnly, 0);\r
if(TmpHost.ListCmdOnly == YES)\r
EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
+ // MLSD対応\r
+ else\r
+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE);\r
+ SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_SETCHECK, TmpHost.UseMLSD, 0);\r
SendDlgItemMessage(hDlg, HSET_NLST_R, BM_SETCHECK, TmpHost.UseNLST_R, 0);\r
SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_SETCHECK, TmpHost.NoFullPath, 0);\r
SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN139);\r
SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, WM_GETTEXT, CHMOD_CMD_LEN+1, (LPARAM)TmpHost.ChmodCmd);\r
SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_GETTEXT, NLST_NAME_LEN+1, (LPARAM)TmpHost.LsName);\r
TmpHost.ListCmdOnly = SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0);\r
+ // MLSD対応\r
+ TmpHost.UseMLSD = SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_GETCHECK, 0, 0);\r
TmpHost.UseNLST_R = SendDlgItemMessage(hDlg, HSET_NLST_R, BM_GETCHECK, 0, 0);\r
TmpHost.NoFullPath = SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_GETCHECK, 0, 0);\r
TmpHost.HostType = SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_GETCURSEL, 0, 0);\r
\r
case HSET_LISTCMD :\r
if(SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0) == 0)\r
+ // MLSD対応\r
+// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);\r
+ {\r
+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE);\r
EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);\r
+ }\r
else\r
+ // MLSD対応\r
+// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
+ {\r
+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), TRUE);\r
EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);\r
+ }\r
break;\r
\r
case HSET_HOSTTYPE :\r
\r
\r
// 暗号化通信対応\r
-static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
- int Num;\r
+// int Num;\r
\r
switch (iMessage)\r
{\r
case WM_INITDIALOG :\r
+ SendDlgItemMessage(hDlg, HSET_NO_ENCRYPTION, BM_SETCHECK, TmpHost.UseNoEncryption, 0);\r
if(IsOpenSSLLoaded())\r
{\r
SendDlgItemMessage(hDlg, HSET_FTPES, BM_SETCHECK, TmpHost.UseFTPES, 0);\r
SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, TmpHost.UseFTPIS, 0);\r
- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, TmpHost.UseSFTP, 0);\r
}\r
else\r
{\r
EnableWindow(GetDlgItem(hDlg, HSET_FTPES), FALSE);\r
SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, BST_UNCHECKED, 0);\r
EnableWindow(GetDlgItem(hDlg, HSET_FTPIS), FALSE);\r
- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, BST_UNCHECKED, 0);\r
- EnableWindow(GetDlgItem(hDlg, HSET_SFTP), FALSE);\r
}\r
- // TODO: FTPIS対応\r
- SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, BST_UNCHECKED, 0);\r
- EnableWindow(GetDlgItem(hDlg, HSET_FTPIS), FALSE);\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
return(TRUE);\r
\r
case WM_NOTIFY:\r
switch(pnmhdr->code)\r
{\r
case PSN_APPLY :\r
+ TmpHost.UseNoEncryption = SendDlgItemMessage(hDlg, HSET_NO_ENCRYPTION, BM_GETCHECK, 0, 0);\r
if(IsOpenSSLLoaded())\r
{\r
TmpHost.UseFTPES = SendDlgItemMessage(hDlg, HSET_FTPES, BM_GETCHECK, 0, 0);\r
- // TODO: FTPIS対応\r
-// TmpHost.UseFTPIS = SendDlgItemMessage(hDlg, HSET_FTPIS, BM_GETCHECK, 0, 0);\r
- // TODO: SFTP対応\r
-// TmpHost.UseSFTP = SendDlgItemMessage(hDlg, HSET_SFTP, 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
Apply = YES;\r
break;\r
\r
}\r
\r
// 同時接続対応\r
-static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
+static INT_PTR CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
- int Num;\r
+// int Num;\r
+\r
+ // UTF-8対応\r
+ static const RADIOBUTTON KanjiButton[] = {\r
+ { HSET_NO_CNV, KANJI_NOCNV },\r
+ { HSET_SJIS_CNV, KANJI_SJIS },\r
+ { HSET_JIS_CNV, KANJI_JIS },\r
+ { HSET_EUC_CNV, KANJI_EUC },\r
+ { HSET_UTF8N_CNV, KANJI_UTF8N },\r
+ { HSET_UTF8BOM_CNV, KANJI_UTF8BOM }\r
+ };\r
+ #define KANJIBUTTONS (sizeof(KanjiButton)/sizeof(RADIOBUTTON))\r
\r
switch (iMessage)\r
{\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
+ SendDlgItemMessage(hDlg, HSET_REUSE_SOCKET, BM_SETCHECK, TmpHost.ReuseCmdSkt, 0);\r
+ SendDlgItemMessage(hDlg, HSET_NOOP_INTERVAL, EM_LIMITTEXT, (WPARAM)3, 0);\r
+ SetDecimalText(hDlg, HSET_NOOP_INTERVAL, TmpHost.NoopInterval);\r
+ SendDlgItemMessage(hDlg, HSET_NOOP_INTERVAL_SPN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(300, 0));\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_ADDSTRING, 0, (LPARAM)MSGJPN335);\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_ADDSTRING, 0, (LPARAM)MSGJPN336);\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_ADDSTRING, 0, (LPARAM)MSGJPN337);\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_ADDSTRING, 0, (LPARAM)MSGJPN338);\r
+ if(TmpHost.TransferErrorNotify == YES)\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 0, 0);\r
+ else if(TmpHost.TransferErrorMode == EXIST_OVW)\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 1, 0);\r
+ else if(TmpHost.TransferErrorMode == EXIST_RESUME)\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 2, 0);\r
+ else if(TmpHost.TransferErrorMode == EXIST_IGNORE)\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 3, 0);\r
+ else\r
+ SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_SETCURSEL, 0, 0);\r
return(TRUE);\r
\r
case WM_NOTIFY:\r
case PSN_APPLY :\r
TmpHost.MaxThreadCount = GetDecimalText(hDlg, HSET_THREAD_COUNT);\r
CheckRange2(&TmpHost.MaxThreadCount, MAX_DATA_CONNECTION, 1);\r
+ TmpHost.ReuseCmdSkt = SendDlgItemMessage(hDlg, HSET_REUSE_SOCKET, BM_GETCHECK, 0, 0);\r
+ TmpHost.NoopInterval = GetDecimalText(hDlg, HSET_NOOP_INTERVAL);\r
+ CheckRange2(&TmpHost.NoopInterval, 300, 0);\r
+ switch(SendDlgItemMessage(hDlg, HSET_ERROR_MODE, CB_GETCURSEL, 0, 0))\r
+ {\r
+ case 0:\r
+ TmpHost.TransferErrorMode = EXIST_OVW;\r
+ TmpHost.TransferErrorNotify = YES;\r
+ break;\r
+ case 1:\r
+ TmpHost.TransferErrorMode = EXIST_OVW;\r
+ TmpHost.TransferErrorNotify = NO;\r
+ break;\r
+ case 2:\r
+ TmpHost.TransferErrorMode = EXIST_RESUME;\r
+ TmpHost.TransferErrorNotify = NO;\r
+ break;\r
+ case 3:\r
+ TmpHost.TransferErrorMode = EXIST_IGNORE;\r
+ TmpHost.TransferErrorNotify = NO;\r
+ break;\r
+ }\r
Apply = YES;\r
break;\r
\r
return(FALSE);\r
}\r
\r
+// 暗号化通信対応\r
+// ホストの暗号化設定を更新\r
+int SetHostExcryption(int Num, int UseNoEncryption, int UseFTPES, int UseFTPIS, int UseSFTP)\r
+{\r
+ int Sts;\r
+ HOSTLISTDATA *Pos;\r
+\r
+ Sts = FFFTP_FAIL;\r
+ if((Num >= 0) && (Num < Hosts))\r
+ {\r
+ Pos = GetNodeByNum(Num);\r
+ Pos->Set.UseNoEncryption = UseNoEncryption;\r
+ Pos->Set.UseFTPES = UseFTPES;\r
+ Pos->Set.UseFTPIS = UseFTPIS;\r
+ Pos->Set.UseSFTP = UseSFTP;\r
+ Sts = FFFTP_SUCCESS;\r
+ }\r
+ return(Sts);\r
+}\r
+\r
OSDN Git Service
