Commit: 663728dfaea4b4e0da170722b4046764e01555dc - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 663728dfaea4b4e0da170722b4046764e01555dc (tree)
• Hora: 2012-02-19 00:14:32
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Change behavior of automatic IPv4/IPv6 selection.
Modify messages.
Fix bugs of hanging at accessing non-existent directories.
Fix spelling mistakes.
Modify documents.
Remove unused files.

Mudança Sumário

• modified: FFFTP.vc90.vcproj
• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_English.vc90.vcproj
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: connect.c
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: filelist.c
• modified: ftpproc.c
• modified: getput.c
• modified: hostman.c
• modified: main.c
• modified: mesg-eng.h
• modified: mesg-jpn.h
• delete: msgutil.c
• delete: msgutil.h
• modified: option.c
• modified: registry.c
• modified: remote.c
• modified: socket.c
• modified: socketwrapper.c
• modified: toolmenu.c

Diff

--- a/FFFTP.vc90.vcproj
+++ b/FFFTP.vc90.vcproj
@@ -619,6 +619,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\Resource\list_16.bmp"
+				>
+			</File>
+			<File
 				RelativePath=".\Resource\list_bmp.bmp"
 				>
 			</File>

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -619,6 +619,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\Resource_eng\list_16.bmp"
+				>
+			</File>
+			<File
 				RelativePath=".\Resource_eng\list_bmp.bmp"
 				>
 			</File>
@@ -647,15 +651,15 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|x64"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|x64"
-				ExcludedFromBuild="true"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -353,7 +353,7 @@ BEGIN
     LTEXT           "",stc1,9,18,88,8
 END
 
-opt_user_dlg DIALOG  0, 0, 211, 139
+opt_user_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -362,7 +362,7 @@ BEGIN
     LTEXT           "ƒ[ƒ‹ƒAƒhƒŒƒX‚Íanonymous FTP‚̃pƒXƒ[ƒh‚Æ‚µ‚ÄŽg—p‚³‚ê‚Ü‚·B",-1,28,36,169,18,SS_SUNKEN
 END
 
-opt_tool_dlg DIALOG  0, 0, 211, 139
+opt_tool_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -448,7 +448,7 @@ BEGIN
     LTEXT           "ì¬‚·‚éƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B",-1,7,7,160,8
 END
 
-opt_misc_dlg DIALOG  0, 0, 211, 139
+opt_misc_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -549,7 +549,7 @@ BEGIN
     PUSHBUTTON      "‚¢‚¢‚¦",IDCANCEL,112,42,50,14
 END
 
-opt_trmode2_dlg DIALOG  0, 0, 211, 139
+opt_trmode2_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -567,7 +567,7 @@ BEGIN
     LTEXT           "ƒ~ƒ‰[ƒŠƒ“ƒOƒAƒbƒvƒ[ƒhŽž‚̐ݒè‚́Auƒ~ƒ‰[ƒŠƒ“ƒOvƒ^ƒu‚Ì’†‚É‚ ‚è‚Ü‚·B",-1,18,56,181,17,SS_SUNKEN
 END
 
-opt_notify_dlg DIALOGEX 0, 0, 211, 139
+opt_notify_dlg DIALOGEX 0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -604,7 +604,7 @@ BEGIN
     PUSHBUTTON      "ƒwƒ‹ƒv",9,165,90,50,14
 END
 
-opt_fire_dlg DIALOG  0, 0, 211, 139
+opt_fire_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -684,7 +684,7 @@ BEGIN
     LTEXT           "‚±‚±‚Å“ü—Í‚µ‚½ƒ[ƒ‹ƒAƒhƒŒƒX‚́AŒã‚ŃIƒvƒVƒ‡ƒ“‚Ì\nuƒ†[ƒU[vƒ^ƒu‚Ì‚Æ‚±‚ë‚ŕύX‚Å‚«‚Ü‚·B",-1,16,48,164,18
 END
 
-opt_sound_dlg DIALOG  0, 0, 211, 139
+opt_sound_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -759,7 +759,7 @@ BEGIN
     CONTROL         "”¼ŠpƒJƒi‚ð‘SŠp‚É•ÏŠ·",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,114,107,81,10
 END
 
-opt_trmode1_dlg DIALOG  0, 0, 211, 139
+opt_trmode1_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -767,14 +767,15 @@ BEGIN
     CONTROL         "í‚ɃAƒXƒL[ƒ‚[ƒh(&A)",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,19,85,10
     CONTROL         "í‚ɃoƒCƒiƒŠƒ‚[ƒh(&B)",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10
     CONTROL         "ƒtƒ@ƒCƒ‹–¼‚Őؑւ¦(&X)",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,81,10
+    LTEXT           "¨",-1,98,49,8,8
     GROUPBOX        "ƒAƒXƒL[ƒ‚[ƒh‚̃tƒ@ƒCƒ‹–¼(&F)",-1,104,7,99,84,WS_GROUP
     LISTBOX         TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "’ljÁ(&I)...",TRMODE_ADD,167,19,31,14
     PUSHBUTTON      "íœ",TRMODE_DEL,167,38,31,14
     CONTROL         "ƒAƒXƒL[ƒ‚[ƒh‚ŃAƒbƒvƒ[ƒhŽžAEOF(Ctrl-Z)‚ðŽæ‚菜‚­(&Z)",TRMODE_EOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
     CONTROL         "ƒ_ƒEƒ“ƒ[ƒh‚·‚éƒtƒ@ƒCƒ‹‚̃^ƒCƒ€ƒXƒ^ƒ“ƒv‚ðˆÛŽ(&T)",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10
-    LTEXT           "¨",-1,98,49,8,8
     CONTROL         "ƒtƒ@ƒCƒ‹–¼‚̃Zƒ~ƒRƒƒ“ˆÈ~‚ÍŽæ‚菜‚¢‚ă_ƒEƒ“ƒ[ƒh(&S)",TRMODE_SEMICOLON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,196,10
+    CONTROL         "ƒtƒ@ƒCƒ‹–¼‚ð•Ï‚¦‚Ä“]‘—‚µ‚½ê‡‚ɃfƒBƒŒƒNƒgƒŠ‚ðì¬(&D)",TRMODE_MAKEDIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,196,10
 END
 
 up_exist_dlg DIALOG  0, 0, 223, 119
@@ -900,7 +901,7 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_mirror_dlg DIALOG  0, 0, 211, 139
+opt_mirror_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -944,7 +945,7 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_connect_dlg DIALOG  0, 0, 211, 139
+opt_connect_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1024,7 +1025,7 @@ BEGIN
     CTEXT           "ˆ—‚𒆎~‚µ‚Ü‚·B",-1,7,31,140,8
 END
 
-opt_trmode3_dlg DIALOG  0, 0, 211, 139
+opt_trmode3_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1281,7 +1282,7 @@ BEGIN
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,96,72,50,14
 END
 
-opt_disp_dlg DIALOG  0, 0, 211, 139
+opt_disp_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1484,7 +1485,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 134
+        BOTTOMMARGIN, 148
     END
 
     opt_tool_dlg, DIALOG
@@ -1492,7 +1493,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     chmod_dlg, DIALOG
@@ -1524,7 +1525,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hostname_dlg, DIALOG
@@ -1587,7 +1588,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     opt_notify_dlg, DIALOG
@@ -1595,7 +1596,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_dlg, DIALOG
@@ -1611,7 +1612,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hset_adv_dlg, DIALOG
@@ -1651,7 +1652,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     downerr_dlg, DIALOG
@@ -1683,7 +1684,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     up_exist_dlg, DIALOG
@@ -1763,7 +1764,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     somecmd_dlg, DIALOG
@@ -1787,7 +1788,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     rasnotify_dlg, DIALOG
@@ -1835,7 +1836,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     def_attr_dlg, DIALOG
@@ -1995,7 +1996,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_edit_dlg, DIALOG

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -215,6 +215,7 @@
 #define CONNECT_RASCLOSE                1014
 #define FIRE_LOWER                      1014
 #define MIRROR_TIMECHECK                1014
+#define TRMODE_MAKEDIR                  1014
 #define TOOL_EDITOR_BR                  1015
 #define PERM_A_READ                     1015
 #define SOUND_TRNNG                     1015

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -354,7 +354,7 @@ BEGIN
     LTEXT           "",stc1,9,18,88,8
 END
 
-opt_user_dlg DIALOG  0, 0, 211, 139
+opt_user_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -363,7 +363,7 @@ BEGIN
     LTEXT           "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN
 END
 
-opt_tool_dlg DIALOG  0, 0, 211, 139
+opt_tool_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -449,7 +449,7 @@ BEGIN
     LTEXT           "Enter new folder name:",-1,7,7,160,8
 END
 
-opt_misc_dlg DIALOG  0, 0, 211, 139
+opt_misc_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -552,7 +552,7 @@ BEGIN
     PUSHBUTTON      "No",IDCANCEL,112,42,50,14
 END
 
-opt_trmode2_dlg DIALOG  0, 0, 211, 139
+opt_trmode2_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -570,7 +570,7 @@ BEGIN
     LTEXT           "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN
 END
 
-opt_notify_dlg DIALOGEX 0, 0, 211, 139
+opt_notify_dlg DIALOGEX 0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -607,7 +607,7 @@ BEGIN
     PUSHBUTTON      "&Help",9,165,90,50,14
 END
 
-opt_fire_dlg DIALOG  0, 0, 211, 139
+opt_fire_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -689,7 +689,7 @@ BEGIN
     LTEXT           "You can reenter mail address at the Option dialog.",-1,16,54,164,10
 END
 
-opt_sound_dlg DIALOG  0, 0, 211, 139
+opt_sound_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -766,7 +766,7 @@ BEGIN
     CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10
 END
 
-opt_trmode1_dlg DIALOG  0, 0, 211, 139
+opt_trmode1_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -774,15 +774,17 @@ BEGIN
     CONTROL         "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,19,85,10
     CONTROL         "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10
     CONTROL         "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10
+    LTEXT           "->",-1,98,49,8,8
     GROUPBOX        "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP
     LISTBOX         TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "A&dd...",TRMODE_ADD,167,19,31,14
     PUSHBUTTON      "Delete",TRMODE_DEL,167,38,31,14
     CONTROL         "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
-    CONTROL         "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10
-    LTEXT           "->",-1,98,49,8,8
+    CONTROL         "Retain file date/&time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10
     CONTROL         "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,196,10
+    CONTROL         "Create &directory at file transfer with renaming",TRMODE_MAKEDIR,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,196,10
 END
 
 up_exist_dlg DIALOG  0, 0, 234, 119
