From bf967dc39b964ae84d007ab65c1fda7001029273 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Sun, 31 May 2015 20:10:26 +0100
Subject: [PATCH] v2.2 (build 668)

* Also fix display of some of the buttons on Windows XP
---
 ChangeLog.txt |  6 +++---
 src/rufus.c   |  6 ++++--
 src/rufus.rc  | 16 ++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5853077a..29eace03 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,12 +1,12 @@
-o Version 2.2 (2015.05.??)
+o Version 2.2 (2015.05.31)
     Modernize the language selection button, courtesy of David Warner
     Add keyboard accessibility, courtesy of David Warner
     Add a clear indication of when UEFI-CSM is to be used
-    Fix an USB detection issue and add support for ASUS UASP Turbo Mode
+    Fix an USB detection issue and add support for ASUS UASP "Turbo Mode"
     Fix prevention of Windows shutdown when Rufus is idle
     Improve UI on high DPI monitors
     Update Grub4DOS to 0.4.6a [2015.05.18]
-    Other UI improvements and fixes
+    Other UI improvements and fixes, including translation updates
 
 o Version 2.1 (2015.03.23)
     Add 32 bit support to UEFI:NTFS boot
diff --git a/src/rufus.c b/src/rufus.c
index aaec305f..4a1c0b1e 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1831,8 +1831,10 @@ void InitDialog(HWND hDlg)
 	CreateTooltip(GetDlgItem(hDlg, IDC_WINDOWS_TO_GO), lmprintf(MSG_200), -1);
 
 	// Set a label for the Advanced Mode and Select Image button for screen readers
-	SetWindowTextU(GetDlgItem(hDlg, IDC_ADVANCED), lmprintf(MSG_160));
-	SetWindowTextU(hSelectISO, lmprintf(MSG_165));
+	if (nWindowsVersion > WINDOWS_XP) {
+		SetWindowTextU(GetDlgItem(hDlg, IDC_ADVANCED), lmprintf(MSG_160));
+		SetWindowTextU(hSelectISO, lmprintf(MSG_165));
+	}
 
 	ToggleAdvanced();	// We start in advanced mode => go to basic mode
 	ToggleToGo();
diff --git a/src/rufus.rc b/src/rufus.rc
index 82485263..c922c428 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,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
-CAPTION "Rufus 2.2.667"
+CAPTION "Rufus 2.2.668"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -157,7 +157,7 @@ END
 
 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.2.667"
+CAPTION "Rufus 2.2.668"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -283,7 +283,7 @@ END
 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.2.667"
+CAPTION "Rufus 2.2.668"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -415,7 +415,7 @@ END
 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.2.667"
+CAPTION "Rufus 2.2.668"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -671,8 +671,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,667,0
- PRODUCTVERSION 2,2,667,0
+ FILEVERSION 2,2,668,0
+ PRODUCTVERSION 2,2,668,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -689,13 +689,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.2.667"
+            VALUE "FileVersion", "2.2.668"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.2.667"
+            VALUE "ProductVersion", "2.2.668"
         END
     END
     BLOCK "VarFileInfo"