Add files to create 64bit packages.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index adc45b6..5e00d2e 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe
index efde721..d82dd44 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/Package/EXEpress/amd64/eng/ffftp.ini b/Package/EXEpress/amd64/eng/ffftp.ini
new file mode 100644 (file)
index 0000000..2dae192
--- /dev/null
+++ b/Package/EXEpress/amd64/eng/ffftp.ini
@@ -0,0 +1,133 @@
+[EXEpress]\r
+UseExtensionModuleFile=0\r
+ExtensionModuleFile=\r
+ExtensionModuleDatFile=\r
+NoUI=0\r
+SrcArchiveFile=ffftp.cab\r
+DstExeFile=ffftp.exe\r
+DialogTitle=FFFTP Ver.1.99 64bit\r
+ForFreeSoftWare=0\r
+EXEpressFor=EXEpress CX 5 Professional Licensed Edition\r
+Greeting0=Click Next button to start install...\r
+Greeting1=\r
+Greeting2=\r
+IconFile=\r
+IconTypeIndex=1\r
+UseBannerFile=1\r
+NoExtractBannerFile=1\r
+BannerFile=banner.bmp\r
+UseURL=1\r
+HPTitle=Do you want to access the web site of this program?\r
+URL=http://sourceforge.jp/projects/ffftp/\r
+NoSaveInstallPath=0\r
+FailIfPathRegNotExist=0\r
+OnlyAdmin=0\r
+DenyUsers=1\r
+NoCRCCheck=0\r
+BootOSCheck=1\r
+BootOSFlag=1008\r
+BootableOSFlag=1008\r
+Deny64bitMode=1\r
+CheckTrust=0\r
+UsePanelBitmap=0\r
+NoExtractPanelBitmap=0\r
+PanelBitmap=\r
+UseNewWizard=0\r
+UseWiz97PanelBitmap=0\r
+NoExtractWiz97PanelBitmap=0\r
+Wiz97PanelBitmap=\r
+UseBackScreen=0\r
+BackScreenText=\r
+BackScreenColor=0,0,255\r
+BackScreenLogoBmp=\r
+UseBackScreenLogoBmp=0\r
+ExtractScreenLogo=1\r
+UseExplain=1\r
+ExplainFile=FFFTP.txt\r
+NoExtractExplainFile=0\r
+ExplainToConsent=0\r
+ExplainAllRead=0\r
+UseSaveExplainShowFlag=0\r
+SaveExplainShowFlagRootKey=1\r
+SaveExplainShowFlagKey=Software\EXEpress Programs\r
+SaveExplainShowFlagValue=SetupShowExplainFlag\r
+AskExtPath=1\r
+UseExtractFolder=1\r
+BaseFolder=4\r
+ExtractFolder=Program Files\ffftp\r
+AskOverwrite=0\r
+HideAskOverWrite=0\r
+AddFileTitle=0\r
+WithAttribute=0\r
+NoAskMakeDir=0\r
+ForceUninstallDir=0\r
+OverWriteMethod=0\r
+NoOverwriteNewTimeStamp=0\r
+NoOpenFolderOnEnd=0\r
+UseSavePath=1\r
+SavePathRootKey=2\r
+SavePathKey=Software\Sota\FFFTP\r
+SavePathValue=InstallDir\r
+StartMenuToCommon=1\r
+UseStartMenu=1\r
+StartMenuGroup=FFFTP\r
+StartMenu0_Title=FFFTP\r
+StartMenu0_File=FFFTP.exe\r
+StartMenu0_Args=\r
+StartMenu0_Comment=\r
+StartMenu0_Icon=\r
+StartMenu0_CreateOnQuickLaunch=0\r
+StartMenu0_CreateOnDesktop=1\r
+StartMenu0_CreateOnStartup=0\r
+StartMenu0_CreateOnStartRoot=0\r
+StartMenu0_NoCreateInGroup=0\r
+StartMenu1_Title=About FFFTP\r
+StartMenu1_File=FFFTP.txt\r
+StartMenu1_Args=\r
+StartMenu1_Comment=\r
+StartMenu1_Icon=\r
+StartMenu1_CreateOnQuickLaunch=0\r
+StartMenu1_CreateOnDesktop=0\r
+StartMenu1_CreateOnStartup=0\r
+StartMenu1_CreateOnStartRoot=0\r
+StartMenu1_NoCreateInGroup=0\r
+StartMenu2_Title=History\r
+StartMenu2_File=history.txt\r
+StartMenu2_Args=\r
+StartMenu2_Comment=\r
+StartMenu2_Icon=\r
+StartMenu2_CreateOnQuickLaunch=0\r
+StartMenu2_CreateOnDesktop=0\r
+StartMenu2_CreateOnStartup=0\r
+StartMenu2_CreateOnStartRoot=0\r
+StartMenu2_NoCreateInGroup=0\r
+UseUnInstall=1\r
+UseEXEpressUninstaller=1\r
+UseEXEpressUninstallerFolder=\r
+UnInstallTitle=FFFTP Ver.1.99 64bit\r
+UnInstallKey=FFFTP\r
+UnInstallFile=\r
+UnInstallArgs=\r
+UninstIconFile=FFFTP.exe,0\r
+UninstallRebootable=1\r
+AutoUninstIni=1\r
+AutoDeleteDat=0\r
+UnInstallPublisher=FFFTP Project\r
+UnInstallSupportLink=http://sourceforge.jp/projects/ffftp/\r
+UnInstallHelpLink=\r
+UnInstallUpdateLink=\r
+UninstallReg0=HKEY_CURRENT_USER\Sota\FFFTP\r
+UseAutoExecute=0\r
+CmdLine=\r
+CmdArgs=\r
+AfterDeleteFiles=0\r
+InstallShield=0\r
+64bitSFX=0\r
+ModifyOSVersion=0\r
+ModifySubSysVersion=0\r
+SFXOSMajor=4\r
+SFXOSMinor=0\r
+SFXSubSysMajor=4\r
+SFXSubSysMinor=0\r
+ModifyManifest=0\r
+ManifestFile=\r

