nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[mingw] fix compilation breakage due to MinGW header screwup

Browse source 
* 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!
This commit is contained in:
Pete Batard 2022-02-28 22:00:41 +00:00
parent cef651c52c
commit d07ec87b3a
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/drive.c
View file

@ -29,8 +29,8 @@
#include <assert.h> #include <assert.h>
#if !defined(__MINGW32__) #if !defined(__MINGW32__)
#include <initguid.h> #include <initguid.h>
#endif
#include <vds.h> #include <vds.h>
#endif
#include "rufus.h" #include "rufus.h"
#include "missing.h" #include "missing.h"

7
src/drive.h
View file

@ -94,7 +94,12 @@ typedef struct _FILE_FS_DEVICE_INFORMATION {
ULONG Characteristics; ULONG Characteristics;
} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; } FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION;
#else #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> #include <vds.h>
typedef interface IVdsServiceLoader IVdsServiceLoader; typedef interface IVdsServiceLoader IVdsServiceLoader;
typedef interface IVdsService IVdsService; typedef interface IVdsService IVdsService;

2
src/format.c
View file

@ -31,7 +31,9 @@
#include <ctype.h> #include <ctype.h>
#include <locale.h> #include <locale.h>
#include <assert.h> #include <assert.h>
#if !defined(__MINGW32__)
#include <vds.h> #include <vds.h>
#endif
#include "rufus.h" #include "rufus.h"
#include "missing.h" #include "missing.h"

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.18.1874" CAPTION "Rufus 3.18.1875"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,18,1874,0 FILEVERSION 3,18,1875,0
PRODUCTVERSION 3,18,1874,0 PRODUCTVERSION 3,18,1875,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.18.1874" VALUE "FileVersion", "3.18.1875"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.18.exe" VALUE "OriginalFilename", "rufus-3.18.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.18.1874" VALUE "ProductVersion", "3.18.1875"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"