Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Windows: remove dependency towards Mount/Format when building setup to fix Win32 build issue (#1487)

Browse Source 
MainCom_i.c and FormatCom_i.c are needed only for mount/format type libraries GUIDs. Since they don't change, we just define them directly.
This commit is contained in:
Mounir IDRASSI
2025-02-08 12:00:05 +01:00
parent a2f11e1102
commit 974a3909ec
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Setup/ComSetup.cpp
View File

@@ -23,8 +23,13 @@
#include "ComSetup.h" #include "ComSetup.h"
#include "Dlgcode.h" #include "Dlgcode.h"
#include "Resource.h" #include "Resource.h"
#include "../Mount/MainCom_i.c"
#include "../Format/FormatCom_i.c" #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
// Define GUIDs of "VeraCrypt.exe and" "VeraCrypt Format.exe" type libraries
MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptMainCom, 0x9ACF6176, 0x5FC4, 0x4690, 0xA0, 0x25, 0xB3, 0x30, 0x6A, 0x50, 0xEB, 0x6A);
MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptFormatCom, 0x56327DDA, 0xF1A7, 0x4e13, 0xB1, 0x28, 0x52, 0x0D, 0x12, 0x9B, 0xDE, 0xF6);
extern "C" BOOL RegisterComServers (wchar_t *modulePath) extern "C" BOOL RegisterComServers (wchar_t *modulePath)

9
src/SetupDLL/ComSetup.cpp
View File

@@ -23,8 +23,13 @@
#include "ComSetup.h" #include "ComSetup.h"
#include "Dlgcode.h" #include "Dlgcode.h"
#include "Resource.h" #include "Resource.h"
#include "../Mount/MainCom_i.c"
#include "../Format/FormatCom_i.c" #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
// Define GUIDs of "VeraCrypt.exe and" "VeraCrypt Format.exe" type libraries
MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptMainCom, 0x9ACF6176, 0x5FC4, 0x4690, 0xA0, 0x25, 0xB3, 0x30, 0x6A, 0x50, 0xEB, 0x6A);
MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptFormatCom, 0x56327DDA, 0xF1A7, 0x4e13, 0xB1, 0x28, 0x52, 0x0D, 0x12, 0x9B, 0xDE, 0xF6);
/* /*
* Same as RegisterComServers() in Setup project, but * Same as RegisterComServers() in Setup project, but