diff --git a/Package/EXEpress/amd64/eng/ffftp/banner.bmp b/Package/EXEpress/amd64/eng/ffftp/banner.bmp
new file mode 100644 (file)
index 0000000..21d72cb
Binary files /dev/null and b/Package/EXEpress/amd64/eng/ffftp/banner.bmp differ

diff --git a/Package/EXEpress/amd64/jpn/ffftp.ini b/Package/EXEpress/amd64/jpn/ffftp.ini
new file mode 100644 (file)
index 0000000..55d7ac7
--- /dev/null
+++ b/Package/EXEpress/amd64/jpn/ffftp.ini
@@ -0,0 +1,143 @@
+[EXEpress]\r
+UseExtensionModuleFile=0\r
+ExtensionModuleFile=\r
+ExtensionModuleDatFile=\r
+NoUI=0\r
+SrcArchiveFile=ffftp.cab\r
+DstExeFile=ffftp.exe\r
+DialogTitle=FFFTP Ver.1.99 64bit\r
+ForFreeSoftWare=0\r
+EXEpressFor=EXEpress CX 5 Professional Licensed Edition\r
+Greeting0=FFFTP\82ð\83C\83\93\83X\83g\81[\83\8b\82µ\82Ü\82·\81B\r
+Greeting1=[\8e\9f\82Ö(N)]\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢\81B\r
+Greeting2=\r
+IconFile=\r
+IconTypeIndex=1\r
+UseBannerFile=1\r
+NoExtractBannerFile=1\r
+BannerFile=banner.bmp\r
+UseURL=1\r
+HPTitle=\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Ì\83E\83F\83u\83T\83C\83g\82É\83A\83N\83Z\83X\82µ\82Ü\82·\82©\81H\r
+URL=http://sourceforge.jp/projects/ffftp/\r
+NoSaveInstallPath=0\r
+FailIfPathRegNotExist=0\r
+OnlyAdmin=0\r
+DenyUsers=1\r
+NoCRCCheck=0\r
+BootOSCheck=1\r
+BootOSFlag=1008\r
+BootableOSFlag=1008\r
+Deny64bitMode=1\r
+CheckTrust=0\r
+UsePanelBitmap=0\r
+NoExtractPanelBitmap=0\r
+PanelBitmap=\r
+UseNewWizard=0\r
+UseWiz97PanelBitmap=0\r
+NoExtractWiz97PanelBitmap=0\r
+Wiz97PanelBitmap=\r
+UseBackScreen=0\r
+BackScreenText=\r
+BackScreenColor=0,0,255\r
+BackScreenLogoBmp=\r
+UseBackScreenLogoBmp=0\r
+ExtractScreenLogo=1\r
+UseExplain=1\r
+ExplainFile=FFFTP.txt\r
+NoExtractExplainFile=0\r
+ExplainToConsent=0\r
+ExplainAllRead=0\r
+UseSaveExplainShowFlag=0\r
+SaveExplainShowFlagRootKey=1\r
+SaveExplainShowFlagKey=Software\EXEpress Programs\r
+SaveExplainShowFlagValue=SetupShowExplainFlag\r
+AskExtPath=1\r
+UseExtractFolder=1\r
+BaseFolder=4\r
+ExtractFolder=Program Files\ffftp\r
+AskOverwrite=0\r
+HideAskOverWrite=0\r
+AddFileTitle=0\r
+WithAttribute=0\r
+NoAskMakeDir=0\r
+ForceUninstallDir=0\r
+OverWriteMethod=0\r
+NoOverwriteNewTimeStamp=0\r
+NoOpenFolderOnEnd=0\r
+UseSavePath=1\r
+SavePathRootKey=2\r
+SavePathKey=Software\Sota\FFFTP\r
+SavePathValue=InstallDir\r
+StartMenuToCommon=1\r
+UseStartMenu=1\r
+StartMenuGroup=FFFTP\r
+StartMenu0_Title=FFFTP\r
+StartMenu0_File=FFFTP.exe\r
+StartMenu0_Args=\r
+StartMenu0_Comment=\r
+StartMenu0_Icon=\r
+StartMenu0_CreateOnQuickLaunch=0\r
+StartMenu0_CreateOnDesktop=1\r
+StartMenu0_CreateOnStartup=0\r
+StartMenu0_CreateOnStartRoot=0\r
+StartMenu0_NoCreateInGroup=0\r
+StartMenu1_Title=FFFTP\82É\82Â\82¢\82Ä\r
+StartMenu1_File=FFFTP.txt\r
+StartMenu1_Args=\r
+StartMenu1_Comment=\r
+StartMenu1_Icon=\r
+StartMenu1_CreateOnQuickLaunch=0\r
+StartMenu1_CreateOnDesktop=0\r
+StartMenu1_CreateOnStartup=0\r
+StartMenu1_CreateOnStartRoot=0\r
+StartMenu1_NoCreateInGroup=0\r
+StartMenu2_Title=FFFTP\82Ì\83w\83\8b\83v\r
+StartMenu2_File=FFFTP.CHM\r
+StartMenu2_Args=\r
+StartMenu2_Comment=\r
+StartMenu2_Icon=\r
+StartMenu2_CreateOnQuickLaunch=0\r
+StartMenu2_CreateOnDesktop=0\r
+StartMenu2_CreateOnStartup=0\r
+StartMenu2_CreateOnStartRoot=0\r
+StartMenu2_NoCreateInGroup=0\r
+StartMenu3_Title=FFFTP\82Ì\89ü\94Å\97\9a\97ð\r
+StartMenu3_File=history.txt\r
+StartMenu3_Args=\r
+StartMenu3_Comment=\r
+StartMenu3_Icon=\r
+StartMenu3_CreateOnQuickLaunch=0\r
+StartMenu3_CreateOnDesktop=0\r
+StartMenu3_CreateOnStartup=0\r
+StartMenu3_CreateOnStartRoot=0\r
+StartMenu3_NoCreateInGroup=0\r
+UseUnInstall=1\r
+UseEXEpressUninstaller=1\r
+UseEXEpressUninstallerFolder=\r
+UnInstallTitle=FFFTP Ver.1.99 64bit\r
+UnInstallKey=FFFTP\r
+UnInstallFile=\r
+UnInstallArgs=\r
+UninstIconFile=FFFTP.exe,0\r
+UninstallRebootable=1\r
+AutoUninstIni=1\r
+AutoDeleteDat=0\r
+UnInstallPublisher=FFFTP Project\r
+UnInstallSupportLink=http://sourceforge.jp/projects/ffftp/\r
+UnInstallHelpLink=\r
+UnInstallUpdateLink=\r
+UninstallReg0=HKEY_CURRENT_USER\Sota\FFFTP\r
+UseAutoExecute=0\r
+CmdLine=\r
+CmdArgs=\r
+AfterDeleteFiles=0\r
+InstallShield=0\r
+64bitSFX=0\r
+ModifyOSVersion=0\r
+ModifySubSysVersion=0\r
+SFXOSMajor=4\r
+SFXOSMinor=0\r
+SFXSubSysMajor=4\r
+SFXSubSysMinor=0\r
+ModifyManifest=0\r
+ManifestFile=\r

diff --git a/Package/EXEpress/amd64/jpn/ffftp/banner.bmp b/Package/EXEpress/amd64/jpn/ffftp/banner.bmp
new file mode 100644 (file)
index 0000000..21d72cb
Binary files /dev/null and b/Package/EXEpress/amd64/jpn/ffftp/banner.bmp differ

diff --git a/Package/EXEpress/eng/ffftp.ini b/Package/EXEpress/eng/ffftp.ini
index f39752f..6cde564 100644 (file)
--- a/Package/EXEpress/eng/ffftp.ini
+++ b/Package/EXEpress/eng/ffftp.ini
@@ -5,7 +5,7 @@ ExtensionModuleDatFile=
 NoUI=0\r
 SrcArchiveFile=ffftp.cab\r
 DstExeFile=ffftp.exe\r
-DialogTitle=FFFTP Ver.1.98f\r
+DialogTitle=FFFTP Ver.1.99\r
 ForFreeSoftWare=0\r
 EXEpressFor=EXEpress CX 5 Professional Licensed Edition\r
 Greeting0=Click Next button to start install...\r
@@ -17,7 +17,7 @@ UseBannerFile=1
 NoExtractBannerFile=1\r
 BannerFile=banner.bmp\r
 UseURL=1\r
-HPTitle=\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Ì\83E\83F\83u\83T\83C\83g\82É\83A\83N\83Z\83X\82µ\82Ü\82·\82©\81H\r
+HPTitle=Do you want to access the web site of this program?\r
 URL=http://sourceforge.jp/projects/ffftp/\r
 NoSaveInstallPath=0\r
 FailIfPathRegNotExist=0\r
@@ -104,7 +104,7 @@ StartMenu2_NoCreateInGroup=0
 UseUnInstall=1\r
 UseEXEpressUninstaller=1\r
 UseEXEpressUninstallerFolder=\r
-UnInstallTitle=FFFTP Ver.1.98f\r
+UnInstallTitle=FFFTP Ver.1.99\r
 UnInstallKey=FFFTP\r
 UnInstallFile=\r
 UnInstallArgs=\r

diff --git a/Package/EXEpress/jpn/ffftp.ini b/Package/EXEpress/jpn/ffftp.ini
index c108603..d018a89 100644 (file)
--- a/Package/EXEpress/jpn/ffftp.ini
+++ b/Package/EXEpress/jpn/ffftp.ini
@@ -5,7 +5,7 @@ ExtensionModuleDatFile=
 NoUI=0\r
 SrcArchiveFile=ffftp.cab\r
 DstExeFile=ffftp.exe\r
-DialogTitle=FFFTP Ver.1.98f\r
+DialogTitle=FFFTP Ver.1.99\r
 ForFreeSoftWare=0\r
 EXEpressFor=EXEpress CX 5 Professional Licensed Edition\r
 Greeting0=FFFTP\82ð\83C\83\93\83X\83g\81[\83\8b\82µ\82Ü\82·\81B\r
@@ -114,7 +114,7 @@ StartMenu3_NoCreateInGroup=0
 UseUnInstall=1\r
 UseEXEpressUninstaller=1\r
 UseEXEpressUninstallerFolder=\r
-UnInstallTitle=FFFTP Ver.1.98f\r
+UnInstallTitle=FFFTP Ver.1.99\r
 UnInstallKey=FFFTP\r
 UnInstallFile=\r
 UnInstallArgs=\r

diff --git a/Package/installer_config.bat b/Package/installer_config.bat
index be08e6f..314ae16 100644 (file)
--- a/Package/installer_config.bat
+++ b/Package/installer_config.bat
@@ -11,16 +11,33 @@ set ENG_ZIP=zip\eng\ffftp.zip
 \r
 set DIR_JPN_INST=EXEpress\jpn\ffftp\r
 set DIR_ENG_INST=EXEpress\eng\ffftp\r
+set INI_JPN_INST=EXEpress\jpn\ffftp.ini\r
+set INI_ENG_INST=EXEpress\eng\ffftp.ini\r
 set JPN_INST=EXEpress\jpn\ffftp.exe\r
 set ENG_INST=EXEpress\eng\ffftp.exe\r
 \r
+set AMD64_DIR_JPN=zip\amd64\jpn\ffftp\r
+set AMD64_DIR_ENG=zip\amd64\eng\ffftp\r
+set AMD64_JPN_ZIP=zip\amd64\jpn\ffftp.zip\r
+set AMD64_ENG_ZIP=zip\amd64\eng\ffftp.zip\r
+\r
+set AMD64_DIR_JPN_INST=EXEpress\amd64\jpn\ffftp\r
+set AMD64_DIR_ENG_INST=EXEpress\amd64\eng\ffftp\r
+set AMD64_INI_JPN_INST=EXEpress\amd64\jpn\ffftp.ini\r
+set AMD64_INI_ENG_INST=EXEpress\amd64\eng\ffftp.ini\r
+set AMD64_JPN_INST=EXEpress\amd64\jpn\ffftp.exe\r
+set AMD64_ENG_INST=EXEpress\amd64\eng\ffftp.exe\r
+\r
 set HTMLHELP=..\htmlhelp\FFFTP.CHM\r
 set BIN_JPN=..\Release\FFFTP.exe\r
 set BIN_ENG=..\FFFTP_Eng_Release\FFFTP.exe\r
+set BIN_AMD64_JPN=..\Release_64\FFFTP.exe\r
+set BIN_AMD64_ENG=..\FFFTP_Eng_Release_64\FFFTP.exe\r
 set PORTABLE_FILE=portable\r
 \r
 set DIR_JPN_DOC=..\doc\jpn\r
 set DIR_ENG_DOC=..\doc\eng\r
 set DIR_DIST=..\dist\r
 \r
-set FFFTP_VERSION=1.98f\r
+set FFFTP_VERSION=1.99\r
+\r

diff --git a/Package/make_cab_file.bat b/Package/make_cab_file.bat
index d62d99a..7fac7c0 100644 (file)
--- a/Package/make_cab_file.bat
+++ b/Package/make_cab_file.bat
@@ -6,105 +6,8 @@ REM;
 \r
 call installer_config.bat\r
 \r
-set DIR_CAB=%cd%\%DIR_JPN_INST%\..\r
-set CAB_NAME=ffftp\r
-set SED_FILE=%DIR_CAB%\%CAB_NAME%.sed\r
-echo [Version] > %SED_FILE%\r
-echo Class=IEXPRESS >> %SED_FILE%\r
-echo SEDVersion=3 >> %SED_FILE%\r
-echo [Options] >> %SED_FILE%\r
-echo PackagePurpose=CreateCAB >> %SED_FILE%\r
-echo ShowInstallProgramWindow=0 >> %SED_FILE%\r
-echo HideExtractAnimation=0 >> %SED_FILE%\r
-echo UseLongFileName=1 >> %SED_FILE%\r
-echo InsideCompressed=0 >> %SED_FILE%\r
-echo CAB_FixedSize=0 >> %SED_FILE%\r
-echo CAB_ResvCodeSigning=6144 >> %SED_FILE%\r
-echo RebootMode=I >> %SED_FILE%\r
-echo InstallPrompt=%%InstallPrompt%% >> %SED_FILE%\r
-echo DisplayLicense=%%DisplayLicense%% >> %SED_FILE%\r
-echo FinishMessage=%%FinishMessage%% >> %SED_FILE%\r
-echo TargetName=%%TargetName%% >> %SED_FILE%\r
-echo FriendlyName=%%FriendlyName%% >> %SED_FILE%\r
-echo AppLaunched=%%AppLaunched%% >> %SED_FILE%\r
-echo PostInstallCmd=%%PostInstallCmd%% >> %SED_FILE%\r
-echo AdminQuietInstCmd=%%AdminQuietInstCmd%% >> %SED_FILE%\r
-echo UserQuietInstCmd=%%UserQuietInstCmd%% >> %SED_FILE%\r
-echo SourceFiles=SourceFiles >> %SED_FILE%\r
-echo [Strings] >> %SED_FILE%\r
-echo InstallPrompt= >> %SED_FILE%\r
-echo DisplayLicense= >> %SED_FILE%\r
-echo FinishMessage= >> %SED_FILE%\r
-echo TargetName=%CAB_NAME%.cab >> %SED_FILE%\r
-echo FriendlyName=IExpress Wizard >> %SED_FILE%\r
-echo AppLaunched= >> %SED_FILE%\r
-echo PostInstallCmd= >> %SED_FILE%\r
-echo AdminQuietInstCmd= >> %SED_FILE%\r
-echo UserQuietInstCmd= >> %SED_FILE%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\%CAB_NAME%\r
-for %%i in (*) do echo FILE%%i=%%i >> %SED_FILE%\r
-cd %PREV_CD%\r
-echo [SourceFiles] >> %SED_FILE%\r
-echo SourceFiles0=%CAB_NAME%\ >> %SED_FILE%\r
-echo [SourceFiles0] >> %SED_FILE%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\%CAB_NAME%\r
-for %%i in (*) do echo %%FILE%%i%%= >> %SED_FILE%\r
-cd %PREV_CD%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\r
-iexpress /N %CAB_NAME%.sed\r
-cd %PREV_CD%\r
-\r
-set DIR_CAB=%cd%\%DIR_ENG_INST%\..\r
-set CAB_NAME=ffftp\r
-set SED_FILE=%DIR_CAB%\%CAB_NAME%.sed\r
-echo [Version] > %SED_FILE%\r
-echo Class=IEXPRESS >> %SED_FILE%\r
-echo SEDVersion=3 >> %SED_FILE%\r
-echo [Options] >> %SED_FILE%\r
-echo PackagePurpose=CreateCAB >> %SED_FILE%\r
-echo ShowInstallProgramWindow=0 >> %SED_FILE%\r
-echo HideExtractAnimation=0 >> %SED_FILE%\r
-echo UseLongFileName=1 >> %SED_FILE%\r
-echo InsideCompressed=0 >> %SED_FILE%\r
-echo CAB_FixedSize=0 >> %SED_FILE%\r
-echo CAB_ResvCodeSigning=6144 >> %SED_FILE%\r
-echo RebootMode=I >> %SED_FILE%\r
-echo InstallPrompt=%%InstallPrompt%% >> %SED_FILE%\r
-echo DisplayLicense=%%DisplayLicense%% >> %SED_FILE%\r
-echo FinishMessage=%%FinishMessage%% >> %SED_FILE%\r
-echo TargetName=%%TargetName%% >> %SED_FILE%\r
-echo FriendlyName=%%FriendlyName%% >> %SED_FILE%\r
-echo AppLaunched=%%AppLaunched%% >> %SED_FILE%\r
-echo PostInstallCmd=%%PostInstallCmd%% >> %SED_FILE%\r
-echo AdminQuietInstCmd=%%AdminQuietInstCmd%% >> %SED_FILE%\r
-echo UserQuietInstCmd=%%UserQuietInstCmd%% >> %SED_FILE%\r
-echo SourceFiles=SourceFiles >> %SED_FILE%\r
-echo [Strings] >> %SED_FILE%\r
-echo InstallPrompt= >> %SED_FILE%\r
-echo DisplayLicense= >> %SED_FILE%\r
-echo FinishMessage= >> %SED_FILE%\r
-echo TargetName=%CAB_NAME%.cab >> %SED_FILE%\r
-echo FriendlyName=IExpress Wizard >> %SED_FILE%\r
-echo AppLaunched= >> %SED_FILE%\r
-echo PostInstallCmd= >> %SED_FILE%\r
-echo AdminQuietInstCmd= >> %SED_FILE%\r
-echo UserQuietInstCmd= >> %SED_FILE%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\%CAB_NAME%\r
-for %%i in (*) do echo FILE%%i=%%i >> %SED_FILE%\r
-cd %PREV_CD%\r
-echo [SourceFiles] >> %SED_FILE%\r
-echo SourceFiles0=%CAB_NAME%\ >> %SED_FILE%\r
-echo [SourceFiles0] >> %SED_FILE%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\%CAB_NAME%\r
-for %%i in (*) do echo %%FILE%%i%%= >> %SED_FILE%\r
-cd %PREV_CD%\r
-set PREV_CD=%cd%\r
-cd %DIR_CAB%\r
-iexpress /N %CAB_NAME%.sed\r
-cd %PREV_CD%\r
+call make_cab_file_routine.bat "%cd%\%DIR_JPN_INST%\.." ffftp\r
+call make_cab_file_routine.bat "%cd%\%DIR_ENG_INST%\.." ffftp\r
+call make_cab_file_routine.bat "%cd%\%AMD64_DIR_JPN_INST%\.." ffftp\r
+call make_cab_file_routine.bat "%cd%\%AMD64_DIR_ENG_INST%\.." ffftp\r
 \r

diff --git a/Package/make_cab_file_routine.bat b/Package/make_cab_file_routine.bat
new file mode 100644 (file)
index 0000000..4cf930e
--- /dev/null
+++ b/Package/make_cab_file_routine.bat
@@ -0,0 +1,55 @@
+REM;\r
+REM;  Please do not run this directly.\r
+REM; \r
+\r
+set DIR_CAB=%~1\r
+set CAB_NAME=%~2\r
+set SED_FILE=%DIR_CAB%\%CAB_NAME%.sed\r
+echo [Version] > %SED_FILE%\r
+echo Class=IEXPRESS >> %SED_FILE%\r
+echo SEDVersion=3 >> %SED_FILE%\r
+echo [Options] >> %SED_FILE%\r
+echo PackagePurpose=CreateCAB >> %SED_FILE%\r
+echo ShowInstallProgramWindow=0 >> %SED_FILE%\r
+echo HideExtractAnimation=0 >> %SED_FILE%\r
+echo UseLongFileName=1 >> %SED_FILE%\r
+echo InsideCompressed=0 >> %SED_FILE%\r
+echo CAB_FixedSize=0 >> %SED_FILE%\r
+echo CAB_ResvCodeSigning=6144 >> %SED_FILE%\r
+echo RebootMode=I >> %SED_FILE%\r
+echo InstallPrompt=%%InstallPrompt%% >> %SED_FILE%\r
+echo DisplayLicense=%%DisplayLicense%% >> %SED_FILE%\r
+echo FinishMessage=%%FinishMessage%% >> %SED_FILE%\r
+echo TargetName=%%TargetName%% >> %SED_FILE%\r
+echo FriendlyName=%%FriendlyName%% >> %SED_FILE%\r
+echo AppLaunched=%%AppLaunched%% >> %SED_FILE%\r
+echo PostInstallCmd=%%PostInstallCmd%% >> %SED_FILE%\r
+echo AdminQuietInstCmd=%%AdminQuietInstCmd%% >> %SED_FILE%\r
+echo UserQuietInstCmd=%%UserQuietInstCmd%% >> %SED_FILE%\r
+echo SourceFiles=SourceFiles >> %SED_FILE%\r
+echo [Strings] >> %SED_FILE%\r
+echo InstallPrompt= >> %SED_FILE%\r
+echo DisplayLicense= >> %SED_FILE%\r
+echo FinishMessage= >> %SED_FILE%\r
+echo TargetName=%CAB_NAME%.cab >> %SED_FILE%\r
+echo FriendlyName=IExpress Wizard >> %SED_FILE%\r
+echo AppLaunched= >> %SED_FILE%\r
+echo PostInstallCmd= >> %SED_FILE%\r
+echo AdminQuietInstCmd= >> %SED_FILE%\r
+echo UserQuietInstCmd= >> %SED_FILE%\r
+set PREV_CD=%cd%\r
+cd %DIR_CAB%\%CAB_NAME%\r
+for %%i in (*) do echo FILE%%i=%%i >> %SED_FILE%\r
+cd %PREV_CD%\r
+echo [SourceFiles] >> %SED_FILE%\r
+echo SourceFiles0=%CAB_NAME%\ >> %SED_FILE%\r
+echo [SourceFiles0] >> %SED_FILE%\r
+set PREV_CD=%cd%\r
+cd %DIR_CAB%\%CAB_NAME%\r
+for %%i in (*) do echo %%FILE%%i%%= >> %SED_FILE%\r
+cd %PREV_CD%\r
+set PREV_CD=%cd%\r
+cd %DIR_CAB%\r
+iexpress /N %CAB_NAME%.sed\r
+cd %PREV_CD%\r
+\r

diff --git a/Package/make_exe_file.bat b/Package/make_exe_file.bat
new file mode 100644 (file)
index 0000000..fa58259
--- /dev/null
+++ b/Package/make_exe_file.bat
@@ -0,0 +1,14 @@
+REM;\r
+REM;  This is batch-file to create FFFTP installer.\r
+REM; \r
+\r
+call installer_config.bat\r
+\r
+set EXEPRESS_PATH="%ProgramFiles%\Web Technology\EXEpress CX 5\EXEpress.exe"\r
+if %PROCESSOR_ARCHITECTURE%==AMD64 set EXEPRESS_PATH="%ProgramFiles(x86)%\Web Technology\EXEpress CX 5\EXEpress.exe"\r
+\r
+%EXEPRESS_PATH% %cd%\%INI_JPN_INST%\r
+%EXEPRESS_PATH% %cd%\%INI_ENG_INST%\r
+%EXEPRESS_PATH% %cd%\%AMD64_INI_JPN_INST%\r
+%EXEPRESS_PATH% %cd%\%AMD64_INI_ENG_INST%\r
+\r

diff --git a/Package/make_installer.bat b/Package/make_installer.bat
new file mode 100644 (file)
index 0000000..c93cc99
--- /dev/null
+++ b/Package/make_installer.bat
@@ -0,0 +1,15 @@
+@echo off\r
+\r
+REM;\r
+REM;  This is batch-file to create installer files.\r
+REM; \r
+\r
+call make_installer_pre.bat\r
+call make_cab_file.bat\r
+call make_exe_file.bat\r
+echo Please create ZIP files manually and then resume this.\r
+pause\r
+call make_installer_post.bat\r
+echo Done.\r
+pause\r
+\r

diff --git a/Package/make_installer_post.bat b/Package/make_installer_post.bat
index 0c936e6..55d8b2f 100644 (file)
--- a/Package/make_installer_post.bat
+++ b/Package/make_installer_post.bat
@@ -14,4 +14,11 @@ REM; copy installer
 copy /Y %JPN_INST% ffftp-%FFFTP_VERSION%.exe\r
 copy /Y %ENG_INST% ffftp-%FFFTP_VERSION%-eng.exe\r
 \r
-pause\r
+REM;  copy zip archive\r
+copy /Y %AMD64_JPN_ZIP% ffftp-%FFFTP_VERSION%-64.zip\r
+copy /Y %AMD64_ENG_ZIP% ffftp-%FFFTP_VERSION%-64-eng.zip\r
+\r
+REM; copy installer\r
+copy /Y %AMD64_JPN_INST% ffftp-%FFFTP_VERSION%-64.exe\r
+copy /Y %AMD64_ENG_INST% ffftp-%FFFTP_VERSION%-64-eng.exe\r
+\r

diff --git a/Package/make_installer_pre.bat b/Package/make_installer_pre.bat
index 08c65bd..fbfeadd 100644 (file)
--- a/Package/make_installer_pre.bat
+++ b/Package/make_installer_pre.bat
@@ -23,12 +23,32 @@ copy /Y %DIR_DIST%\*.dll %DIR_ENG%
 copy /Y %DIR_DIST%\*.manifest %DIR_ENG%\r
 copy /Y %DIR_DIST%\*.pem %DIR_ENG%\r
 \r
+REM;  copy Japanese files\r
+mkdir %AMD64_DIR_JPN%\r
+copy /Y %BIN_AMD64_JPN% %AMD64_DIR_JPN%\r
+copy /Y %HTMLHELP% %AMD64_DIR_JPN%\r
+copy /Y %DIR_JPN_DOC%\*.txt %AMD64_DIR_JPN%\r
+copy /Y %DIR_DIST%\amd64\*.dll %AMD64_DIR_JPN%\r
+copy /Y %DIR_DIST%\amd64\*.manifest %AMD64_DIR_JPN%\r
+copy /Y %DIR_DIST%\*.pem %AMD64_DIR_JPN%\r
+\r
+REM;  copy English files\r
+mkdir %AMD64_DIR_ENG%\r
+copy /Y %BIN_AMD64_ENG% %AMD64_DIR_ENG%\r
+copy /Y %DIR_ENG_DOC%\*.txt %AMD64_DIR_ENG%\r
+copy /Y %DIR_DIST%\amd64\*.dll %AMD64_DIR_ENG%\r
+copy /Y %DIR_DIST%\amd64\*.manifest %AMD64_DIR_ENG%\r
+copy /Y %DIR_DIST%\*.pem %AMD64_DIR_ENG%\r
+\r
 REM; copy to installer working directory\r
 copy /Y %DIR_JPN%\*.* %DIR_JPN_INST%\r
 copy /Y %DIR_ENG%\*.* %DIR_ENG_INST%\r
+copy /Y %AMD64_DIR_JPN%\*.* %AMD64_DIR_JPN_INST%\r
+copy /Y %AMD64_DIR_ENG%\*.* %AMD64_DIR_ENG_INST%\r
 \r
 REM; copy a portable indicator file\r
 copy /Y %PORTABLE_FILE% %DIR_JPN%\r
 copy /Y %PORTABLE_FILE% %DIR_ENG%\r
+copy /Y %PORTABLE_FILE% %AMD64_DIR_JPN%\r
+copy /Y %PORTABLE_FILE% %AMD64_DIR_ENG%\r
 \r
-pause\r

diff --git a/Package/package_readme.txt b/Package/package_readme.txt
index e4a45d6..bae6a8f 100644 (file)
--- a/Package/package_readme.txt
+++ b/Package/package_readme.txt
@@ -2,22 +2,41 @@
 \r
 インストーラの作成にはEXEpress CX 5を使用します。EXEpress CX 5はフリーソフトウェア向けのものが無償でダウンロードできます。\r
 \r
+\r
+\r
+半自動的にインストーラを作成する手順\r
+\r
+1. make_installer.batを実行\r
+\r
+2. 途中で処理が中断されるので、以下の手順に従ってZIPファイルを作成（ZIP版を作成しない場合は省略可能）\r
+   2.1. zip\jpn\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+   2.2. zip\eng\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+   2.3. zip\amd64\jpn\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+   2.4. zip\amd64\eng\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+\r
+3. 処理を続行\r
+\r
+\r
+\r
+手動でインストーラを作成する手順\r
+\r
 1. 準備\r
-  1.1. make_installer_pre.batを実行\r
+   1.1. make_installer_pre.batを実行\r
 \r
 2. 日本語版インストーラを作成\r
-  2.1. make_cab_file.batを実行（失敗する場合は手作業でEXEpress\jpn\ffftp\内のファイルをCAB形式で圧縮、EXEpress\jpn\ffftp.cabとして保存（Windows標準のiexpressツールが利用できます））\r
-  2.2. EXEpressを起動し、「設定読み込み」でEXEpress\jpn\ffftp.iniを指定、「作成」をクリックする\r
+   2.1. make_cab_file.batを実行（失敗する場合は手作業でEXEpress\jpn\ffftp\内のファイルをCAB形式で圧縮、EXEpress\jpn\ffftp.cabとして保存（Windows標準のiexpressツールが利用できます））\r
+   2.2. make_exe_file.batを実行（失敗する場合は手作業でEXEpressを起動し、「設定読み込み」でEXEpress\jpn\ffftp.iniを指定、「作成」をクリック）\r
 \r
-3. 英語版インストーラを作成\r
-  3.1. EXEpress\eng\ffftp\内のファイルをCAB形式で圧縮、EXEpress\eng\ffftp.cabとして保存\r
-  3.2. EXEpressを起動し、「設定読み込み」でEXEpress\eng\ffftp.iniを指定、「作成」をクリックする\r
+3. 英語版インストーラを作成（make_cab_file.batとmake_exe_file.batの実行に成功した場合はすでにインストーラが作成されていますので、何もする必要はありません）\r
+   3.1. EXEpress\eng\ffftp\内のファイルをCAB形式で圧縮、EXEpress\eng\ffftp.cabとして保存\r
+   3.2. EXEpressを起動し、「設定読み込み」でEXEpress\eng\ffftp.iniを指定、「作成」をクリックする\r
 \r
 4. 日本語版ZIPファイルを作成\r
-  4.1. zip\jpn\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+   4.1. zip\jpn\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
 \r
 5. 英語版ZIPファイルを作成\r
-  4.1. zip\enf\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
+   4.1. zip\enf\ffftpフォルダをZIP形式で圧縮（「送る」→「圧縮（ZIP形式）フォルダ」で可能）\r
 \r
 6. ファイルを収集\r
-  6.1. make_installer_post.batを実行\r
+   6.1. make_installer_post.batを実行\r
+\r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 3363e4d..9873c53 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe
index ee9a243..610af98 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/common.h b/common.h
index 167d7be..1168fbd 100644 (file)
--- a/common.h
+++ b/common.h
@@ -70,7 +70,12 @@
 //#define VER_STR                                      "1.97b"\r
 //#define VER_NUM                                      1921            /* 設定バージョン */\r
 //#define PROGRAM_VERSION_NUM          1972            /* バージョン */\r
+// 64ビット対応\r
+#ifdef _WIN64\r
+#define VER_STR                                        "1.99 64bit"\r
+#else\r
 #define VER_STR                                        "1.99"\r
+#endif\r
 #define VER_NUM                                        1990            /* 設定バージョン */\r
 #define PROGRAM_VERSION_NUM            1990            /* バージョン */\r
 \r

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

diff --git a/dist/amd64/libeay32.dll b/dist/amd64/libeay32.dll
new file mode 100644 (file)
index 0000000..b18d6f9
Binary files /dev/null and b/dist/amd64/libeay32.dll differ

diff --git a/dist/amd64/msvcr90.dll b/dist/amd64/msvcr90.dll
new file mode 100644 (file)
index 0000000..0ae568a
Binary files /dev/null and b/dist/amd64/msvcr90.dll differ

diff --git a/dist/amd64/ssleay32.dll b/dist/amd64/ssleay32.dll
new file mode 100644 (file)
index 0000000..792f7ac
Binary files /dev/null and b/dist/amd64/ssleay32.dll differ

diff --git a/toolmenu.c b/toolmenu.c
index f9fb036..df9831a 100644 (file)
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -266,7 +266,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
                                hWnd,\r
                                WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP | TBSTYLE_FLAT,\r
                                1,\r
-                               27,\r
+                               30,\r
                                NULL,\r
                                (UINT_PTR)hResized,\r
                                TbarDataMain,\r