@@ -913,7 +915,7 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_mirror_dlg DIALOG  0, 0, 211, 139
+opt_mirror_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -958,7 +960,7 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_connect_dlg DIALOG  0, 0, 211, 139
+opt_connect_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1048,7 +1050,7 @@ BEGIN
     CTEXT           "Stop processing.",-1,7,20,141,8
 END
 
-opt_trmode3_dlg DIALOG  0, 0, 211, 139
+opt_trmode3_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1306,7 +1308,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,96,63,50,14
 END
 
-opt_disp_dlg DIALOG  0, 0, 211, 139
+opt_disp_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
@@ -1512,7 +1514,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 134
+        BOTTOMMARGIN, 148
     END
 
     opt_tool_dlg, DIALOG
@@ -1520,7 +1522,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     chmod_dlg, DIALOG
@@ -1552,7 +1554,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hostname_dlg, DIALOG
@@ -1615,7 +1617,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     opt_notify_dlg, DIALOG
@@ -1623,7 +1625,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_dlg, DIALOG
@@ -1639,7 +1641,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hset_adv_dlg, DIALOG
@@ -1679,7 +1681,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     downerr_dlg, DIALOG
@@ -1711,7 +1713,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     up_exist_dlg, DIALOG
@@ -1791,7 +1793,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     somecmd_dlg, DIALOG
@@ -1815,7 +1817,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     rasnotify_dlg, DIALOG
@@ -1863,7 +1865,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     def_attr_dlg, DIALOG
@@ -2023,7 +2025,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_edit_dlg, DIALOG

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -215,6 +215,7 @@
 #define CONNECT_RASCLOSE                1014
 #define FIRE_LOWER                      1014
 #define MIRROR_TIMECHECK                1014
+#define TRMODE_MAKEDIR                  1014
 #define TOOL_EDITOR_BR                  1015
 #define PERM_A_READ                     1015
 #define SOUND_TRNNG                     1015

--- a/common.h
+++ b/common.h
@@ -1537,12 +1537,12 @@ void CountPrevFfftpWindows(void);
 
 /*===== ftpproc.c =====*/
 
-void DownLoadProc(int ChName, int ForceFile, int All);
-void DirectDownLoadProc(char *Fname);
-void InputDownLoadProc(void);
+void DownloadProc(int ChName, int ForceFile, int All);
+void DirectDownloadProc(char *Fname);
+void InputDownloadProc(void);
 void MirrorDownloadProc(int Notify);
-void UpLoadListProc(int ChName, int All);
-void UpLoadDragProc(WPARAM wParam);
+void UploadListProc(int ChName, int All);
+void UploadDragProc(WPARAM wParam);
 void MirrorUploadProc(int Notify);
 void DeleteProc(void);
 void RenameProc(void);
@@ -1603,7 +1603,9 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);
 //int DoQUOTE(char *CmdStr);
 int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork);
 SOCKET DoClose(SOCKET Sock);
-int DoQUIT(SOCKET ctrl_skt);
+// 同時接続対応
+//int DoQUIT(SOCKET ctrl_skt);
+int DoQUIT(SOCKET ctrl_skt, int *CancelCheckWork);
 int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);
 #if defined(HAVE_TANDEM)
 void SwitchOSSProc(void);
@@ -1636,7 +1638,7 @@ int AskTransferNow(void);
 int AskTransferFileNum(void);
 void GoForwardTransWindow(void);
 void InitTransCurDir(void);
-int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork);
+int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork);
 int CheckPathViolation(TRANSPACKET *packet);
 
 /*===== codecnv.c =====*/
@@ -1696,13 +1698,13 @@ int CheckFname(char *str, char *regexp);
 
 /*===== registory.c =====*/
 
-void SaveRegistory(void);
-int LoadRegistory(void);
-void ClearRegistory(void);
+void SaveRegistry(void);
+int LoadRegistry(void);
+void ClearRegistry(void);
 void SetMasterPassword( const char* );
 int GetMasterPasswordStatus(void);
 int ValidateMasterPassword(void);
-DWORD LoadHideDriveListRegistory(void);
+DWORD LoadHideDriveListRegistry(void);
 void SaveSettingsToFile(void);
 int LoadSettingsFromFile(void);
 

--- a/connect.c
+++ b/connect.c
@@ -340,7 +340,7 @@ void QuickConnectProc(void)
 				EnableUserOpe();
 
 				if(strlen(File) > 0)
-					DirectDownLoadProc(File);
+					DirectDownloadProc(File);
 			}
 			else
 			{
@@ -528,7 +528,7 @@ void DirectConnectProc(char *unc, int Kanji, int Kana, int Fkanji, int TrMode)
 			EnableUserOpe();
 
 			if(strlen(File) > 0)
-				DirectDownLoadProc(File);
+				DirectDownloadProc(File);
 			else
 				ResetAutoExitFlg();
 		}
@@ -1265,13 +1265,17 @@ void DisconnectProc(void)
 
 	if((CmdCtrlSocket != INVALID_SOCKET) && (CmdCtrlSocket != TrnCtrlSocket))
 	{
-		DoQUIT(CmdCtrlSocket);
+		// 同時接続対応
+//		DoQUIT(CmdCtrlSocket);
+		DoQUIT(CmdCtrlSocket, &CancelFlg);
 		DoClose(CmdCtrlSocket);
 	}
 
 	if(TrnCtrlSocket != INVALID_SOCKET)
 	{
-		DoQUIT(TrnCtrlSocket);
+		// 同時接続対応
+//		DoQUIT(TrnCtrlSocket);
+		DoQUIT(TrnCtrlSocket, &CancelFlg);
 		DoClose(TrnCtrlSocket);
 
 		SaveCurrentSetToHistory();
@@ -1994,17 +1998,109 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 *----------------------------------------------------------------------------*/
 
 // IPv6対応
+typedef SOCKET (__cdecl* LPCONNECTSOCK)(char*, int, char*, int*);
+
+typedef struct
+{
+	HANDLE h;
+	DWORD ExitCode;
+	char *host;
+	int port;
+	char *PreMsg;
+	int CancelCheckWork;
+	LPCONNECTSOCK f;
+	SOCKET s;
+} CONNECTSOCKDATA;
+
+DWORD WINAPI connectsockThreadProc(LPVOID lpParameter)
+{
+	CONNECTSOCKDATA* pData;
+	pData = (CONNECTSOCKDATA*)lpParameter;
+	pData->s = pData->f(pData->host, pData->port, pData->PreMsg, &pData->CancelCheckWork);
+	return 0;
+}
+
+// IPv6対応
 SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 {
 	SOCKET Result;
+	CONNECTSOCKDATA DataIPv4;
+	CONNECTSOCKDATA DataIPv6;
 	Result = INVALID_SOCKET;
 	switch(CurHost.CurNetType)
 	{
 	case NTYPE_AUTO:
-		if((Result = connectsockIPv4(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
-			CurHost.CurNetType = NTYPE_IPV4;
-		else if((Result = connectsockIPv6(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
-			CurHost.CurNetType = NTYPE_IPV6;
+//		if((Result = connectsockIPv4(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
+//			CurHost.CurNetType = NTYPE_IPV4;
+//		else if((Result = connectsockIPv6(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
+//			CurHost.CurNetType = NTYPE_IPV6;
+		DataIPv4.host = host;
+		DataIPv4.port = port;
+		DataIPv4.PreMsg = PreMsg;
+		DataIPv4.CancelCheckWork = *CancelCheckWork;
+		DataIPv4.f = connectsockIPv4;
+		DataIPv4.h = CreateThread(NULL, 0, connectsockThreadProc, &DataIPv4, 0, NULL);
+		DataIPv6.host = host;
+		DataIPv6.port = port;
+		DataIPv6.PreMsg = PreMsg;
+		DataIPv6.CancelCheckWork = *CancelCheckWork;
+		DataIPv6.f = connectsockIPv6;
+		DataIPv6.h = CreateThread(NULL, 0, connectsockThreadProc, &DataIPv6, 0, NULL);
+		while(1)
+		{
+			if(GetExitCodeThread(DataIPv4.h, &DataIPv4.ExitCode))
+			{
+				if(DataIPv4.ExitCode != STILL_ACTIVE)
+				{
+					if(DataIPv4.s != INVALID_SOCKET)
+					{
+						Result = DataIPv4.s;
+						CurHost.CurNetType = NTYPE_IPV4;
+						break;
+					}
+				}
+			}
+			if(GetExitCodeThread(DataIPv6.h, &DataIPv6.ExitCode))
+			{
+				if(DataIPv6.ExitCode != STILL_ACTIVE)
+				{
+					if(DataIPv6.s != INVALID_SOCKET)
+					{
+						Result = DataIPv6.s;
+						CurHost.CurNetType = NTYPE_IPV6;
+						break;
+					}
+				}
+			}
+			if(GetExitCodeThread(DataIPv4.h, &DataIPv4.ExitCode) && GetExitCodeThread(DataIPv6.h, &DataIPv6.ExitCode))
+			{
+				if(DataIPv4.ExitCode != STILL_ACTIVE && DataIPv6.ExitCode != STILL_ACTIVE)
+				{
+					if(DataIPv4.s == INVALID_SOCKET && DataIPv6.s == INVALID_SOCKET)
+						break;
+				}
+			}
+			DataIPv4.CancelCheckWork = *CancelCheckWork;
+			DataIPv6.CancelCheckWork = *CancelCheckWork;
+			BackgrndMessageProc();
+			Sleep(1);
+		}
+		while(1)
+		{
+			if(GetExitCodeThread(DataIPv4.h, &DataIPv4.ExitCode) && GetExitCodeThread(DataIPv6.h, &DataIPv6.ExitCode))
+			{
+				if(DataIPv4.ExitCode != STILL_ACTIVE && DataIPv6.ExitCode != STILL_ACTIVE)
+				{
+					CloseHandle(DataIPv4.h);
+					CloseHandle(DataIPv6.h);
+					break;
+				}
+			}
+			DataIPv4.CancelCheckWork = YES;
+			DataIPv6.CancelCheckWork = YES;
+			BackgrndMessageProc();
+			Sleep(1);
+		}
 		break;
 	case NTYPE_IPV4:
 		Result = connectsockIPv4(host, port, PreMsg, CancelCheckWork);
@@ -2067,7 +2163,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 		else
 		{
 			// アドレスを取得
-			SetTaskMsg(MSGJPN016, DomainName);
+			// IPv6対応
+//			SetTaskMsg(MSGJPN016, DomainName);
+			SetTaskMsg(MSGJPN016, DomainName, MSGJPN333);
 			// IPv6対応
 //			pHostEntry = do_gethostbyname(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
 			pHostEntry = do_gethostbynameIPv4(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
@@ -2079,7 +2177,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 //			memcpy((char *)&CurSockAddr.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
 //			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
 			memcpy((char *)&CurSockAddrIPv4.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
-			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port));
+			// IPv6対応
+//			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port));
+			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port), MSGJPN333);
 		}
 		else
 		{
@@ -2088,11 +2188,13 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				UseIPadrs = NO;
 				// IPv6対応
 //				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddr.sin_port));
-				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv4.sin_port));
+				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv4.sin_port), MSGJPN333);
 			}
 			else
 			{
-				SetTaskMsg(MSGJPN019, host);
+				// IPv6対応
+//				SetTaskMsg(MSGJPN019, host);
+				SetTaskMsg(MSGJPN019, host, MSGJPN333);
 				return(INVALID_SOCKET);
 			}
 		}
@@ -2100,7 +2202,7 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 	else
 		// IPv6対応
 //		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
-		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port));
+		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port), MSGJPN333);
 
 	if((Fwall == FWALL_SOCKS4) || (Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 	{
@@ -2138,7 +2240,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				memcpy((char *)&SocksSockAddrIPv4.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
 			else
 			{
-				SetTaskMsg(MSGJPN021, FwallHost);
+				// IPv6対応
+//				SetTaskMsg(MSGJPN021, FwallHost);
+				SetTaskMsg(MSGJPN021, FwallHost, MSGJPN333);
 				return INVALID_SOCKET;
 			}
 		}
@@ -2148,7 +2252,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 //		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddr.sin_addr), ntohs(SocksSockAddr.sin_port));
 		SocksSockAddrIPv4.sin_port = htons((u_short)FwallPort);
 		SocksSockAddrIPv4.sin_family = AF_INET;
-		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddrIPv4.sin_addr), ntohs(SocksSockAddrIPv4.sin_port));
+		// IPv6対応
+//		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddrIPv4.sin_addr), ntohs(SocksSockAddrIPv4.sin_port));
+		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddrIPv4.sin_addr), ntohs(SocksSockAddrIPv4.sin_port), MSGJPN333);
 		// connectで接続する先はSOCKSサーバ
 		// IPv6対応
 //		memcpy(&saSockAddr, &SocksSockAddr, sizeof(SocksSockAddr));
