From d3238d7210915c3bff195b1d25b6f2170546af4e Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 4 Jun 2013 00:44:49 +0100
Subject: [PATCH] [misc] fix MinGW compilation issues

---
 _release.sh  |  2 +-
 src/drive.c  |  3 +--
 src/rufus.c  |  5 ++++-
 src/rufus.rc | 10 +++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/_release.sh b/_release.sh
index 23a02b1f..129ac6cd 100644
--- a/_release.sh
+++ b/_release.sh
@@ -2,4 +2,4 @@
 rm -f rufus*.exe
 ./configure
 make clean
-make release -j2
+make release
diff --git a/src/drive.c b/src/drive.c
index 5fc580a0..d67b6924 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -90,7 +90,6 @@ char* GetPhysicalName(DWORD DriveIndex)
 {
 	BOOL success = FALSE;
 	char physical_name[24];
-	char* r = NULL;
 
 	CheckDriveIndex(DriveIndex);
 	safe_sprintf(physical_name, sizeof(physical_name), "\\\\.\\PHYSICALDRIVE%d", DriveIndex);
@@ -286,7 +285,7 @@ out:
 char GetUnusedDriveLetter(void)
 {
 	DWORD size;
-	char drive_letter, *drive, drives[26*4];	/* "D:\", "E:\", etc. */
+	char drive_letter = 'Z'+1, *drive, drives[26*4];	/* "D:\", "E:\", etc. */
 
 	size = GetLogicalDriveStringsA(sizeof(drives), drives);
 	if (size == 0) {
diff --git a/src/rufus.c b/src/rufus.c
index 3bf36340..ece3438e 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -41,7 +41,7 @@
 #include "rufus.h"
 #include "registry.h"
 
-/* Redefinitions for the WDK */
+/* Redefinitions for WDK and MinGW */
 #ifndef PBM_SETSTATE
 #define PBM_SETSTATE (WM_USER+16)
 #endif
@@ -60,6 +60,9 @@
 #ifndef BCM_SETIMAGELIST
 #define BCM_SETIMAGELIST 0x1602
 #endif
+#ifndef DBT_CUSTOMEVENT
+#define DBT_CUSTOMEVENT 0x8006
+#endif
 
 // MinGW fails to link those
 typedef HIMAGELIST (WINAPI *ImageList_Create_t)(
diff --git a/src/rufus.rc b/src/rufus.rc
index 58f4bf48..af78fd31 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.3.3.245"
+CAPTION "Rufus v1.3.3.246"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,291,50,14
@@ -276,8 +276,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,3,245
- PRODUCTVERSION 1,3,3,245
+ FILEVERSION 1,3,3,246
+ PRODUCTVERSION 1,3,3,246
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -294,13 +294,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.3.3.245"
+            VALUE "FileVersion", "1.3.3.246"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "(c) 2011-2013 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.3.3.245"
+            VALUE "ProductVersion", "1.3.3.246"
         END
     END
     BLOCK "VarFileInfo"