From d07ec87b3acb9e5bd364c9d7c38d5a13cf644066 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 28 Feb 2022 22:00:41 +0000
Subject: [PATCH] [mingw] fix compilation breakage due to MinGW header screwup

* See https://github.com/pbatard/rufus/actions/runs/1900092904
* Guys, I know VDS is fundamentally broken... but that's no reason to break it further!
---
 src/drive.c  |  2 +-
 src/drive.h  |  7 ++++++-
 src/format.c |  2 ++
 src/rufus.rc | 10 +++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/drive.c b/src/drive.c
index ee715676..4e01f0f6 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -29,8 +29,8 @@
 #include <assert.h>
 #if !defined(__MINGW32__)
 #include <initguid.h>
-#endif
 #include <vds.h>
+#endif
 
 #include "rufus.h"
 #include "missing.h"
diff --git a/src/drive.h b/src/drive.h
index bb17929c..6506da75 100644
--- a/src/drive.h
+++ b/src/drive.h
@@ -94,7 +94,12 @@ typedef struct _FILE_FS_DEVICE_INFORMATION {
 	ULONG Characteristics;
 } FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION;
 #else
-/* MinGW is currently missing all the VDS COM stuff */
+/*
+ * MinGW is currently missing most of the VDS COM stuff.
+ * Oh, and MinGW's vds.h is screwed up unless you define the following:
+ */
+#define VDS_LUN_INFORMATION void
+#define __vdslun_h__
 #include <vds.h>
 typedef interface IVdsServiceLoader IVdsServiceLoader;
 typedef interface IVdsService IVdsService;
diff --git a/src/format.c b/src/format.c
index f42dee37..a3fcc63b 100644
--- a/src/format.c
+++ b/src/format.c
@@ -31,7 +31,9 @@
 #include <ctype.h>
 #include <locale.h>
 #include <assert.h>
+#if !defined(__MINGW32__)
 #include <vds.h>
+#endif
 
 #include "rufus.h"
 #include "missing.h"
diff --git a/src/rufus.rc b/src/rufus.rc
index 19c6dcaf..f68c751f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.18.1874"
+CAPTION "Rufus 3.18.1875"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,18,1874,0
- PRODUCTVERSION 3,18,1874,0
+ FILEVERSION 3,18,1875,0
+ PRODUCTVERSION 3,18,1875,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.18.1874"
+            VALUE "FileVersion", "3.18.1875"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.18.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.18.1874"
+            VALUE "ProductVersion", "3.18.1875"
         END
     END
     BLOCK "VarFileInfo"