@@ -2181,7 +2287,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				   (Socks4GetCmdReply(sSocket, &Socks4Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks4Reply.Result != SOCKS4_RES_OK))
 				{
-					SetTaskMsg(MSGJPN023, Socks4Reply.Result);
+					// IPv6対応
+//					SetTaskMsg(MSGJPN023, Socks4Reply.Result);
+					SetTaskMsg(MSGJPN023, Socks4Reply.Result, MSGJPN333);
 					DoClose(sSocket);
 					sSocket = INVALID_SOCKET;
 				}
@@ -2203,7 +2311,9 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				   (Socks5GetCmdReply(sSocket, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
-					SetTaskMsg(MSGJPN024, Socks5Reply.Result);
+					// IPv6対応
+//					SetTaskMsg(MSGJPN024, Socks5Reply.Result);
+					SetTaskMsg(MSGJPN024, Socks5Reply.Result, MSGJPN333);
 					DoClose(sSocket);
 					sSocket = INVALID_SOCKET;
 				}
@@ -2211,18 +2321,24 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
 			}
 
 			if(sSocket != INVALID_SOCKET)
-				SetTaskMsg(MSGJPN025);
+				// IPv6対応
+//				SetTaskMsg(MSGJPN025);
+				SetTaskMsg(MSGJPN025, MSGJPN333);
 		}
 		else
 		{
 //#pragma aaa
-			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/);
+			// IPv6対応
+//			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/);
+			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/, MSGJPN333);
 			DoClose(sSocket);
 			sSocket = INVALID_SOCKET;
 		}
 	}
 	else
-		SetTaskMsg(MSGJPN027);
+		// IPv6対応
+//		SetTaskMsg(MSGJPN027);
+		SetTaskMsg(MSGJPN027, MSGJPN333);
 
 	return(sSocket);
 }
@@ -2268,31 +2384,31 @@ SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
 		else
 		{
 			// アドレスを取得
-			SetTaskMsg(MSGJPN016, DomainName);
+			SetTaskMsg(MSGJPN016, DomainName, MSGJPN334);
 			pHostEntry = do_gethostbynameIPv6(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
 		}
 
 		if(pHostEntry != NULL)
 		{
 			memcpy((char *)&CurSockAddrIPv6.sin6_addr, pHostEntry->h_addr, pHostEntry->h_length);
-			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port));
+			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port), MSGJPN334);
 		}
 		else
 		{
 			if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 			{
 				UseIPadrs = NO;
-				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv6.sin6_port));
+				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv6.sin6_port), MSGJPN334);
 			}
 			else
 			{
-				SetTaskMsg(MSGJPN019, host);
+				SetTaskMsg(MSGJPN019, host, MSGJPN334);
 				return(INVALID_SOCKET);
 			}
 		}
 	}
 	else
-		SetTaskMsg(MSGJPN020, PreMsg, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port));
+		SetTaskMsg(MSGJPN020, PreMsg, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port), MSGJPN334);
 
 	if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 	{
@@ -2310,13 +2426,13 @@ SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				memcpy((char *)&SocksSockAddrIPv6.sin6_addr, pHostEntry->h_addr, pHostEntry->h_length);
 			else
 			{
-				SetTaskMsg(MSGJPN021, FwallHost);
+				SetTaskMsg(MSGJPN021, FwallHost, MSGJPN334);
 				return INVALID_SOCKET;
 			}
 		}
 		SocksSockAddrIPv6.sin6_port = htons((u_short)FwallPort);
 		SocksSockAddrIPv6.sin6_family = AF_INET6;
-		SetTaskMsg(MSGJPN022, inet6_ntoa(SocksSockAddrIPv6.sin6_addr), ntohs(SocksSockAddrIPv6.sin6_port));
+		SetTaskMsg(MSGJPN022, inet6_ntoa(SocksSockAddrIPv6.sin6_addr), ntohs(SocksSockAddrIPv6.sin6_port), MSGJPN334);
 		// connectで接続する先はSOCKSサーバ
 		memcpy(&saSockAddr, &SocksSockAddrIPv6, sizeof(SocksSockAddrIPv6));
 	}
@@ -2352,7 +2468,7 @@ SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
 				   (Socks5GetCmdReply(sSocket, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
-					SetTaskMsg(MSGJPN024, Socks5Reply.Result);
+					SetTaskMsg(MSGJPN024, Socks5Reply.Result, MSGJPN334);
 					DoClose(sSocket);
 					sSocket = INVALID_SOCKET;
 				}
@@ -2360,18 +2476,18 @@ SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
 			}
 
 			if(sSocket != INVALID_SOCKET)
-				SetTaskMsg(MSGJPN025);
+				SetTaskMsg(MSGJPN025, MSGJPN334);
 		}
 		else
 		{
 //#pragma aaa
-			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/);
+			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/, MSGJPN334);
 			DoClose(sSocket);
 			sSocket = INVALID_SOCKET;
 		}
 	}
 	else
-		SetTaskMsg(MSGJPN027);
+		SetTaskMsg(MSGJPN027, MSGJPN334);
 
 	return(sSocket);
 }
@@ -2454,7 +2570,9 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 				   (Socks4GetCmdReply(listen_skt, &Socks4Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks4Reply.Result != SOCKS4_RES_OK))
 				{
-					SetTaskMsg(MSGJPN028, Socks4Reply.Result);
+					// IPv6対応
+//					SetTaskMsg(MSGJPN028, Socks4Reply.Result);
+					SetTaskMsg(MSGJPN028, Socks4Reply.Result, MSGJPN333);
 					DoClose(listen_skt);
 					listen_skt = INVALID_SOCKET;
 				}
@@ -2496,7 +2614,9 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 				   (Socks5GetCmdReply(listen_skt, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
-					SetTaskMsg(MSGJPN029, Socks5Reply.Result);
+					// IPv6対応
+//					SetTaskMsg(MSGJPN029, Socks5Reply.Result);
+					SetTaskMsg(MSGJPN029, Socks5Reply.Result, MSGJPN333);
 					DoClose(listen_skt);
 					listen_skt = INVALID_SOCKET;
 				}
@@ -2556,7 +2676,9 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 			}
 
 			if(listen_skt == INVALID_SOCKET)
-				SetTaskMsg(MSGJPN030);
+				// IPv6対応
+//				SetTaskMsg(MSGJPN030);
+				SetTaskMsg(MSGJPN030, MSGJPN333);
 		}
 	}
 	else
@@ -2573,7 +2695,9 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 				UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),
 				UC(p[0]), UC(p[1])) / 100) != FTP_COMPLETE)
 		{
-			SetTaskMsg(MSGJPN031);
+			// IPv6対応
+//			SetTaskMsg(MSGJPN031);
+			SetTaskMsg(MSGJPN031, MSGJPN333);
 			do_closesocket(listen_skt);
 			listen_skt = INVALID_SOCKET;
 		}
@@ -2630,7 +2754,7 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 				   (Socks5GetCmdReply(listen_skt, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
-					SetTaskMsg(MSGJPN029, Socks5Reply.Result);
+					SetTaskMsg(MSGJPN029, Socks5Reply.Result, MSGJPN334);
 					DoClose(listen_skt);
 					listen_skt = INVALID_SOCKET;
 				}
@@ -2690,7 +2814,7 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 			}
 
 			if(listen_skt == INVALID_SOCKET)
-				SetTaskMsg(MSGJPN030);
+				SetTaskMsg(MSGJPN030, MSGJPN334);
 		}
 	}
 	else
@@ -2707,7 +2831,7 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 				AddressToStringIPv6(Adrs, a),
 				(UC(p[0]) << 8) | UC(p[1])) / 100) != FTP_COMPLETE)
 		{
-			SetTaskMsg(MSGJPN031);
+			SetTaskMsg(MSGJPN031, MSGJPN334);
 			do_closesocket(listen_skt);
 			listen_skt = INVALID_SOCKET;
 		}

--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -62,6 +62,13 @@ Changes in Ver.1.98e
 
 -- Fixed bugs of hanging on exit in some cases.
 
+-- Fixed bugs of hanging at accessing non-existent directories without full
+   path.
+
+-- Changed behavior of Auto of network type selection.
+   Name resolution and connection will be performed at same time on IPv4 and
+   IPv6, and whichever finished earlier will be used.
+
 
 Outline
 -------

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -34,6 +34,13 @@ Changes in Ver.1.98e
 
 -- Fixed bugs of hanging on exit in some cases.
 
