From e1499c4db0109b5b88166519b5dfeeb5e056ea65 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 5 Feb 2016 22:24:47 +0000
Subject: [PATCH] [misc] fix WDK warnings

---
 ChangeLog.txt | 10 ++++++++++
 src/rufus.c   |  4 ++--
 src/rufus.rc  | 10 +++++-----
 src/stdlg.c   |  3 ++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1643df15..0dca37ca 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+o Version 2.7 (2016.02.??)
+    Add Thai translation, courtesy of Sippapas Wangsri
+    Add Drag and Drop support, courtesy of SeymourApps
+    Add a retry for most write operations
+    Update UEFI:NTFS, ms-sys and Grub4DOS to latest
+    Dual sign Rufus with both SHA-1 and SHA-256
+    Fix 2nd line of SHA-256 being hidden on some platforms
+    Fix shutdown prevention issues
+    Additional small fixes
+
 o Version 2.6 (2015.12.22)
     Add Serbian (Latin) translation, courtesy of Ivan Strugar
     Add a cheat mode to zero a device (Alt-Z)
diff --git a/src/rufus.c b/src/rufus.c
index 21cd0f88..5f7806d8 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -654,7 +654,7 @@ static void SetTargetSystem(void)
 
 static void SetProposedLabel(int ComboIndex)
 {
-	const char no_label[] = STR_NO_LABEL;
+	const char no_label[] = STR_NO_LABEL, empty[] = "";
 	int bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
 
 	app_changed_label = TRUE;
@@ -680,7 +680,7 @@ static void SetProposedLabel(int ComboIndex)
 	}
 
 	// Else if no existing label is available, propose one according to the size (eg: "256MB", "8GB")
-	if ((safe_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (safe_stricmp(no_label, "") == 0)
+	if ((safe_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (safe_stricmp(no_label, empty) == 0)
 		|| (safe_stricmp(lmprintf(MSG_207), DriveLabel.String[ComboIndex]) == 0)) {
 		SetWindowTextU(hLabel, SelectedDrive.proposed_label);
 	} else {
diff --git a/src/rufus.rc b/src/rufus.rc
index 616f0099..13fbcf62 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.7.847"
+CAPTION "Rufus 2.7.848"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,7,847,0
- PRODUCTVERSION 2,7,847,0
+ FILEVERSION 2,7,848,0
+ PRODUCTVERSION 2,7,848,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.7.847"
+            VALUE "FileVersion", "2.7.848"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.7.847"
+            VALUE "ProductVersion", "2.7.848"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdlg.c b/src/stdlg.c
index c9d02a85..066932db 100644
--- a/src/stdlg.c
+++ b/src/stdlg.c
@@ -1648,6 +1648,7 @@ out:
 LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
 {
 	int i;
+	const char thai_id[] = "th-TH";
 	size_t len;
 	DWORD size;
 	DWORD* dwBuf;
@@ -1672,7 +1673,7 @@ LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
 
 	// If 'Segoe UI Symbol' is available, and we are using Thai, we're done here
 	if (IsFontAvailable("Segoe UI Symbol") && (selected_locale != NULL)
-		&& (safe_strcmp(selected_locale->txt[0], "th-TH") == 0))
+		&& (safe_strcmp(selected_locale->txt[0], thai_id) == 0))
 		return rcTemplate;
 
 	// 'Segoe UI Symbol' cannot be used => Fall back to the best we have