OSDN Git Service

This version may be nearly stable.
authors_kawamoto <s_kawamoto@users.sourceforge.jp>
Tue, 13 Sep 2011 03:14:29 +0000 (12:14 +0900)
committers_kawamoto <s_kawamoto@users.sourceforge.jp>
Tue, 13 Sep 2011 03:14:29 +0000 (12:14 +0900)
Fix bugs of UTF-8 to UTF-16 API bridge.
Fix definition of calling convention for OpenSSL.
Apply most patches from ticket #26185.
Fix settings of project files.
Fix bugs on FFFTP_English Debug build.

14 files changed:
FFFTP.exe
FFFTP.vc90.vcproj
FFFTP.vcproj
FFFTP_Eng_Release/FFFTP.exe [new file with mode: 0644]
FFFTP_English.vc90.vcproj
FFFTP_English.vcproj
Release/FFFTP.exe [new file with mode: 0644]
Resource/FFFTP.APS
Resource/FFFTP.rc
Resource_eng/FFFTP-eng.aps
Resource_eng/FFFTP-eng.rc
main.c
mbswrapper.c
socketwrapper.c

index 1a2f576..65ca710 100644 (file)
Binary files a/FFFTP.exe and b/FFFTP.exe differ
index 4457a7a..6ea6f40 100644 (file)
@@ -16,8 +16,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory=".\debug"
+                       OutputDirectory=".\Debug"
+                       IntermediateDirectory=".\Debug"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
                        UseOfMFC="0"
@@ -41,7 +41,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName="./FFFTP.tlb"
+                               TypeLibraryName=".\Debug\FFFTP.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="Resource"
                                PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\debug/FFFTP.pch"
-                               AssemblerListingLocation=".\debug/"
-                               ObjectFile=".\debug/"
-                               ProgramDataBaseFileName=".\debug/"
+                               PrecompiledHeaderFile=".\Debug\FFFTP.pch"
+                               AssemblerListingLocation=".\Debug\"
+                               ObjectFile=".\Debug\"
+                               ProgramDataBaseFileName=".\Debug\"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
-                               OutputFile="./FFFTP.exe"
+                               OutputFile=".\Debug\FFFTP.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
+                               GenerateManifest="false"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="./FFFTP.pdb"
+                               ProgramDatabaseFile=".\Debug\FFFTP.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="."
+                       OutputDirectory=".\Release"
                        IntermediateDirectory=".\Release"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName="./FFFTP.tlb"
+                               TypeLibraryName=".\Release\FFFTP.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile=".\Release/FFFTP.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
+                               PrecompiledHeaderFile=".\Release\FFFTP.pch"
+                               AssemblerListingLocation=".\Release\"
+                               ObjectFile=".\Release\"
+                               ProgramDataBaseFileName=".\Release\"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="0"
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib RASAPI32.LIB htmlhelp.lib"
-                               OutputFile="./FFFTP.exe"
+                               OutputFile=".\Release\FFFTP.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               GenerateDebugInformation="false"
-                               ProgramDatabaseFile="./FFFTP.pdb"
+                               GenerateManifest="false"
+                               ProgramDatabaseFile=".\Release\FFFTP.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                >
                        </File>
                        <File
-                               RelativePath=".\Resource\ico00001.ico"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\Resource\icon1.ico"
                                >
                        </File>
index bb072e9..ad16916 100644 (file)
@@ -15,8 +15,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="."\r
-                       IntermediateDirectory=".\debug"\r
+                       OutputDirectory=".\Debug"\r
+                       IntermediateDirectory=".\Debug"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -40,7 +40,7 @@
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName="./FFFTP.tlb"\r
+                               TypeLibraryName=".\Debug\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="Resource"\r
                                PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\debug/FFFTP.pch"\r
-                               AssemblerListingLocation=".\debug/"\r
-                               ObjectFile=".\debug/"\r
-                               ProgramDataBaseFileName=".\debug/"\r
+                               PrecompiledHeaderFile=".\Debug\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Debug\"\r
+                               ObjectFile=".\Debug\"\r
+                               ProgramDataBaseFileName=".\Debug\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"\r
-                               OutputFile="./FFFTP.exe"\r
+                               OutputFile=".\Debug\FFFTP.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
+                               GenerateManifest="false"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="./FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\Debug\FFFTP.pdb"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="."\r
+                       OutputDirectory=".\Release"\r
                        IntermediateDirectory=".\Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName="./FFFTP.tlb"\r
+                               TypeLibraryName=".\Release\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/FFFTP.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Release\"\r
+                               ObjectFile=".\Release\"\r
+                               ProgramDataBaseFileName=".\Release\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="0"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib RASAPI32.LIB htmlhelp.lib"\r
-                               OutputFile="./FFFTP.exe"\r
+                               OutputFile=".\Release\FFFTP.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               GenerateDebugInformation="false"\r
-                               ProgramDatabaseFile="./FFFTP.pdb"\r
+                               GenerateManifest="false"\r
+                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Resource\ico00001.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\Resource\icon1.ico"\r
                                >\r
                        </File>\r
diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
new file mode 100644 (file)
index 0000000..f3e41e4
Binary files /dev/null and b/FFFTP_Eng_Release/FFFTP.exe differ
index 5b25653..3226993 100644 (file)
@@ -16,9 +16,9 @@
        </ToolFiles>
        <Configurations>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\FFFTP_Eng_Release"
-                       IntermediateDirectory=".\FFFTP_Eng_Release"
+                       Name="Debug|Win32"
+                       OutputDirectory=".\FFFTP_Eng_Debug"
+                       IntermediateDirectory=".\FFFTP_Eng_Debug"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
                        UseOfMFC="0"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\FFFTP_Eng_Release/FFFTP_English.tlb"
+                               TypeLibraryName=".\FFFTP_Eng_Debug\FFFTP_English.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="Resource_eng"
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
-                               StringPooling="true"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Release/FFFTP_English.pch"
-                               AssemblerListingLocation=".\FFFTP_Eng_Release/"
-                               ObjectFile=".\FFFTP_Eng_Release/"
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Release/"
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
+                               AssemblerListingLocation=".\FFFTP_Eng_Debug\"
+                               ObjectFile=".\FFFTP_Eng_Debug\"
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug\"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="4"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
-                               OutputFile="FFFTP_Eng_Release/FFFTP.exe"
-                               LinkIncremental="1"
+                               OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               ProgramDatabaseFile=".\FFFTP_Eng_Release/FFFTP.pdb"
+                               GenerateManifest="false"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\FFFTP_Eng_Debug\FFFTP.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\FFFTP_Eng_Debug"
-                       IntermediateDirectory=".\FFFTP_Eng_Debug"
+                       Name="Release|Win32"
+                       OutputDirectory=".\FFFTP_Eng_Release"
+                       IntermediateDirectory=".\FFFTP_Eng_Release"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
                        UseOfMFC="0"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\FFFTP_Eng_Debug/FFFTP_English.tlb"
+                               TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
+                               InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="Resource_eng"
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug/FFFTP_English.pch"
-                               AssemblerListingLocation=".\FFFTP_Eng_Debug/"
-                               ObjectFile=".\FFFTP_Eng_Debug/"
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug/"
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+                               StringPooling="true"
+                               RuntimeLibrary="0"
+                               EnableFunctionLevelLinking="true"
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
+                               AssemblerListingLocation=".\FFFTP_Eng_Release\"
+                               ObjectFile=".\FFFTP_Eng_Release\"
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
-                               OutputFile="FFFTP_Eng_Debug/FFFTP.exe"
-                               LinkIncremental="2"
+                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\FFFTP_Eng_Debug/FFFTP.pdb"
+                               GenerateManifest="false"
+                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index b36eefd..d2c99af 100644 (file)
@@ -15,9 +15,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\FFFTP_Eng_Release"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Release"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory=".\FFFTP_Eng_Debug"\r
+                       IntermediateDirectory=".\FFFTP_Eng_Debug"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\FFFTP_Eng_Release/FFFTP_English.tlb"\r
+                               TypeLibraryName=".\FFFTP_Eng_Debug\FFFTP_English.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Release/FFFTP_English.pch"\r
-                               AssemblerListingLocation=".\FFFTP_Eng_Release/"\r
-                               ObjectFile=".\FFFTP_Eng_Release/"\r
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Release/"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"\r
+                               AssemblerListingLocation=".\FFFTP_Eng_Debug\"\r
+                               ObjectFile=".\FFFTP_Eng_Debug\"\r
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"\r
-                               OutputFile="FFFTP_Eng_Release/FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Release/FFFTP.pdb"\r
+                               GenerateManifest="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Debug\FFFTP.pdb"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory=".\FFFTP_Eng_Debug"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Debug"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\FFFTP_Eng_Release"\r
+                       IntermediateDirectory=".\FFFTP_Eng_Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\FFFTP_Eng_Debug/FFFTP_English.tlb"\r
+                               TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource_eng"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug/FFFTP_English.pch"\r
-                               AssemblerListingLocation=".\FFFTP_Eng_Debug/"\r
-                               ObjectFile=".\FFFTP_Eng_Debug/"\r
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug/"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"\r
+                               AssemblerListingLocation=".\FFFTP_Eng_Release\"\r
+                               ObjectFile=".\FFFTP_Eng_Release\"\r
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Release\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"\r
-                               OutputFile="FFFTP_Eng_Debug/FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Debug/FFFTP.pdb"\r
+                               GenerateManifest="false"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
new file mode 100644 (file)
index 0000000..d603e92
Binary files /dev/null and b/Release/FFFTP.exe differ
index 9e3189e..5385ea1 100644 (file)
Binary files a/Resource/FFFTP.APS and b/Resource/FFFTP.APS differ
index c264ad5..2ddef28 100644 (file)
@@ -1965,6 +1965,14 @@ BEGIN
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 50\r
     END\r
+\r
+    hset_crypt_dlg, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 200\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
+    END\r
 END\r
 #endif    // APSTUDIO_INVOKED\r
 \r
index a9928a3..73692b7 100644 (file)
Binary files a/Resource_eng/FFFTP-eng.aps and b/Resource_eng/FFFTP-eng.aps differ
index 2d734af..2d25cb6 100644 (file)
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// \93ú\96{\8cê resources\r
+// \89p\8cê (\95Ä\8d\91) resources\r
 \r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
 #ifdef _WIN32\r
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r
-#pragma code_page(932)\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
 #endif //_WIN32\r
 \r
+#ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
-// Dialog\r
+// TEXTINCLUDE\r
 //\r
 \r
-IDD_OLEDRAG DIALOGEX 0, 0, 30, 13\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Transfering"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N", 400, 0, 0x80\r
+1 TEXTINCLUDE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE \r
 BEGIN\r
+    "#include ""afxres.h""\r\n"\r
+    "\0"\r
+END\r
+\r
+3 TEXTINCLUDE \r
+BEGIN\r
+    "\r\n"\r
+    "\0"\r
 END\r
 \r
+#endif    // APSTUDIO_INVOKED\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
-// DESIGNINFO\r
+// RT_MANIFEST\r
 //\r
 \r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO \r
-BEGIN\r
-    IDD_OLEDRAG, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 23\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 6\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
+1                       RT_MANIFEST             "ffftp.exe.manifest"\r
 \r
-#endif    // \93ú\96{\8cê resources\r
 /////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icon\r
+//\r
 \r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+ffftp                   ICON                    "icon1.ico"\r
+notify                  ICON                    "icon2.ico"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// \89p\8cê (\95Ä\8d\91) resources\r
+//\r
+// Bitmap\r
+//\r
 \r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-#ifdef _WIN32\r
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
-#pragma code_page(1252)\r
-#endif //_WIN32\r
+main_toolbar_bmp        BITMAP                  "toolbar1.bmp"\r
+remote_toolbar_bmp      BITMAP                  "main_too.bmp"\r
+dirattr_bmp             BITMAP                  "list_bmp.bmp"\r
+hlist_bmp               BITMAP                  "bitmap1.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
-// Dialog\r
+// Menu\r
 //\r
 \r
-down_exist_dlg DIALOG  0, 0, 234, 109\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
-CAPTION "Download"\r
-FONT 9, "MS Sans Serif"\r
+main_menu MENU \r
 BEGIN\r
-    CONTROL         "&Overwrite existing file",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,39,99,10\r
-    CONTROL         "Overwrite if download file is &newer",DOWN_EXIST_NEW,\r
-                    "Button",BS_AUTORADIOBUTTON,7,51,123,10\r
-    CONTROL         "&Resume",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,63,99,10\r
-    CONTROL         "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,75,99,10\r
-    LTEXT           "To download with a different name, modify the filename and click Overwrite existing file.",-1,133,38,94,39\r
-    DEFPUSHBUTTON   "OK",IDOK,13,91,50,14,WS_GROUP\r
-    PUSHBUTTON      "&Do All",IDOK_ALL,68,91,50,14\r
-    PUSHBUTTON      "&Cancel All",IDCANCEL,123,91,50,14\r
-    PUSHBUTTON      "&Help",9,178,91,41,14\r
-    LTEXT           "Filename already exists on local disk. Download?",-1,7,7,184,8\r
-    EDITTEXT        DOWN_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL\r
+    POPUP "&File"\r
+    BEGIN\r
+        MENUITEM "&Connect...\tCtrl+C",         MENU_CONNECT\r
+        MENUITEM "&Quick Connect...\tCtrl+Q",   MENU_QUICK\r
+        MENUITEM "&Disconnect",                 MENU_DISCONNECT\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Host Setting...",            MENU_SET_CONNECT\r
+        POPUP "&Settings"\r
+        BEGIN\r
+            MENUITEM "Import Settings from &WS_FTP.INI...", MENU_IMPORT_WS\r
+            MENUITEM "&Save Settings to File...",   MENU_REGSAVE\r
+            MENUITEM "&Load Settings from File...", MENU_REGLOAD\r
+            MENUITEM "Change &Master password...",  MENU_CHANGEPASSWD\r
+            MENUITEM SEPARATOR\r
+            MENUITEM "Clear All Settings...",       MENU_REGINIT\r
+        END\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "E&xit",                       MENU_EXIT\r
+    END\r
+    POPUP "&Commands"\r
+    BEGIN\r
+        MENUITEM "&Download\tCtrl+D",           MENU_DOWNLOAD\r
+        MENUITEM "&Upload\tCtrl+U",             MENU_UPLOAD\r
+        MENUITEM "D&ownload As...",             MENU_DOWNLOAD_AS\r
+        MENUITEM "U&pload As...",               MENU_UPLOAD_AS\r
+        MENUITEM "Change &Filename && Download...", MENU_DOWNLOAD_NAME\r
+        MENUITEM "Download &as File",           MENU_DOWNLOAD_AS_FILE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Mirror Upload...\tCtrl+Shift+U", MENU_MIRROR_UPLOAD\r
+        MENUITEM "File &size...",               MENU_FILESIZE\r
+        MENUITEM "Mirror Down&load...\tCtrl+Shift+D", MENU_MIRROR_DOWNLOAD\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "D&elete\tDel",                MENU_DELETE\r
+        MENUITEM "&Rename...\tCtrl+N",          MENU_RENAME\r
+        MENUITEM "Permissio&ns...\tCtrl+T",     MENU_CHMOD\r
+        MENUITEM "Ne&w Folder...\tCtrl+K",      MENU_MKDIR\r
+        MENUITEM "Specify &command...",         MENU_SOMECMD\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Synchronize Folder Mo&vement", MENU_SYNC\r
+    END\r
+    POPUP "&Bookmarks"\r
+    BEGIN\r
+        MENUITEM "Add &Host folder",            MENU_BMARK_ADD\r
+        MENUITEM "Add &Local folder",           MENU_BMARK_ADD_LOCAL\r
+        MENUITEM "Add &Both Host && Local folders", MENU_BMARK_ADD_BOTH\r
+        MENUITEM "&Edit Bookmarks...\tCtrl+B",  MENU_BMARK_EDIT\r
+        MENUITEM SEPARATOR\r
+    END\r
+    POPUP "&View"\r
+    BEGIN\r
+        MENUITEM "F&ilter...\tCtrl+Y",          MENU_FILTER\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Find...\tCtrl+F",            MENU_FIND\r
+        MENUITEM "Find &Next\tF3",              MENU_FINDNEXT\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Select...\tCtrl+S",          MENU_SELECT\r
+        MENUITEM "Select &All/None\tCtrl+A",    MENU_SELECT_ALL\r
+        MENUITEM SEPARATOR\r
+        POPUP "Displa&y"\r
+        BEGIN\r
+            MENUITEM "&List",                       MENU_LIST\r
+            MENUITEM "&Details",                    MENU_REPORT\r
+        END\r
+        MENUITEM "S&ort...",                    MENU_SORT\r
+        MENUITEM "Display files with leading &dot", MENU_DOTFILE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Display File &List in Viewer", MENU_DIRINFO\r
+        MENUITEM "Display Lo&g in Viewer",      MENU_TASKINFO\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Refresh\tF5",                MENU_REFRESH\r
+    END\r
+    POPUP "&Tools"\r
+    BEGIN\r
+        MENUITEM "&One-Time Password Calculation...", MENU_OTPCALC\r
+    END\r
+    POPUP "&Options"\r
+    BEGIN\r
+        MENUITEM "&Settings...",                MENU_OPTION\r
+    END\r
+    POPUP "&Help"\r
+    BEGIN\r
+        MENUITEM "&Contents\tF1",               MENU_HELP\r
+        MENUITEM "&Q&&A (Connect to Internet)", MENU_HELP_TROUBLE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&About FFFTP...",             MENU_ABOUT\r
+    END\r
 END\r
 \r
