Add UI for MLSD command.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index aac2807..d4e2d2a 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 6d5c6e8..08399a4 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index 45f1ae5..e62d918 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -999,16 +999,17 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
 BEGIN\r
     CONTROL         "LIST\83R\83}\83\93\83h\82Å\83t\83@\83C\83\8b\88ê\97\97\82ð\8eæ\93¾(&L)",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10\r
-    CONTROL         "NLST -R \82ð\8eg\82Á\82Ä\8d\82\91¬\82É\8dÄ\8bA\8c\9f\8dõ(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
-    CONTROL         "\83t\83\8b\83p\83X\82Å\83t\83@\83C\83\8b\82ð\83A\83N\83Z\83X\82µ\82È\82¢(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
-    LTEXT           "\91®\90«\95Ï\8dX\83R\83}\83\93\83h(&A)",-1,7,51,83,8\r
-    EDITTEXT        HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "\95W\8f\80",HSET_CHMOD_NOR,70,61,25,13\r
-    LTEXT           "\83z\83X\83g\82Ì\8eí\97Þ(&H)",-1,7,80,69,8\r
-    COMBOBOX        HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "NLST\83t\83@\83C\83\8b\96¼/\83I\83v\83V\83\87\83\93",-1,7,109,89,8\r
-    EDITTEXT        HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "\95W\8f\80",HSET_LS_FNAME_NOR,70,119,25,13\r
+    CONTROL         "\89Â\94\\82Å\82 \82ê\82ÎMLSD\83R\83}\83\93\83h\82Å\88ê\97\97\82ð\8eæ\93¾(&M)",HSET_MLSDCMD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
+    CONTROL         "NLST -R \82ð\8eg\82Á\82Ä\8d\82\91¬\82É\8dÄ\8bA\8c\9f\8dõ(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
+    CONTROL         "\83t\83\8b\83p\83X\82Å\83t\83@\83C\83\8b\82ð\83A\83N\83Z\83X\82µ\82È\82¢(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10\r
+    LTEXT           "\91®\90«\95Ï\8dX\83R\83}\83\93\83h(&A)",-1,7,65,83,8\r
+    EDITTEXT        HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "\95W\8f\80",HSET_CHMOD_NOR,70,75,25,13\r
+    LTEXT           "\83z\83X\83g\82Ì\8eí\97Þ(&H)",-1,7,94,69,8\r
+    COMBOBOX        HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "NLST\83t\83@\83C\83\8b\96¼/\83I\83v\83V\83\87\83\93",-1,7,123,89,8\r
+    EDITTEXT        HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "\95W\8f\80",HSET_LS_FNAME_NOR,70,133,25,13\r
 END\r
 \r
 cwderr_dlg DIALOG  0, 0, 154, 69\r

diff --git a/Resource/resource.h b/Resource/resource.h
index ed87acc..12173b9 100644 (file)
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -437,6 +437,7 @@
 #define HSET_NOOP_INTERVAL_SPN          1209\r
 #define HSET_NETTYPE                    1210\r
 #define HSET_ERROR_MODE                 1211\r
+#define HSET_MLSDCMD                    1212\r
 #define MENU_END                        40001\r
 #define MENU_EXIT                       40001\r
 #define MENU_CONNECT                    40003\r
@@ -623,7 +624,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        193\r
 #define _APS_NEXT_COMMAND_VALUE         40176\r
-#define _APS_NEXT_CONTROL_VALUE         1212\r
+#define _APS_NEXT_CONTROL_VALUE         1213\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r
 #endif\r

diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc
index 6d8d073..8013da3 100644 (file)
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1020,18 +1020,20 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10\r
-    CONTROL         "Use &NLST -R for high-speed recursive search",HSET_NLST_R,\r
+    CONTROL         "Use &MLSD command to get file list if possible",HSET_MLSDCMD,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,167,10\r
+    CONTROL         "Use &NLST -R for high-speed recursive search",HSET_NLST_R,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,167,10\r
     CONTROL         "&Do not use full path to access files",HSET_FULLPATH,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
-    LTEXT           "&Permissions Change Command",-1,7,51,110,8\r
-    EDITTEXT        HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "Default",HSET_CHMOD_NOR,70,61,28,13\r
-    LTEXT           "&Host Type",-1,7,80,69,8\r
-    COMBOBOX        HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "NLST &Filename/Option",-1,7,109,89,8\r
-    EDITTEXT        HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "Delault",HSET_LS_FNAME_NOR,70,119,28,13\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10\r
+    LTEXT           "&Permissions Change Command",-1,7,65,110,8\r
+    EDITTEXT        HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Default",HSET_CHMOD_NOR,70,75,28,13\r
+    LTEXT           "&Host Type",-1,7,94,69,8\r
+    COMBOBOX        HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "NLST &Filename/Option",-1,7,123,89,8\r
+    EDITTEXT        HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Delault",HSET_LS_FNAME_NOR,70,133,28,13\r
 END\r
 \r
 cwderr_dlg DIALOG  0, 0, 155, 57\r
@@ -1402,7 +1404,8 @@ BEGIN
     EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER\r
     CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14\r
     LTEXT           "(1 to 4 threads)",-1,102,10,53,8\r
-    CONTROL         "Reuse socket of the main window",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10\r
+    CONTROL         "Reuse socket of the main window",HSET_REUSE_SOCKET,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10\r
     LTEXT           "Command for Keep Alive",-1,7,44,84,8\r
     EDITTEXT        HSET_NOOP_INTERVAL,92,42,17,12,ES_AUTOHSCROLL | ES_NUMBER\r
     CONTROL         "Spin1",HSET_NOOP_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,109,41,9,14\r

diff --git a/Resource_eng/resource.h b/Resource_eng/resource.h
index 8e996d5..05d49bf 100644 (file)
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -437,6 +437,7 @@
 #define HSET_NOOP_INTERVAL_SPN          1209\r
 #define HSET_NETTYPE                    1210\r
 #define HSET_ERROR_MODE                 1211\r
+#define HSET_MLSDCMD                    1212\r
 #define MENU_END                        40001\r
 #define MENU_EXIT                       40001\r
 #define MENU_CONNECT                    40003\r
@@ -623,7 +624,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        193\r
 #define _APS_NEXT_COMMAND_VALUE         40176\r
-#define _APS_NEXT_CONTROL_VALUE         1212\r
+#define _APS_NEXT_CONTROL_VALUE         1213\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r
 #endif\r

diff --git a/hostman.c b/hostman.c
index 25c758d..afd2e4e 100644 (file)
--- a/hostman.c
+++ b/hostman.c
@@ -2083,6 +2083,10 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
                        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
@@ -2110,6 +2114,8 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
                                        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
@@ -2138,9 +2144,19 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
 \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