Fix inconsistent VC++ Project files.

Add "Microsoft.VC90.CRT.manifest" to installer.
Remove useless files.

diff --git a/FFFTP.vc90.vcproj b/FFFTP.vc90.vcproj
index 7f37271..f75d9b0 100644 (file)
--- a/FFFTP.vc90.vcproj
+++ b/FFFTP.vc90.vcproj
@@ -48,7 +48,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\Debug\FFFTP.pch"\r
                                AssemblerListingLocation=".\Debug\"\r
@@ -138,7 +138,7 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS"\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

diff --git a/FFFTP.vcproj b/FFFTP.vcproj
index a8b5eb6..aa99a73 100644 (file)
--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="FFFTP"\r
        ProjectGUID="{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"\r
+       RootNamespace="FFFTP"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -45,8 +46,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="Resource"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS"\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\FFFTP.pch"\r
                                AssemblerListingLocation=".\Debug\"\r
@@ -136,8 +137,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="Resource"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS"\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

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

diff --git a/FFFTP_English.vc90.vcproj b/FFFTP_English.vc90.vcproj
index d818364..9ba66de 100644 (file)
--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -48,7 +48,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=0x0600,_CRT_SECURE_NO_WARNINGS,ENGLISH"\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\FFFTP_English.pch"\r
@@ -139,7 +139,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=0x0600,_CRT_SECURE_NO_WARNINGS,ENGLISH"\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

diff --git a/FFFTP_English.vcproj b/FFFTP_English.vcproj
index 143cd66..44df1c8 100644 (file)
--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -46,8 +46,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="Resource_eng"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS,ENGLISH"\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\FFFTP_English.pch"\r
@@ -138,8 +138,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="Resource_eng"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS,ENGLISH"\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

diff --git a/Package/make_installer_pre.bat b/Package/make_installer_pre.bat
index 59f3647..374aa0c 100644 (file)
--- a/Package/make_installer_pre.bat
+++ b/Package/make_installer_pre.bat
@@ -12,12 +12,14 @@ copy /Y %BIN_JPN% %DIR_JPN%
 copy /Y %HTMLHELP% %DIR_JPN%\r
 copy /Y %DIR_JPN_DOC%\*.txt %DIR_JPN%\r
 copy /Y %DIR_DIST%\*.dll %DIR_JPN%\r
+copy /Y %DIR_DIST%\*.manifest %DIR_JPN%\r
 \r
 REM;  copy English files\r
 mkdir %DIR_ENG%\r
 copy /Y %BIN_ENG% %DIR_ENG%\r
 copy /Y %DIR_ENG_DOC%\*.txt %DIR_ENG%\r
 copy /Y %DIR_DIST%\*.dll %DIR_ENG%\r
+copy /Y %DIR_DIST%\*.manifest %DIR_ENG%\r
 \r
 REM; copy to installer working directory\r
 copy /Y %DIR_JPN%\*.* %DIR_JPN_INST%\r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 65ff3e8..5c51aa6 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/FFFTP.APS b/Resource/FFFTP.APS
deleted file mode 100644 (file)
index d2f35df..0000000
Binary files a/Resource/FFFTP.APS and /dev/null differ

diff --git a/dist/Microsoft.VC90.CRT.manifest b/dist/Microsoft.VC90.CRT.manifest
new file mode 100644 (file)
index 0000000..f31d51f
--- /dev/null
+++ b/dist/Microsoft.VC90.CRT.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity
+        type="win32"
+        name="Microsoft.VC90.CRT"
+        version="9.0.21022.8"
+        processorArchitecture="x86"
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr90.dll"/>
+</assembly>
+

diff --git a/dist/readme_dist.txt b/dist/readme_dist.txt
index 582940b..b957f12 100644 (file)
--- a/dist/readme_dist.txt
+++ b/dist/readme_dist.txt
@@ -1,5 +1,6 @@
 put below DLL files to distribue in this directory.\r
 \r
  * libeay32.dll\r
+ * Microsoft.VC90.CRT.manifest\r
  * msvcr90.dll\r
  * ssleay32.dll\r

diff --git a/mbswrapper.c b/mbswrapper.c
index f94be76..35b57d5 100644 (file)
--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -405,11 +405,8 @@ void FreeDuplicatedString(void* p)
 #pragma warning(disable:4102)
 #define START_ROUTINE                                  do{
 #define END_ROUTINE                                            }while(0);
-
-/*
 #define END_ROUTINE                                            }while(0);end_of_routine:
 #define QUIT_ROUTINE                                   goto end_of_routine;
-*/
 
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
 {

diff --git a/toolmenu.c b/toolmenu.c
index df1f451..8dde5bb 100644 (file)
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -233,7 +233,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 \r
        hWndTbarMain = CreateToolbarEx(\r
                                hWnd,\r
-                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP | TBSTYLE_FLAT,\r
+                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP,\r
                                1,\r
                                27,\r
                                hInst,\r
@@ -258,7 +258,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 \r
        hWndTbarLocal = CreateToolbarEx(\r
                                hWnd,\r
-                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,\r
+                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,\r
                                2,\r
                                2,\r
                                hInst,\r
@@ -321,7 +321,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 \r
        hWndTbarRemote = CreateToolbarEx(\r
                                hWnd,\r
-                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,\r
+                               WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,\r
                                3,\r
                                2,\r
                                hInst,\r