-chmod_dlg DIALOG  0, 0, 171, 109\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Permission"\r
-FONT 9, "MS Sans Serif"\r
+dummy_menu MENU \r
 BEGIN\r
-    LTEXT           "Current Permission :",-1,61,74,61,8\r
-    EDITTEXT        PERM_NOW,124,72,25,12,ES_AUTOHSCROLL | ES_NUMBER\r
-    GROUPBOX        "Owner",-1,7,7,48,58\r
-    CONTROL         "Read",PERM_O_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,31,10\r
-    CONTROL         "Write",PERM_O_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,35,31,10\r
-    CONTROL         "Execute",PERM_O_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,50,39,10\r
-    GROUPBOX        "Group",-1,61,7,48,58\r
-    CONTROL         "Read",PERM_G_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,21,31,10\r
-    CONTROL         "Write",PERM_G_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,35,31,10\r
-    CONTROL         "Execute",PERM_G_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,49,39,10\r
-    GROUPBOX        "Others",-1,116,8,48,58\r
-    CONTROL         "Read",PERM_A_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,22,31,10\r
-    CONTROL         "Write",PERM_A_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,36,31,10\r
-    CONTROL         "Execute",PERM_A_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,51,39,10\r
-    CONTROL         "",-1,"Static",SS_BLACKFRAME,57,69,106,18\r
-    DEFPUSHBUTTON   "OK",IDOK,7,92,48,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,61,92,48,14\r
-    PUSHBUTTON      "Help",9,116,92,48,14\r
+    POPUP "dummy"\r
+    BEGIN\r
+        MENUITEM "Go up (host)",                MENU_REMOTE_UPDIR\r
+        MENUITEM "Go up (local)",               MENU_LOCAL_UPDIR\r
+        MENUITEM "Go up (both)",                MENU_UPDIR\r
+        MENUITEM "COMBO_LOCAL",                 COMBO_LOCAL\r
+        MENUITEM "COMBO REMOTE",                COMBO_REMOTE\r
+        MENUITEM "Text Mode",                   MENU_TEXT\r
+        MENUITEM "Binary Mode",                 MENU_BINARY\r
+        MENUITEM "Auto Mode",                   MENU_AUTO\r
+        MENUITEM "Refresh (local)",             REFRESH_LOCAL\r
+        MENUITEM "Refresh (remote)",            REFRESH_REMOTE\r
+        MENUITEM "CHDIR(remote)",               MENU_REMOTE_CHDIR\r
+        MENUITEM "CHDIR(local)",                MENU_LOCAL_CHDIR\r
+        MENUITEM "KANJI EUC",                   MENU_KNJ_EUC\r
+        MENUITEM "KANJI JIS",                   MENU_KNJ_JIS\r
+        MENUITEM "KANJI NONE",                  MENU_KNJ_NONE\r
+        MENUITEM "Double click",                MENU_DCLICK\r
+        MENUITEM "Kana henkan",                 MENU_KANACNV\r
+        MENUITEM "Open 1",                      MENU_OPEN1\r
+        MENUITEM "Open 2",                      MENU_OPEN2\r
+        MENUITEM "Open 3",                      MENU_OPEN3\r
+        MENUITEM "Connect",                     MENU_CONNECT_NUM\r
+        MENUITEM "HIst 1",                      MENU_HIST_1\r
+        MENUITEM "Hist 2",                      MENU_HIST_2\r
+        MENUITEM "Hist 3",                      MENU_HIST_3\r
+        MENUITEM "Hist 4",                      MENU_HIST_4\r
+        MENUITEM "Hist 5",                      MENU_HIST_5\r
+        MENUITEM "Hist 6",                      MENU_HIST_6\r
+        MENUITEM "Hist 7",                      MENU_HIST_7\r
+        MENUITEM "Hist 8",                      MENU_HIST_8\r
+        MENUITEM "Hist 9",                      MENU_HIST_9\r
+        MENUITEM "Hist 10 ",                    MENU_HIST_10\r
+        MENUITEM "Hist 11",                     MENU_HIST_11\r
+        MENUITEM "Hist 12",                     MENU_HIST_12\r
+        MENUITEM "Hist 13",                     MENU_HIST_13\r
+        MENUITEM "Hist 14",                     MENU_HIST_14\r
+        MENUITEM "Hist 15",                     MENU_HIST_15\r
+        MENUITEM "Hist 16",                     MENU_HIST_16\r
+        MENUITEM "Hist 17",                     MENU_HIST_17\r
+        MENUITEM "Hist 18",                     MENU_HIST_18\r
+        MENUITEM "Hist 19",                     MENU_HIST_19\r
+        MENUITEM "Hist 20",                     MENU_HIST_20\r
+        MENUITEM "Auto exit",                   MENU_AUTO_EXIT\r
+        MENUITEM "Stop",                        MENU_ABORT\r
+        MENUITEM "URL to clipboard",            MENU_URL_COPY\r
+        MENUITEM "Download all",                MENU_DOWNLOAD_ALL\r
+        MENUITEM "Upload all",                  MENU_UPLOAD_ALL\r
+    END\r
 END\r
 \r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Dialog\r
+//\r
+\r
 about_dlg DIALOGEX 0, 0, 195, 209\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "About FFFTP"\r
@@ -130,63 +244,48 @@ BEGIN
     CTEXT           "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,74,181,27\r
 END\r
 \r
-bmark_dlg DIALOG  0, 0, 222, 109\r
-STYLE DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "Bookmarks"\r
+transfer_dlg DIALOG  0, 0, 199, 91\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LISTBOX         BMARK_LIST,7,7,152,75,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    DEFPUSHBUTTON   "&Close",IDOK,91,90,50,14\r
-    PUSHBUTTON      "Chan&ge",BMARK_JUMP,27,90,50,14\r
-    PUSHBUTTON      "&New...",BMARK_NEW,165,7,50,14\r
-    PUSHBUTTON      "&Modify...",BMARK_SET,165,26,50,14\r
-    PUSHBUTTON      "&Delete...",BMARK_DEL,165,45,50,14\r
-    PUSHBUTTON      "U&p",BMARK_UP,165,65,23,14\r
-    PUSHBUTTON      "Do&wn",BMARK_DOWN,192,65,23,14\r
-    SCROLLBAR       BMARK_SIZEGRIP,212,96,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
-    PUSHBUTTON      "&Help",9,165,90,50,14\r
+    PUSHBUTTON      "Cancel this File",IDCANCEL,7,73,62,14\r
+    PUSHBUTTON      "Cancel from Next",TRANS_STOP_NEXT,78,73,62,14\r
+    PUSHBUTTON      "Cancel All",TRANS_STOP_ALL,150,73,42,14\r
+    LTEXT           "Host :",-1,7,5,27,8\r
+    LTEXT           "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX\r
+    LTEXT           "Local :",-1,7,18,27,8\r
+    LTEXT           "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX\r
+    LTEXT           "Status :",-1,7,44,27,8\r
+    LTEXT           "",TRANS_STATUS,45,44,147,8\r
+    CONTROL         "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9\r
+    LTEXT           "Mode :",-1,7,31,27,8\r
+    LTEXT           "",TRANS_MODE,45,31,51,8\r
+    LTEXT           "Kanji Code :",-1,98,31,39,8\r
+    LTEXT           "",TRANS_KANJI,140,31,52,8\r
 END\r
 \r
-def_attr_dlg DIALOG  0, 0, 123, 69\r
+rename_dlg DIALOG  0, 0, 187, 69\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Default Permission"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&Filename",-1,7,7,49,8\r
-    EDITTEXT        DEFATTR_FNAME,7,18,47,12,ES_AUTOHSCROLL\r
-    LTEXT           "->",-1,58,20,8,8\r
-    LTEXT           "&Permission",-1,71,7,40,8\r
-    EDITTEXT        DEFATTR_ATTR,71,18,31,12,ES_AUTOHSCROLL | ES_NUMBER\r
-    PUSHBUTTON      "...",DEFATTR_ATTR_BR,102,18,13,12\r
-    LTEXT           "(example: 644)",-1,53,35,51,8\r
-    DEFPUSHBUTTON   "OK",IDOK,7,48,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,66,48,50,14\r
+    EDITTEXT        RENAME_NEW,7,34,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,9,51,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,68,51,50,14\r
+    PUSHBUTTON      "&Stop",RENAME_STOP,128,51,50,14\r
+    LTEXT           "",RENAME_TEXT,7,21,173,8,SS_NOPREFIX\r
+    LTEXT           "Enter new name",-1,7,7,133,8\r
 END\r
 \r
-opt_fire_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+delete_dlg DIALOG  0, 0, 209, 55\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Firewall &Type",-1,7,7,90,8\r
-    COMBOBOX        FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "Firewall &Hostname",-1,7,32,80,8\r
-    EDITTEXT        FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL\r
-    LTEXT           "&Port",-1,168,32,36,8\r
-    EDITTEXT        FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER\r
-    LTEXT           "Firewall &Username",-1,7,56,72,8\r
-    EDITTEXT        FIRE_USER,7,65,70,12,ES_AUTOHSCROLL\r
-    LTEXT           "Firewall P&assword",-1,81,56,70,8\r
-    EDITTEXT        FIRE_PASS,81,65,70,12,ES_PASSWORD | ES_AUTOHSCROLL\r
-    LTEXT           "&Security",-1,7,80,63,8\r
-    COMBOBOX        FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,\r
-                    "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10\r
-    CONTROL         "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10\r
-    CONTROL         "Us&e the firewall for undefined hosts",FIRE_USEIT,\r
-                    "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10\r
-    CONTROL         "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10\r
-    LTEXT           "Replace @ by",-1,154,55,50,8\r
-    EDITTEXT        FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "&Delete",IDOK,7,37,45,14\r
+    PUSHBUTTON      "&Cancel",DELETE_NO,57,37,44,14\r
+    PUSHBUTTON      "Delete &All",DELETE_ALL,107,37,45,14\r
+    PUSHBUTTON      "Ca&ncel All",IDCANCEL,157,37,45,14\r
+    LTEXT           "",DELETE_TEXT,7,19,195,8,SS_NOPREFIX\r
+    LTEXT           "Delete following file?",-1,7,7,167,8\r
 END\r
 \r
 hostlist_dlg DIALOG  0, 0, 222, 120\r
@@ -208,96 +307,6 @@ BEGIN
     PUSHBUTTON      "Help",9,165,102,50,14\r
 END\r
 \r
-hostname_dlg DIALOG  0, 0, 187, 93\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Quick Connect"\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    LTEXT           "&Host Name/Address",-1,7,6,130,8\r
-    COMBOBOX        QHOST_HOST,7,16,173,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "&Username",-1,7,34,57,8\r
-    EDITTEXT        QHOST_USER,7,44,80,12,ES_AUTOHSCROLL\r
-    LTEXT           "&Password/Phrase",-1,99,34,87,8\r
-    EDITTEXT        QHOST_PASS,99,44,80,12,ES_PASSWORD | ES_AUTOHSCROLL\r
-    CONTROL         "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,75,10\r
-    CONTROL         "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,61,83,10\r
-    DEFPUSHBUTTON   "OK",IDOK,36,75,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,75,50,14\r
-END\r
-\r
-hset_adv2_dlg DIALOG  0, 0, 207, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-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
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,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
-END\r
-\r
-hset_adv_dlg DIALOG  0, 0, 207, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    CONTROL         "Use &Firewall",HSET_FIREWALL,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,92,10\r
-    CONTROL         "Use PAS&V mode",HSET_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,22,92,10\r
-    CONTROL         "S&ync. folder movement",HSET_SYNCMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,93,10\r
-    LTEXT           "&Port",-1,7,56,54,8\r
-    EDITTEXT        HSET_PORT,7,66,22,12,ES_AUTOHSCROLL | ES_NUMBER\r
-    PUSHBUTTON      "Default",HSET_PORT_NOR,30,66,28,13\r
-    LTEXT           "&Account",-1,7,87,65,8\r
-    EDITTEXT        HSET_ACCOUNT,7,97,62,12,ES_AUTOHSCROLL\r
-    LTEXT           "Host &Timezone",-1,103,7,81,8\r
-    COMBOBOX        HSET_TIMEZONE,103,17,83,102,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "&Security",-1,103,35,72,8\r
-    COMBOBOX        HSET_SECURITY,103,45,83,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "&Commands After Connection",-1,103,65,97,8\r
-    EDITTEXT        HSET_INITCMD,103,76,92,30,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN\r
-END\r
-\r
-hset_code_dlg DIALOGEX 0, 0, 207, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-FONT 9, "MS Sans Serif", 0, 0, 0x0\r
-BEGIN\r
-    GROUPBOX        "&Japanese Kanji Code",-1,7,7,98,94,WS_GROUP\r
-    CONTROL         "No conversion",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,21,91,10\r
-    CONTROL         "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10\r
-    CONTROL         "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10\r
-    CONTROL         "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10\r
-    CONTROL         "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
-    CONTROL         "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,96,90,10\r
-    GROUPBOX        "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP\r
-    CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10\r
-    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,33,65,10\r
-    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10\r
-    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10\r
-    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10\r
-    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10\r
-    CONTROL         "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10\r
-    CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10\r
-END\r
-\r
-hset_dialup_dlg DIALOG  0, 0, 207, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    CONTROL         "&Use Dialup Connection",HSET_DIALUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,110,10\r
-    LTEXT           "&Dialup Setting",-1,19,23,97,8\r
-    COMBOBOX        HSET_DIALENTRY,19,33,181,101,CBS_DROPDOWNLIST | CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "&Reconnect if another dialup is active",HSET_DIALUSETHIS,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,53,181,10\r
-    CONTROL         "&Notify before reconnecting",HSET_DIALNOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,67,116,10\r
-END\r
-\r
 hset_main_dlg DIALOG  0, 0, 207, 139\r
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
@@ -321,115 +330,120 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,193,10\r
 END\r
 \r
-account_dlg DIALOG  0, 0, 187, 42\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Account"\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
-END\r
-\r
-chdir_br_dlg DIALOG  0, 0, 187, 43\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Folder"\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    EDITTEXT        INP_INPSTR,7,8,159,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",INP_BROUSE,167,7,13,14\r
-    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
-END\r
-\r
-bmark_edit_dlg DIALOG  0, 0, 187, 83\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Bookmark"\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    LTEXT           "&Local Folder",-1,7,7,173,8\r
-    EDITTEXT        BEDIT_LOCAL,7,17,173,12,ES_AUTOHSCROLL\r
-    LTEXT           "&Host Folder",-1,7,37,173,8\r
-    EDITTEXT        BEDIT_REMOTE,7,47,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,65,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,65,50,14\r
-END\r
-\r
-chdir_dlg DIALOG  0, 0, 187, 43\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Folder"\r
-FONT 9, "MS Sans Serif"\r
-BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,31,16,8\r
-END\r
-\r
-cwderr_dlg DIALOG  0, 0, 155, 57\r
+FILEOPENORD_1 DIALOG  109, 35, 165, 134\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Error"\r
+CAPTION "Open"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "STOP",IDCANCEL,51,36,50,14\r
-    CTEXT           "Cannot move to subfolder.",-1,7,7,141,8\r
-    CTEXT           "Stop processing.",-1,7,20,141,8\r
+    LTEXT           "&Folder",-1,7,6,92,9\r
+    LISTBOX         lst2,7,32,92,68,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "&Drive",stc4,7,104,92,9\r
+    COMBOBOX        cmb2,7,114,92,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP\r
+    DEFPUSHBUTTON   "OK",IDOK,105,6,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,105,24,50,14,WS_GROUP\r
+    PUSHBUTTON      "&Help",psh15,105,46,50,14,WS_GROUP\r
+    CONTROL         "&Read Only",chx1,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,105,68,50,12\r
+    LISTBOX         lst1,102,99,20,20,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | NOT WS_VISIBLE | WS_VSCROLL\r
+    LTEXT           "File &Name:",stc3,121,83,12,10,NOT WS_VISIBLE\r
+    EDITTEXT        edt1,104,83,12,12,ES_AUTOHSCROLL | ES_OEMCONVERT | NOT WS_VISIBLE | NOT WS_TABSTOP\r
+    LTEXT           "List Files of &Type:",stc2,127,99,12,9,NOT WS_VISIBLE\r
+    COMBOBOX        cmb1,107,115,16,36,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL\r
+    LTEXT           "",stc1,9,18,88,8\r
 END\r
 \r
-delete_dlg DIALOG  0, 0, 209, 55\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+opt_user_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "&Delete",IDOK,7,37,45,14\r
-    PUSHBUTTON      "&Cancel",DELETE_NO,57,37,44,14\r
-    PUSHBUTTON      "Delete &All",DELETE_ALL,107,37,45,14\r
-    PUSHBUTTON      "Ca&ncel All",IDCANCEL,157,37,45,14\r
-    LTEXT           "",DELETE_TEXT,7,19,195,8,SS_NOPREFIX\r
-    LTEXT           "Delete following file?",-1,7,7,167,8\r
+    LTEXT           "&Mail address",-1,7,7,59,8\r
+    EDITTEXT        USER_ADRS,7,18,196,12,ES_AUTOHSCROLL\r
+    LTEXT           "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN\r
 END\r
 \r
-dial_dlg DIALOG  0, 0, 159, 37\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+opt_tool_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Cancel",IDCANCEL,54,19,50,14\r
-    CTEXT           "",DIAL_STATUS,7,6,145,8,SS_NOPREFIX\r
+    LTEXT           "Viewer &1",-1,7,7,39,8\r
+    EDITTEXT        TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",TOOL_EDITOR1_BR,191,18,12,13\r
+    LTEXT           "Viewer &2",-1,7,63,39,8\r
+    EDITTEXT        TOOL_EDITOR2,7,74,183,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",TOOL_EDITOR2_BR,191,74,12,13\r
+    LTEXT           "Viewer &3",-1,7,93,39,8\r
+    EDITTEXT        TOOL_EDITOR3,7,104,183,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",TOOL_EDITOR3_BR,191,104,12,13\r
+    LTEXT           "Unassociated files will be opened in Viewer 1.",-1,19,33,184,27,SS_SUNKEN\r
+    LTEXT           "Use Viewer 2 and 3 by right-clicking with the mouse.",-1,14,124,184,8\r
 END\r
 \r
