From f01043feda1f77ad638be2cabd2dace3f051a02b Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 17 Jul 2017 16:02:47 +0100 Subject: [PATCH] [misc] fix minor MinGW warnings * Also update localization to version 1.0.22 --- ChangeLog.txt | 7 +++++++ res/localization/ChangeLog.txt | 9 +++++++++ res/localization/embedded.sed | 5 +++-- res/localization/rufus.loc | 13 ++++++++++--- src/rufus.h | 8 ++++---- src/rufus.rc | 10 +++++----- 6 files changed, 38 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 43d34e82..c4c9356f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +o Version 2.16 (2017.07.??) + Add an audiovisual cue on completion/error + Notify user when an ISO is broken or truncated + Notify user if other processes are accessing the drive before format + List processes that are locking a drive, if any, on failure + Improve verbosity of the Windows To Go process + o Version 2.15 (2017.05.17) Fix non-listing of drives that are opened for write access by another process Report external processes that may be preventing disk access (in the log) diff --git a/res/localization/ChangeLog.txt b/res/localization/ChangeLog.txt index fe605895..3016958f 100644 --- a/res/localization/ChangeLog.txt +++ b/res/localization/ChangeLog.txt @@ -15,6 +15,15 @@ content. PLEASE, do not just look at this Changelog when updating your translation, but always use the English section of rufus.loc as your base. For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line! +o Version 1.0.22 (2017.07.17) + - *NEW* MSG_295 "Warning: Unofficial version" + - *NEW* MSG_296 "This version of Rufus was NOT produced by its official developer(s).\n\nAre you sure you want to run it?" + - *NEW* MSG_297 "Truncated ISO detected" + - *NEW* MSG_298 "The ISO file you have selected does not match its declared size: %s of data is missing!\n\nIf you obtained " + "this file from the Internet, you should try to download a new copy and verify that the MD5 or SHA checksums match the " + "official ones.\n\nNote that you can compute the MD5 or SHA in Rufus by clicking the '#' button." + Note: You can test MSG_297/MSG_298 using https://rufus.akeo.ie/testing/arch_trunc.iso (A truncated version of archlinux-2017.07.01-x86_64.iso) + o Version 1.0.21 (2017.01.16) - *NEW* MSG_288 "Missing elevated privileges" - *NEW* MSG_289 "This application can only run with elevated privileges" diff --git a/res/localization/embedded.sed b/res/localization/embedded.sed index 543ddbfa..9d621260 100644 --- a/res/localization/embedded.sed +++ b/res/localization/embedded.sed @@ -1,7 +1,8 @@ # This sed script removes everything we don't need from rufus.loc, for embedding. -# remove comments (aggressively!) -s/#.*$// +# remove comments (but not so aggressively as to drop the end of MSG_298!) +s/^#.*$// +s/[ \t]#.*$// # remove empty lines /^$/d diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index b6457cf8..9a3dc66b 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -93,7 +93,7 @@ # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf # for the LCID (0x####) codes you should use l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809 -v 1.0.21 +v 1.0.22 # Main dialog g IDD_DIALOG @@ -558,7 +558,7 @@ t MSG_292 "Please select the version of Windows you want to install:" t MSG_293 "Unsupported Windows version" t MSG_294 "This version of Windows is no longer supported by Rufus." t MSG_295 "Warning: Unofficial version" -t MSG_296 "This version of Rufus was NOT produced by its official developer(s).\n\nAre you sure you want to run it?" +t MSG_296 "This version of Rufus was not produced by its official developer(s).\n\nAre you sure you want to run it?" t MSG_297 "Truncated ISO detected" t MSG_298 "The ISO file you have selected does not match its declared size: %s of data is missing!\n\nIf you obtained " "this file from the Internet, you should try to download a new copy and verify that the MD5 or SHA checksums match " @@ -5119,7 +5119,7 @@ t MSG_294 "Rufus ei enää tue tätä Windows-versiota." ################################################################################ l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c -v 1.0.21 +v 1.0.22 b "en-US" g IDD_DIALOG @@ -5544,6 +5544,13 @@ t MSG_291 "Sélection de version" t MSG_292 "Sélectionnez la version de Windows que vous souhaitez installer :" t MSG_293 "Version de Windows non supportée" t MSG_294 "Cette version de Windows n'est plus supportée par Rufus." +t MSG_295 "Alerte: Version non-officielle" +t MSG_296 "Cette version de Rufus n'a pas produite par ses développeurs officiels.\n\nEtes-vous sur de vouloir la lancer ?" +t MSG_297 "ISO tronquée détectée" +t MSG_298 "Le fichier ISO que vous avez sélectionné ne fait pas la bonne taille : %s de données sont manquantes !\n\n" + "Si vous avez obtenu ce fichier depuis Internet, vous devriez essayer de le télécharger à nouveau et verifier que " + "le MD5 ou SHA correspond aux valeurs officielles.\n\nNotez que vous pouvez calculer le MD5 ou SHA depuis Rufus en " + "cliquant le bouton '#'." ################################################################################ l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407 diff --git a/src/rufus.h b/src/rufus.h index b5ed9509..46acbc81 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -116,10 +116,10 @@ #ifdef RUFUS_LOGGING extern void _uprintf(const char *format, ...); #define uprintf(...) _uprintf(__VA_ARGS__) -#define vuprintf(...) if (verbose) _uprintf(__VA_ARGS__) -#define vvuprintf(...) if (verbose > 1) _uprintf(__VA_ARGS__) -#define suprintf(...) if (!bSilent) _uprintf(__VA_ARGS__) -#define uuprintf(...) if (usb_debug) _uprintf(__VA_ARGS__) +#define vuprintf(...) do { if (verbose) _uprintf(__VA_ARGS__); } while(0) +#define vvuprintf(...) do { if (verbose > 1) _uprintf(__VA_ARGS__); } while(0) +#define suprintf(...) do { if (!bSilent) _uprintf(__VA_ARGS__); } while(0) +#define uuprintf(...) do { if (usb_debug) _uprintf(__VA_ARGS__); } while(0) #define ubprintf(...) do { safe_sprintf(&ubuffer[ubuffer_pos], UBUFFER_SIZE - ubuffer_pos - 2, __VA_ARGS__); \ ubuffer_pos = strlen(ubuffer); ubuffer[ubuffer_pos++] = '\r'; ubuffer[ubuffer_pos++] = '\n'; \ ubuffer[ubuffer_pos] = 0; } while(0) diff --git a/src/rufus.rc b/src/rufus.rc index 831b452d..4c0e9471 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.16.1127" +CAPTION "Rufus 2.16.1128" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -366,8 +366,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,16,1127,0 - PRODUCTVERSION 2,16,1127,0 + FILEVERSION 2,16,1128,0 + PRODUCTVERSION 2,16,1128,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -384,13 +384,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.16.1127" + VALUE "FileVersion", "2.16.1128" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.16.1127" + VALUE "ProductVersion", "2.16.1128" END END BLOCK "VarFileInfo"