+-- Fixed bugs of hanging at accessing non-existent directories without full
+   path.
+
+-- Changed behavior of Auto of network type selection.
+   Name resolution and connection will be performed at same time on IPv4 and
+   IPv6, and whichever finished earlier will be used.
+
 Changes in Ver.1.98d
 --------------------
 

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -66,6 +66,13 @@ Ver 1.98e
 
 EI—¹Žž‚ɃtƒŠ[ƒY‚·‚邱‚Æ‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
 
+Eƒtƒ‹ƒpƒX‚ŃAƒNƒZƒX‚µ‚È‚¢Ý’è‚Å‘¶Ý‚µ‚È‚¢ƒfƒBƒŒƒNƒgƒŠ‚ɃAƒNƒZƒX‚·‚é‚Æ
+@ƒtƒŠ[ƒY‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
+
+Eƒlƒbƒgƒ[ƒN‚ÌŽí—Þ‚ðŽ©“®‚ɐݒ肵‚Ä‚¢‚éê‡‚Ì‹““®‚ð•ÏX‚µ‚Ü‚µ‚½B
+@IPv4‚ÆIPv6‚Ì—¼•û‚Å–¼‘O‰ðŒˆ‚Ɛڑ±‚𓯎ž‚ɍs‚¢Aæ‚ɐڑ±‚ªŠ®—¹‚µ‚½•û‚ð
+@Žg—p‚µ‚Ü‚·B
+
 
 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
 -----------------------

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -38,6 +38,13 @@ FFFTP
 
 EI—¹Žž‚ɃtƒŠ[ƒY‚·‚邱‚Æ‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
 
+Eƒtƒ‹ƒpƒX‚ŃAƒNƒZƒX‚µ‚È‚¢Ý’è‚Å‘¶Ý‚µ‚È‚¢ƒfƒBƒŒƒNƒgƒŠ‚ɃAƒNƒZƒX‚·‚é‚Æ
+@ƒtƒŠ[ƒY‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
+
+Eƒlƒbƒgƒ[ƒN‚ÌŽí—Þ‚ðŽ©“®‚ɐݒ肵‚Ä‚¢‚éê‡‚Ì‹““®‚ð•ÏX‚µ‚Ü‚µ‚½B
+@IPv4‚ÆIPv6‚Ì—¼•û‚Å–¼‘O‰ðŒˆ‚Ɛڑ±‚𓯎ž‚ɍs‚¢Aæ‚ɐڑ±‚ªŠ®—¹‚µ‚½•û‚ð
+@Žg—p‚µ‚Ü‚·B
+
 ¡Ver 1.98d
 
 EMLSDƒRƒ}ƒ“ƒh‚ɑΉž‚µ‚½ƒzƒXƒg‚Å‚ÍMLSDƒRƒ}ƒ“ƒh‚ð—p‚¢‚ătƒ@ƒCƒ‹ˆê——‚ð

--- a/filelist.c
+++ b/filelist.c
@@ -798,7 +798,7 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 			if(hWnd == hWndListRemote)
 			{
 				if(AskConnecting() == YES)
-					UpLoadDragProc(wParam);
+					UploadDragProc(wParam);
 			}
 			else if(hWnd == hWndListLocal)
 			{
@@ -1443,7 +1443,7 @@ void GetLocalDirForWnd(void)
 	if(DispDrives)
 	{
 		GetLogicalDriveStrings(FMAX_PATH, Scan);
-		NoDrives = LoadHideDriveListRegistory();
+		NoDrives = LoadHideDriveListRegistry();
 
 		Pos = Scan;
 		while(*Pos != NUL)

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -71,7 +71,7 @@ static INT_PTR CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wP
 static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static void CountMirrorFiles(HWND hDlg, TRANSPACKET *Pkt);
 static int AskMirrorNoTrn(char *Fname, int Mode);
-static int AskUpLoadFileAttr(char *Fname);
+static int AskUploadFileAttr(char *Fname);
 // 64ビット対応
 //static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
@@ -140,14 +140,13 @@ static double FileSize;		/* ファイル総容量 */
 
 // ディレクトリ自動作成
 // ローカル側のパスから必要なフォルダを作成
-int MakeDirFromLocalPath(char* LocalFile)
+int MakeDirFromLocalPath(char* LocalFile, char* Old)
 {
 	TRANSPACKET Pkt;
 	char* pDelimiter;
 	char* pNext;
 	char* Cat;
 	int Len;
-	char Tmp[FMAX_PATH+1];
 	int Make;
 	pDelimiter = LocalFile;
 	Make = NO;
@@ -156,9 +155,7 @@ int MakeDirFromLocalPath(char* LocalFile)
 		Len = pNext - LocalFile;
 		strncpy(Pkt.LocalFile, LocalFile, Len);
 		Pkt.LocalFile[Len] = '\0';
-		AskLocalCurDir(Tmp, FMAX_PATH);
-		SetYenTail(Tmp);
-		if(strncmp(LocalFile, Tmp, Len + 1) != 0)
+		if(strncmp(LocalFile, Old, Len + 1) != 0)
 		{
 			Cat = Pkt.LocalFile + (pDelimiter - LocalFile);
 			if(FnameCnv == FNAME_LOWER)
@@ -178,11 +175,13 @@ int MakeDirFromLocalPath(char* LocalFile)
 	return Make;
 }
 
-void DownLoadProc(int ChName, int ForceFile, int All)
+void DownloadProc(int ChName, int ForceFile, int All)
 {
 	FILELIST *FileListBase;
 	FILELIST *Pos;
 	TRANSPACKET Pkt;
+	// ディレクトリ自動作成
+	char Tmp[FMAX_PATH+1];
 
 	// 同時接続対応
 	CancelFlg = NO;
@@ -286,6 +285,8 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
 
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.LocalFile);
 				Pkt.Mode = CheckLocalFile(&Pkt);	/* Pkt.ExistSize がセットされる */
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
@@ -294,7 +295,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 //					AddTransFileList(&Pkt);
 				{
 					if(MakeAllDir == YES)
-						MakeDirFromLocalPath(Pkt.LocalFile);
+						MakeDirFromLocalPath(Pkt.LocalFile, Tmp);
 					AddTransFileList(&Pkt);
 				}
 			}
@@ -331,7 +332,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void DirectDownLoadProc(char *Fname)
+void DirectDownloadProc(char *Fname)
 {
 	TRANSPACKET Pkt;
 
@@ -434,7 +435,7 @@ void DirectDownLoadProc(char *Fname)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void InputDownLoadProc(void)
+void InputDownloadProc(void)
 {
 	char Path[FMAX_PATH+1];
 	int Tmp;
@@ -444,7 +445,7 @@ void InputDownLoadProc(void)
 	strcpy(Path, "");
 	if(InputDialogBox(downname_dlg, GetMainHwnd(), NULL, Path, FMAX_PATH, &Tmp, IDH_HELP_TOPIC_0000001) == YES)
 	{
-		DirectDownLoadProc(Path);
+		DirectDownloadProc(Path);
 	}
 
 //	EnableUserOpe();
@@ -940,7 +941,7 @@ static INT_PTR CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM
 
 // ディレクトリ自動作成
 // リモート側のパスから必要なディレクトリを作成
-int MakeDirFromRemotePath(char* RemoteFile, int FirstAdd)
+int MakeDirFromRemotePath(char* RemoteFile, char* Old, int FirstAdd)
 {
 	TRANSPACKET Pkt;
 	TRANSPACKET Pkt1;
@@ -948,7 +949,6 @@ int MakeDirFromRemotePath(char* RemoteFile, int FirstAdd)
 	char* pNext;
 	char* Cat;
 	int Len;
-	char Tmp[FMAX_PATH+1];
 	int Make;
 	pDelimiter = RemoteFile;
 	Make = NO;
@@ -957,9 +957,7 @@ int MakeDirFromRemotePath(char* RemoteFile, int FirstAdd)
 		Len = pNext - RemoteFile;
 		strncpy(Pkt.RemoteFile, RemoteFile, Len);
 		Pkt.RemoteFile[Len] = '\0';
-		AskRemoteCurDir(Tmp, FMAX_PATH);
-		SetSlashTail(Tmp);
-		if(strncmp(RemoteFile, Tmp, Len + 1) != 0)
+		if(strncmp(RemoteFile, Old, Len + 1) != 0)
 		{
 			Cat = Pkt.RemoteFile + (pDelimiter - RemoteFile);
 			if(FnameCnv == FNAME_LOWER)
@@ -1004,7 +1002,7 @@ int MakeDirFromRemotePath(char* RemoteFile, int FirstAdd)
 	return Make;
 }
 
-void UpLoadListProc(int ChName, int All)
+void UploadListProc(int ChName, int All)
 {
 	FILELIST *FileListBase;
 	FILELIST *Pos;
@@ -1143,7 +1141,7 @@ void UpLoadListProc(int ChName, int All)
 				Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 				Pkt.Size = 0;
 				Pkt.Time = Pos->Time;
-				Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+				Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 				Pkt.KanjiCode = AskHostKanjiCode();
 				// UTF-8対応
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
@@ -1153,6 +1151,8 @@ void UpLoadListProc(int ChName, int All)
 					CalcExtentSize(&Pkt, Pos->Size);
 				}
 #endif
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.RemoteFile);
 				Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
@@ -1161,7 +1161,7 @@ void UpLoadListProc(int ChName, int All)
 					// ディレクトリ自動作成
 					if(MakeAllDir == YES)
 					{
-						if(MakeDirFromRemotePath(Pkt.RemoteFile, FirstAdd) == YES)
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, Tmp, FirstAdd) == YES)
 							FirstAdd = NO;
 					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
@@ -1210,7 +1210,7 @@ void UpLoadListProc(int ChName, int All)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void UpLoadDragProc(WPARAM wParam)
+void UploadDragProc(WPARAM wParam)
 {
 	FILELIST *FileListBase;
 	FILELIST *Pos;
@@ -1316,7 +1316,7 @@ void UpLoadDragProc(WPARAM wParam)
 				Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 				Pkt.Size = 0;
 				Pkt.Time = Pos->Time;
-				Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+				Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 				Pkt.KanjiCode = AskHostKanjiCode();
 				// UTF-8対応
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
@@ -1327,6 +1327,8 @@ void UpLoadDragProc(WPARAM wParam)
 					CalcExtentSize(&Pkt, Pos->Size);
 				}
 #endif
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.RemoteFile);
 				Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
@@ -1335,7 +1337,7 @@ void UpLoadDragProc(WPARAM wParam)
 					// ディレクトリ自動作成
 					if(MakeAllDir == YES)
 					{
-						if(MakeDirFromRemotePath(Pkt.RemoteFile, FirstAdd) == YES)
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, Tmp, FirstAdd) == YES)
 							FirstAdd = NO;
 					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
@@ -1600,7 +1602,7 @@ void MirrorUploadProc(int Notify)
 						Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 						Pkt.Size = 0;
 						Pkt.Time = LocalPos->Time;
-						Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+						Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 						Pkt.KanjiCode = AskHostKanjiCode();
 						// UTF-8対応
 						Pkt.KanjiCodeDesired = AskLocalKanjiCode();
@@ -1973,7 +1975,7 @@ static int AskMirrorNoTrn(char *Fname, int Mode)
 *		int 属性 (-1=設定なし)
 *----------------------------------------------------------------------------*/
 
-static int AskUpLoadFileAttr(char *Fname)
+static int AskUploadFileAttr(char *Fname)
 {
 	int Ret;
 	int Sts;

--- a/getput.c
+++ b/getput.c
@@ -84,9 +84,9 @@ static void DispTransPacket(TRANSPACKET *Pkt);
 static void EraseTransFileList(void);
 static ULONG WINAPI TransferThread(void *Dummy);
 static int MakeNonFullPath(TRANSPACKET *Pkt, char *CurDir, char *Tmp);
-static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
-static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
-static int DownLoadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork);
+static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
+static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
+static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork);
 static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode);
 // 再転送対応
 //static int DispUpDownErrDialog(int ResID, HWND hWnd, char *Fname);
@@ -98,10 +98,10 @@ static int SetDownloadResume(TRANSPACKET *Pkt, int ProcMode, LONGLONG Size, int
 // 64ビット対応
 //static BOOL CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
-static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt);
-static int UpLoadNonPassive(TRANSPACKET *Pkt);
-static int UpLoadPassive(TRANSPACKET *Pkt);
-static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt);
+static int DoUpload(SOCKET cSkt, TRANSPACKET *Pkt);
+static int UploadNonPassive(TRANSPACKET *Pkt);
+static int UploadPassive(TRANSPACKET *Pkt);
+static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt);
 // 同時接続対応
 //static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data, int Size, int Ascii);
 static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data, int Size, int Ascii, int *CancelCheckWork);