-dial_password_dlg DIALOG  0, 0, 171, 85\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+chmod_dlg DIALOG  0, 0, 171, 109\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Permission"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Enter Username and Password for Dialup",-1,7,4,157,9\r
-    RTEXT           "&Username",-1,14,23,45,8\r
-    EDITTEXT        RASPASS_USER,62,19,95,14,ES_AUTOHSCROLL\r
-    RTEXT           "&Password",-1,14,43,45,8\r
-    EDITTEXT        RASPASS_PASS,62,41,95,14,ES_PASSWORD | ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,24,63,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,96,63,50,14\r
+    LTEXT           "Current Permission :",-1,61,74,61,8\r
+    EDITTEXT        PERM_NOW,124,72,25,12,ES_AUTOHSCROLL | ES_NUMBER\r
+    GROUPBOX        "Owner",-1,7,7,48,58\r
+    CONTROL         "Read",PERM_O_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,31,10\r
+    CONTROL         "Write",PERM_O_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,35,31,10\r
+    CONTROL         "Execute",PERM_O_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,50,39,10\r
+    GROUPBOX        "Group",-1,61,7,48,58\r
+    CONTROL         "Read",PERM_G_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,21,31,10\r
+    CONTROL         "Write",PERM_G_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,35,31,10\r
+    CONTROL         "Execute",PERM_G_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,49,39,10\r
+    GROUPBOX        "Others",-1,116,8,48,58\r
+    CONTROL         "Read",PERM_A_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,22,31,10\r
+    CONTROL         "Write",PERM_A_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,36,31,10\r
+    CONTROL         "Execute",PERM_A_EXEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,51,39,10\r
+    CONTROL         "",-1,"Static",SS_BLACKFRAME,57,69,106,18\r
+    DEFPUSHBUTTON   "OK",IDOK,7,92,48,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,61,92,48,14\r
+    PUSHBUTTON      "Help",9,116,92,48,14\r
 END\r
 \r
-diskfull_dlg DIALOG  0, 0, 159, 42\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP:Error"\r
+sort_dlg DIALOG  0, 0, 187, 197\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Sort"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Cencal this File",IDOK,13,24,66,14\r
-    PUSHBUTTON      "Cencel All",IDCANCEL,95,24,50,14\r
-    CTEXT           "Disk is full",-1,7,6,145,10\r
+    GROUPBOX        "Local",-1,7,7,81,150\r
+    GROUPBOX        "&File",-1,10,17,74,80,WS_GROUP\r
+    CONTROL         "Name order",SORT_LFILE_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,30,66,10\r
+    CONTROL         "Extension order",SORT_LFILE_EXT,"Button",BS_AUTORADIOBUTTON,15,42,66,10\r
+    CONTROL         "Size order",SORT_LFILE_SIZE,"Button",BS_AUTORADIOBUTTON,15,55,66,10\r
+    CONTROL         "Date order",SORT_LFILE_DATE,"Button",BS_AUTORADIOBUTTON,15,68,66,10\r
+    CONTROL         "Reverse",SORT_LFILE_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,81,66,10\r
+    GROUPBOX        "F&older",-1,10,100,74,52,WS_GROUP\r
+    CONTROL         "Name order",SORT_LDIR_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,112,66,10\r
+    CONTROL         "Date order",SORT_LDIR_DATE,"Button",BS_AUTORADIOBUTTON,15,124,66,10\r
+    CONTROL         "Reverse",SORT_LDIR_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,137,66,10\r
+    GROUPBOX        "Host",-1,98,7,82,150\r
+    GROUPBOX        "F&ile",-1,102,17,74,80,WS_GROUP\r
+    CONTROL         "Name order",SORT_RFILE_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,30,66,10\r
+    CONTROL         "Extension order",SORT_RFILE_EXT,"Button",BS_AUTORADIOBUTTON,107,42,66,10\r
+    CONTROL         "Size order",SORT_RFILE_SIZE,"Button",BS_AUTORADIOBUTTON,107,55,66,10\r
+    CONTROL         "Date order",SORT_RFILE_DATE,"Button",BS_AUTORADIOBUTTON,107,68,66,10\r
+    CONTROL         "Reverse",SORT_RFILE_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,107,81,66,10\r
+    GROUPBOX        "Fo&lder",-1,102,100,74,52,WS_GROUP\r
+    CONTROL         "Name order",SORT_RDIR_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,112,66,10\r
+    CONTROL         "Extention order",SORT_RDIR_DATE,"Button",BS_AUTORADIOBUTTON,107,124,66,10\r
+    CONTROL         "Reverse",SORT_RDIR_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,107,137,66,10\r
+    CONTROL         "Save sort setting on each host",SORT_SAVEHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,164,156,10\r
+    DEFPUSHBUTTON   "OK",IDOK,11,179,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,69,179,50,14\r
+    PUSHBUTTON      "Help",9,127,179,50,14\r
 END\r
 \r
-downerr_dlg DIALOGEX 0, 0, 159, 65\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP:Error"\r
-FONT 9, "MS Sans Serif", 0, 0, 0x1\r
+mkdir_dlg DIALOG  0, 0, 187, 58\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Cancel this File",IDOK,7,47,82,14\r
-    PUSHBUTTON      "Cancel All",IDCANCEL,102,47,50,14\r
-    LTEXT           "Cannot download following file :",-1,7,4,138,10\r
-    LTEXT           "",UPDOWN_ERR_FNAME,7,16,145,8,SS_NOPREFIX\r
-    EDITTEXT        UPDOWN_ERR_MSG,7,29,145,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE\r
+    EDITTEXT        INP_INPSTR,7,21,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,40,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,102,40,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,167,40,13,10\r
+    LTEXT           "Enter new folder name:",-1,7,7,160,8\r
 END\r
 \r
 opt_misc_dlg DIALOG  0, 0, 211, 139\r
@@ -453,15 +467,66 @@ BEGIN
     CONTROL         "Debug",MISC_DEBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,123,40,10\r
 END\r
 \r
-downname_dlg DIALOG  0, 0, 187, 42\r
+hostname_dlg DIALOG  0, 0, 187, 93\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Download File"\r
+CAPTION "Quick Connect"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,6,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
+    LTEXT           "&Host Name/Address",-1,7,6,130,8\r
+    COMBOBOX        QHOST_HOST,7,16,173,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "&Username",-1,7,34,57,8\r
+    EDITTEXT        QHOST_USER,7,44,80,12,ES_AUTOHSCROLL\r
+    LTEXT           "&Password/Phrase",-1,99,34,87,8\r
+    EDITTEXT        QHOST_PASS,99,44,80,12,ES_PASSWORD | ES_AUTOHSCROLL\r
+    CONTROL         "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,75,10\r
+    CONTROL         "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,61,83,10\r
+    DEFPUSHBUTTON   "OK",IDOK,36,75,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,75,50,14\r
+END\r
+\r
+passwd_dlg DIALOG  0, 0, 187, 43\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Password/Pass phrase"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,31,16,8\r
+END\r
+\r
+newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Enter new master password"\r
+FONT 9, "MS Sans Serif", 0, 0, 0x0\r
+BEGIN\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,25,25,43,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,72,25,43,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,31,8,8\r
+    PUSHBUTTON      "Help",IDHELP,118,25,43,14\r
+END\r
+\r
+username_dlg DIALOG  0, 0, 187, 58\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "User Name"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    CONTROL         "Anonymous(&A)",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,73,10\r
+    DEFPUSHBUTTON   "OK",IDOK,36,40,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,40,50,14\r
+END\r
+\r
+chdir_dlg DIALOG  0, 0, 187, 43\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Folder"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,31,16,8\r
 END\r
 \r
 exit_dlg DIALOG  0, 0, 143, 64\r
@@ -474,62 +539,125 @@ BEGIN
     LTEXT           "File transfer is now in progress.\n\nPlease quit FFFTP after the file transfer done.",-1,7,7,129,35\r
 END\r
 \r
-FILEOPENORD_1 DIALOG  109, 35, 165, 134\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Open"\r
+forcepasschange_dlg DIALOG  0, 0, 211, 64\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Force reset of master password"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&Folder",-1,7,6,92,9\r
-    LISTBOX         lst2,7,32,92,68,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "&Drive",stc4,7,104,92,9\r
-    COMBOBOX        cmb2,7,114,92,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP\r
-    DEFPUSHBUTTON   "OK",IDOK,105,6,50,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,105,24,50,14,WS_GROUP\r
-    PUSHBUTTON      "&Help",psh15,105,46,50,14,WS_GROUP\r
-    CONTROL         "&Read Only",chx1,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,105,68,50,12\r
-    LISTBOX         lst1,102,99,20,20,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | NOT WS_VISIBLE | WS_VSCROLL\r
-    LTEXT           "File &Name:",stc3,121,83,12,10,NOT WS_VISIBLE\r
-    EDITTEXT        edt1,104,83,12,12,ES_AUTOHSCROLL | ES_OEMCONVERT | NOT WS_VISIBLE | NOT WS_TABSTOP\r
-    LTEXT           "List Files of &Type:",stc2,127,99,12,9,NOT WS_VISIBLE\r
-    COMBOBOX        cmb1,107,115,16,36,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL\r
-    LTEXT           "",stc1,9,18,88,8\r
+    LTEXT           "All the registered FTP passwords will be invalidated if you forcely set a new master password.\r\nAre you sure you want to set a new password?",-1,7,7,196,36\r
+    DEFPUSHBUTTON   "Yes",IDOK,48,42,50,14\r
+    PUSHBUTTON      "No",IDCANCEL,112,42,50,14\r
 END\r
 \r
-filesize_dlg DIALOG  0, 0, 131, 76\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "File Size"\r
+opt_trmode2_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,42,55,50,14\r
-    CTEXT           "",FSIZE_SIZE,7,18,117,8\r
-    CTEXT           "",FSIZE_TITLE,7,7,117,8\r
-    CTEXT           "Including all files in subfolder.",-1,7,30,117,19,SS_CENTERIMAGE | SS_SUNKEN\r
+    GROUPBOX        "Filename",-1,7,7,196,69\r
+    CONTROL         "Convert to &lowercase",TRMODE2_LOWER,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,18,143,10\r
+    CONTROL         "Convert to &uppercase",TRMODE2_UPPER,"Button",BS_AUTORADIOBUTTON,13,30,143,10\r
+    CONTROL         "&No conversion",TRMODE2_NOCNV,"Button",BS_AUTORADIOBUTTON,13,42,143,10\r
+    LTEXT           "&Timeout",-1,7,80,131,8\r
+    EDITTEXT        TRMODE2_TIMEOUT,7,90,26,14,ES_AUTOHSCROLL | ES_NUMBER\r
+    CONTROL         "Spin1",TRMODE2_TIMEOUT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,33,90,9,14\r
+    LTEXT           "(0 to 300sec: 0=No timeout)",-1,45,94,107,8\r
+    LTEXT           "&Default local folder",-1,7,108,196,8\r
+    EDITTEXT        TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",TRMODE2_LOCAL_BR,190,118,13,13\r
+    LTEXT           "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN\r
 END\r
 \r
-filesize_notify_dlg DIALOG  0, 0, 155, 70\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "File Size"\r
+opt_notify_dlg DIALOGEX 0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+FONT 9, "MS Sans Serif", 0, 0, 0x0\r
+BEGIN\r
+    GROUPBOX        "If File Already Exists",-1,7,7,196,67,WS_GROUP\r
+    GROUPBOX        "Download",-1,11,20,188,24,WS_GROUP\r
+    CONTROL         "&Overwrite",NOTIFY_D_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,30,50,10\r
+    CONTROL         "&Confirm",NOTIFY_D_DLG,"Button",BS_AUTORADIOBUTTON,80,30,94,10\r
+    GROUPBOX        "Upload",-1,11,47,188,23,WS_GROUP\r
+    CONTROL         "O&verwrite",NOTIFY_U_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,57,48,10\r
+    CONTROL         "Co&nfirm",NOTIFY_U_DLG,"Button",BS_AUTORADIOBUTTON,80,57,106,10\r
+    GROUPBOX        "On Double-click",-1,7,78,196,23,WS_GROUP\r
+    CONTROL         "O&pen",NOTIFY_OPEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,88,53,10\r
+    CONTROL         "Down&load",NOTIFY_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,80,88,102,10\r
+    GROUPBOX        "In Server File Move function",-1,7,106,196,26,WS_GROUP\r
+    CONTROL         "No Confirm",NOTIFY_M_NODLG,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,118,56,10\r
+    CONTROL         "Confirm",NOTIFY_M_DLG,"Button",BS_AUTORADIOBUTTON,80,118,56,10\r
+    CONTROL         "Disable",NOTIFY_M_DISABLE,"Button",BS_AUTORADIOBUTTON,141,118,56,10\r
+END\r
+\r
+bmark_dlg DIALOG  0, 0, 222, 109\r
+STYLE DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION "Bookmarks"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    LISTBOX         BMARK_LIST,7,7,152,75,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    DEFPUSHBUTTON   "&Close",IDOK,91,90,50,14\r
+    PUSHBUTTON      "Chan&ge",BMARK_JUMP,27,90,50,14\r
+    PUSHBUTTON      "&New...",BMARK_NEW,165,7,50,14\r
+    PUSHBUTTON      "&Modify...",BMARK_SET,165,26,50,14\r
+    PUSHBUTTON      "&Delete...",BMARK_DEL,165,45,50,14\r
+    PUSHBUTTON      "U&p",BMARK_UP,165,65,23,14\r
+    PUSHBUTTON      "Do&wn",BMARK_DOWN,192,65,23,14\r
+    SCROLLBAR       BMARK_SIZEGRIP,212,96,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
+    PUSHBUTTON      "&Help",9,165,90,50,14\r
+END\r
+\r
+opt_fire_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "Firewall &Type",-1,7,7,90,8\r
+    COMBOBOX        FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "Firewall &Hostname",-1,7,32,80,8\r
+    EDITTEXT        FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL\r
+    LTEXT           "&Port",-1,168,32,36,8\r
+    EDITTEXT        FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL | ES_NUMBER\r
+    LTEXT           "Firewall &Username",-1,7,56,72,8\r
+    EDITTEXT        FIRE_USER,7,65,70,12,ES_AUTOHSCROLL\r
+    LTEXT           "Firewall P&assword",-1,81,56,70,8\r
+    EDITTEXT        FIRE_PASS,81,65,70,12,ES_PASSWORD | ES_AUTOHSCROLL\r
+    LTEXT           "&Security",-1,7,80,63,8\r
+    COMBOBOX        FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,\r
+                    "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,83,139,10\r
+    CONTROL         "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,71,96,139,10\r
+    CONTROL         "Us&e the firewall for undefined hosts",FIRE_USEIT,\r
+                    "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,109,197,10\r
+    CONTROL         "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,197,10\r
+    LTEXT           "Replace @ by",-1,154,55,50,8\r
+    EDITTEXT        FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL\r
+END\r
+\r
+hset_adv_dlg DIALOG  0, 0, 207, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,23,49,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,82,49,50,14\r
-    CONTROL         "&Calcualte only the selected files.",FSNOTIFY_SEL_ONLY,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,33,141,10\r
-    CTEXT           "",FSNOTIFY_TITLE,7,7,142,8\r
-    CTEXT           "( This may take a few minutes. )",FSNOTIFY_TITLE,7,19,141,8\r
+    CONTROL         "Use &Firewall",HSET_FIREWALL,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,92,10\r
+    CONTROL         "Use PAS&V mode",HSET_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,22,92,10\r
+    CONTROL         "S&ync. folder movement",HSET_SYNCMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,93,10\r
+    LTEXT           "&Port",-1,7,56,54,8\r
+    EDITTEXT        HSET_PORT,7,66,22,12,ES_AUTOHSCROLL | ES_NUMBER\r
+    PUSHBUTTON      "Default",HSET_PORT_NOR,30,66,28,13\r
+    LTEXT           "&Account",-1,7,87,65,8\r
+    EDITTEXT        HSET_ACCOUNT,7,97,62,12,ES_AUTOHSCROLL\r
+    LTEXT           "Host &Timezone",-1,103,7,81,8\r
+    COMBOBOX        HSET_TIMEZONE,103,17,83,102,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "&Security",-1,103,35,72,8\r
+    COMBOBOX        HSET_SECURITY,103,45,83,75,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "&Commands After Connection",-1,103,65,97,8\r
+    EDITTEXT        HSET_INITCMD,103,76,92,30,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN\r
 END\r
 \r
-filter_dlg DIALOG  0, 0, 187, 79\r
+diskfull_dlg DIALOG  0, 0, 159, 42\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Filter"\r
+CAPTION "FFFTP:Error"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Use semicolons to delineate multiple filters.\n (Example *.txt;*.log)\nFile transfer is also affected by this filter setting.",-1,13,29,167,27\r
-    EDITTEXT        FILTER_STR,7,8,147,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,7,61,41,14\r
-    PUSHBUTTON      "All",FILTER_NOR,51,61,41,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,95,61,41,14\r
-    PUSHBUTTON      "Help",9,139,61,41,14\r
+    DEFPUSHBUTTON   "Cencal this File",IDOK,13,24,66,14\r
+    PUSHBUTTON      "Cencel All",IDCANCEL,95,24,50,14\r
+    CTEXT           "Disk is full",-1,7,6,145,10\r
 END\r
 \r
 find_dlg DIALOG  0, 0, 187, 56\r
