Commit: 3b09ef2e463c95dc10644c6d006b19423e538d7d - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 3b09ef2e463c95dc10644c6d006b19423e538d7d (tree)
• Zeit: 2011-10-05 21:46:41
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix inconsistent VC++ Project files.
Add "Microsoft.VC90.CRT.manifest" to installer.
Remove useless files.

Ändern Zusammenfassung

• modified: FFFTP.vc90.vcproj
• modified: FFFTP.vcproj
• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_English.vc90.vcproj
• modified: FFFTP_English.vcproj
• modified: Package/make_installer_pre.bat
• modified: Release/FFFTP.exe
• delete: Resource/FFFTP.APS
• add: dist/Microsoft.VC90.CRT.manifest
• modified: dist/readme_dist.txt
• modified: mbswrapper.c
• modified: toolmenu.c

Diff

--- a/FFFTP.vc90.vcproj
+++ b/FFFTP.vc90.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="Resource;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\Debug\FFFTP.pch"
 				AssemblerListingLocation=".\Debug\"
@@ -138,7 +138,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Resource;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="FFFTP"
 	ProjectGUID="{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"
+	RootNamespace="FFFTP"
 	>
 	<Platforms>
 		<Platform
@@ -45,8 +46,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="Resource"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="Resource;contrib\openssl\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\Debug\FFFTP.pch"
 				AssemblerListingLocation=".\Debug\"
@@ -136,8 +137,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="Resource"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="Resource;contrib\openssl\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

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

--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -139,7 +139,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0600,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -46,8 +46,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="Resource_eng"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -138,8 +138,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="Resource_eng"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0400,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

--- 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%
 copy /Y %DIR_JPN_DOC%\*.txt %DIR_JPN%
 copy /Y %DIR_DIST%\*.dll %DIR_JPN%
+copy /Y %DIR_DIST%\*.manifest %DIR_JPN%
 
 REM;  copy English files
 mkdir %DIR_ENG%
 copy /Y %BIN_ENG% %DIR_ENG%
 copy /Y %DIR_ENG_DOC%\*.txt %DIR_ENG%
 copy /Y %DIR_DIST%\*.dll %DIR_ENG%
+copy /Y %DIR_DIST%\*.manifest %DIR_ENG%
 
 REM; copy to installer working directory
 copy /Y %DIR_JPN%\*.* %DIR_JPN_INST%

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

Binary files a/Resource/FFFTP.APS and /dev/null differ

--- /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>
+

--- a/dist/readme_dist.txt
+++ b/dist/readme_dist.txt
@@ -1,5 +1,6 @@
 put below DLL files to distribue in this directory.
 
  * libeay32.dll
+ * Microsoft.VC90.CRT.manifest
  * msvcr90.dll
  * ssleay32.dll

--- 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)
 {

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -233,7 +233,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarMain = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP | TBSTYLE_FLAT,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP,
 				1,
 				27,
 				hInst,
@@ -258,7 +258,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarLocal = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,
 				2,
 				2,
 				hInst,
@@ -321,7 +321,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 
 	hWndTbarRemote = CreateToolbarEx(
 				hWnd,
-				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT,
+				WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE,
 				3,
 				2,
 				hInst,