@@ -182,6 +182,8 @@ extern int MirUpDelNotify;
 extern int MirDownDelNotify;
 extern int FolderAttr;
 extern int FolderAttrNum;
+// 同時接続対応
+extern int SendQuit;
 
 
 /*----- ファイル転送スレッドを起動する ----------------------------------------
@@ -791,7 +793,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 					if(timeGetTime() - LastUsed > 60000 || NewCmdSkt == INVALID_SOCKET)
 					{
 						ReleaseMutex(hListAccMutex);
-						SendData(TrnSkt, "QUIT\r\n", 6, 0, &Canceled[ThreadCount]);
+						DoQUIT(TrnSkt, &Canceled[ThreadCount]);
 						DoClose(TrnSkt);
 						TrnSkt = INVALID_SOCKET;
 //						WaitForSingleObject(hListAccMutex, INFINITE);
@@ -882,11 +884,11 @@ static ULONG WINAPI TransferThread(void *Dummy)
 						}
 
 						Down = YES;
-//						if(DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)
+//						if(DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)
 //						{
 //							if(ReConnectTrnSkt() == FFFTP_SUCCESS)
-//								DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
-								DoDownLoad(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]);
+//								DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
+								DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]);
 //						}
 					}
 				}
@@ -904,11 +906,11 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				if(MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
 				{
 					Up = YES;
-//					if(DoUpLoad(AskTrnCtrlSkt(), TransPacketBase) == 429)
+//					if(DoUpload(AskTrnCtrlSkt(), TransPacketBase) == 429)
 //					{
 //						if(ReConnectTrnSkt() == FFFTP_SUCCESS)
-//							DoUpLoad(AskTrnCtrlSkt(), TransPacketBase);
-							DoUpLoad(TrnSkt, Pos);
+//							DoUpload(AskTrnCtrlSkt(), TransPacketBase);
+							DoUpload(TrnSkt, Pos);
 //					}
 				}
 				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
@@ -1132,9 +1134,11 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				{
 					for(i = 0; i < MAX_DATA_CONNECTION; i++)
 						Canceled[i] = YES;
+					if(Pos != NULL)
+						strcpy(Pos->Cmd, "");
+					Pos = NULL;
 					EraseTransFileList();
 					GoExit = YES;
-					Pos = NULL;
 				}
 				else
 				{
@@ -1297,7 +1301,7 @@ static int MakeNonFullPath(TRANSPACKET *Pkt, char *Cur, char *Tmp)
 *		からも呼ばれる。メインのスレッドから呼ばれる時は Pkt->hWndTrans == NULL。
 *----------------------------------------------------------------------------*/
 
-int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
+int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 {
 	int iRetCode;
 	char Reply[ERR_MSG_LEN+7];
@@ -1339,9 +1343,9 @@ int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 			else if(BackgrndMessageProc() == NO)
 			{
 				if(AskPasvMode() != YES)
-					iRetCode = DownLoadNonPassive(Pkt, CancelCheckWork);
+					iRetCode = DownloadNonPassive(Pkt, CancelCheckWork);
 				else
-					iRetCode = DownLoadPassive(Pkt, CancelCheckWork);
+					iRetCode = DownloadPassive(Pkt, CancelCheckWork);
 			}
 			else
 				iRetCode = 500;
@@ -1370,7 +1374,7 @@ int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
+static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 {
 	int iRetCode;
 	int iLength;
@@ -1444,16 +1448,16 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 					// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 					ReleaseMutex(hListAccMutex);
 					// FTPS対応
-//					iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+//					iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 					if(IsSSLAttached(Pkt->ctrl_skt))
 					{
 						if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))
-							iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+							iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 						else
 							iRetCode = 500;
 					}
 					else
-						iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+						iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 //					data_socket = DoClose(data_socket);
 				}
 			}
@@ -1489,7 +1493,7 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
+static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 {
 	int iRetCode;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
@@ -1537,16 +1541,16 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 						// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 						ReleaseMutex(hListAccMutex);
 						// FTPS対応
-//						iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+//						iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 						if(IsSSLAttached(Pkt->ctrl_skt))
 						{
 							if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))
-								iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+								iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 							else
 								iRetCode = 500;
 						}
 						else
-							iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+							iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 //						data_socket = DoClose(data_socket);
 					}
 					else
@@ -1596,7 +1600,7 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 *			ダイアログを出さない場合、このルーチンからDispDownloadSize()を呼ぶ
 *----------------------------------------------------------------------------*/
 
-static int DownLoadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork)
+static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork)
 {
 	int iNumBytes;
 	char Buf[BUFSIZE];
@@ -2563,7 +2567,7 @@ static INT_PTR CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
+static int DoUpload(SOCKET cSkt, TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	char Reply[ERR_MSG_LEN+7];
@@ -2597,9 +2601,9 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 				else if(BackgrndMessageProc() == NO)
 				{
 					if(AskPasvMode() != YES)
-						iRetCode = UpLoadNonPassive(Pkt);
+						iRetCode = UploadNonPassive(Pkt);
 					else
-						iRetCode = UpLoadPassive(Pkt);
+						iRetCode = UploadPassive(Pkt);
 				}
 				else
 					iRetCode = 500;
@@ -2644,7 +2648,7 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int UpLoadNonPassive(TRANSPACKET *Pkt)
+static int UploadNonPassive(TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	int iLength;
@@ -2739,16 +2743,16 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 				ReleaseMutex(hListAccMutex);
 				// FTPS対応
-//				iRetCode = UpLoadFile(Pkt, data_socket);
+//				iRetCode = UploadFile(Pkt, data_socket);
 				if(IsSSLAttached(Pkt->ctrl_skt))
 				{
 					if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))
-						iRetCode = UpLoadFile(Pkt, data_socket);
+						iRetCode = UploadFile(Pkt, data_socket);
 					else
 						iRetCode = 500;
 				}
 				else
-					iRetCode = UpLoadFile(Pkt, data_socket);
+					iRetCode = UploadFile(Pkt, data_socket);
 				data_socket = DoClose(data_socket);
 			}
 		}
@@ -2781,7 +2785,7 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int UpLoadPassive(TRANSPACKET *Pkt)
+static int UploadPassive(TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
@@ -2852,16 +2856,16 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 					// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 					ReleaseMutex(hListAccMutex);
 					// FTPS対応
-//					iRetCode = UpLoadFile(Pkt, data_socket);
+//					iRetCode = UploadFile(Pkt, data_socket);
 					if(IsSSLAttached(Pkt->ctrl_skt))
 					{
 						if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))
-							iRetCode = UpLoadFile(Pkt, data_socket);
+							iRetCode = UploadFile(Pkt, data_socket);
 						else
 							iRetCode = 500;
 					}
 					else
-						iRetCode = UpLoadFile(Pkt, data_socket);
+						iRetCode = UploadFile(Pkt, data_socket);
 
 					data_socket = DoClose(data_socket);
 				}
@@ -2910,7 +2914,7 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 *		転送ダイアログを出さないでアップロードすることはない
 *----------------------------------------------------------------------------*/
 
-static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
+static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 {
 	DWORD iNumBytes;
 	HANDLE iFileHandle;

--- a/hostman.c
+++ b/hostman.c
@@ -127,7 +127,7 @@ int SelectHost(int Type)
 
 	/* ホスト設定を保存 */
 	SetNodeLevelAll();
-	SaveRegistory();
+	SaveRegistry();
 
 	return(Sts);
 }

--- a/main.c
+++ b/main.c
@@ -234,7 +234,7 @@ BYTE SSLRootCAFileHash[20];
 // ファイルアイコン表示対応
 int DispFileIcon = NO;
 // ディレクトリ自動作成
-int MakeAllDir = YES;
+int MakeAllDir = NO;
 
 
 
@@ -452,7 +452,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 		/* 2010.02.01 genta マスターパスワードを入力させる
 		  -z オプションがあるときは最初だけスキップ
 		  -z オプションがないときは，デフォルトパスワードをまず試す
-		  LoadRegistory()する
+		  LoadRegistry()する
 		  パスワードが不一致なら再入力するか尋ねる．
 		  (破損していた場合はさせない)
 		*/