@@ -542,122 +670,204 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,101,38,50,14\r
 END\r
 \r
-forcerename_dlg DIALOG  0, 0, 187, 67\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Download"\r
+mailadrs_dlg DIALOG  0, 0, 187, 89\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,29,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,31,49,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,104,49,50,14\r
-    LTEXT           "Invalid character specified in filename.\nRename the file.",IDC_STATIC,7,7,173,16\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,55,8,8\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,13,71,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,68,71,50,14\r
+    PUSHBUTTON      "Help",9,123,71,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,61,8,8\r
+    LTEXT           "Enter ypur mail address.\nThis address is used for the anonymous FTP password.",-1,16,25,164,26\r
+    LTEXT           "You can reenter mail address at the Option dialog.",-1,16,54,164,10\r
 END\r
 \r
-fname_in_dlg DIALOG  0, 0, 86, 44\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+opt_sound_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,7,26,33,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,46,26,33,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,71,23,8,10\r
+    CONTROL         "Play *.wav file at successful &connection",SOUND_CONNECT,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,9,196,10\r
+    EDITTEXT        SOUND_CONNECT_WAV,31,22,116,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",SOUND_CONNECT_BR,148,21,13,13\r
+    PUSHBUTTON      "Test",SOUND_CONNECT_TEST,166,21,37,13\r
+    CONTROL         "Play *.wav file when &transfer is complete",SOUND_TRANS,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,196,10\r
+    EDITTEXT        SOUND_TRANS_WAV,31,55,116,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",SOUND_TRANS_BR,148,55,13,13\r
+    PUSHBUTTON      "Test",SOUND_TRANS_TEST,166,55,37,13\r
+    CONTROL         "Play *.wav file at &error",SOUND_ERROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,75,196,10\r
+    EDITTEXT        SOUND_ERROR_WAV,31,88,116,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",SOUND_ERROR_BR,148,88,13,13\r
+    PUSHBUTTON      "Test",SOUND_ERROR_TEST,166,88,37,13\r
 END\r
 \r
-group_dlg DIALOG  0, 0, 187, 42\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Group Name"\r
+downerr_dlg DIALOGEX 0, 0, 159, 65\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP:Error"\r
+FONT 9, "MS Sans Serif", 0, 0, 0x1\r
+BEGIN\r
+    DEFPUSHBUTTON   "Cancel this File",IDOK,7,47,82,14\r
+    PUSHBUTTON      "Cancel All",IDCANCEL,102,47,50,14\r
+    LTEXT           "Cannot download following file :",-1,7,4,138,10\r
+    LTEXT           "",UPDOWN_ERR_FNAME,7,16,145,8,SS_NOPREFIX\r
+    EDITTEXT        UPDOWN_ERR_MSG,7,29,145,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE\r
+END\r
+\r
+uperr_dlg DIALOGEX 0, 0, 159, 67\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP:Error"\r
+FONT 9, "MS Sans Serif", 0, 0, 0x1\r
+BEGIN\r
+    DEFPUSHBUTTON   "Cancel this File",IDOK,7,49,82,14\r
+    PUSHBUTTON      "Cancel All",IDCANCEL,102,49,50,14\r
+    LTEXT           "Cannot upload following file.",-1,7,4,137,10\r
+    LTEXT           "",UPDOWN_ERR_FNAME,7,17,145,8,SS_NOPREFIX\r
+    EDITTEXT        UPDOWN_ERR_MSG,7,32,153,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE\r
+END\r
+\r
+hset_code_dlg DIALOGEX 0, 0, 207, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+FONT 9, "MS Sans Serif", 0, 0, 0x0\r
+BEGIN\r
+    GROUPBOX        "&Japanese Kanji Code",-1,7,7,98,94,WS_GROUP\r
+    CONTROL         "No conversion",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,21,91,10\r
+    CONTROL         "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10\r
+    CONTROL         "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10\r
+    CONTROL         "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10\r
+    CONTROL         "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
+    CONTROL         "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,96,90,10\r
+    GROUPBOX        "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP\r
+    CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10\r
+    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,33,65,10\r
+    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10\r
+    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10\r
+    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10\r
+    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10\r
+    CONTROL         "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10\r
+    CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10\r
+END\r
+\r
+opt_trmode1_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
+    GROUPBOX        "Transfer mode",-1,7,7,93,56\r
+    CONTROL         "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,19,85,10\r
+    CONTROL         "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10\r
+    CONTROL         "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10\r
+    GROUPBOX        "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP\r
+    LISTBOX         TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "A&dd...",TRMODE_ADD,167,19,31,14\r
+    PUSHBUTTON      "Delete",TRMODE_DEL,167,38,31,14\r
+    CONTROL         "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10\r
+    CONTROL         "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10\r
+    LTEXT           "->",-1,98,49,8,8\r
+    CONTROL         "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,196,10\r
 END\r
 \r
-hostconnect_dlg DIALOG  0, 0, 166, 106\r
-STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "Host List"\r
+up_exist_dlg DIALOG  0, 0, 234, 119\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
+CAPTION "Upload"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,7,6,152,75\r
-    DEFPUSHBUTTON   "&Connect",IDOK,20,88,50,14\r
-    PUSHBUTTON      "Cl&ose",IDCANCEL,96,88,50,14\r
-    SCROLLBAR       HOST_SIZEGRIP,156,92,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
-    PUSHBUTTON      "?????(&N)...",HOST_NEW,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "????????(&G)...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "????(&M)...",HOST_SET,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "???(&C)",HOST_COPY,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "??(&D)...",HOST_DEL,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "?",HOST_UP,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
-    PUSHBUTTON      "?",HOST_DOWN,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    CONTROL         "&Overwrite existing file",UP_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,38,99,10\r
+    CONTROL         "Overwrite if upload file is &newer",UP_EXIST_NEW,"Button",BS_AUTORADIOBUTTON,7,50,118,10\r
+    CONTROL         "&Resume",UP_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,62,99,10\r
+    CONTROL         "Rename &by the host",UP_EXIST_UNIQUE,"Button",BS_AUTORADIOBUTTON,7,74,99,10\r
+    CONTROL         "&Skip",UP_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,86,99,10\r
+    LTEXT           "To upload with a different name, modify the filename and click Overwrite existing file.",-1,129,39,98,41\r
+    DEFPUSHBUTTON   "OK",IDOK,13,101,50,14,WS_GROUP\r
+    PUSHBUTTON      "&Do All",IDOK_ALL,68,101,50,14\r
+    PUSHBUTTON      "&Cancel All",IDCANCEL,123,101,50,14\r
+    PUSHBUTTON      "&Help",9,178,101,41,14\r
+    LTEXT           "Filename already exists on host. Upload?",-1,7,7,184,8\r
+    EDITTEXT        UP_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL\r
 END\r
 \r
-hostdel_dlg DIALOG  0, 0, 134, 39\r
+reginit_dlg DIALOG  0, 0, 155, 83\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Delete Host"\r
+CAPTION "Erase All Settings"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "&Yes",IDOK,11,21,50,14\r
-    PUSHBUTTON      "&No",IDCANCEL,73,21,50,14\r
-    LTEXT           "Delete this host?",-1,7,6,120,10\r
+    DEFPUSHBUTTON   "No",IDCANCEL,41,45,71,31\r
+    PUSHBUTTON      "Yes",IDOK,125,62,23,14,NOT WS_TABSTOP\r
+    LTEXT           "Erase ALL settings including Host settings.",-1,7,7,141,17\r
+    CTEXT           "Are you sure?",-1,7,29,141,8\r
 END\r
 \r
-groupdel_dlg DIALOG  0, 0, 135, 47\r
+updown_as_dlg DIALOG  0, 0, 187, 69\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Delete Group"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "&Yes",IDOK,11,29,50,14\r
-    PUSHBUTTON      "&No",IDCANCEL,73,29,50,14\r
-    LTEXT           "Delete this group and all hosts in the group?",-1,7,6,121,18\r
+    EDITTEXT        UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,35,51,50,14\r
+    PUSHBUTTON      "Cancel",UPDOWNAS_STOP,101,51,50,14\r
+    LTEXT           "",UPDOWNAS_TEXT,7,21,173,8,SS_NOPREFIX\r
+    LTEXT           "Enter new name",-1,7,7,133,8\r
 END\r
 \r
-mailadrs_dlg DIALOG  0, 0, 187, 89\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP"\r
+re_passwd_dlg DIALOG  0, 0, 187, 62\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Password"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,13,71,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,68,71,50,14\r
-    PUSHBUTTON      "Help",9,123,71,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,61,8,8\r
-    LTEXT           "Enter ypur mail address.\nThis address is used for the anonymous FTP password.",-1,16,25,164,26\r
-    LTEXT           "You can reenter mail address at the Option dialog.",-1,16,54,164,10\r
+    EDITTEXT        INP_INPSTR,7,27,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,44,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,44,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,50,16,8\r
+    LTEXT           "Cannot login.\nEnter correct password.",-1,7,7,173,19\r
 END\r
 \r
-mirror_down_dlg DIALOG  0, 0, 215, 155\r
+savepass_dlg DIALOG  0, 0, 146, 50\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Mirroring Download"\r
+CAPTION "Save Password"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "&Display Transfer Files",MIRRORUP_DISP,9,134,85,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,106,134,50,14\r
-    PUSHBUTTON      "Help",9,168,134,36,14\r
-    LTEXT           "",-1,7,19,201,78,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "The following processes are required:\n\n  *Copy some files from the host to the local disk.\n\n  *Delete some files from the local disk.",-1,35,26,166,64\r
-    CTEXT           "Mirror Download",-1,7,7,201,8\r
-    CTEXT           "*** DOWNLOAD ***",-1,7,105,201,8\r
-    LTEXT           "Confirm?",-1,42,121,166,8\r
-    ICON            notify,-1,12,34,20,20\r
+    LTEXT           "Save correct password to host setting?",-1,7,7,132,17\r
+    DEFPUSHBUTTON   "Yes",IDOK,17,29,50,14\r
+    PUSHBUTTON      "No",IDCANCEL,78,29,50,14\r
 END\r
 \r
-mirror_notify_dlg DIALOG  0, 0, 174, 171\r
-STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "Mirror Upload"\r
+sel_local_dlg DIALOG  0, 0, 187, 106\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Select File (Local)"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Copy/Delete following files",-1,7,6,160,8\r
-    LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP\r
-    DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14\r
-    SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
-    PUSHBUTTON      "Help",9,117,153,50,14\r
-    PUSHBUTTON      "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP\r
-    LTEXT           "",MIRROR_COPYNUM,7,115,160,8\r
-    LTEXT           "",MIRROR_MAKENUM,7,126,160,8\r
-    LTEXT           "",MIRROR_DELNUM,7,137,160,8\r
+    LTEXT           "&File to select",-1,7,7,109,8\r
+    EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL\r
+    CONTROL         "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,160,10\r
+    CONTROL         "Do not select if the host file is &newer.",SEL_NOOLD,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,160,10\r
+    CONTROL         "Do not select if the host file is &older.",SEL_NONEW,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10\r
+    CONTROL         "Do not select if the same file &resides in the host.",SEL_NOEXIST,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,160,10\r
+    DEFPUSHBUTTON   "OK",IDOK,10,88,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,68,88,50,14\r
+    PUSHBUTTON      "Help",9,126,88,50,14\r
+END\r
+\r
+sel_remote_dlg DIALOG  0, 0, 187, 106\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Select File (Host)"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "&File to select",-1,7,7,109,8\r
+    EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL\r
+    CONTROL         "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,160,10\r
+    CONTROL         "Do not select if the local file is &newer.",SEL_NOOLD,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,160,10\r
+    CONTROL         "Do not select if the local file is &older.",SEL_NONEW,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10\r
+    CONTROL         "Do not select if the same file &resides in the local.",SEL_NOEXIST,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,160,10\r
+    DEFPUSHBUTTON   "OK",IDOK,10,88,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,68,88,50,14\r
+    PUSHBUTTON      "Help",9,126,88,50,14\r
 END\r
 \r
 mirror_up_dlg DIALOG  0, 0, 215, 135\r
@@ -676,43 +886,60 @@ BEGIN
     ICON            notify,-1,12,46,20,20\r
 END\r
 \r
-mirrordown_notify_dlg DIALOG  0, 0, 174, 171\r
-STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "Mirror Download"\r
+account_dlg DIALOG  0, 0, 187, 42\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Account"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Copy/Delete following files",-1,7,6,92,8\r
-    LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP\r
-    DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14\r
-    SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
-    PUSHBUTTON      "Help",9,117,153,50,14\r
-    PUSHBUTTON      "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP\r
-    LTEXT           "",MIRROR_COPYNUM,7,115,160,8\r
-    LTEXT           "",MIRROR_MAKENUM,7,126,160,8\r
-    LTEXT           "",MIRROR_DELNUM,7,137,160,8\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
 END\r
 \r
-mkdir_dlg DIALOG  0, 0, 187, 58\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+opt_mirror_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,21,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,40,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,102,40,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,167,40,13,10\r
-    LTEXT           "Enter new folder name:",-1,7,7,160,8\r
+    GROUPBOX        "Files Not Transferred",-1,7,7,95,85,WS_GROUP\r
+    LISTBOX         MIRROR_NOTRN_LIST,12,20,50,69,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "Add...",MIRROR_NOTRN_ADD,66,20,31,14\r
+    PUSHBUTTON      "Delete",MIRROR_NOTRN_DEL,66,37,31,14\r
+    LTEXT           "Folder names are also  OK",-1,65,56,33,33,SS_SUNKEN\r
+    GROUPBOX        "Files Not Deleted",-1,108,7,95,86,WS_GROUP\r
+    LISTBOX         MIRROR_NODEL_LIST,113,20,50,69,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "Add...",MIRROR_NODEL_ADD,167,20,31,14\r
+    PUSHBUTTON      "Delete...",MIRROR_NODEL_DEL,167,37,31,14\r
+    LTEXT           "Folder names are also  OK",-1,166,56,33,33,SS_SUNKEN\r
+    CONTROL         "&Convert filenames to lowercase",MIRROR_LOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,97,174,10\r
+    CONTROL         "Confirm deletions during Mirror &Upload",MIRROR_UPDEL_NOTIFY,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,111,174,10\r
+    CONTROL         "Confirm deletions during Mirror &Download",MIRROR_DOWNDEL_NOTIFY,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,125,174,10\r
 END\r
 \r
-noresume_dlg DIALOG  0, 0, 191, 47\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP:Error"\r
+somecmd_dlg DIALOG  0, 0, 187, 61\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Specify Command"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Yes",IDOK,10,29,45,14\r
-    PUSHBUTTON      "Cancel This File",IDCANCEL,65,29,59,14\r
-    PUSHBUTTON      "Cancel All",RESUME_CANCEL_ALL,134,29,45,14\r
-    LTEXT           "This host doesn't support Resume command.\nOverwrite existing file?",-1,7,4,177,17\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,10,43,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,68,43,50,14\r
+    PUSHBUTTON      "Help",9,126,43,50,14\r
+    LTEXT           "Some commands cannot be specified here. See help for details.",-1,7,24,173,15\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,171,30,9,8\r
+END\r
+\r
+downname_dlg DIALOG  0, 0, 187, 42\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Download File"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    EDITTEXT        INP_INPSTR,7,6,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
 END\r
 \r
 opt_connect_dlg DIALOG  0, 0, 211, 139\r
@@ -740,165 +967,116 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10\r
 END\r
 \r
-opt_disp_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+rasnotify_dlg DIALOG  0, 0, 158, 46\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "&Change",DISP_FONT_BR,167,7,36,14,WS_GROUP\r
-    LTEXT           "",-1,7,7,159,14,SS_NOPREFIX | SS_SUNKEN\r
-    LTEXT           "Font :",-1,9,11,29,8\r
-    LTEXT           "",DISP_FONT,40,11,123,8,SS_NOPREFIX\r
-    CONTROL         "Do not display &hidden files/folders",DISP_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,172,10\r
-    LTEXT           "If this box is checked, hidden files/folders are not transferred during Mirror operations.",-1,29,44,167,27,SS_SUNKEN\r
-    CONTROL         "&Display drives in the file list",DISP_DRIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,76,172,10\r
+    DEFPUSHBUTTON   "Yes",IDOK,23,25,50,14\r
+    PUSHBUTTON      "No",IDCANCEL,86,25,50,14\r
+    CTEXT           "Disconnect dialup?",-1,7,7,144,8\r
 END\r
 \r
