Fix #249

katahiromz · Jul 21, 2024 · b695730 · b695730
1 parent 6703da9
commit b695730
Show file tree

Hide file tree

Showing 13 changed files with 354 additions and 0 deletions.
diff --git 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
@@ -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
@@ -658,3 +658,4 @@
     - ファイル名からリソース名を埋める。
     - リソース言語設定を追加。
     - Enter キーを押したときのフリーズを修正。
+    - x64 のサポート。
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git a/src/res/RCData_109.bin b/src/res/RCData_109.bin
diff --git 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