@@ -497,7 +497,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 		
 		if(masterpass != 0)
 		{
-			LoadRegistory();
+			LoadRegistry();
 
 			// 暗号化通信対応
 			SetSSLTimeoutCallback(TimeOut * 1000, SSLTimeoutCallback);
@@ -1067,42 +1067,42 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 				case MENU_DOWNLOAD :
 					SetCurrentDirAsDirHist();
-					DownLoadProc(NO, NO, NO);
+					DownloadProc(NO, NO, NO);
 					break;
 
 				case MENU_DOWNLOAD_AS :
 					SetCurrentDirAsDirHist();
-					DownLoadProc(YES, NO, NO);
+					DownloadProc(YES, NO, NO);
 					break;
 
 				case MENU_DOWNLOAD_AS_FILE :
 					SetCurrentDirAsDirHist();
-					DownLoadProc(NO, YES, NO);
+					DownloadProc(NO, YES, NO);
 					break;
 
 				case MENU_DOWNLOAD_ALL :
 					SetCurrentDirAsDirHist();
-					DownLoadProc(NO, NO, YES);
+					DownloadProc(NO, NO, YES);
 					break;
 
 				case MENU_DOWNLOAD_NAME :
 					SetCurrentDirAsDirHist();
-					InputDownLoadProc();
+					InputDownloadProc();
 					break;
 
 				case MENU_UPLOAD :
 					SetCurrentDirAsDirHist();
-					UpLoadListProc(NO, NO);
+					UploadListProc(NO, NO);
 					break;
 
 				case MENU_UPLOAD_AS :
 					SetCurrentDirAsDirHist();
-					UpLoadListProc(YES, NO);
+					UploadListProc(YES, NO);
 					break;
 
 				case MENU_UPLOAD_ALL :
 					SetCurrentDirAsDirHist();
-					UpLoadListProc(NO, YES);
+					UploadListProc(NO, YES);
 					break;
 
 				case MENU_MIRROR_UPLOAD :
@@ -1363,7 +1363,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 				case MENU_REGSAVE :
 					GetListTabWidth();
-					SaveRegistory();
+					SaveRegistry();
 					SaveSettingsToFile();
 					break;
 
@@ -1379,7 +1379,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_REGINIT :
 					if(DialogBox(hInstFtp, MAKEINTRESOURCE(reginit_dlg), hWnd, ExeEscDialogProc) == YES)
 					{
-						ClearRegistory();
+						ClearRegistry();
 						SaveExit = NO;
 						PostMessage(hWnd, WM_CLOSE, 0, 0L);
 					}
@@ -2086,7 +2086,7 @@ static void ExitProc(HWND hWnd)
 	if(SaveExit == YES)
 	{
 		GetListTabWidth();
-		SaveRegistory();
+		SaveRegistry();
 
 		if((CacheEntry > 0) && (CacheSave == YES))
 			SaveCache();
@@ -2226,12 +2226,12 @@ void DoubleClickProc(int Win, int Mode, int App)
 							/* 不正なパスを検出 */
 							if(CheckPathViolation(&MainTransPkt) == NO)
 							{
-//								if((Sts = DoDownLoad(AskCmdCtrlSkt(), &MainTransPkt, NO)) == 429)
+//								if((Sts = DoDownload(AskCmdCtrlSkt(), &MainTransPkt, NO)) == 429)
 //								{
 //									ReConnectCmdSkt();
 									// 同時接続対応
 									CancelFlg = NO;
-									Sts = DoDownLoad(AskCmdCtrlSkt(), &MainTransPkt, NO, &CancelFlg);
+									Sts = DoDownload(AskCmdCtrlSkt(), &MainTransPkt, NO, &CancelFlg);
 //								}
 							}
 

--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -14,22 +14,22 @@
 #define MSGJPN013		_Tu8("SHA-1 used.", "SHA-1 used.")
 #define MSGJPN014		_Tu8("MD4(S/KEY) used.", "MD4(S/KEY) used.")
 #define MSGJPN015		_Tu8("Can't process One-time Password.", "Can't process One-time Password.")
-#define MSGJPN016		_Tu8("Searching host %s.", "Searching host %s.")
-#define MSGJPN017		_Tu8("Connecting %sto host %s (%s (%d)).", "Connecting %sto host %s (%s (%d)).")
-#define MSGJPN018		_Tu8("Connecting %sto host %s (%d).", "Connecting %sto host %s (%d).")
-#define MSGJPN019		_Tu8("Host %s not found.", "Host %s not found.")
-#define MSGJPN020		_Tu8("Connecting %sto host %s (%d).", "Connecting %sto host %s (%d).")
-#define MSGJPN021		_Tu8("SOCKS server %s not found.", "SOCKS server %s not found.")
-#define MSGJPN022		_Tu8("Connecting to SOCKS server %s (%d).", "Connecting to SOCKS server %s (%d).")
-#define MSGJPN023		_Tu8("Can't connect to SOCKS server. (Err=%d)", "Can't connect to SOCKS server. (Err=%d)")
-#define MSGJPN024		_Tu8("Can't connect to SOCKS server. (Err=%d)", "Can't connect to SOCKS server. (Err=%d)")
-#define MSGJPN025		_Tu8("Connected.", "Connected.")
-#define MSGJPN026		_Tu8("Can't connected.", "Can't connected.")
-#define MSGJPN027		_Tu8("Can't create socket.", "Can't create socket.")
-#define MSGJPN028		_Tu8("Can't connect to SOCKS server. (Err=%d)", "Can't connect to SOCKS server. (Err=%d)")
-#define MSGJPN029		_Tu8("Can't connect to SOCKS server. (Err=%d)", "Can't connect to SOCKS server. (Err=%d)")
-#define MSGJPN030		_Tu8("Can't create listen socket.", "Can't create listen socket.")
-#define MSGJPN031		_Tu8("PORT command not accepted", "PORT command not accepted")
+#define MSGJPN016		_Tu8("Searching host %s. (%s)", "Searching host %s. (%s)")
+#define MSGJPN017		_Tu8("Connecting %sto host %s (%s (%d)). (%s)", "Connecting %sto host %s (%s (%d)). (%s)")
+#define MSGJPN018		_Tu8("Connecting %sto host %s (%d). (%s)", "Connecting %sto host %s (%d). (%s)")
+#define MSGJPN019		_Tu8("Host %s not found. (%s)", "Host %s not found. (%s)")
+#define MSGJPN020		_Tu8("Connecting %sto host %s (%d). (%s)", "Connecting %sto host %s (%d). (%s)")
+#define MSGJPN021		_Tu8("SOCKS server %s not found. (%s)", "SOCKS server %s not found. (%s)")
+#define MSGJPN022		_Tu8("Connecting to SOCKS server %s (%d). (%s)", "Connecting to SOCKS server %s (%d). (%s)")
+#define MSGJPN023		_Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
+#define MSGJPN024		_Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
+#define MSGJPN025		_Tu8("Connected. (%s)", "Connected. (%s)")
+#define MSGJPN026		_Tu8("Can't connected. (%s)", "Can't connected. (%s)")
+#define MSGJPN027		_Tu8("Can't create socket. (%s)", "Can't create socket. (%s)")
+#define MSGJPN028		_Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
+#define MSGJPN029		_Tu8("Can't connect to SOCKS server. (Err=%d) (%s)", "Can't connect to SOCKS server. (Err=%d) (%s)")
+#define MSGJPN030		_Tu8("Can't create listen socket. (%s)", "Can't create listen socket. (%s)")
+#define MSGJPN031		_Tu8("PORT command not accepted. (%s)", "PORT command not accepted. (%s)")
 #define MSGJPN032		_Tu8("Connection is cancelled by user.", "Connection is cancelled by user.")
 #define MSGJPN033		_Tu8("Can't send SOCKS command. (Cmd = %04X)", "Can't send SOCKS command. (Cmd = %04X)")
 #define MSGJPN034		_Tu8("Can't receive SOCKS5 reply.", "Can't receive SOCKS5 reply.")

--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -14,22 +14,22 @@
 #define MSGJPN013		_Tu8("SHA-1を使用します.", "SHA-1\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99.")
 #define MSGJPN014		_Tu8("MD4(S/KEY)を使用します.", "MD4(S/KEY)\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99.")
 #define MSGJPN015		_Tu8("ワンタイムパスワードが処理できません", "\xE3\x83\xAF\xE3\x83\xB3\xE3\x82\xBF\xE3\x82\xA4\xE3\x83\xA0\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE5\x87\xA6\xE7\x90\x86\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93")
-#define MSGJPN016		_Tu8("ホスト %s を探しています.", "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s \xE3\x82\x92\xE6\x8E\xA2\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
-#define MSGJPN017		_Tu8("%sホスト %s (%s (%d)) に接続しています.", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%s (%d)) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
-#define MSGJPN018		_Tu8("%sホスト %s (%d) に接続しています.", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
-#define MSGJPN019		_Tu8("ホスト %s が見つかりません.", "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s \xE3\x81\x8C\xE8\xA6\x8B\xE3\x81\xA4\xE3\x81\x8B\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN020		_Tu8("%sホスト %s (%d) に接続しています.", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
-#define MSGJPN021		_Tu8("SOCKSサーバー %s が見つかりません.", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC %s \xE3\x81\x8C\xE8\xA6\x8B\xE3\x81\xA4\xE3\x81\x8B\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN022		_Tu8("SOCKSサーバー %s (%d) に接続しています。", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99\xE3\x80\x82")
-#define MSGJPN023		_Tu8("SOCKSサーバーに接続できません. (Err=%d)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d)")
-#define MSGJPN024		_Tu8("SOCKSサーバーに接続できません. (Err=%d)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d)")
-#define MSGJPN025		_Tu8("接続しました.", "\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.")
-#define MSGJPN026		_Tu8("接続できません.", "\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN027		_Tu8("ソケットが作成できません.", "\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN028		_Tu8("SOCKSサーバーに接続できません. (Err=%d)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d)")
-#define MSGJPN029		_Tu8("SOCKSサーバーに接続できません. (Err=%d)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d)")
-#define MSGJPN030		_Tu8("Listenソケットが作成できません.", "Listen\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN031		_Tu8("PORTコマンドが受け付けられません.", "PORT\xE3\x82\xB3\xE3\x83\x9E\xE3\x83\xB3\xE3\x83\x89\xE3\x81\x8C\xE5\x8F\x97\xE3\x81\x91\xE4\xBB\x98\xE3\x81\x91\xE3\x82\x89\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
+#define MSGJPN016		_Tu8("ホスト %s を探しています. (%s)", "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s \xE3\x82\x92\xE6\x8E\xA2\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99. (%s)")
+#define MSGJPN017		_Tu8("%sホスト %s (%s (%d)) に接続しています. (%s)", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%s (%d)) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99. (%s)")
+#define MSGJPN018		_Tu8("%sホスト %s (%d) に接続しています. (%s)", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99. (%s)")
+#define MSGJPN019		_Tu8("ホスト %s が見つかりません. (%s)", "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s \xE3\x81\x8C\xE8\xA6\x8B\xE3\x81\xA4\xE3\x81\x8B\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
+#define MSGJPN020		_Tu8("%sホスト %s (%d) に接続しています. (%s)", "%s\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88 %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99. (%s)")
+#define MSGJPN021		_Tu8("SOCKSサーバー %s が見つかりません. (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC %s \xE3\x81\x8C\xE8\xA6\x8B\xE3\x81\xA4\xE3\x81\x8B\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
+#define MSGJPN022		_Tu8("SOCKSサーバー %s (%d) に接続しています。 (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC %s (%d) \xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99\xE3\x80\x82 (%s)")
+#define MSGJPN023		_Tu8("SOCKSサーバーに接続できません. (Err=%d) (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d) (%s)")
+#define MSGJPN024		_Tu8("SOCKSサーバーに接続できません. (Err=%d) (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d) (%s)")
+#define MSGJPN025		_Tu8("接続しました. (%s)", "\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F. (%s)")
+#define MSGJPN026		_Tu8("接続できません. (%s)", "\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
+#define MSGJPN027		_Tu8("ソケットが作成できません. (%s)", "\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
+#define MSGJPN028		_Tu8("SOCKSサーバーに接続できません. (Err=%d) (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d) (%s)")
+#define MSGJPN029		_Tu8("SOCKSサーバーに接続できません. (Err=%d) (%s)", "SOCKS\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (Err=%d) (%s)")
+#define MSGJPN030		_Tu8("Listenソケットが作成できません. (%s)", "Listen\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
+#define MSGJPN031		_Tu8("PORTコマンドが受け付けられません. (%s)", "PORT\xE3\x82\xB3\xE3\x83\x9E\xE3\x83\xB3\xE3\x83\x89\xE3\x81\x8C\xE5\x8F\x97\xE3\x81\x91\xE4\xBB\x98\xE3\x81\x91\xE3\x82\x89\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93. (%s)")
 #define MSGJPN032		_Tu8("接続はユーザーによって中止されました.", "\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xAF\xE3\x83\xA6\xE3\x83\xBC\xE3\x82\xB6\xE3\x83\xBC\xE3\x81\xAB\xE3\x82\x88\xE3\x81\xA3\xE3\x81\xA6\xE4\xB8\xAD\xE6\xAD\xA2\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.")
 #define MSGJPN033		_Tu8("SOCKSのコマンドが送れませんでした (Cmd = %04X)", "SOCKS\xE3\x81\xAE\xE3\x82\xB3\xE3\x83\x9E\xE3\x83\xB3\xE3\x83\x89\xE3\x81\x8C\xE9\x80\x81\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F (Cmd = %04X)")
 #define MSGJPN034		_Tu8("SOCKS5のコマンドに対するリプライが受信できませんでした", "SOCKS5\xE3\x81\xAE\xE3\x82\xB3\xE3\x83\x9E\xE3\x83\xB3\xE3\x83\x89\xE3\x81\xAB\xE5\xAF\xBE\xE3\x81\x99\xE3\x82\x8B\xE3\x83\xAA\xE3\x83\x97\xE3\x83\xA9\xE3\x82\xA4\xE3\x81\x8C\xE5\x8F\x97\xE4\xBF\xA1\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F")

--- a/msgutil.c
+++ /dev/null
@@ -1,110 +0,0 @@
-
-#include <windows.h>
-
-/**
- * アドレス固定のWide文字列とそれに対応するUTF-8文字列を格納する構造体
- */
-typedef struct {
-	const wchar_t *ws;
-	char *u8s;
-	size_t u8size;
-} StrPair;
-
-static BOOL g_initialized = FALSE;
-static CRITICAL_SECTION g_msgUtilLLock;
-
-// Wide文字列 - UTF-8文字列 対応Map
-static StrPair *pStrMap = NULL;
-
-//! 現在有効なStrPairの数
-static int strMapCount = 0;
-
-//! 確保済みのStrPairの領域数
-static int strMapMaxCount = 0;
-
-/**
- * staticなWide文字列に対応するUTF-8バイナリ文字列領域を確保し、その先頭アドレスを返す
- */
-const char* const MessageUtil_GetUTF8StaticBinaryBlock(const wchar_t* const ws, size_t ws_area_length)
-{
-	int i = 0;
-	int wcsCount = 0;
-	int newSize = 0;
-	const char *pResult = NULL;
-	if (!g_initialized)
-	{
-		InitializeCriticalSection(&g_msgUtilLLock);
-		g_initialized = TRUE;
-	}
-	EnterCriticalSection(&g_msgUtilLLock);
-	for (i = 0; i < strMapCount; i++)
-	{
-		if (pStrMap[i].ws == ws)
-		{
-			pResult = pStrMap[i].u8s;
-			break;
-		}
-	}
-	if (pResult == NULL)
-	{
-		if (strMapMaxCount < strMapCount + 1)
-		{
-			// 領域が足りなくなったので追加する
-			if (strMapMaxCount == 0)
-			{
-				strMapMaxCount = 100;
-				pStrMap = (StrPair*)malloc(sizeof(StrPair) * strMapMaxCount);
-			}
-			else
-			{
-				strMapMaxCount += 100;
-				pStrMap = (StrPair*)realloc(pStrMap, sizeof(StrPair) * strMapMaxCount);
-			}
-		}
-		newSize = WideCharToMultiByte(CP_UTF8, 0, ws, ws_area_length, 0, 0, NULL, NULL);
-		if (newSize > 0)
-		{
-			int index = strMapCount;
-			char *beginPos = 0;
-			int postSize = 0;
-			strMapCount++;
-			pStrMap[index].ws = ws;
-			pStrMap[index].u8size = newSize;
-			beginPos = (char*)malloc(newSize);
-			pStrMap[index].u8s = beginPos;
-			postSize = WideCharToMultiByte(CP_UTF8, 0, ws, ws_area_length, beginPos, newSize, NULL, NULL);
-			pResult = beginPos;
-		}
-		else
-		{
-			static char sEmpty[] = "";
-			pResult = sEmpty;
-		}
-	}
-	LeaveCriticalSection(&g_msgUtilLLock);
-	return pResult;
-}
-
-/**
- * MessageUtil_GetUTF8StaticBinaryBlock() で確保した領域をすべて破棄する
- */
-void MessageUtil_FreeUTF8StaticBinaryBlocks()
-{
-	int i = 0;
-	if (!g_initialized)
-	{
-		InitializeCriticalSection(&g_msgUtilLLock);
-		g_initialized = TRUE;
-	}
-	EnterCriticalSection(&g_msgUtilLLock);
-	for (i = 0; i < strMapCount; i++)
-	{
-		free(pStrMap[i].u8s);
-	}
-	if (pStrMap)
-	{
-		free(pStrMap);
-		pStrMap = (StrPair*)NULL;
-	}
-	LeaveCriticalSection(&g_msgUtilLLock);
-}

--- a/msgutil.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// 指定した文字列の UTF-8 バイナリ文字列の先頭アドレスを取得する u8("文字列リテラル") の形で呼び出す
-#define u8(x)	MessageUtil_GetUTF8StaticBinaryBlock(L ## x, sizeof(L ## x) / sizeof(wchar_t))
-
-/**
- * UTF-8文字列バイナリを取得する。取得した文字列のアドレスはアプリケーション終了まで有効。
- * 失敗した場合は "" が返る。
- * 必ず u8マクロと組み合わせて、u8("文字列リテラル") の形で呼び出す。引数に文字列変数を渡した場合の動作は不定。
- * 
- * @param[in] ws 文字列
- * @param[in] ws_area_length 文字列の長さ。終端NULL文字を含んだ値であること。ws: "" のとき、countof_ws: 1
- * @return wsで表される文字列のUTF8バイナリの先頭アドレス
- */
-const char* const MessageUtil_GetUTF8StaticBinaryBlock(const wchar_t* const ws, size_t ws_area_length);
-
-/**
- * UTF-8文字列群の文字領域を破棄する.
- * 
- * MessageUtil_GetUTF8StaticBinaryBlock()で確保した文字列領域をすべて開放する。アプリケーション終了時に呼び出すこと.
- */
-void MessageUtil_FreeUTF8StaticBinaryBlocks();

--- a/option.c
+++ b/option.c
@@ -168,6 +168,8 @@ extern int FolderAttr;
 extern int FolderAttrNum;
 // ファイルアイコン表示対応
 extern int DispFileIcon;
+// ディレクトリ自動作成
+extern int MakeAllDir;
 
 
 /*----- オプションのプロパティシート ------------------------------------------
@@ -406,6 +408,8 @@ static INT_PTR CALLBACK Trmode1SettingProc(HWND hDlg, UINT message, WPARAM wPara
 			SendDlgItemMessage(hDlg, TRMODE_TIME, BM_SETCHECK, SaveTimeStamp, 0);
 			SendDlgItemMessage(hDlg, TRMODE_EOF, BM_SETCHECK, RmEOF, 0);
 			SendDlgItemMessage(hDlg, TRMODE_SEMICOLON, BM_SETCHECK, VaxSemicolon, 0);
+			// ディレクトリ自動作成
+			SendDlgItemMessage(hDlg, TRMODE_MAKEDIR, BM_SETCHECK, MakeAllDir, 0);
 
 			SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(TRMODE_EXT_LIST, 0), 0);
 
@@ -422,6 +426,8 @@ static INT_PTR CALLBACK Trmode1SettingProc(HWND hDlg, UINT message, WPARAM wPara
 					SaveTimeStamp = SendDlgItemMessage(hDlg, TRMODE_TIME, BM_GETCHECK, 0, 0);
 					RmEOF = SendDlgItemMessage(hDlg, TRMODE_EOF, BM_GETCHECK, 0, 0);
 					VaxSemicolon = SendDlgItemMessage(hDlg, TRMODE_SEMICOLON, BM_GETCHECK, 0, 0);
+					// ディレクトリ自動作成
+					MakeAllDir = SendDlgItemMessage(hDlg, TRMODE_MAKEDIR, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/registry.c
+++ b/registry.c
@@ -195,6 +195,8 @@ extern BYTE CertificateCacheHash[MAX_CERT_CACHE_HASH][20];
 extern BYTE SSLRootCAFileHash[20];
 // ファイルアイコン表示対応
 extern int DispFileIcon;
+// ディレクトリ自動作成
+extern int MakeAllDir;
 
 /*----- マスタパスワードの設定 ----------------------------------------------
 *
@@ -293,7 +295,7 @@ int ValidateMasterPassword(void)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void SaveRegistory(void)
+void SaveRegistry(void)
 {
 	void *hKey3;
 	void *hKey4;
@@ -615,6 +617,8 @@ void SaveRegistory(void)
 				WriteStringToReg(hKey4, "RootCertHash", Str);
 				// ファイルアイコン表示対応
 				WriteIntValueToReg(hKey4, "ListIcon", DispFileIcon);
+				// ディレクトリ自動作成
+				WriteIntValueToReg(hKey4, "MakeDir", MakeAllDir);
 			}
 			CloseSubKey(hKey4);
 		}
@@ -635,7 +639,7 @@ void SaveRegistory(void)
 *		NO:  読み出し失敗(設定無し)
 *----------------------------------------------------------------------------*/
 
-int LoadRegistory(void)
+int LoadRegistry(void)
 {
 	void *hKey3;
 	void *hKey4;
@@ -992,6 +996,8 @@ int LoadRegistory(void)
 			StrReadIn(Buf, sizeof(SSLRootCAFileHash), (char*)&SSLRootCAFileHash);
 			// ファイルアイコン表示対応
 			ReadIntValueFromReg(hKey4, "ListIcon", &DispFileIcon);
+			// ディレクトリ自動作成
+			ReadIntValueFromReg(hKey4, "MakeDir", &MakeAllDir);
 
 			CloseSubKey(hKey4);
 		}
@@ -1033,7 +1039,7 @@ int LoadRegistory(void)
 *			YES/NO=設定無し
 *----------------------------------------------------------------------------*/
 
-DWORD LoadHideDriveListRegistory(void)
+DWORD LoadHideDriveListRegistry(void)
 {
 	HKEY hKey1;
 	HKEY hKey2;
@@ -1085,7 +1091,7 @@ DWORD LoadHideDriveListRegistory(void)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void ClearRegistory(void)
+void ClearRegistry(void)
 {
 	HKEY hKey2;
 	HKEY hKey3;
@@ -1980,7 +1986,7 @@ static int CloseReg(void *Handle)
 			if(WriteOutRegToFile(Handle) == TRUE)
 			{
 //				/* レジストリをクリア */
-//				ClearRegistory();
+//				ClearRegistry();
 			}
 		}
 		/* テーブルを削除 */

--- a/remote.c
+++ b/remote.c
@@ -523,7 +523,9 @@ SOCKET DoClose(SOCKET Sock)
 *		int 応答コードの１桁目
 *----------------------------------------------------------------------------*/
 
-int DoQUIT(SOCKET ctrl_skt)
+// 同時接続対応
+//int DoQUIT(SOCKET ctrl_skt)
+int DoQUIT(SOCKET ctrl_skt, int *CancelCheckWork)
 {
 	int Ret;
 
@@ -531,7 +533,7 @@ int DoQUIT(SOCKET ctrl_skt)
 	if(SendQuit == YES)
 		// 同時接続対応
 //		Ret = command(ctrl_skt, NULL, &CheckCancelFlg, "QUIT") / 100;
-		Ret = command(ctrl_skt, NULL, &CancelFlg, "QUIT") / 100;
+		Ret = command(ctrl_skt, NULL, CancelCheckWork, "QUIT") / 100;
 
 	return(Ret);
 }
@@ -637,7 +639,7 @@ static int DoDirList(HWND hWnd, SOCKET cSkt, char *AddOpt, char *Path, int Num,
 	MainTransPkt.hWndTrans = hWnd;
 	MainTransPkt.Next = NULL;
 
-	Sts = DoDownLoad(cSkt, &MainTransPkt, YES, CancelCheckWork);
+	Sts = DoDownload(cSkt, &MainTransPkt, YES, CancelCheckWork);
 
 //#pragma aaa
 //DoPrintf("===== DoDirList Done.");

--- a/socket.c
+++ b/socket.c
@@ -91,10 +91,10 @@ typedef struct {
 static LRESULT CALLBACK SocketWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 static int AskAsyncDone(SOCKET s, int *Error, int Mask);
 static int AskAsyncDoneDbase(HANDLE Async, int *Error);
-static int RegistAsyncTable(SOCKET s);
-static int RegistAsyncTableDbase(HANDLE Async);
-static int UnRegistAsyncTable(SOCKET s);
-static int UnRegistAsyncTableDbase(HANDLE Async);
+static int RegisterAsyncTable(SOCKET s);
+static int RegisterAsyncTableDbase(HANDLE Async);
+static int UnregisterAsyncTable(SOCKET s);
+static int UnregisterAsyncTableDbase(HANDLE Async);
 
 
 /*===== 外部参照 =====*/
@@ -275,7 +275,7 @@ static LRESULT CALLBACK SocketWndProc(HWND hWnd, UINT message, WPARAM wParam, LP
 
 		case WM_ASYNC_DBASE :
 			// APIの仕様上ハンドルが登録される前にウィンドウメッセージが呼び出される可能性あり
-			RegistAsyncTableDbase((HANDLE)wParam);
+			RegisterAsyncTableDbase((HANDLE)wParam);
 			// スレッド衝突のバグ修正
 			WaitForSingleObject(hAsyncTblAccMutex, INFINITE);
 			for(Pos = 0; Pos < MAX_SIGNAL_ENTRY_DBASE; Pos++)
@@ -450,7 +450,7 @@ static int AskAsyncDoneDbase(HANDLE Async, int *Error)
 *		
 *----------------------------------------------------------------------------*/
 
-static int RegistAsyncTable(SOCKET s)
+static int RegisterAsyncTable(SOCKET s)
 {
 	int Sts;
 	int Pos;
@@ -516,7 +516,7 @@ static int RegistAsyncTable(SOCKET s)
 *		
 *----------------------------------------------------------------------------*/
 
-static int RegistAsyncTableDbase(HANDLE Async)
+static int RegisterAsyncTableDbase(HANDLE Async)
 {
 	int Sts;
 	int Pos;
@@ -578,7 +578,7 @@ static int RegistAsyncTableDbase(HANDLE Async)
 *		
 *----------------------------------------------------------------------------*/
 
-static int UnRegistAsyncTable(SOCKET s)
+static int UnregisterAsyncTable(SOCKET s)
 {
 	int Sts;
 	int Pos;
@@ -613,7 +613,7 @@ static int UnRegistAsyncTable(SOCKET s)
 *		
 *----------------------------------------------------------------------------*/
 
-static int UnRegistAsyncTableDbase(HANDLE Async)
+static int UnregisterAsyncTableDbase(HANDLE Async)
 {
 	int Sts;
 	int Pos;
@@ -666,7 +666,7 @@ struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *
 	hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
 	if(hAsync != NULL)
 	{
-		RegistAsyncTableDbase(hAsync);
+		RegisterAsyncTableDbase(hAsync);
 		while((*CancelCheckWork == NO) && (AskAsyncDoneDbase(hAsync, &Error) != YES))
 		{
 			Sleep(1);
@@ -682,7 +682,7 @@ struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *
 		{
 			Ret = (struct hostent *)Buf;
 		}
-		UnRegistAsyncTableDbase(hAsync);
+		UnregisterAsyncTableDbase(hAsync);
 	}
 	return(Ret);
 #else
@@ -710,7 +710,7 @@ struct hostent *do_gethostbynameIPv6(const char *Name, char *Buf, int Len, int *
 	hAsync = WSAAsyncGetHostByNameIPv6M(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len, AF_INET6);
 	if(hAsync != NULL)
 	{
-		RegistAsyncTableDbase(hAsync);
+		RegisterAsyncTableDbase(hAsync);
 		while((*CancelCheckWork == NO) && (AskAsyncDoneDbase(hAsync, &Error) != YES))
 		{
 			Sleep(1);
@@ -726,7 +726,7 @@ struct hostent *do_gethostbynameIPv6(const char *Name, char *Buf, int Len, int *
 		{
 			Ret = (struct hostent *)Buf;
 		}
-		UnRegistAsyncTableDbase(hAsync);
+		UnregisterAsyncTableDbase(hAsync);
 	}
 	return(Ret);
 #else
@@ -745,7 +745,7 @@ SOCKET do_socket(int af, int type, int protocol)
 	Ret = socket(af, type, protocol);
 	if(Ret != INVALID_SOCKET)
 	{
-		RegistAsyncTable(Ret);
+		RegisterAsyncTable(Ret);
 	}
 #if DBG_MSG
 	DoPrintf("# do_socket (S=%x)", Ret);
@@ -769,7 +769,7 @@ int do_closesocket(SOCKET s)
 
 	// スレッド衝突のバグ修正
 	WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, 0);
-	UnRegistAsyncTable(s);
+	UnregisterAsyncTable(s);
 	// FTPS対応
 //	Ret = closesocket(s);
 	Ret = FTPS_closesocket(s);
@@ -792,7 +792,7 @@ int do_closesocket(SOCKET s)
 	if(BackgrndMessageProc() == YES)
 		CancelCheckWork = YES;
 	// スレッド衝突のバグ修正
-//	UnRegistAsyncTable(s);
+//	UnregisterAsyncTable(s);
 
 #if DBG_MSG
 	DoPrintf("# Exit close");
@@ -929,7 +929,7 @@ SOCKET do_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
 				DoPrintf("## do_sccept (S=%x)", Ret2);
 				DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");
 #endif
-				RegistAsyncTable(Ret2);
+				RegisterAsyncTable(Ret2);
 				// 高速化のためFD_READとFD_WRITEを使用しない
 //				if(WSAAsyncSelect(Ret2, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE) == SOCKET_ERROR)
 				if(WSAAsyncSelect(Ret2, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT) == SOCKET_ERROR)

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -717,10 +717,11 @@ DWORD WINAPI WSAAsyncGetHostByNameIPv6ThreadProc(LPVOID lpParameter)
 	}
 	else
 		PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(ERROR_INVALID_FUNCTION << 16));
-	free(pData->name);
-	free(pData);
 	// CreateThreadが返すハンドルが重複するのを回避
 	Sleep(10000);
+	CloseHandle(pData->h);
+	free(pData->name);
+	free(pData);
 	return 0;
 }
 

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -315,7 +315,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 			/* ドライブ名をセットしておく */
 			GetLogicalDriveStrings(FMAX_PATH, Tmp);
-			NoDrives = LoadHideDriveListRegistory();
+			NoDrives = LoadHideDriveListRegistry();
 			Pos = Tmp;
 			while(*Pos != NUL)
 			{