-opt_mirror_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+filesize_dlg DIALOG  0, 0, 131, 76\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "File Size"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "Files Not Transferred",-1,7,7,95,85,WS_GROUP\r
-    LISTBOX         MIRROR_NOTRN_LIST,12,20,50,69,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Add...",MIRROR_NOTRN_ADD,66,20,31,14\r
-    PUSHBUTTON      "Delete",MIRROR_NOTRN_DEL,66,37,31,14\r
-    LTEXT           "Folder names are also  OK",-1,65,56,33,33,SS_SUNKEN\r
-    GROUPBOX        "Files Not Deleted",-1,108,7,95,86,WS_GROUP\r
-    LISTBOX         MIRROR_NODEL_LIST,113,20,50,69,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Add...",MIRROR_NODEL_ADD,167,20,31,14\r
-    PUSHBUTTON      "Delete...",MIRROR_NODEL_DEL,167,37,31,14\r
-    LTEXT           "Folder names are also  OK",-1,166,56,33,33,SS_SUNKEN\r
-    CONTROL         "&Convert filenames to lowercase",MIRROR_LOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,97,174,10\r
-    CONTROL         "Confirm deletions during Mirror &Upload",MIRROR_UPDEL_NOTIFY,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,111,174,10\r
-    CONTROL         "Confirm deletions during Mirror &Download",MIRROR_DOWNDEL_NOTIFY,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,125,174,10\r
-END\r
-\r
-opt_notify_dlg DIALOGEX 0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-FONT 9, "MS Sans Serif", 0, 0, 0x0\r
-BEGIN\r
-    GROUPBOX        "If File Already Exists",-1,7,7,196,67,WS_GROUP\r
-    GROUPBOX        "Download",-1,11,20,188,24,WS_GROUP\r
-    CONTROL         "&Overwrite",NOTIFY_D_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,30,50,10\r
-    CONTROL         "&Confirm",NOTIFY_D_DLG,"Button",BS_AUTORADIOBUTTON,80,30,94,10\r
-    GROUPBOX        "Upload",-1,11,47,188,23,WS_GROUP\r
-    CONTROL         "O&verwrite",NOTIFY_U_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,57,48,10\r
-    CONTROL         "Co&nfirm",NOTIFY_U_DLG,"Button",BS_AUTORADIOBUTTON,80,57,106,10\r
-    GROUPBOX        "On Double-click",-1,7,78,196,23,WS_GROUP\r
-    CONTROL         "O&pen",NOTIFY_OPEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,88,53,10\r
-    CONTROL         "Down&load",NOTIFY_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,80,88,102,10\r
-    GROUPBOX        "In Server File Move function",-1,7,106,196,26,WS_GROUP\r
-    CONTROL         "No Confirm",NOTIFY_M_NODLG,"Button",BS_AUTORADIOBUTTON | WS_GROUP,19,118,56,10\r
-    CONTROL         "Confirm",NOTIFY_M_DLG,"Button",BS_AUTORADIOBUTTON,80,118,56,10\r
-    CONTROL         "Disable",NOTIFY_M_DISABLE,"Button",BS_AUTORADIOBUTTON,141,118,56,10\r
+    DEFPUSHBUTTON   "OK",IDOK,42,55,50,14\r
+    CTEXT           "",FSIZE_SIZE,7,18,117,8\r
+    CTEXT           "",FSIZE_TITLE,7,7,117,8\r
+    CTEXT           "Including all files in subfolder.",-1,7,30,117,19,SS_CENTERIMAGE | SS_SUNKEN\r
 END\r
 \r
-opt_sound_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+filesize_notify_dlg DIALOG  0, 0, 155, 70\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "File Size"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "Play *.wav file at successful &connection",SOUND_CONNECT,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,9,196,10\r
-    EDITTEXT        SOUND_CONNECT_WAV,31,22,116,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",SOUND_CONNECT_BR,148,21,13,13\r
-    PUSHBUTTON      "Test",SOUND_CONNECT_TEST,166,21,37,13\r
-    CONTROL         "Play *.wav file when &transfer is complete",SOUND_TRANS,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,196,10\r
-    EDITTEXT        SOUND_TRANS_WAV,31,55,116,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",SOUND_TRANS_BR,148,55,13,13\r
-    PUSHBUTTON      "Test",SOUND_TRANS_TEST,166,55,37,13\r
-    CONTROL         "Play *.wav file at &error",SOUND_ERROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,75,196,10\r
-    EDITTEXT        SOUND_ERROR_WAV,31,88,116,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",SOUND_ERROR_BR,148,88,13,13\r
-    PUSHBUTTON      "Test",SOUND_ERROR_TEST,166,88,37,13\r
+    DEFPUSHBUTTON   "OK",IDOK,23,49,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,82,49,50,14\r
+    CONTROL         "&Calcualte only the selected files.",FSNOTIFY_SEL_ONLY,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,33,141,10\r
+    CTEXT           "",FSNOTIFY_TITLE,7,7,142,8\r
+    CTEXT           "( This may take a few minutes. )",FSNOTIFY_TITLE,7,19,141,8\r
 END\r
 \r
-opt_tool_dlg DIALOG  0, 0, 211, 139\r
+hset_adv2_dlg DIALOG  0, 0, 207, 139\r
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Viewer &1",-1,7,7,39,8\r
-    EDITTEXT        TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",TOOL_EDITOR1_BR,191,18,12,13\r
-    LTEXT           "Viewer &2",-1,7,63,39,8\r
-    EDITTEXT        TOOL_EDITOR2,7,74,183,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",TOOL_EDITOR2_BR,191,74,12,13\r
-    LTEXT           "Viewer &3",-1,7,93,39,8\r
-    EDITTEXT        TOOL_EDITOR3,7,104,183,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",TOOL_EDITOR3_BR,191,104,12,13\r
-    LTEXT           "Unassociated files will be opened in Viewer 1.",-1,19,33,184,27,SS_SUNKEN\r
-    LTEXT           "Use Viewer 2 and 3 by right-clicking with the mouse.",-1,14,124,184,8\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
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,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
 END\r
 \r
-opt_trmode1_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+cwderr_dlg DIALOG  0, 0, 155, 57\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Error"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "Transfer mode",-1,7,7,93,56\r
-    CONTROL         "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,19,85,10\r
-    CONTROL         "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10\r
-    CONTROL         "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10\r
-    GROUPBOX        "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP\r
-    LISTBOX         TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "A&dd...",TRMODE_ADD,167,19,31,14\r
-    PUSHBUTTON      "Delete",TRMODE_DEL,167,38,31,14\r
-    CONTROL         "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10\r
-    CONTROL         "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10\r
-    LTEXT           "->",-1,98,49,8,8\r
-    CONTROL         "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,196,10\r
+    PUSHBUTTON      "STOP",IDCANCEL,51,36,50,14\r
+    CTEXT           "Cannot move to subfolder.",-1,7,7,141,8\r
+    CTEXT           "Stop processing.",-1,7,20,141,8\r
 END\r
 \r
-forcepasschange_dlg DIALOG  0, 0, 211, 64\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Force reset of master password"\r
+opt_trmode3_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "All the registered FTP passwords will be invalidated if you forcely set a new master password.\r\nAre you sure you want to set a new password?",-1,7,7,196,36\r
-    DEFPUSHBUTTON   "Yes",IDOK,48,42,50,14\r
-    PUSHBUTTON      "No",IDCANCEL,112,42,50,14\r
+    CONTROL         "List1",TRMODE3_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,13,20,78,78\r
+    PUSHBUTTON      "&Add",TRMODE3_ADD,95,20,31,14\r
+    PUSHBUTTON      "Delete",TRMODE3_DEL,95,38,31,14\r
+    GROUPBOX        "Default Upload File Permission",-1,7,7,124,96\r
+    CONTROL         "Set default upload &folder permission",TRMODE3_FOLDER,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,109,182,10\r
+    EDITTEXT        TRMODE3_FOLDER_ATTR,60,123,29,12,ES_AUTOHSCROLL | ES_NUMBER\r
+    LTEXT           "Permission",-1,23,123,33,8\r
 END\r
 \r
-opt_trmode2_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+def_attr_dlg DIALOG  0, 0, 123, 69\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Default Permission"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "Filename",-1,7,7,196,69\r
-    CONTROL         "Convert to &lowercase",TRMODE2_LOWER,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,18,143,10\r
-    CONTROL         "Convert to &uppercase",TRMODE2_UPPER,"Button",BS_AUTORADIOBUTTON,13,30,143,10\r
-    CONTROL         "&No conversion",TRMODE2_NOCNV,"Button",BS_AUTORADIOBUTTON,13,42,143,10\r
-    LTEXT           "&Timeout",-1,7,80,131,8\r
-    EDITTEXT        TRMODE2_TIMEOUT,7,90,26,14,ES_AUTOHSCROLL | ES_NUMBER\r
-    CONTROL         "Spin1",TRMODE2_TIMEOUT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,33,90,9,14\r
-    LTEXT           "(0 to 300sec: 0=No timeout)",-1,45,94,107,8\r
-    LTEXT           "&Default local folder",-1,7,108,196,8\r
-    EDITTEXT        TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",TRMODE2_LOCAL_BR,190,118,13,13\r
-    LTEXT           "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN\r
+    LTEXT           "&Filename",-1,7,7,49,8\r
+    EDITTEXT        DEFATTR_FNAME,7,18,47,12,ES_AUTOHSCROLL\r
+    LTEXT           "->",-1,58,20,8,8\r
+    LTEXT           "&Permission",-1,71,7,40,8\r
+    EDITTEXT        DEFATTR_ATTR,71,18,31,12,ES_AUTOHSCROLL | ES_NUMBER\r
+    PUSHBUTTON      "...",DEFATTR_ATTR_BR,102,18,13,12\r
+    LTEXT           "(example: 644)",-1,53,35,51,8\r
+    DEFPUSHBUTTON   "OK",IDOK,7,48,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,66,48,50,14\r
 END\r
 \r
-opt_trmode3_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+fname_in_dlg DIALOG  0, 0, 86, 44\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "List1",TRMODE3_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,13,20,78,78\r
-    PUSHBUTTON      "&Add",TRMODE3_ADD,95,20,31,14\r
-    PUSHBUTTON      "Delete",TRMODE3_DEL,95,38,31,14\r
-    GROUPBOX        "Default Upload File Permission",-1,7,7,124,96\r
-    CONTROL         "Set default upload &folder permission",TRMODE3_FOLDER,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,109,182,10\r
-    EDITTEXT        TRMODE3_FOLDER_ATTR,60,123,29,12,ES_AUTOHSCROLL | ES_NUMBER\r
-    LTEXT           "Permission",-1,23,123,33,8\r
+    EDITTEXT        INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,7,26,33,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,46,26,33,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,71,23,8,10\r
 END\r
 \r
-opt_user_dlg DIALOG  0, 0, 211, 139\r
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
+otp_notify_dlg DIALOG  0, 0, 141, 60\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "One-time Password"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&Mail address",-1,7,7,59,8\r
-    EDITTEXT        USER_ADRS,7,18,196,12,ES_AUTOHSCROLL\r
-    LTEXT           "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN\r
+    DEFPUSHBUTTON   "OK",IDOK,45,39,50,14\r
+    LTEXT           "Sequence number becomes less than 10. Please change sequence.",-1,7,7,127,24\r
 END\r
 \r
 otp_calc_dlg DIALOG  0, 0, 187, 104\r
@@ -921,264 +1099,251 @@ BEGIN
     PUSHBUTTON      "Help",9,126,83,50,14\r
 END\r
 \r
-otp_notify_dlg DIALOG  0, 0, 141, 60\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "One-time Password"\r
+mirror_notify_dlg DIALOG  0, 0, 174, 171\r
+STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION "Mirror Upload"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,45,39,50,14\r
-    LTEXT           "Sequence number becomes less than 10. Please change sequence.",-1,7,7,127,24\r
+    LTEXT           "Copy/Delete following files",-1,7,6,160,8\r
+    LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP\r
+    DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14\r
+    SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
+    PUSHBUTTON      "Help",9,117,153,50,14\r
+    PUSHBUTTON      "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP\r
+    LTEXT           "",MIRROR_COPYNUM,7,115,160,8\r
+    LTEXT           "",MIRROR_MAKENUM,7,126,160,8\r
+    LTEXT           "",MIRROR_DELNUM,7,137,160,8\r
 END\r
 \r
-passwd_dlg DIALOG  0, 0, 187, 43\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Password/Pass phrase"\r
+mirrordown_notify_dlg DIALOG  0, 0, 174, 171\r
+STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION "Mirror Download"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,31,16,8\r
+    LTEXT           "Copy/Delete following files",-1,7,6,92,8\r
+    LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP\r
+    DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14\r
+    SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
+    PUSHBUTTON      "Help",9,117,153,50,14\r
+    PUSHBUTTON      "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP\r
+    LTEXT           "",MIRROR_COPYNUM,7,115,160,8\r
+    LTEXT           "",MIRROR_MAKENUM,7,126,160,8\r
+    LTEXT           "",MIRROR_DELNUM,7,137,160,8\r
 END\r
 \r
-newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43\r
+mirror_down_dlg DIALOG  0, 0, 215, 155\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Enter new master password"\r
-FONT 9, "MS Sans Serif", 0, 0, 0x0\r
+CAPTION "Mirroring Download"\r
+FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,25,25,43,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,72,25,43,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,31,8,8\r
-    PUSHBUTTON      "Help",IDHELP,118,25,43,14\r
+    DEFPUSHBUTTON   "&Display Transfer Files",MIRRORUP_DISP,9,134,85,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,106,134,50,14\r
+    PUSHBUTTON      "Help",9,168,134,36,14\r
+    LTEXT           "",-1,7,19,201,78,SS_SUNKEN | NOT WS_GROUP\r
+    LTEXT           "The following processes are required:\n\n  *Copy some files from the host to the local disk.\n\n  *Delete some files from the local disk.",-1,35,26,166,64\r
+    CTEXT           "Mirror Download",-1,7,7,201,8\r
+    CTEXT           "*** DOWNLOAD ***",-1,7,105,201,8\r
+    LTEXT           "Confirm?",-1,42,121,166,8\r
+    ICON            notify,-1,12,34,20,20\r
 END\r
 \r
-rasnotify_dlg DIALOG  0, 0, 158, 46\r
+chdir_br_dlg DIALOG  0, 0, 187, 43\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP"\r
+CAPTION "Folder"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Yes",IDOK,23,25,50,14\r
-    PUSHBUTTON      "No",IDCANCEL,86,25,50,14\r
-    CTEXT           "Disconnect dialup?",-1,7,7,144,8\r
+    EDITTEXT        INP_INPSTR,7,8,159,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",INP_BROUSE,167,7,13,14\r
+    DEFPUSHBUTTON   "OK",IDOK,36,25,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,25,50,14\r
 END\r
 \r
-rasreconnect_dlg DIALOG  0, 0, 159, 67\r
+filter_dlg DIALOG  0, 0, 187, 79\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP"\r
+CAPTION "Filter"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Yes",IDOK,16,46,50,14\r
-    PUSHBUTTON      "Keep Connection",IDCANCEL,76,46,66,14\r
-    LTEXT           "Disconnect current connection and reconnect dialup?",-1,7,7,145,16\r
+    LTEXT           "Use semicolons to delineate multiple filters.\n (Example *.txt;*.log)\nFile transfer is also affected by this filter setting.",-1,13,29,167,27\r
+    EDITTEXT        FILTER_STR,7,8,147,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,7,61,41,14\r
+    PUSHBUTTON      "All",FILTER_NOR,51,61,41,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,95,61,41,14\r
+    PUSHBUTTON      "Help",9,139,61,41,14\r
 END\r
 \r
-re_passwd_dlg DIALOG  0, 0, 187, 62\r
+group_dlg DIALOG  0, 0, 187, 42\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Password"\r
+CAPTION "Group Name"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,27,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,36,44,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,44,50,14\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,50,16,8\r
-    LTEXT           "Cannot login.\nEnter correct password.",-1,7,7,173,19\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,24,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,24,50,14\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8\r
 END\r
 \r
-reginit_dlg DIALOG  0, 0, 155, 83\r
+hostdel_dlg DIALOG  0, 0, 134, 39\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Erase All Settings"\r
+CAPTION "Delete Host"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "No",IDCANCEL,41,45,71,31\r
-    PUSHBUTTON      "Yes",IDOK,125,62,23,14,NOT WS_TABSTOP\r
-    LTEXT           "Erase ALL settings including Host settings.",-1,7,7,141,17\r
-    CTEXT           "Are you sure?",-1,7,29,141,8\r
+    DEFPUSHBUTTON   "&Yes",IDOK,11,21,50,14\r
+    PUSHBUTTON      "&No",IDCANCEL,73,21,50,14\r
+    LTEXT           "Delete this host?",-1,7,6,120,10\r
 END\r
 \r
-rename_dlg DIALOG  0, 0, 187, 69\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+groupdel_dlg DIALOG  0, 0, 135, 47\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Delete Group"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        RENAME_NEW,7,34,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,9,51,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,68,51,50,14\r
-    PUSHBUTTON      "&Stop",RENAME_STOP,128,51,50,14\r
-    LTEXT           "",RENAME_TEXT,7,21,173,8,SS_NOPREFIX\r
-    LTEXT           "Enter new name",-1,7,7,133,8\r
+    DEFPUSHBUTTON   "&Yes",IDOK,11,29,50,14\r
+    PUSHBUTTON      "&No",IDCANCEL,73,29,50,14\r
+    LTEXT           "Delete this group and all hosts in the group?",-1,7,6,121,18\r
 END\r
 \r
-savepass_dlg DIALOG  0, 0, 146, 50\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Save Password"\r
+hostconnect_dlg DIALOG  0, 0, 166, 106\r
+STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION "Host List"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Save correct password to host setting?",-1,7,7,132,17\r
-    DEFPUSHBUTTON   "Yes",IDOK,17,29,50,14\r
-    PUSHBUTTON      "No",IDCANCEL,78,29,50,14\r
+    CONTROL         "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,7,6,152,75\r
+    DEFPUSHBUTTON   "&Connect",IDOK,20,88,50,14\r
+    PUSHBUTTON      "Cl&ose",IDCANCEL,96,88,50,14\r
+    SCROLLBAR       HOST_SIZEGRIP,156,92,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP\r
+    PUSHBUTTON      "&New Host...",HOST_NEW,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "New &Group...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "&Modify Settings...",HOST_SET,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "&Copy",HOST_COPY,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "&Delete...",HOST_DEL,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "Up",HOST_UP,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
+    PUSHBUTTON      "Down",HOST_DOWN,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED\r
 END\r
 \r
