From d3d07e97bdc7278d73afec9c2aa120936eb83a39 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 29 Nov 2011 20:48:51 +0000
Subject: [PATCH] [mingw] add ms-sys support for MinGW and fix warnings

---
 Makefile |  4 ++--
 rufus.c  | 10 +++++-----
 rufus.h  |  2 +-
 rufus.rc | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 2fc73edf..7ecdef69 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ STRIP  = strip
 CFLAGS = -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow -O2 -Wl,--subsystem,windows -DWINVER=0x501 -D_WIN32_IE=0x501
 LIBS   = -lsetupapi -lole32 -lgdi32
 
-RUFUS_SRC = rufus.c stdlg.c msdos.c
+RUFUS_SRC = rufus.c stdlg.c msdos.c file.c br.c fat12.c fat16.c fat32.c
 
 .PHONY: all clean
 
@@ -14,7 +14,7 @@ all: $(TARGETNAME)
 
 $(TARGETNAME): $(RUFUS_SRC) $(TARGETNAME)_rc.o
 	@echo "[CCLD]  $@"
-	@$(CC) -o $@ $(CFLAGS) $^ $(TARGETNAME)_rc.o $(LIBS)
+	@$(CC) -I./inc -o $@ $(CFLAGS) $^ $(TARGETNAME)_rc.o $(LIBS)
 	@$(STRIP) $(TARGETNAME).exe
 
 $(TARGETNAME)_rc.o: $(TARGETNAME).rc
diff --git a/rufus.c b/rufus.c
index 81e31cfb..1b393a4f 100644
--- a/rufus.c
+++ b/rufus.c
@@ -116,13 +116,13 @@ void _uprintf(const char *format, ...)
 
 void DumpBufferHex(unsigned char *buffer, size_t size)
 {
-	size_t i, j, k, pos;
+	size_t i, j, k;
 	char line[80] = "";
 
-	for (i=0, pos=0; i<size; i+=16) {
+	for (i=0; i<size; i+=16) {
 		uprintf("%s\n", line);
 		line[0] = 0;
-		sprintf(&line[strlen(line)], "  %08x  ", i);
+		sprintf(&line[strlen(line)], "  %08x  ", (unsigned int)i);
 		for(j=0,k=0; k<16; j++,k++) {
 			if (i+j < size) {
 				sprintf(&line[strlen(line)], "%02x", buffer[i+j]);
@@ -590,7 +590,7 @@ static BOOLEAN __stdcall FormatExCallback(FILE_SYSTEM_CALLBACK_COMMAND Command,
 		break;
 	case FCC_BAD_LABEL:
 		uprintf("Bad label\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_INVALID_LABEL;
+		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_LABEL_TOO_LONG;
 		break;
 	case FCC_OUTPUT:
 		uprintf("%s\n", ((PTEXTOUTPUT)Data)->Output);
@@ -654,7 +654,7 @@ static BOOL ProcessMBR(HANDLE hPhysicalDrive)
 	BOOL r = FALSE;
 	HANDLE hDrive = hPhysicalDrive;
 	FILE fake_fd;
-	unsigned char* buf;
+	unsigned char* buf = NULL;
 	size_t SecSize = SelectedDrive.Geometry.BytesPerSector;
 	size_t nSecs = 0x200/min(0x200, SelectedDrive.Geometry.BytesPerSector);
 
diff --git a/rufus.h b/rufus.h
index 5fbddf73..1efeaa57 100644
--- a/rufus.h
+++ b/rufus.h
@@ -22,7 +22,7 @@
 
 #define RUFUS_DEBUG
 
-#define APP_VERSION                 "Rufus v1.0.0.46"
+#define APP_VERSION                 "Rufus v1.0.0.47"
 #define STR_NO_LABEL                "NO_LABEL"
 #define RUFUS_CANCELBOX_TITLE       "Rufus - Cancellation"
 #define DRIVE_INDEX_MIN             0x80
diff --git a/rufus.rc b/rufus.rc
index e894cf9a..38c472e7 100644
--- a/rufus.rc
+++ b/rufus.rc
@@ -63,7 +63,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP
     CONTROL         "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL,
                     "SysLink",WS_TABSTOP,46,47,114,9
-    LTEXT           "Version 1.0.0 (Build 46)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 1.0.0 (Build 47)",IDC_STATIC,46,19,78,8
     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -162,8 +162,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,46
- PRODUCTVERSION 1,0,0,46
+ FILEVERSION 1,0,0,47
+ PRODUCTVERSION 1,0,0,47
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -180,13 +180,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.0.0.46"
+            VALUE "FileVersion", "1.0.0.47"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.0.0.46"
+            VALUE "ProductVersion", "1.0.0.47"
         END
     END
     BLOCK "VarFileInfo"