From b695730d51ed15c06a1c7b14eaf747b92e38ef60 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 21 Jul 2024 14:43:34 +0900 Subject: [PATCH] Fix #249 --- HISTORY-ID.txt | 1 + HISTORY-ITA.txt | 1 + HISTORY-JPN.txt | 1 + HISTORY-KOR.txt | 1 + HISTORY-PTB.txt | 1 + HISTORY.txt | 1 + installer64.iss | 328 +++++++++++++++++++++++++++++++++++++++++ src/CMakeLists.txt | 6 + src/RisohEditor.cpp | 8 + src/RisohEditor_res.rc | 4 + src/res/RCData_108.bin | Bin 0 -> 400 bytes src/res/RCData_109.bin | Bin 0 -> 391 bytes src/resource.h | 2 + 13 files changed, 354 insertions(+) create mode 100644 installer64.iss create mode 100644 src/res/RCData_108.bin create mode 100644 src/res/RCData_109.bin diff --git a/HISTORY-ID.txt b/HISTORY-ID.txt index a85a6975..3b85ec37 100644 --- a/HISTORY-ID.txt +++ b/HISTORY-ID.txt @@ -314,3 +314,4 @@ - Auto filling resource name from filename. - Added resource language setting. - Fixed freeze on Enter key. + - Supported x64. diff --git a/HISTORY-ITA.txt b/HISTORY-ITA.txt index 084bda73..69f65ab8 100644 --- a/HISTORY-ITA.txt +++ b/HISTORY-ITA.txt @@ -314,3 +314,4 @@ - Auto filling resource name from filename. - Added resource language setting. - Fixed freeze on Enter key. + - Supported x64. diff --git a/HISTORY-JPN.txt b/HISTORY-JPN.txt index 6aaffac2..2194e933 100644 --- a/HISTORY-JPN.txt +++ b/HISTORY-JPN.txt @@ -658,3 +658,4 @@ - ファイル名からリソース名を埋める。 - リソース言語設定を追加。 - Enter キーを押したときのフリーズを修正。 + - x64 のサポート。 diff --git a/HISTORY-KOR.txt b/HISTORY-KOR.txt index f1f21572..2c82bc1b 100644 --- a/HISTORY-KOR.txt +++ b/HISTORY-KOR.txt @@ -315,3 +315,4 @@ - Auto filling resource name from filename. - Added resource language setting. - Fixed freeze on Enter key. + - Supported x64. diff --git a/HISTORY-PTB.txt b/HISTORY-PTB.txt index f1c7e4e3..44fe1dc6 100644 --- a/HISTORY-PTB.txt +++ b/HISTORY-PTB.txt @@ -314,3 +314,4 @@ - Auto filling resource name from filename. - Added resource language setting. - Fixed freeze on Enter key. + - Supported x64. diff --git a/HISTORY.txt b/HISTORY.txt index 84d1ff2d..22914455 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -314,3 +314,4 @@ - Auto filling resource name from filename. - Added resource language setting. - Fixed freeze on Enter key. + - Supported x64. diff --git a/installer64.iss b/installer64.iss new file mode 100644 index 00000000..885d4b03 --- /dev/null +++ b/installer64.iss @@ -0,0 +1,328 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; !!! This file must be UTF-8 with BOM !!! + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; TODO: Update the version numbers +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +#define MyAppName "RisohEditor64" +#define MyAppVersion "5.8.3" +#define MyAppCompanyName "Katayama Hirofumi MZ" +#define MyAppCopyright "(C) 2017-2024 Katayama Hirofumi MZ." +#define MyAppURL "http://katahiromz.web.fc2.com/" +#define MyAppDescription "Resource Editor (64bit)" + +AppId={{AF7494D1-4064-4D04-A8FE-8F9DAB97F664} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppCompanyName} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +DisableDirPage=no +AllowNoIcons=yes +LicenseFile=LICENSE.txt +OutputDir=. +OutputBaseFilename={#MyAppName}-{#MyAppVersion}-installer +SetupIconFile=src\res\Icon_100.ico +Compression=lzma +SolidCompression=yes +UninstallDisplayIcon={app}\{#MyAppName}.exe +UsePreviousAppDir=yes +VersionInfoCompany={#MyAppCompanyName} +VersionInfoCopyright={#MyAppCopyright} +VersionInfoDescription={#MyAppDescription} +VersionInfoProductName={#MyAppName} +VersionInfoProductTextVersion={#MyAppVersion} +VersionInfoProductVersion={#MyAppVersion} +VersionInfoVersion={#MyAppVersion} +ArchitecturesInstallIn64BitMode=x64 + +[Languages] +Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" +Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl" +Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl" +Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" +Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "korean"; MessagesFile: ".\Languages\Korean.isl" +Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" +Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl" +Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" +Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" +Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" +Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" +Name: "rc_association"; Description: "{cm:AssociateRcFiles}" +Name: "res_association"; Description: "{cm:AssociateResFiles}" + +[Files] +Source: "README.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-ID.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-ITA.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-JPN.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-KOR.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-TR.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "README-PTB.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY-ID.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY-ITA.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY-JPN.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY-KOR.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "HISTORY-PTB.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "Standardize.md"; DestDir: "{app}"; Flags: ignoreversion +Source: "HYOJUNKA.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "TRANSLATORS.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "mcdx\MESSAGETABLEDX.md"; DestDir: "{app}"; Flags: ignoreversion +Source: "build\RisohEditor64.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "src\resource.h"; DestDir: "{app}"; Flags: ignoreversion +Source: "data\Constants.txt"; DestDir: "{app}\data"; Flags: ignoreversion +Source: "build\mcdx.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "src\MOleHost.hpp"; DestDir: "{app}\OLE"; Flags: ignoreversion +Source: "src\MOleHost.cpp"; DestDir: "{app}\OLE"; Flags: ignoreversion +Source: "src\MWindowBase.hpp"; DestDir: "{app}\OLE"; Flags: ignoreversion +Source: "src\DlgInit.h"; DestDir: "{app}\DlgInit"; Flags: ignoreversion +Source: "src\Toolbar.h"; DestDir: "{app}\Toolbar"; Flags: ignoreversion +Source: "MyWndCtrl\MWindowBase.hpp"; DestDir: "{app}\MyWndCtrl"; Flags: ignoreversion +Source: "MyWndCtrl\MyWndCtrl.cpp"; DestDir: "{app}\MyWndCtrl"; Flags: ignoreversion +Source: "MyWndCtrl\CMakeLists.txt"; DestDir: "{app}\MyWndCtrl"; Flags: ignoreversion +Source: "build\MyWndCtrl.dll"; DestDir: "{app}\MyWndCtrl"; Flags: ignoreversion +Source: "data\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\libwinpthread-1.dll"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\windres.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\upx.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\mcpp.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\dfmsc.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\olebow.exe"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "data\bin\midlwrap.bat"; DestDir: "{app}\data\bin"; Flags: ignoreversion +Source: "EGA\EGA-Manual.pdf"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA\samples\fact.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA\samples\plus.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA\samples\break.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\Censorship.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\DeleteNonEnglish.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\NeutralToEnglish.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_clone_by_lang.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_delete.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_select.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_set_binary.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_set_text.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_str_get.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "EGA-samples\RES_str_set.ega"; DestDir: "{app}\EGA"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\commctrl.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\dlgs.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\windef.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\windows.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\winnt.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\winresrc.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\winuser.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\winver.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "data\lib\gcc\i686-w64-mingw32\10.2.0\include\afxres.h"; DestDir: "{app}\data\lib\gcc\i686-w64-mingw32\10.2.0\include"; Flags: ignoreversion +Source: "win32-samples\DialogBox\.gitignore"; DestDir: "{app}\win32-samples\DialogBox"; Flags: ignoreversion +Source: "win32-samples\DialogBox\CMakeLists.txt"; DestDir: "{app}\win32-samples\DialogBox"; Flags: ignoreversion +Source: "win32-samples\DialogBox\DialogBox.cpp"; DestDir: "{app}\win32-samples\DialogBox"; Flags: ignoreversion +Source: "win32-samples\DialogBox\DialogBox_res.rc"; DestDir: "{app}\win32-samples\DialogBox"; Flags: ignoreversion +Source: "win32-samples\DialogBox\resource.h"; DestDir: "{app}\win32-samples\DialogBox"; Flags: ignoreversion +Source: "win32-samples\DialogBox\lang\en_US.rc"; DestDir: "{app}\win32-samples\DialogBox\lang"; Flags: ignoreversion +Source: "win32-samples\MainWnd\.gitignore"; DestDir: "{app}\win32-samples\MainWnd"; Flags: ignoreversion +Source: "win32-samples\MainWnd\CMakeLists.txt"; DestDir: "{app}\win32-samples\MainWnd"; Flags: ignoreversion +Source: "win32-samples\MainWnd\MainWnd.cpp"; DestDir: "{app}\win32-samples\MainWnd"; Flags: ignoreversion +Source: "win32-samples\MainWnd\MainWnd_res.rc"; DestDir: "{app}\win32-samples\MainWnd"; Flags: ignoreversion +Source: "win32-samples\MainWnd\resource.h"; DestDir: "{app}\win32-samples\MainWnd"; Flags: ignoreversion +Source: "win32-samples\MainWnd\lang\en_US.rc"; DestDir: "{app}\win32-samples\MainWnd\lang"; Flags: ignoreversion +Source: "win32-samples\MainWnd\res\Icon_100.ico"; DestDir: "{app}\win32-samples\MainWnd\res"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\CMakeLists.txt"; DestDir: "{app}\win32-samples\ToolbarTest"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\ToolbarTest.cpp"; DestDir: "{app}\win32-samples\ToolbarTest"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\ToolbarTest_res.rc"; DestDir: "{app}\win32-samples\ToolbarTest"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\lang\en_US.rc"; DestDir: "{app}\win32-samples\ToolbarTest\lang"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\res\Bitmap_100.bmp"; DestDir: "{app}\win32-samples\ToolbarTest\res"; Flags: ignoreversion +Source: "win32-samples\ToolbarTest\resource.h"; DestDir: "{app}\win32-samples\ToolbarTest"; Flags: ignoreversion +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\RisohEditor"; Filename: "{app}\RisohEditor64.exe" +Name: "{group}\{cm:ReadmeEnglish}"; Filename: "{app}\README.txt" +Name: "{group}\{cm:ReadmeJapanese}"; Filename: "{app}\READMEJP.txt" +Name: "{group}\{cm:LicenseEnglish}"; Filename: "{app}\LICENSE.txt" +Name: "{group}\{cm:ProgramOnTheWeb,RisohEditor}"; Filename: "http://katahiromz.web.fc2.com" +Name: "{group}\{cm:UninstallProgram,RisohEditor}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\RisohEditor"; Filename: "{app}\RisohEditor64.exe"; Tasks: desktopicon + +[Run] +Filename: "{app}\RisohEditor64.exe"; Description: "{cm:LaunchProgram,RisohEditor}"; Flags: nowait postinstall skipifsilent + +[Registry] +Root: HKCU; Subkey: "Software\Katayama Hirofumi MZ\RisohEditor64"; Flags: deletekey uninsdeletekey +; .rc +Root: HKCR; Subkey: ".rc"; ValueType: string; ValueName: ""; ValueData: "RisohEditor.ResourceFile"; Flags: uninsdeletevalue; Tasks: "rc_association" +Root: HKCR; Subkey: "RisohEditor.ResourceFile"; ValueType: string; ValueName: ""; ValueData: "RisohEditor Resource File"; Flags: uninsdeletekey; Tasks: "rc_association" +Root: HKCR; Subkey: "RisohEditor.ResourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\RisohEditor64.exe,0"; Tasks: "rc_association" +Root: HKCR; Subkey: "RisohEditor.ResourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\RisohEditor64.exe"" ""%1"""; Tasks: "rc_association" +; .res +Root: HKCR; Subkey: ".res"; ValueType: string; ValueName: ""; ValueData: "RisohEditor.BinaryResourceFile"; Flags: uninsdeletevalue; Tasks: "res_association" +Root: HKCR; Subkey: "RisohEditor.BinaryResourceFile"; ValueType: string; ValueName: ""; ValueData: "RisohEditor Binary Resource File"; Flags: uninsdeletekey; Tasks: "res_association" +Root: HKCR; Subkey: "RisohEditor.BinaryResourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\RisohEditor64.exe,0"; Tasks: "res_association" +Root: HKCR; Subkey: "RisohEditor.BinaryResourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\RisohEditor64.exe"" ""%1"""; Tasks: "res_association" + +[CustomMessages] +brazilianportuguese.ReadmeEnglish=ReadMe (inglês) +brazilianportuguese.ReadmeJapanese=ReadMe (japonês) +brazilianportuguese.LicenseEnglish=Licença +brazilianportuguese.AssociateRcFiles=Associar arquivos *.rc +brazilianportuguese.AssociateResFiles=Associar arquivos *.res +catalan.ReadmeEnglish=ReadMe (English) +catalan.ReadmeJapanese=ReadMe (Japanese) +catalan.LicenseEnglish=License +catalan.AssociateRcFiles=Associate *.rc files +catalan.AssociateResFiles=Associate *.res files +corsican.ReadmeEnglish=ReadMe (English) +corsican.ReadmeJapanese=ReadMe (Japanese) +corsican.LicenseEnglish=License +corsican.AssociateRcFiles=Associate *.rc files +corsican.AssociateResFiles=Associate *.res files +czech.ReadmeEnglish=ReadMe (anglicky) +czech.ReadmeJapanese=ReadMe (japonština) +czech.LicenseEnglish=Licence +czech.AssociateRcFiles=Přidružit soubory *.rc +czech.AssociateResFiles=Přiřadit soubory *.res +danish.ReadmeEnglish=ReadMe (engelsk) +danish.ReadmeJapanese=ReadMe (japansk) +danish.LicenseEnglish=Licens +danish.AssociateRcFiles=Associerede *.rc-filer +danish.AssociateResFiles=Tilknyttede *.res-filer +dutch.ReadmeEnglish=ReadMe (Engels) +dutch.ReadmeJapanese=ReadMe (Japans) +dutch.LicenseEnglish=Licentie +dutch.AssociateRcFiles=Koppel *.rc-bestanden +dutch.AssociateResFiles=Koppel *.res-bestanden +english.ReadmeEnglish=ReadMe (English) +english.ReadmeJapanese=ReadMe (Japanese) +english.LicenseEnglish=License +english.AssociateRcFiles=Associate *.rc files +english.AssociateResFiles=Associate *.res files +finnish.ReadmeEnglish=ReadMe (englanti) +finnish.ReadmeJapanese=ReadMe (Japans) +finnish.LicenseEnglish=Lisenssi +finnish.AssociateRcFiles=Liitä *.rc-tiedostot +finnish.AssociateResFiles=Liitä *.res-tiedostot +french.ReadmeEnglish=ReadMe (anglais) +french.ReadmeJapanese=ReadMe (japonais) +french.LicenseEnglish=Licence +french.AssociateRcFiles=Associer des fichiers *.rc +french.AssociateResFiles=Associer des fichiers *.res +german.ReadmeEnglish=ReadMe (Englisch) +german.ReadmeJapanese=ReadMe (Japanisch) +german.LicenseEnglish=Lizenz +german.AssociateRcFiles=Verknüpfen Sie *.rc-Dateien +german.AssociateResFiles=Verknüpfen Sie *.res-Dateien +greek.ReadmeEnglish=ReadMe (Αγγλικά) +greek.ReadmeJapanese=ReadMe (Ιαπωνικά) +greek.LicenseEnglish=Αδεια +greek.AssociateRcFiles=Συσχετίστε αρχεία *.rc +greek.AssociateResFiles=Συσχετίστε αρχεία *.res +hebrew.ReadmeEnglish=ReadMe (אנגלית) +hebrew.ReadmeJapanese=ReadMe (יפנית) +hebrew.LicenseEnglish=רישיון +hebrew.AssociateRcFiles=לשייך קבצי *.rc +hebrew.AssociateResFiles=שיוך קבצי *.res +hungarian.ReadmeEnglish=ReadMe (angol) +hungarian.ReadmeJapanese=ReadMe (japán) +hungarian.LicenseEnglish=Engedély +hungarian.AssociateRcFiles=*.rc fájlok társítása +hungarian.AssociateResFiles=*.res fájlok társítása +italian.ReadmeEnglish=Leggimi (Inglese) +italian.ReadmeJapanese=Leggimi (Giapponese) +italian.LicenseEnglish=Licenza (Inglese) +italian.AssociateRcFiles=Associa file *.rc +italian.AssociateResFiles=Associa file *.res +korean.ReadmeEnglish=ReadMe (영어) +korean.ReadmeJapanese=ReadMe (일본어) +korean.LicenseEnglish=License (영어) +korean.AssociateRcFiles=*.rc 파일 연결 +korean.AssociateResFiles=*.res 파일 연결 +japanese.ReadmeEnglish=ReadMe (英語) +japanese.ReadmeJapanese=読んでね (日本語) +japanese.LicenseEnglish=ライセンス (英語) +japanese.AssociateRcFiles=*.rc ファイルを関連付ける +japanese.AssociateResFiles=*.res ファイルを関連付ける +norwegian.ReadmeEnglish=ReadMe (engelsk) +norwegian.ReadmeJapanese=ReadMe (japansk) +norwegian.LicenseEnglish=Tillatelse +norwegian.AssociateRcFiles=Tilknytt *.rc-filer +norwegian.AssociateResFiles=Tilknytt *.res-filer +polish.ReadmeEnglish=ReadMe (angielski) +polish.ReadmeJapanese=ReadMe (japoński) +polish.LicenseEnglish=Licencja +polish.AssociateRcFiles=Skojarz pliki *.rc +polish.AssociateResFiles=Skojarz pliki *.res +portuguese.ReadmeEnglish=ReadMe (inglês) +portuguese.ReadmeJapanese=ReadMe (japonês) +portuguese.LicenseEnglish=Licença +portuguese.AssociateRcFiles=Associar arquivos *.rc +portuguese.AssociateResFiles=Associar arquivos *.res +russian.ReadmeEnglish=ReadMe (английский) +russian.ReadmeJapanese=ReadMe (японский) +russian.LicenseEnglish=Лицензия +russian.AssociateRcFiles=Связать с файлами *.rc +russian.AssociateResFiles=Связать с файлами *.res +scottishgaelic.ReadmeEnglish=ReadMe (English) +scottishgaelic.ReadmeJapanese=ReadMe (Japanese) +scottishgaelic.LicenseEnglish=License +scottishgaelic.AssociateRcFiles=Associate *.rc files +scottishgaelic.AssociateResFiles=Associate *.res files +serbiancyrillic.ReadmeEnglish=ReadMe (English) +serbiancyrillic.ReadmeJapanese=ReadMe (Japanese) +serbiancyrillic.LicenseEnglish=License +serbiancyrillic.AssociateRcFiles=Associate *.rc files +serbiancyrillic.AssociateResFiles=Associate *.res files +serbianlatin.ReadmeEnglish=ReadMe (English) +serbianlatin.ReadmeJapanese=ReadMe (Japanese) +serbianlatin.LicenseEnglish=License +serbianlatin.AssociateRcFiles=Associate *.rc files +serbianlatin.AssociateResFiles=Associate *.res files +slovenian.ReadmeEnglish=ReadMe (English) +slovenian.ReadmeJapanese=ReadMe (Japanese) +slovenian.LicenseEnglish=License +slovenian.AssociateRcFiles=Associate *.rc files +slovenian.AssociateResFiles=Associate *.res files +spanish.ReadmeEnglish=ReadMe (inglés) +spanish.ReadmeJapanese=Léame (japonés) +spanish.LicenseEnglish=Licencia +spanish.AssociateRcFiles=Asociar archivos *.rc +spanish.AssociateResFiles=Asociar archivos *.res +turkish.ReadmeEnglish=ReadMe (İngilizce) +turkish.ReadmeJapanese=ReadMe (Japonca) +turkish.LicenseEnglish=Lisans +turkish.AssociateRcFiles=*.rc dosyalarını ilişkilendirin +turkish.AssociateResFiles=*.res dosyalarını ilişkilendirin +ukrainian.ReadmeEnglish=ReadMe (англійська) +ukrainian.ReadmeJapanese=ReadMe (японська) +ukrainian.LicenseEnglish=Ліцензія +ukrainian.AssociateRcFiles=Пов’язати *.rc файли +ukrainian.AssociateResFiles=Приєднати *.res файли diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c529803..4ecb38e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,6 +24,9 @@ target_link_libraries(RisohEditor libega gdi32 comctl32 msimg32 winmm gdiplus vfw32 wininet oledlg msimg32 advapi32 shlwapi version urlmon) target_compile_definitions(RisohEditor PRIVATE -DUNICODE -D_UNICODE) +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set_target_properties(RisohEditor PROPERTIES OUTPUT_NAME "RisohEditor64") +endif() # RisohEditorPortable.exe add_executable(RisohEditorPortable WIN32 @@ -35,6 +38,9 @@ target_link_libraries(RisohEditorPortable libega gdi32 comctl32 msimg32 winmm gdiplus vfw32 wininet oledlg msimg32 advapi32 shlwapi version urlmon) target_compile_definitions(RisohEditorPortable PRIVATE -DPORTABLE -DUNICODE -D_UNICODE) +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set_target_properties(RisohEditorPortable PROPERTIES OUTPUT_NAME "RisohEditorPortable64") +endif() option(ATL_SUPPORT "Add ATL support" OFF) diff --git a/src/RisohEditor.cpp b/src/RisohEditor.cpp index b31c931b..8a294631 100644 --- a/src/RisohEditor.cpp +++ b/src/RisohEditor.cpp @@ -9729,14 +9729,22 @@ BOOL MMainWnd::DoSaveExeAs(LPCWSTR pszExeFile, BOOL bCompression) // if src and dest are non-executable, then dump tiny exe or dll to dest if (IsDotExe(dest)) { +#ifdef _WIN64 + if (DumpTinyExeOrDll(m_hInst, dest, IDR_TINYEXE64)) +#else if (DumpTinyExeOrDll(m_hInst, dest, IDR_TINYEXE)) +#endif { return DoSaveInner(dest, bCompression); } } else { +#ifdef _WIN64 + if (DumpTinyExeOrDll(m_hInst, dest, IDR_TINYDLL64)) +#else if (DumpTinyExeOrDll(m_hInst, dest, IDR_TINYDLL)) +#endif { return DoSaveInner(dest, bCompression); } diff --git a/src/RisohEditor_res.rc b/src/RisohEditor_res.rc index 2d8bcf77..0d91db09 100644 --- a/src/RisohEditor_res.rc +++ b/src/RisohEditor_res.rc @@ -83,6 +83,10 @@ IDR_TINYEXE RCDATA "res/RCData_106.bin" IDR_TINYDLL RCDATA "res/RCData_107.bin" +IDR_TINYEXE64 RCDATA "res/RCData_108.bin" + +IDR_TINYDLL64 RCDATA "res/RCData_109.bin" + ////////////////////////////////////////////////////////////////////////////// // RT_GROUP_CURSOR diff --git a/src/res/RCData_108.bin b/src/res/RCData_108.bin new file mode 100644 index 0000000000000000000000000000000000000000..87b0dc088f75b50920bf7a03570f20bcc08f4ff0 GIT binary patch literal 400 zcmeZ`N?>4QU|?VY;{X2{7- wpbR)4NeXJlKu~%msTCzai#dUK1JDm3=YeQspuoV85bDwW#>4o)$-__y0Lw=jasU7T literal 0 HcmV?d00001 diff --git a/src/res/RCData_109.bin b/src/res/RCData_109.bin new file mode 100644 index 0000000000000000000000000000000000000000..ae9217f220c48f7127fa85103a6d7f6cb7781e18 GIT binary patch literal 391 zcmeZ`N?>4QU|?VY;{X2{7}RGlOb0|OI70+0ta1#TERAFcvw!oW~^ fC8-r9K&#n-800}1jqDl)28IL=!vh}w4;%&nPhb>l literal 0 HcmV?d00001 diff --git a/src/resource.h b/src/resource.h index f4929223..84b1410f 100644 --- a/src/resource.h +++ b/src/resource.h @@ -99,6 +99,8 @@ #define IDR_UNKNOWNRESID 105 #define IDR_TINYEXE 106 #define IDR_TINYDLL 107 +#define IDR_TINYEXE64 108 +#define IDR_TINYDLL64 109 #define IDS_APPNAME 101 #define IDS_TITLEWITHFILE 102