-sel_local_dlg DIALOG  0, 0, 187, 106\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Select File (Local)"\r
+noresume_dlg DIALOG  0, 0, 191, 47\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP:Error"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&File to select",-1,7,7,109,8\r
-    EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL\r
-    CONTROL         "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,160,10\r
-    CONTROL         "Do not select if the host file is &newer.",SEL_NOOLD,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,160,10\r
-    CONTROL         "Do not select if the host file is &older.",SEL_NONEW,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10\r
-    CONTROL         "Do not select if the same file &resides in the host.",SEL_NOEXIST,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,160,10\r
-    DEFPUSHBUTTON   "OK",IDOK,10,88,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,68,88,50,14\r
-    PUSHBUTTON      "Help",9,126,88,50,14\r
+    DEFPUSHBUTTON   "Yes",IDOK,10,29,45,14\r
+    PUSHBUTTON      "Cancel This File",IDCANCEL,65,29,59,14\r
+    PUSHBUTTON      "Cancel All",RESUME_CANCEL_ALL,134,29,45,14\r
+    LTEXT           "This host doesn't support Resume command.\nOverwrite existing file?",-1,7,4,177,17\r
 END\r
 \r
-sel_remote_dlg DIALOG  0, 0, 187, 106\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Select File (Host)"\r
+forcerename_dlg DIALOG  0, 0, 187, 67\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "Download"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&File to select",-1,7,7,109,8\r
-    EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL\r
-    CONTROL         "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,160,10\r
-    CONTROL         "Do not select if the local file is &newer.",SEL_NOOLD,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,160,10\r
-    CONTROL         "Do not select if the local file is &older.",SEL_NONEW,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10\r
-    CONTROL         "Do not select if the same file &resides in the local.",SEL_NOEXIST,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,160,10\r
-    DEFPUSHBUTTON   "OK",IDOK,10,88,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,68,88,50,14\r
-    PUSHBUTTON      "Help",9,126,88,50,14\r
+    EDITTEXT        INP_INPSTR,7,29,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,31,49,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,104,49,50,14\r
+    LTEXT           "Invalid character specified in filename.\nRename the file.",IDC_STATIC,7,7,173,16\r
+    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,55,8,8\r
 END\r
 \r
-somecmd_dlg DIALOG  0, 0, 187, 61\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "Specify Command"\r
+hset_dialup_dlg DIALOG  0, 0, 207, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,10,43,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,68,43,50,14\r
-    PUSHBUTTON      "Help",9,126,43,50,14\r
-    LTEXT           "Some commands cannot be specified here. See help for details.",-1,7,24,173,15\r
-    CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,171,30,9,8\r
+    CONTROL         "&Use Dialup Connection",HSET_DIALUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,110,10\r
+    LTEXT           "&Dialup Setting",-1,19,23,97,8\r
+    COMBOBOX        HSET_DIALENTRY,19,33,181,101,CBS_DROPDOWNLIST | CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "&Reconnect if another dialup is active",HSET_DIALUSETHIS,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,53,181,10\r
+    CONTROL         "&Notify before reconnecting",HSET_DIALNOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,67,116,10\r
 END\r
 \r
-sort_dlg DIALOG  0, 0, 187, 197\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Sort"\r
+rasreconnect_dlg DIALOG  0, 0, 159, 67\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+CAPTION "FFFTP"\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "Local",-1,7,7,81,150\r
-    GROUPBOX        "&File",-1,10,17,74,80,WS_GROUP\r
-    CONTROL         "Name order",SORT_LFILE_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,30,66,10\r
-    CONTROL         "Extension order",SORT_LFILE_EXT,"Button",BS_AUTORADIOBUTTON,15,42,66,10\r
-    CONTROL         "Size order",SORT_LFILE_SIZE,"Button",BS_AUTORADIOBUTTON,15,55,66,10\r
-    CONTROL         "Date order",SORT_LFILE_DATE,"Button",BS_AUTORADIOBUTTON,15,68,66,10\r
-    CONTROL         "Reverse",SORT_LFILE_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,81,66,10\r
-    GROUPBOX        "F&older",-1,10,100,74,52,WS_GROUP\r
-    CONTROL         "Name order",SORT_LDIR_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,112,66,10\r
-    CONTROL         "Date order",SORT_LDIR_DATE,"Button",BS_AUTORADIOBUTTON,15,124,66,10\r
-    CONTROL         "Reverse",SORT_LDIR_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,137,66,10\r
-    GROUPBOX        "Host",-1,98,7,82,150\r
-    GROUPBOX        "F&ile",-1,102,17,74,80,WS_GROUP\r
-    CONTROL         "Name order",SORT_RFILE_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,30,66,10\r
-    CONTROL         "Extension order",SORT_RFILE_EXT,"Button",BS_AUTORADIOBUTTON,107,42,66,10\r
-    CONTROL         "Size order",SORT_RFILE_SIZE,"Button",BS_AUTORADIOBUTTON,107,55,66,10\r
-    CONTROL         "Date order",SORT_RFILE_DATE,"Button",BS_AUTORADIOBUTTON,107,68,66,10\r
-    CONTROL         "Reverse",SORT_RFILE_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,107,81,66,10\r
-    GROUPBOX        "Fo&lder",-1,102,100,74,52,WS_GROUP\r
-    CONTROL         "Name order",SORT_RDIR_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,112,66,10\r
-    CONTROL         "Extention order",SORT_RDIR_DATE,"Button",BS_AUTORADIOBUTTON,107,124,66,10\r
-    CONTROL         "Reverse",SORT_RDIR_REV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,107,137,66,10\r
-    CONTROL         "Save sort setting on each host",SORT_SAVEHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,164,156,10\r
-    DEFPUSHBUTTON   "OK",IDOK,11,179,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,69,179,50,14\r
-    PUSHBUTTON      "Help",9,127,179,50,14\r
+    DEFPUSHBUTTON   "Yes",IDOK,16,46,50,14\r
+    PUSHBUTTON      "Keep Connection",IDCANCEL,76,46,66,14\r
+    LTEXT           "Disconnect current connection and reconnect dialup?",-1,7,7,145,16\r
 END\r
 \r
-transfer_dlg DIALOG  0, 0, 199, 91\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU\r
+dial_dlg DIALOG  0, 0, 159, 37\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "Cancel this File",IDCANCEL,7,73,62,14\r
-    PUSHBUTTON      "Cancel from Next",TRANS_STOP_NEXT,78,73,62,14\r
-    PUSHBUTTON      "Cancel All",TRANS_STOP_ALL,150,73,42,14\r
-    LTEXT           "Host :",-1,7,5,27,8\r
-    LTEXT           "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX\r
-    LTEXT           "Local :",-1,7,18,27,8\r
-    LTEXT           "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX\r
-    LTEXT           "Status :",-1,7,44,27,8\r
-    LTEXT           "",TRANS_STATUS,45,44,147,8\r
-    CONTROL         "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9\r
-    LTEXT           "Mode :",-1,7,31,27,8\r
-    LTEXT           "",TRANS_MODE,45,31,51,8\r
-    LTEXT           "Kanji Code :",-1,98,31,39,8\r
-    LTEXT           "",TRANS_KANJI,140,31,52,8\r
+    DEFPUSHBUTTON   "Cancel",IDCANCEL,54,19,50,14\r
+    CTEXT           "",DIAL_STATUS,7,6,145,8,SS_NOPREFIX\r
 END\r
 \r
-up_exist_dlg DIALOG  0, 0, 234, 119\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
-CAPTION "Upload"\r
+dial_password_dlg DIALOG  0, 0, 171, 85\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "&Overwrite existing file",UP_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,38,99,10\r
-    CONTROL         "Overwrite if upload file is &newer",UP_EXIST_NEW,"Button",BS_AUTORADIOBUTTON,7,50,118,10\r
-    CONTROL         "&Resume",UP_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,62,99,10\r
-    CONTROL         "Rename &by the host",UP_EXIST_UNIQUE,"Button",BS_AUTORADIOBUTTON,7,74,99,10\r
-    CONTROL         "&Skip",UP_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,86,99,10\r
-    LTEXT           "To upload with a different name, modify the filename and click Overwrite existing file.",-1,129,39,98,41\r
-    DEFPUSHBUTTON   "OK",IDOK,13,101,50,14,WS_GROUP\r
-    PUSHBUTTON      "&Do All",IDOK_ALL,68,101,50,14\r
-    PUSHBUTTON      "&Cancel All",IDCANCEL,123,101,50,14\r
-    PUSHBUTTON      "&Help",9,178,101,41,14\r
-    LTEXT           "Filename already exists on host. Upload?",-1,7,7,184,8\r
-    EDITTEXT        UP_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL\r
+    LTEXT           "Enter Username and Password for Dialup",-1,7,4,157,9\r
+    RTEXT           "&Username",-1,14,23,45,8\r
+    EDITTEXT        RASPASS_USER,62,19,95,14,ES_AUTOHSCROLL\r
+    RTEXT           "&Password",-1,14,43,45,8\r
+    EDITTEXT        RASPASS_PASS,62,41,95,14,ES_PASSWORD | ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,24,63,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,96,63,50,14\r
 END\r
 \r
-updown_as_dlg DIALOG  0, 0, 187, 69\r
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
+opt_disp_dlg DIALOG  0, 0, 211, 139\r
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,35,51,50,14\r
-    PUSHBUTTON      "Cancel",UPDOWNAS_STOP,101,51,50,14\r
-    LTEXT           "",UPDOWNAS_TEXT,7,21,173,8,SS_NOPREFIX\r
-    LTEXT           "Enter new name",-1,7,7,133,8\r
+    PUSHBUTTON      "&Change",DISP_FONT_BR,167,7,36,14,WS_GROUP\r
+    LTEXT           "",-1,7,7,159,14,SS_NOPREFIX | SS_SUNKEN\r
+    LTEXT           "Font :",-1,9,11,29,8\r
+    LTEXT           "",DISP_FONT,40,11,123,8,SS_NOPREFIX\r
+    CONTROL         "Do not display &hidden files/folders",DISP_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,172,10\r
+    LTEXT           "If this box is checked, hidden files/folders are not transferred during Mirror operations.",-1,29,44,167,27,SS_SUNKEN\r
+    CONTROL         "&Display drives in the file list",DISP_DRIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,76,172,10\r
 END\r
 \r
-uperr_dlg DIALOGEX 0, 0, 159, 67\r
+bmark_edit_dlg DIALOG  0, 0, 187, 83\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Bookmark"\r
+FONT 9, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "&Local Folder",-1,7,7,173,8\r
+    EDITTEXT        BEDIT_LOCAL,7,17,173,12,ES_AUTOHSCROLL\r
+    LTEXT           "&Host Folder",-1,7,37,173,8\r
+    EDITTEXT        BEDIT_REMOTE,7,47,173,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,36,65,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,101,65,50,14\r
+END\r
+\r
+down_exist_dlg DIALOG  0, 0, 234, 109\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION\r
-CAPTION "FFFTP:Error"\r
-FONT 9, "MS Sans Serif", 0, 0, 0x1\r
+CAPTION "Download"\r
+FONT 9, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "Cancel this File",IDOK,7,49,82,14\r
-    PUSHBUTTON      "Cancel All",IDCANCEL,102,49,50,14\r
-    LTEXT           "Cannot upload following file.",-1,7,4,137,10\r
-    LTEXT           "",UPDOWN_ERR_FNAME,7,17,145,8,SS_NOPREFIX\r
-    EDITTEXT        UPDOWN_ERR_MSG,7,32,153,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE\r
+    CONTROL         "&Overwrite existing file",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,39,99,10\r
+    CONTROL         "Overwrite if download file is &newer",DOWN_EXIST_NEW,\r
+                    "Button",BS_AUTORADIOBUTTON,7,51,123,10\r
+    CONTROL         "&Resume",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,63,99,10\r
+    CONTROL         "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,75,99,10\r
+    LTEXT           "To download with a different name, modify the filename and click Overwrite existing file.",-1,133,38,94,39\r
+    DEFPUSHBUTTON   "OK",IDOK,13,91,50,14,WS_GROUP\r
+    PUSHBUTTON      "&Do All",IDOK_ALL,68,91,50,14\r
+    PUSHBUTTON      "&Cancel All",IDCANCEL,123,91,50,14\r
+    PUSHBUTTON      "&Help",9,178,91,41,14\r
+    LTEXT           "Filename already exists on local disk. Download?",-1,7,7,184,8\r
+    EDITTEXT        DOWN_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL\r
 END\r
 \r
-username_dlg DIALOG  0, 0, 187, 58\r
+IDD_OLEDRAG DIALOGEX 0, 0, 30, 13\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "User Name"\r
-FONT 9, "MS Sans Serif"\r
+CAPTION "Transfering"\r
+FONT 9, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
-    CONTROL         "Anonymous(&A)",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,73,10\r
-    DEFPUSHBUTTON   "OK",IDOK,36,40,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,101,40,50,14\r
 END\r
 \r
 move_notify_dlg DIALOGEX 0, 0, 201, 82\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Move Files/Folders"\r
-FONT 9, "MS Sans Serif", 400, 0, 0x0\r
+FONT 9, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
     DEFPUSHBUTTON   "Yes",IDOK,44,61,50,14\r
     PUSHBUTTON      "No",IDCANCEL,107,61,50,14\r
@@ -1191,7 +1356,7 @@ END
 masterpasswd_dlg DIALOGEX 65535, 65535, 187, 56\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION\r
 CAPTION "FFFTP"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N", 0, 0, 0x0\r
+FONT 9, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
     LTEXT           "Enter master password",-1,7,7,153,8\r
     EDITTEXT        INP_INPSTR,7,19,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
