Fix project files.

diff --git a/FFFTP.vc80ee.vcproj b/FFFTP.vc80ee.vcproj
index 8e887d7..9909f52 100644 (file)
--- a/FFFTP.vc80ee.vcproj
+++ b/FFFTP.vc80ee.vcproj
@@ -111,9 +111,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\Debug_64"\r
+                       IntermediateDirectory=".\Debug_64"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -134,34 +134,32 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\Release\FFFTP.tlb"\r
+                               TypeLibraryName=".\Debug_64\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
-                               AssemblerListingLocation=".\Release\"\r
-                               ObjectFile=".\Release\"\r
-                               ProgramDataBaseFileName=".\Release\"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Debug_64\"\r
+                               ObjectFile=".\Debug_64\"\r
+                               ProgramDataBaseFileName=".\Debug_64\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="0"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1041"\r
                        />\r
                        <Tool\r
@@ -169,15 +167,16 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"\r
-                               OutputFile=".\Release\FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
+                               OutputFile=".\Debug_64\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -205,9 +204,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\Debug_64"\r
-                       IntermediateDirectory=".\Debug_64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\Release"\r
+                       IntermediateDirectory=".\Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -228,32 +227,34 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\Debug_64\FFFTP.tlb"\r
+                               TypeLibraryName=".\Release\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"\r
-                               AssemblerListingLocation=".\Debug_64\"\r
-                               ObjectFile=".\Debug_64\"\r
-                               ProgramDataBaseFileName=".\Debug_64\"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Release\"\r
+                               ObjectFile=".\Release\"\r
+                               ProgramDataBaseFileName=".\Release\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1041"\r
                        />\r
                        <Tool\r
@@ -261,16 +262,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\Debug_64\FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"\r
+                               OutputFile=".\Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/FFFTP.vcproj b/FFFTP.vcproj
index 2d265c3..68363f8 100644 (file)
--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -111,9 +111,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\Debug_64"\r
+                       IntermediateDirectory=".\Debug_64"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -134,34 +134,32 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\Release\FFFTP.tlb"\r
+                               TypeLibraryName=".\Debug_64\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
-                               AssemblerListingLocation=".\Release\"\r
-                               ObjectFile=".\Release\"\r
-                               ProgramDataBaseFileName=".\Release\"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Debug_64\"\r
+                               ObjectFile=".\Debug_64\"\r
+                               ProgramDataBaseFileName=".\Debug_64\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="0"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1041"\r
                        />\r
                        <Tool\r
@@ -170,14 +168,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\Release\FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               OutputFile=".\Debug_64\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -205,9 +204,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\Debug_64"\r
-                       IntermediateDirectory=".\Debug_64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\Release"\r
+                       IntermediateDirectory=".\Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -228,32 +227,34 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
-                               TypeLibraryName=".\Debug_64\FFFTP.tlb"\r
+                               TypeLibraryName=".\Release\FFFTP.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"\r
-                               AssemblerListingLocation=".\Debug_64\"\r
-                               ObjectFile=".\Debug_64\"\r
-                               ProgramDataBaseFileName=".\Debug_64\"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Release\"\r
+                               ObjectFile=".\Release\"\r
+                               ProgramDataBaseFileName=".\Release\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1041"\r
                        />\r
                        <Tool\r
@@ -262,15 +263,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\Debug_64\FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               OutputFile=".\Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index af6eb05..0322eb0 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_English.vc80ee.vcproj b/FFFTP_English.vc80ee.vcproj
index f7be36d..eba2ae8 100644 (file)
--- a/FFFTP_English.vc80ee.vcproj
+++ b/FFFTP_English.vc80ee.vcproj
@@ -51,7 +51,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"\r
@@ -112,9 +112,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\FFFTP_Eng_Release"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
+                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -135,33 +135,33 @@
                        />\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_64\FFFTP_English.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_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,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
+                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
+                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\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
@@ -169,15 +169,16 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
+                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -205,9 +206,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\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
@@ -228,33 +229,33 @@
                        />\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_64\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;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
-                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
-                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_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
@@ -262,16 +263,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"\r
+                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -332,7 +332,7 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

diff --git a/FFFTP_English.vc90.vcproj b/FFFTP_English.vc90.vcproj
index 94654c9..5475435 100644 (file)
--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"\r
@@ -112,9 +112,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\FFFTP_Eng_Release"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
+                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -135,33 +135,33 @@
                        />\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_64\FFFTP_English.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_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,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
+                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
+                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\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
@@ -170,16 +170,17 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -204,9 +205,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\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
@@ -227,33 +228,33 @@
                        />\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_64\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;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
-                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
-                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_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
@@ -262,17 +263,16 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -330,7 +330,7 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

diff --git a/FFFTP_English.vcproj b/FFFTP_English.vcproj
index a28eb4f..eaf3090 100644 (file)
--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -51,7 +51,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"\r
@@ -112,9 +112,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\FFFTP_Eng_Release"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
+                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
@@ -135,33 +135,33 @@
                        />\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_64\FFFTP_English.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_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,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
+                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
+                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
+                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\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
@@ -170,14 +170,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
-                               LinkIncremental="1"\r
+                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -205,9 +206,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\FFFTP_Eng_Debug_64"\r
-                       IntermediateDirectory=".\FFFTP_Eng_Debug_64"\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
@@ -228,33 +229,33 @@
                        />\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_64\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;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"\r
-                               AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"\r
-                               ObjectFile=".\FFFTP_Eng_Debug_64\"\r
-                               ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_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
@@ -263,15 +264,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"\r
-                               OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"\r
-                               LinkIncremental="2"\r
+                               OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateManifest="false"\r
                                DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -332,7 +332,7 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 26aa5b5..d6a6b16 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/common.h b/common.h
index 9eaaf47..9d93f41 100644 (file)
--- a/common.h
+++ b/common.h
@@ -30,7 +30,7 @@
 #define __COMMON_H__\r
 \r
 #include "config.h"\r
-#ifndef ENGLISH\r
+#ifndef FFFTP_ENGLISH\r
 #include "mesg-jpn.h"\r
 #else\r
 #include "mesg-eng.h"\r

diff --git a/putty/PuTTY.vcproj b/putty/PuTTY.vcproj
index 35f92a3..0d895c2 100644 (file)
--- a/putty/PuTTY.vcproj
+++ b/putty/PuTTY.vcproj
@@ -90,12 +90,11 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -114,12 +113,12 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories=".;CHARSET;WINDOWS"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
@@ -135,12 +134,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="false"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -165,11 +162,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -188,12 +186,12 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories=".;CHARSET;WINDOWS"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
@@ -209,10 +207,12 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/toolmenu.c b/toolmenu.c
index b41165f..4f1a548 100644 (file)
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -289,7 +289,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
                /*===== ローカルのディレクトリ名ウインドウ =====*/\r
 \r
                SendMessage(hWndTbarLocal, TB_GETITEMRECT, 3, (LPARAM)&Rect1);\r
-#ifndef ENGLISH\r
+#ifndef FFFTP_ENGLISH\r
                DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,SHIFTJIS_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);\r
 #else\r
                DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);\r