From c1dbcb32e6f35599b9164438ff0942d9663b084e Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@amcrypto.jp>
Date: Tue, 24 Jun 2025 15:31:39 +0900
Subject: [PATCH] Windows: Add resource file to Format dll. Fix copying output
 of Format dll project.

---
 src/FormatDLL/FormatDLL.rc              | 64 +++++++++++++++++++++++++
 src/FormatDLL/FormatDLL.vcxproj         | 11 +++--
 src/FormatDLL/FormatDLL.vcxproj.filters |  5 ++
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 src/FormatDLL/FormatDLL.rc

diff --git a/src/FormatDLL/FormatDLL.rc b/src/FormatDLL/FormatDLL.rc
new file mode 100644
index 00000000..e0fed8b7
--- /dev/null
+++ b/src/FormatDLL/FormatDLL.rc
@@ -0,0 +1,64 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,26,24,0
+ PRODUCTVERSION 1,26,24,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "AM Crypto"
+            VALUE "FileDescription", "VeraCrypt Format SDK"
+            VALUE "FileVersion", "1.26.24"
+            VALUE "LegalTrademarks", "VeraCrypt"
+            VALUE "OriginalFilename", "VeraCryptFormat.dll"
+            VALUE "ProductName", "VeraCrypt"
+            VALUE "ProductVersion", "1.26.24"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
diff --git a/src/FormatDLL/FormatDLL.vcxproj b/src/FormatDLL/FormatDLL.vcxproj
index 15188791..657a04ea 100644
--- a/src/FormatDLL/FormatDLL.vcxproj
+++ b/src/FormatDLL/FormatDLL.vcxproj
@@ -106,6 +106,9 @@
   <ItemGroup>
     <ClInclude Include="VeraCryptFormatSDK.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FormatDLL.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -196,7 +199,7 @@
     <PostBuildEvent>
       <Command>md "..\Debug\SDK Files\x64" 2&gt;NUL:
 copy $(TargetPath) "..\Debug\SDK Files\x64\VeraCryptFormat.dll"
-copy $(TargetPath) "..\Debug\SDK Files\x64\VeraCryptFormat.lib"
+copy $(TargetDir)$(TargetName).lib "..\Debug\SDK Files\x64\VeraCryptFormat.lib"
 copy VeraCryptFormatSDK.h "..\Debug\SDK Files\VeraCryptFormatSDK.h"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -222,7 +225,7 @@ copy VeraCryptFormatSDK.h "..\Debug\SDK Files\VeraCryptFormatSDK.h"</Command>
     <PostBuildEvent>
       <Command>md "..\Debug\SDK Files\arm64" 2&gt;NUL:
 copy $(TargetPath) "..\Debug\SDK Files\arm64\VeraCryptFormat.dll"
-copy $(TargetPath) "..\Debug\SDK Files\arm64\VeraCryptFormat.lib"
+copy $(TargetDir)$(TargetName).lib "..\Debug\SDK Files\arm64\VeraCryptFormat.lib"
 copy VeraCryptFormatSDK.h "..\Debug\SDK Files\VeraCryptFormatSDK.h"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -251,7 +254,7 @@ copy VeraCryptFormatSDK.h "..\Debug\SDK Files\VeraCryptFormatSDK.h"</Command>
     <PostBuildEvent>
       <Command>md "..\Release\SDK Files\x64" 2&gt;NUL:
 copy $(TargetPath) "..\Release\SDK Files\x64\VeraCryptFormat.dll"
-copy $(TargetPath) "..\Release\SDK Files\x64\VeraCryptFormat.lib"
+copy $(TargetDir)$(TargetName).lib "..\Release\SDK Files\x64\VeraCryptFormat.lib"
 copy VeraCryptFormatSDK.h "..\Release\SDK Files\VeraCryptFormatSDK.h"
 </Command>
     </PostBuildEvent>
@@ -281,7 +284,7 @@ copy VeraCryptFormatSDK.h "..\Release\SDK Files\VeraCryptFormatSDK.h"
     <PostBuildEvent>
       <Command>md "..\Release\SDK Files\arm64" 2&gt;NUL:
 copy $(TargetPath) "..\Release\SDK Files\arm64\VeraCryptFormat.dll"
-copy $(TargetPath) "..\Release\SDK Files\arm64\VeraCryptFormat.lib"
+copy $(TargetDir)$(TargetName).lib "..\Release\SDK Files\arm64\VeraCryptFormat.lib"
 copy VeraCryptFormatSDK.h "..\Release\SDK Files\VeraCryptFormatSDK.h"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/src/FormatDLL/FormatDLL.vcxproj.filters b/src/FormatDLL/FormatDLL.vcxproj.filters
index c767c03e..6a6be1ec 100644
--- a/src/FormatDLL/FormatDLL.vcxproj.filters
+++ b/src/FormatDLL/FormatDLL.vcxproj.filters
@@ -141,4 +141,9 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FormatDLL.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file