@@ -1203,7 +1368,7 @@ END
 \r
 hset_crypt_dlg DIALOG  0, 0, 207, 139\r
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
+FONT 9, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Connect with FTPS (Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10\r
     CONTROL         "Connect with FTPS (Inplicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
@@ -1219,22 +1384,6 @@ END
 #ifdef APSTUDIO_INVOKED\r
 GUIDELINES DESIGNINFO \r
 BEGIN\r
-    down_exist_dlg, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 227\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 105\r
-    END\r
-\r
-    chmod_dlg, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 164\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 106\r
-    END\r
-\r
     about_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
@@ -1243,28 +1392,28 @@ BEGIN
         BOTTOMMARGIN, 202\r
     END\r
 \r
-    bmark_dlg, DIALOG\r
+    transfer_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 215\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 104\r
+        RIGHTMARGIN, 192\r
+        TOPMARGIN, 5\r
+        BOTTOMMARGIN, 87\r
     END\r
 \r
-    def_attr_dlg, DIALOG\r
+    rename_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 116\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 62\r
+        BOTTOMMARGIN, 65\r
     END\r
 \r
-    opt_fire_dlg, DIALOG\r
+    delete_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 202\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 51\r
     END\r
 \r
     hostlist_dlg, DIALOG\r
@@ -1275,62 +1424,78 @@ BEGIN
         BOTTOMMARGIN, 116\r
     END\r
 \r
-    hostname_dlg, DIALOG\r
+    hset_main_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        TOPMARGIN, 6\r
-        BOTTOMMARGIN, 89\r
+        RIGHTMARGIN, 200\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    hset_adv2_dlg, DIALOG\r
+    opt_user_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 200\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 134\r
     END\r
 \r
-    hset_adv_dlg, DIALOG\r
+    opt_tool_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 200\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 132\r
     END\r
 \r
-    hset_code_dlg, DIALOG\r
+    chmod_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 164\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 106\r
     END\r
 \r
-    hset_dialup_dlg, DIALOG\r
+    sort_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 200\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 193\r
     END\r
 \r
-    hset_main_dlg, DIALOG\r
+    mkdir_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 200\r
+        RIGHTMARGIN, 180\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 54\r
+    END\r
+\r
+    opt_misc_dlg, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 132\r
     END\r
 \r
-    account_dlg, DIALOG\r
+    hostname_dlg, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 89\r
+    END\r
+\r
+    passwd_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 38\r
+        BOTTOMMARGIN, 39\r
     END\r
 \r
-    chdir_br_dlg, DIALOG\r
+    newmasterpasswd_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
@@ -1338,12 +1503,12 @@ BEGIN
         BOTTOMMARGIN, 39\r
     END\r
 \r
-    bmark_edit_dlg, DIALOG\r
+    username_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 79\r
+        BOTTOMMARGIN, 54\r
     END\r
 \r
     chdir_dlg, DIALOG\r
@@ -1354,212 +1519,220 @@ BEGIN
         BOTTOMMARGIN, 39\r
     END\r
 \r
-    cwderr_dlg, DIALOG\r
+    exit_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 148\r
+        RIGHTMARGIN, 136\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 50\r
+        BOTTOMMARGIN, 60\r
     END\r
 \r
-    delete_dlg, DIALOG\r
+    forcepasschange_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 202\r
+        RIGHTMARGIN, 139\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 51\r
+        BOTTOMMARGIN, 43\r
     END\r
 \r
-    dial_dlg, DIALOG\r
+    opt_trmode2_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 152\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 33\r
+        RIGHTMARGIN, 204\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 135\r
     END\r
 \r
-    dial_password_dlg, DIALOG\r
+    opt_notify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 164\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 78\r
+        RIGHTMARGIN, 204\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    diskfull_dlg, DIALOG\r
+    bmark_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 152\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 38\r
+        RIGHTMARGIN, 215\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 104\r
+    END\r
+\r
+    opt_fire_dlg, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 204\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
+    END\r
+\r
+    hset_adv_dlg, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 200\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    downerr_dlg, DIALOG\r
+    diskfull_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 152\r
         TOPMARGIN, 4\r
-        BOTTOMMARGIN, 61\r
+        BOTTOMMARGIN, 38\r
     END\r
 \r
-    opt_misc_dlg, DIALOG\r
+    find_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 52\r
     END\r
 \r
-    downname_dlg, DIALOG\r
+    mailadrs_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
-        TOPMARGIN, 6\r
-        BOTTOMMARGIN, 38\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 85\r
     END\r
 \r
-    exit_dlg, DIALOG\r
+    opt_sound_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 136\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 60\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    filesize_dlg, DIALOG\r
+    downerr_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 124\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 69\r
+        RIGHTMARGIN, 152\r
+        TOPMARGIN, 4\r
+        BOTTOMMARGIN, 61\r
     END\r
 \r
-    filesize_notify_dlg, DIALOG\r
+    uperr_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 148\r
-        TOPMARGIN, 7\r
+        RIGHTMARGIN, 152\r
+        TOPMARGIN, 4\r
         BOTTOMMARGIN, 63\r
     END\r
 \r
-    filter_dlg, DIALOG\r
+    hset_code_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 75\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    find_dlg, DIALOG\r
+    opt_trmode1_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 52\r
+        BOTTOMMARGIN, 135\r
     END\r
 \r
-    forcerename_dlg, DIALOG\r
+    up_exist_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 227\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 63\r
+        BOTTOMMARGIN, 115\r
     END\r
 \r
-    fname_in_dlg, DIALOG\r
+    reginit_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 79\r
+        RIGHTMARGIN, 148\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 40\r
+        BOTTOMMARGIN, 76\r
     END\r
 \r
-    group_dlg, DIALOG\r
+    updown_as_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 38\r
-    END\r
-\r
-    hostconnect_dlg, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 159\r
-        TOPMARGIN, 6\r
-        BOTTOMMARGIN, 102\r
+        BOTTOMMARGIN, 65\r
     END\r
 \r
-    hostdel_dlg, DIALOG\r
+    re_passwd_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 127\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 35\r
+        RIGHTMARGIN, 180\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 58\r
     END\r
 \r
-    groupdel_dlg, DIALOG\r
+    savepass_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 128\r
-        TOPMARGIN, 4\r
+        RIGHTMARGIN, 139\r
+        TOPMARGIN, 7\r
         BOTTOMMARGIN, 43\r
     END\r
 \r
-    mailadrs_dlg, DIALOG\r
+    sel_local_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 85\r
+        BOTTOMMARGIN, 102\r
     END\r
 \r
-    mirror_down_dlg, DIALOG\r
+    sel_remote_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 208\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 148\r
+        BOTTOMMARGIN, 102\r
     END\r
 \r
-    mirror_notify_dlg, DIALOG\r
+    mirror_up_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 167\r
-        TOPMARGIN, 6\r
-        BOTTOMMARGIN, 167\r
+        RIGHTMARGIN, 208\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 128\r
     END\r
 \r
-    mirror_up_dlg, DIALOG\r
+    account_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 208\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 128\r
+        BOTTOMMARGIN, 38\r
     END\r
 \r
-    mirrordown_notify_dlg, DIALOG\r
+    opt_mirror_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 167\r
-        TOPMARGIN, 6\r
-        BOTTOMMARGIN, 167\r
+        RIGHTMARGIN, 204\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 135\r
     END\r
 \r
-    mkdir_dlg, DIALOG\r
+    somecmd_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 54\r
+        BOTTOMMARGIN, 57\r
     END\r
 \r
-    noresume_dlg, DIALOG\r
+    downname_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 184\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 43\r
+        RIGHTMARGIN, 180\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 38\r
     END\r
 \r
     opt_connect_dlg, DIALOG\r
@@ -1570,47 +1743,47 @@ BEGIN
         BOTTOMMARGIN, 132\r
     END\r
 \r
-    opt_disp_dlg, DIALOG\r
+    rasnotify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 151\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 39\r
     END\r
 \r
-    opt_mirror_dlg, DIALOG\r
+    filesize_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 124\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 135\r
+        BOTTOMMARGIN, 69\r
     END\r
 \r
-    opt_notify_dlg, DIALOG\r
+    filesize_notify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 148\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 63\r
     END\r
 \r
-    opt_sound_dlg, DIALOG\r
+    hset_adv2_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 200\r
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 132\r
     END\r
 \r
-    opt_tool_dlg, DIALOG\r
+    cwderr_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 148\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 132\r
+        BOTTOMMARGIN, 50\r
     END\r
 \r
-    opt_trmode1_dlg, DIALOG\r
+    opt_trmode3_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 204\r
@@ -1618,63 +1791,63 @@ BEGIN
         BOTTOMMARGIN, 135\r
     END\r
 \r
-    forcepasschange_dlg, DIALOG\r
+    def_attr_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 139\r
+        RIGHTMARGIN, 116\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 43\r
+        BOTTOMMARGIN, 62\r
     END\r
 \r
-    opt_trmode2_dlg, DIALOG\r
+    fname_in_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 79\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 135\r
+        BOTTOMMARGIN, 40\r
     END\r
 \r
-    opt_trmode3_dlg, DIALOG\r
+    otp_notify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 134\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 135\r
+        BOTTOMMARGIN, 53\r
     END\r
 \r
-    opt_user_dlg, DIALOG\r
+    otp_calc_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 204\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 134\r
+        BOTTOMMARGIN, 97\r
     END\r
 \r
-    otp_calc_dlg, DIALOG\r
+    mirror_notify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 97\r
+        RIGHTMARGIN, 167\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 167\r
     END\r
 \r
-    otp_notify_dlg, DIALOG\r
+    mirrordown_notify_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 134\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 53\r
+        RIGHTMARGIN, 167\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 167\r
     END\r
 \r
-    passwd_dlg, DIALOG\r
+    mirror_down_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 208\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 39\r
+        BOTTOMMARGIN, 148\r
     END\r
 \r
-    newmasterpasswd_dlg, DIALOG\r
+    chdir_br_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
@@ -1682,124 +1855,124 @@ BEGIN
         BOTTOMMARGIN, 39\r
     END\r
 \r
-    rasnotify_dlg, DIALOG\r
+    filter_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 151\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 39\r
+        BOTTOMMARGIN, 75\r
     END\r
 \r
-    rasreconnect_dlg, DIALOG\r
+    group_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 152\r
+        RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 60\r
+        BOTTOMMARGIN, 38\r
     END\r
 \r
-    re_passwd_dlg, DIALOG\r
+    hostdel_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 58\r
+        RIGHTMARGIN, 127\r
+        TOPMARGIN, 4\r
+        BOTTOMMARGIN, 35\r
     END\r
 \r
-    reginit_dlg, DIALOG\r
+    groupdel_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 148\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 76\r
+        RIGHTMARGIN, 128\r
+        TOPMARGIN, 4\r
+        BOTTOMMARGIN, 43\r
     END\r
 \r
-    rename_dlg, DIALOG\r
+    hostconnect_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 65\r
+        RIGHTMARGIN, 159\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 102\r
     END\r
 \r
-    savepass_dlg, DIALOG\r
+    noresume_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 139\r
-        TOPMARGIN, 7\r
+        RIGHTMARGIN, 184\r
+        TOPMARGIN, 4\r
         BOTTOMMARGIN, 43\r
     END\r
 \r
-    sel_local_dlg, DIALOG\r
+    forcerename_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 102\r
+        BOTTOMMARGIN, 63\r
     END\r
 \r
-    sel_remote_dlg, DIALOG\r
+    hset_dialup_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 200\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 102\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    somecmd_dlg, DIALOG\r
+    rasreconnect_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 152\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 57\r
+        BOTTOMMARGIN, 60\r
     END\r
 \r
-    sort_dlg, DIALOG\r
+    dial_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 193\r
+        RIGHTMARGIN, 152\r
+        TOPMARGIN, 4\r
+        BOTTOMMARGIN, 33\r
     END\r
 \r
-    transfer_dlg, DIALOG\r
+    dial_password_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 192\r
-        TOPMARGIN, 5\r
-        BOTTOMMARGIN, 87\r
+        RIGHTMARGIN, 164\r
+        TOPMARGIN, 4\r
+        BOTTOMMARGIN, 78\r
     END\r
 \r
-    up_exist_dlg, DIALOG\r
+    opt_disp_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 227\r
+        RIGHTMARGIN, 204\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 115\r
+        BOTTOMMARGIN, 132\r
     END\r
 \r
-    updown_as_dlg, DIALOG\r
+    bmark_edit_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 180\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 65\r
+        BOTTOMMARGIN, 79\r
     END\r
 \r
-    uperr_dlg, DIALOG\r
+    down_exist_dlg, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 152\r
-        TOPMARGIN, 4\r
-        BOTTOMMARGIN, 63\r
+        RIGHTMARGIN, 227\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 105\r
     END\r
 \r
-    username_dlg, DIALOG\r
+    IDD_OLEDRAG, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 180\r
+        RIGHTMARGIN, 23\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 54\r
+        BOTTOMMARGIN, 6\r
     END\r
 \r
     move_notify_dlg, DIALOG\r
@@ -1814,210 +1987,16 @@ BEGIN
     BEGIN\r
         BOTTOMMARGIN, 50\r
     END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// TEXTINCLUDE\r
-//\r
-\r
-1 TEXTINCLUDE \r
-BEGIN\r
-    "resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE \r
-BEGIN\r
-    "#include ""afxres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// RT_MANIFEST\r
-//\r
-\r
-1                       RT_MANIFEST             "ffftp.exe.manifest"\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Icon\r
-//\r
-\r
-// Icon with lowest ID value placed first to ensure application icon\r
-// remains consistent on all systems.\r
-ffftp                   ICON                    "icon1.ico"\r
-notify                  ICON                    "icon2.ico"\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Bitmap\r
-//\r
-\r
-main_toolbar_bmp        BITMAP                  "toolbar1.bmp"\r
-remote_toolbar_bmp      BITMAP                  "main_too.bmp"\r
-dirattr_bmp             BITMAP                  "list_bmp.bmp"\r
-hlist_bmp               BITMAP                  "bitmap1.bmp"\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Menu\r
-//\r
-\r
-main_menu MENU \r
-BEGIN\r
-    POPUP "&File"\r
-    BEGIN\r
-        MENUITEM "&Connect...\tCtrl+C",         MENU_CONNECT\r
-        MENUITEM "&Quick Connect...\tCtrl+Q",   MENU_QUICK\r
-        MENUITEM "&Disconnect",                 MENU_DISCONNECT\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Host Setting...",            MENU_SET_CONNECT\r
-        POPUP "&Settings"\r
-        BEGIN\r
-            MENUITEM "Import Settings from &WS_FTP.INI...", MENU_IMPORT_WS\r
-            MENUITEM "&Save Settings to File...",   MENU_REGSAVE\r
-            MENUITEM "&Load Settings from File...", MENU_REGLOAD\r
-            MENUITEM "Change &Master password...",  MENU_CHANGEPASSWD\r
-            MENUITEM SEPARATOR\r
-            MENUITEM "Clear All Settings...",       MENU_REGINIT\r
-        END\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "E&xit",                       MENU_EXIT\r
-    END\r
-    POPUP "&Commands"\r
-    BEGIN\r
-        MENUITEM "&Download\tCtrl+D",           MENU_DOWNLOAD\r
-        MENUITEM "&Upload\tCtrl+U",             MENU_UPLOAD\r
-        MENUITEM "D&ownload As...",             MENU_DOWNLOAD_AS\r
-        MENUITEM "U&pload As...",               MENU_UPLOAD_AS\r
-        MENUITEM "Change &Filename && Download...", MENU_DOWNLOAD_NAME\r
-        MENUITEM "Download &as File",           MENU_DOWNLOAD_AS_FILE\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Mirror Upload...\tCtrl+Shift+U", MENU_MIRROR_UPLOAD\r
-        MENUITEM "File &size...",               MENU_FILESIZE\r
-        MENUITEM "Mirror Down&load...\tCtrl+Shift+D", MENU_MIRROR_DOWNLOAD\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "D&elete\tDel",                MENU_DELETE\r
-        MENUITEM "&Rename...\tCtrl+N",          MENU_RENAME\r
-        MENUITEM "Permissio&ns...\tCtrl+T",     MENU_CHMOD\r
-        MENUITEM "Ne&w Folder...\tCtrl+K",      MENU_MKDIR\r
-        MENUITEM "Specify &command...",         MENU_SOMECMD\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Synchronize Folder Mo&vement", MENU_SYNC\r
-    END\r
-    POPUP "&Bookmarks"\r
-    BEGIN\r
-        MENUITEM "Add &Host folder",            MENU_BMARK_ADD\r
-        MENUITEM "Add &Local folder",           MENU_BMARK_ADD_LOCAL\r
-        MENUITEM "Add &Both Host && Local folders", MENU_BMARK_ADD_BOTH\r
-        MENUITEM "&Edit Bookmarks...\tCtrl+B",  MENU_BMARK_EDIT\r
-        MENUITEM SEPARATOR\r
-    END\r
-    POPUP "&View"\r
-    BEGIN\r
-        MENUITEM "F&ilter...\tCtrl+Y",          MENU_FILTER\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Find...\tCtrl+F",            MENU_FIND\r
-        MENUITEM "Find &Next\tF3",              MENU_FINDNEXT\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Select...\tCtrl+S",          MENU_SELECT\r
-        MENUITEM "Select &All/None\tCtrl+A",    MENU_SELECT_ALL\r
-        MENUITEM SEPARATOR\r
-        POPUP "Displa&y"\r
-        BEGIN\r
-            MENUITEM "&List",                       MENU_LIST\r
-            MENUITEM "&Details",                    MENU_REPORT\r
-        END\r
-        MENUITEM "S&ort...",                    MENU_SORT\r
-        MENUITEM "Display files with leading &dot", MENU_DOTFILE\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Display File &List in Viewer", MENU_DIRINFO\r
-        MENUITEM "Display Lo&g in Viewer",      MENU_TASKINFO\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Refresh\tF5",                MENU_REFRESH\r
-    END\r
-    POPUP "&Tools"\r
-    BEGIN\r
-        MENUITEM "&One-Time Password Calculation...", MENU_OTPCALC\r
-    END\r
-    POPUP "&Options"\r
-    BEGIN\r
-        MENUITEM "&Settings...",                MENU_OPTION\r
-    END\r
-    POPUP "&Help"\r
-    BEGIN\r
-        MENUITEM "&Contents\tF1",               MENU_HELP\r
-        MENUITEM "&Q&&A (Connect to Internet)", MENU_HELP_TROUBLE\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&About FFFTP...",             MENU_ABOUT\r
-    END\r
-END\r
 \r
-dummy_menu MENU \r
-BEGIN\r
-    POPUP "dummy"\r
+    hset_crypt_dlg, DIALOG\r
     BEGIN\r
-        MENUITEM "Go up (host)",                MENU_REMOTE_UPDIR\r
-        MENUITEM "Go up (local)",               MENU_LOCAL_UPDIR\r
-        MENUITEM "Go up (both)",                MENU_UPDIR\r
-        MENUITEM "COMBO_LOCAL",                 COMBO_LOCAL\r
-        MENUITEM "COMBO REMOTE",                COMBO_REMOTE\r
-        MENUITEM "Text Mode",                   MENU_TEXT\r
-        MENUITEM "Binary Mode",                 MENU_BINARY\r
-        MENUITEM "Auto Mode",                   MENU_AUTO\r
-        MENUITEM "Refresh (local)",             REFRESH_LOCAL\r
-        MENUITEM "Refresh (remote)",            REFRESH_REMOTE\r
-        MENUITEM "CHDIR(remote)",               MENU_REMOTE_CHDIR\r
-        MENUITEM "CHDIR(local)",                MENU_LOCAL_CHDIR\r
-        MENUITEM "KANJI EUC",                   MENU_KNJ_EUC\r
-        MENUITEM "KANJI JIS",                   MENU_KNJ_JIS\r
-        MENUITEM "KANJI NONE",                  MENU_KNJ_NONE\r
-        MENUITEM "Double click",                MENU_DCLICK\r
-        MENUITEM "Kana henkan",                 MENU_KANACNV\r
-        MENUITEM "Open 1",                      MENU_OPEN1\r
-        MENUITEM "Open 2",                      MENU_OPEN2\r
-        MENUITEM "Open 3",                      MENU_OPEN3\r
-        MENUITEM "Connect",                     MENU_CONNECT_NUM\r
-        MENUITEM "HIst 1",                      MENU_HIST_1\r
-        MENUITEM "Hist 2",                      MENU_HIST_2\r
-        MENUITEM "Hist 3",                      MENU_HIST_3\r
-        MENUITEM "Hist 4",                      MENU_HIST_4\r
-        MENUITEM "Hist 5",                      MENU_HIST_5\r
-        MENUITEM "Hist 6",                      MENU_HIST_6\r
-        MENUITEM "Hist 7",                      MENU_HIST_7\r
-        MENUITEM "Hist 8",                      MENU_HIST_8\r
-        MENUITEM "Hist 9",                      MENU_HIST_9\r
-        MENUITEM "Hist 10 ",                    MENU_HIST_10\r
-        MENUITEM "Hist 11",                     MENU_HIST_11\r
-        MENUITEM "Hist 12",                     MENU_HIST_12\r
-        MENUITEM "Hist 13",                     MENU_HIST_13\r
-        MENUITEM "Hist 14",                     MENU_HIST_14\r
-        MENUITEM "Hist 15",                     MENU_HIST_15\r
-        MENUITEM "Hist 16",                     MENU_HIST_16\r
-        MENUITEM "Hist 17",                     MENU_HIST_17\r
-        MENUITEM "Hist 18",                     MENU_HIST_18\r
-        MENUITEM "Hist 19",                     MENU_HIST_19\r
-        MENUITEM "Hist 20",                     MENU_HIST_20\r
-        MENUITEM "Auto exit",                   MENU_AUTO_EXIT\r
-        MENUITEM "Stop",                        MENU_ABORT\r
-        MENUITEM "URL to clipboard",            MENU_URL_COPY\r
-        MENUITEM "Download all",                MENU_DOWNLOAD_ALL\r
-        MENUITEM "Upload all",                  MENU_UPLOAD_ALL\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 200\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 132\r
     END\r
 END\r
+#endif    // APSTUDIO_INVOKED\r
 \r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
diff --git a/main.c b/main.c
index c50b535..d0ca2ba 100644 (file)
--- a/main.c
+++ b/main.c
@@ -535,7 +535,13 @@ static int MakeAllWindows(int cmdShow)
                WinPosX = CW_USEDEFAULT;\r
                WinPosY = 0;\r
        }\r
