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
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->UseIPv6 = Pos->Set.UseIPv6;\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
// MLSD対応\r
Set->Feature = 0;\r
Set->UseMLSD = YES;\r
+ // IPv6対応\r
+ Set->InetFamily = AF_UNSPEC;\r
+ Set->UseIPv6 = YES;\r
return;\r
}\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
static BOOL 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
static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)\r
{\r
NMHDR *pnmhdr;\r
- int Num;\r
+// int Num;\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
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
Apply = YES;\r
break;\r
\r