-       hWndFtp = CreateWindow(FtpClassStr, "FFFTP",\r
+       // UTF-8\91Î\89\9e\r
+       // \83\86\81[\83U\81[\92è\8b`\82Ì\83N\83\89\83X\82Í\83f\83t\83H\83\8b\83g\82ÌWNDPROC\82ªShift_JIS\90ê\97p\82Ì\82½\82ß\r
+//     hWndFtp = CreateWindow(FtpClassStr, "FFFTP",\r
+//                             WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,\r
+//                             WinPosX, WinPosY, WinWidth, WinHeight,\r
+//                             HWND_DESKTOP, 0, hInstFtp, NULL);\r
+       hWndFtp = CreateWindowA(FtpClassStr, "FFFTP",\r
                                WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,\r
                                WinPosX, WinPosY, WinWidth, WinHeight,\r
                                HWND_DESKTOP, 0, hInstFtp, NULL);\r
index d00c76e..337d9ff 100644 (file)
@@ -24,7 +24,7 @@
 int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count)
 {
        if(pSrc < (LPCSTR)0x00010000 || pSrc == (LPCSTR)~0)
-               return pSrc;
+               return 0;
        if(pDst)
                return MultiByteToWideChar(CP_UTF8, 0, pSrc, count, pDst, size);
        return MultiByteToWideChar(CP_UTF8, 0, pSrc, count, NULL, 0);
@@ -34,7 +34,7 @@ int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count)
 int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count)
 {
        if(pSrc < (LPCWSTR)0x00010000 || pSrc == (LPCWSTR)~0)
-               return pSrc;
+               return 0;
        if(pDst)
                return WideCharToMultiByte(CP_UTF8, 0, pSrc, count, pDst, size, NULL, NULL);
        return WideCharToMultiByte(CP_UTF8, 0, pSrc, count, NULL, 0, NULL, NULL);
@@ -44,7 +44,7 @@ int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count)
 int WtoA(LPSTR pDst, int size, LPCWSTR pSrc, int count)
 {
        if(pSrc < (LPCWSTR)0x00010000 || pSrc == (LPCWSTR)~0)
-               return pSrc;
+               return 0;
        if(pDst)
                return WideCharToMultiByte(CP_ACP, 0, pSrc, count, pDst, size, NULL, NULL);
        return WideCharToMultiByte(CP_ACP, 0, pSrc, count, NULL, 0, NULL, NULL);
@@ -112,6 +112,60 @@ size_t GetMultiStringLengthW(LPCWSTR lpString)
        return i;
 }
 
+// NULL\8bæ\90Ø\82è\83}\83\8b\83`\83o\83C\83g\95\8e\9a\97ñ\82©\82ç\83\8f\83C\83h\95\8e\9a\97ñ\82Ö\95Ï\8a·
+int MtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc)
+{
+       int i;
+       if(pSrc < (LPCSTR)0x00010000 || pSrc == (LPCSTR)~0)
+               return 0;
+       if(!pDst)
+               return GetMultiStringLengthM(pSrc);
+       i = 0;
+       while(*pSrc != '\0')
+       {
+               i += MultiByteToWideChar(CP_UTF8, 0, pSrc, -1, pDst + i, size - i - 1);
+               pSrc += strlen(pSrc) + 1;
+       }
+       pDst[i] = L'\0';
+       return i;
+}
+
+// NULL\8bæ\90Ø\82è\83\8f\83C\83h\95\8e\9a\97ñ\82©\82ç\83}\83\8b\83`\83o\83C\83g\95\8e\9a\97ñ\82Ö\95Ï\8a·
+int WtoMMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
+{
+       int i;
+       if(pSrc < (LPCWSTR)0x00010000 || pSrc == (LPCWSTR)~0)
+               return 0;
+       if(!pDst)
+               return GetMultiStringLengthW(pSrc);
+       i = 0;
+       while(*pSrc != L'\0')
+       {
+               i += WideCharToMultiByte(CP_UTF8, 0, pSrc, -1, pDst + i, size - i - 1, NULL, NULL);
+               pSrc += wcslen(pSrc) + 1;
+       }
+       pDst[i] = '\0';
+       return i;
+}
+
+// NULL\8bæ\90Ø\82è\83\8f\83C\83h\95\8e\9a\97ñ\82©\82ç\83}\83\8b\83`\83o\83C\83g\95\8e\9a\97ñ\82Ö\95Ï\8a·
+int WtoAMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
+{
+       int i;
+       if(pSrc < (LPCWSTR)0x00010000 || pSrc == (LPCWSTR)~0)
+               return 0;
+       if(!pDst)
+               return GetMultiStringLengthW(pSrc);
+       i = 0;
+       while(*pSrc != L'\0')
+       {
+               i += WideCharToMultiByte(CP_ACP, 0, pSrc, -1, pDst + i, size - i - 1, NULL, NULL);
+               pSrc += wcslen(pSrc) + 1;
+       }
+       pDst[i] = '\0';
+       return i;
+}
+
 // \83}\83\8b\83`\83o\83C\83g\95\8e\9a\97ñ\97p\82Ì\83\81\83\82\83\8a\82ð\8am\95Û
 char* AllocateStringM(int size)
 {
@@ -353,7 +407,7 @@ DWORD GetLogicalDriveStringsM(DWORD nBufferLength, LPSTR lpBuffer)
 START_ROUTINE
        pw0 = AllocateStringW(nBufferLength * 4);
        GetLogicalDriveStringsW(nBufferLength * 4, pw0);
-       WtoM(lpBuffer, nBufferLength, pw0, -1);
+       WtoMMultiString(lpBuffer, nBufferLength, pw0);
        r = TerminateStringM(lpBuffer, nBufferLength);
 END_ROUTINE
        FreeDuplicatedString(pw0);
@@ -362,7 +416,7 @@ END_ROUTINE
 
 ATOM RegisterClassExM(CONST WNDCLASSEXA * v0)
 {
-       LRESULT r = 0;
+       ATOM r = 0;
 START_ROUTINE
        // WNDPROC\82ªShift_JIS\97p\82Å\82 \82é\82½\82ß
        r = RegisterClassExA(v0);
@@ -561,10 +615,13 @@ START_ROUTINE
                                wLVItem.iSubItem = pmLVItem->iSubItem;
                                wLVItem.state = pmLVItem->state;
                                wLVItem.stateMask = pmLVItem->stateMask;
-                               Size = pmLVItem->cchTextMax * 4;
-                               pw0 = AllocateStringW(Size);
-                               wLVItem.pszText = pw0;
-                               wLVItem.cchTextMax = Size;
+                               if(pmLVItem->mask & LVIF_TEXT)
+                               {
+                                       Size = pmLVItem->cchTextMax * 4;
+                                       pw0 = AllocateStringW(Size);
+                                       wLVItem.pszText = pw0;
+                                       wLVItem.cchTextMax = Size;
+                               }
                                wLVItem.iImage = pmLVItem->iImage;
                                wLVItem.lParam = pmLVItem->lParam;
                                wLVItem.iIndent = pmLVItem->iIndent;
@@ -574,8 +631,11 @@ START_ROUTINE
                                pmLVItem->iSubItem = wLVItem.iSubItem;
                                pmLVItem->state = wLVItem.state;
                                pmLVItem->stateMask = wLVItem.stateMask;
-                               WtoM(pmLVItem->pszText, pmLVItem->cchTextMax, wLVItem.pszText, -1);
-                               TerminateStringM(pmLVItem->pszText, pmLVItem->cchTextMax);
+                               if(pmLVItem->mask & LVIF_TEXT)
+                               {
+                                       WtoM(pmLVItem->pszText, pmLVItem->cchTextMax, wLVItem.pszText, -1);
+                                       TerminateStringM(pmLVItem->pszText, pmLVItem->cchTextMax);
+                               }
                                pmLVItem->iImage = wLVItem.iImage;
                                pmLVItem->lParam = wLVItem.lParam;
                                pmLVItem->iIndent = wLVItem.iIndent;
@@ -587,10 +647,13 @@ START_ROUTINE
                                wLVItem.iSubItem = pmLVItem->iSubItem;
                                wLVItem.state = pmLVItem->state;
                                wLVItem.stateMask = pmLVItem->stateMask;
-                               pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
-                               wLVItem.pszText = pw0;
-                               // TODO: cchTextMax\82Ì\8am\94F
-                               wLVItem.cchTextMax = pmLVItem->cchTextMax;
+                               if(pmLVItem->mask & LVIF_TEXT)
+                               {
+                                       pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
+                                       wLVItem.pszText = pw0;
+                                       // TODO: cchTextMax\82Ì\8am\94F
+                                       wLVItem.cchTextMax = pmLVItem->cchTextMax;
+                               }
                                wLVItem.iImage = pmLVItem->iImage;
                                wLVItem.lParam = pmLVItem->lParam;
                                wLVItem.iIndent = pmLVItem->iIndent;
@@ -603,10 +666,13 @@ START_ROUTINE
                                wLVItem.iSubItem = pmLVItem->iSubItem;
                                wLVItem.state = pmLVItem->state;
                                wLVItem.stateMask = pmLVItem->stateMask;
-                               pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
-                               wLVItem.pszText = pw0;
-                               // TODO: cchTextMax\82Ì\8am\94F
-                               wLVItem.cchTextMax = pmLVItem->cchTextMax;
+                               if(pmLVItem->mask & LVIF_TEXT)
+                               {
+                                       pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
+                                       wLVItem.pszText = pw0;
+                                       // TODO: cchTextMax\82Ì\8am\94F
+                                       wLVItem.cchTextMax = pmLVItem->cchTextMax;
+                               }
                                wLVItem.iImage = pmLVItem->iImage;
                                wLVItem.lParam = pmLVItem->lParam;
                                wLVItem.iIndent = pmLVItem->iIndent;
@@ -615,8 +681,11 @@ START_ROUTINE
                        case LVM_FINDITEMA:
                                pmLVFindInfo = (LVFINDINFOA*)lParam;
                                wLVFindInfo.flags = pmLVFindInfo->flags;
-                               pw0 = DuplicateMtoW(pmLVFindInfo->psz, -1);
-                               wLVFindInfo.psz = pw0;
+                               if(pmLVFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL))
+                               {
+                                       pw0 = DuplicateMtoW(pmLVFindInfo->psz, -1);
+                                       wLVFindInfo.psz = pw0;
+                               }
                                wLVFindInfo.lParam = pmLVFindInfo->lParam;
                                wLVFindInfo.pt = pmLVFindInfo->pt;
                                wLVFindInfo.vkDirection = pmLVFindInfo->vkDirection;
@@ -628,9 +697,12 @@ START_ROUTINE
                                wLVColumn.fmt = pmLVColumn->fmt;
                                wLVColumn.cx = pmLVColumn->cx;
                                Size = pmLVColumn->cchTextMax * 4;
-                               pw0 = AllocateStringW(Size);
-                               wLVColumn.pszText = pw0;
-                               wLVColumn.cchTextMax = Size;
+                               if(pmLVColumn->mask & LVCF_TEXT)
+                               {
+                                       pw0 = AllocateStringW(Size);
+                                       wLVColumn.pszText = pw0;
+                                       wLVColumn.cchTextMax = Size;
+                               }
                                wLVColumn.iSubItem = pmLVColumn->iSubItem;
                                wLVColumn.iImage = pmLVColumn->iImage;
                                wLVColumn.iOrder = pmLVColumn->iOrder;
@@ -638,8 +710,11 @@ START_ROUTINE
                                pmLVColumn->mask = wLVColumn.mask;
                                pmLVColumn->fmt = wLVColumn.fmt;
                                pmLVColumn->cx = wLVColumn.cx;
-                               WtoM(pmLVColumn->pszText, pmLVColumn->cchTextMax, wLVColumn.pszText, -1);
-                               TerminateStringM(pmLVColumn->pszText, pmLVColumn->cchTextMax);
+                               if(pmLVColumn->mask & LVCF_TEXT)
+                               {
+                                       WtoM(pmLVColumn->pszText, pmLVColumn->cchTextMax, wLVColumn.pszText, -1);
+                                       TerminateStringM(pmLVColumn->pszText, pmLVColumn->cchTextMax);
+                               }
                                pmLVColumn->iSubItem = wLVColumn.iSubItem;
                                pmLVColumn->iImage = wLVColumn.iImage;
                                pmLVColumn->iOrder = wLVColumn.iOrder;
@@ -649,10 +724,13 @@ START_ROUTINE
                                wLVColumn.mask = pmLVColumn->mask;
                                wLVColumn.fmt = pmLVColumn->fmt;
                                wLVColumn.cx = pmLVColumn->cx;
-                               pw0 = DuplicateMtoW(pmLVColumn->pszText, -1);
-                               wLVColumn.pszText = pw0;
-                               // TODO: cchTextMax\82Ì\8am\94F
-                               wLVColumn.cchTextMax = pmLVColumn->cchTextMax;
+                               if(pmLVColumn->mask & LVCF_TEXT)
+                               {
+                                       pw0 = DuplicateMtoW(pmLVColumn->pszText, -1);
+                                       wLVColumn.pszText = pw0;
+                                       // TODO: cchTextMax\82Ì\8am\94F
+                                       wLVColumn.cchTextMax = pmLVColumn->cchTextMax;
+                               }
                                wLVColumn.iSubItem = pmLVColumn->iSubItem;
                                wLVColumn.iImage = pmLVColumn->iImage;
                                wLVColumn.iOrder = pmLVColumn->iOrder;
@@ -752,7 +830,7 @@ UINT DragQueryFileM(HDROP hDrop, UINT iFile, LPSTR lpszFile, UINT cch)
        wchar_t* pw0 = NULL;
 START_ROUTINE
        if(iFile == (UINT)-1)
-               r = DragQueryFileW(hDrop, iFile, lpszFile, cch);
+               r = DragQueryFileW(hDrop, iFile, (LPWSTR)lpszFile, cch);
        else
        {
                pw0 = AllocateStringW(cch * 4);
@@ -1560,7 +1638,6 @@ size_t _mbslenM(const unsigned char * _Str)
 {
        size_t r = 0;
        wchar_t* pw0 = NULL;
-       wchar_t* wr;
 START_ROUTINE
        pw0 = DuplicateMtoW(_Str, -1);
        r = wcslen(pw0);
index 0fa4b0d..e4f03b0 100644 (file)
 
 #include "socketwrapper.h"
 
-typedef void (__stdcall* _SSL_load_error_strings)();
-typedef int (__stdcall* _SSL_library_init)();
-typedef SSL_METHOD* (__stdcall* _SSLv23_method)();
-typedef SSL_CTX* (__stdcall* _SSL_CTX_new)(SSL_METHOD*);
-typedef void (__stdcall* _SSL_CTX_free)(SSL_CTX*);
-typedef SSL* (__stdcall* _SSL_new)(SSL_CTX*);
-typedef void (__stdcall* _SSL_free)(SSL*);
-typedef int (__stdcall* _SSL_shutdown)(SSL*);
-typedef int (__stdcall* _SSL_get_fd)(SSL*);
-typedef int (__stdcall* _SSL_set_fd)(SSL*, int);
-typedef int (__stdcall* _SSL_accept)(SSL*);
-typedef int (__stdcall* _SSL_connect)(SSL*);
-typedef int (__stdcall* _SSL_write)(SSL*, const void*, int);
-typedef int (__stdcall* _SSL_peek)(SSL*, void*, int);
-typedef int (__stdcall* _SSL_read)(SSL*, void*, int);
-typedef int (__stdcall* _SSL_get_error)(SSL*, int);
+typedef void (__cdecl* _SSL_load_error_strings)();
+typedef int (__cdecl* _SSL_library_init)();
+typedef SSL_METHOD* (__cdecl* _SSLv23_method)();
+typedef SSL_CTX* (__cdecl* _SSL_CTX_new)(SSL_METHOD*);
+typedef void (__cdecl* _SSL_CTX_free)(SSL_CTX*);
+typedef SSL* (__cdecl* _SSL_new)(SSL_CTX*);
+typedef void (__cdecl* _SSL_free)(SSL*);
+typedef int (__cdecl* _SSL_shutdown)(SSL*);
+typedef int (__cdecl* _SSL_get_fd)(SSL*);
+typedef int (__cdecl* _SSL_set_fd)(SSL*, int);
+typedef int (__cdecl* _SSL_accept)(SSL*);
+typedef int (__cdecl* _SSL_connect)(SSL*);
+typedef int (__cdecl* _SSL_write)(SSL*, const void*, int);
+typedef int (__cdecl* _SSL_peek)(SSL*, void*, int);
+typedef int (__cdecl* _SSL_read)(SSL*, void*, int);
+typedef int (__cdecl* _SSL_get_error)(SSL*, int);
 
 _SSL_load_error_strings pSSL_load_error_strings;
 _SSL_library_init pSSL_library_init;