diff --git a/configure b/configure index 440e596d..d7a277c8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rufus 3.13. +# Generated by GNU Autoconf 2.69 for rufus 3.14. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='3.13' -PACKAGE_STRING='rufus 3.13' +PACKAGE_VERSION='3.14' +PACKAGE_STRING='rufus 3.14' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://rufus.ie' @@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 3.13 to adapt to many kinds of systems. +\`configure' configures rufus 3.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 3.13:";; + short | recursive ) echo "Configuration of rufus 3.14:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 3.13 +rufus configure 3.14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1440,7 +1440,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 3.13, which was +It was created by rufus $as_me 3.14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2303,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='3.13' + VERSION='3.14' cat >>confdefs.h <<_ACEOF @@ -4484,7 +4484,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 3.13, which was +This file was extended by rufus $as_me 3.14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4538,7 +4538,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 3.13 +rufus config.status 3.14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7da31e48..3b1c80a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [3.13], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) +AC_INIT([rufus], [3.14], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index 69345740..4fef3826 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -8,7 +8,7 @@ for an interesting struggle, when you also happen to have a comma in one of the fields... --> diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index e82e4e9f..f18c9137 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -1,6 +1,6 @@ @echo off setlocal EnableExtensions DisableDelayedExpansion -set VERSION=3.13 +set VERSION=3.14 del /q *.appx >NUL 2>&1 del /q *.appxbundle >NUL 2>&1 diff --git a/src/dev.c b/src/dev.c index be8e96af..2a1f8972 100644 --- a/src/dev.c +++ b/src/dev.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Device detection and enumeration - * Copyright © 2014-2020 Pete Batard + * Copyright © 2014-2021 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -419,9 +419,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save) /* For debugging user reports of HDDs vs UFDs */ //#define FORCED_DEVICE #ifdef FORCED_DEVICE -#define FORCED_VID 0x2109 -#define FORCED_PID 0x0715 -#define FORCED_NAME "KINGSTON SA400S37960 USB Device" +#define FORCED_VID 0x0BDA +#define FORCED_PID 0x0306 +#define FORCED_NAME "SDXC Card" #endif /* diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h index f375d5ae..b3419c3d 100644 --- a/src/hdd_vs_ufd.h +++ b/src/hdd_vs_ufd.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * SMART HDD vs Flash detection - isHDD() tables - * Copyright © 2013-2020 Pete Batard + * Copyright © 2013-2021 Pete Batard * * Based in part on drivedb.h from Smartmontools: * http://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools/drivedb.h @@ -138,6 +138,7 @@ static vid_score_t vid_score[] = { { 0x09da, -5 }, // A4 Tech { 0x0b27, -5 }, // Ritek { 0x0bc2, 10 }, // Seagate + { 0x0bda, -10 }, // Realtek { 0x0c76, -5 }, // JMTek { 0x0cf2, -5 }, // ENE { 0x0d49, 10 }, // Maxtor diff --git a/src/localization_data.sh b/src/localization_data.sh index fe6a1ba7..ebdb3a3a 100755 --- a/src/localization_data.sh +++ b/src/localization_data.sh @@ -12,7 +12,7 @@ cat > cmd.sed <<\_EOF 1i /*\ * Rufus: The Reliable USB Formatting Utility\ * Localization tables - autogenerated from resource.h\ - * Copyright © 2013-2020 Pete Batard \ + * Copyright © 2013-2021 Pete Batard \ *\ * This program is free software: you can redistribute it and/or modify\ * it under the terms of the GNU General Public License as published by\ diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h index 7eae40cf..3e830025 100644 --- a/src/msapi_utf8.h +++ b/src/msapi_utf8.h @@ -1,7 +1,10 @@ /* * MSAPI_UTF8: Common API calls using UTF-8 strings - * Compensating for what Microsoft should have done a long long time ago. - * Also see https://utf8everywhere.org + * Compensating for what Microsoft should have done a long long time ago, that they + * ONLY started to do in mid-2019 (What the £%^& took them so long?!?), as per: + * https://docs.microsoft.com/en-us/windows/uwp/design/globalizing/use-utf8-code-page + * + * See also: https://utf8everywhere.org * * Copyright © 2010-2020 Pete Batard * diff --git a/src/rufus.c b/src/rufus.c index 4d4cd755..722f1a02 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -3379,14 +3379,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine Sleep(100); mutex = CreateMutexA(NULL, TRUE, "Global/" APPLICATION_NAME); } - if ((mutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS)) { - // Load the translation before we print the error - get_loc_data_file(loc_file, selected_locale); - right_to_left_mode = ((selected_locale->ctrl_id) & LOC_RIGHT_TO_LEFT); - // Set MB_SYSTEMMODAL to prevent Far Manager from stealing focus... - MessageBoxExU(NULL, lmprintf(MSG_002), lmprintf(MSG_001), MB_ICONSTOP|MB_IS_RTL|MB_SYSTEMMODAL, selected_langid); - goto out; - } + //if ((mutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS)) { + // // Load the translation before we print the error + // get_loc_data_file(loc_file, selected_locale); + // right_to_left_mode = ((selected_locale->ctrl_id) & LOC_RIGHT_TO_LEFT); + // // Set MB_SYSTEMMODAL to prevent Far Manager from stealing focus... + // MessageBoxExU(NULL, lmprintf(MSG_002), lmprintf(MSG_001), MB_ICONSTOP|MB_IS_RTL|MB_SYSTEMMODAL, selected_langid); + // goto out; + //} // Save instance of the application for further reference hMainInstance = hInstance; diff --git a/src/rufus.manifest b/src/rufus.manifest index 108030a4..3be5a98d 100644 --- a/src/rufus.manifest +++ b/src/rufus.manifest @@ -4,6 +4,12 @@ true + + true + + + UTF-8 + diff --git a/src/rufus.rc b/src/rufus.rc index c0342a86..fed3433a 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -35,7 +35,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.13.1731" +CAPTION "Rufus 3.14.1732" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -397,8 +397,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,13,1731,0 - PRODUCTVERSION 3,13,1731,0 + FILEVERSION 3,14,1732,0 + PRODUCTVERSION 3,14,1732,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -416,13 +416,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.13.1731" + VALUE "FileVersion", "3.14.1732" VALUE "InternalName", "Rufus" - VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" + VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" - VALUE "OriginalFilename", "rufus-3.13.exe" + VALUE "OriginalFilename", "rufus-3.14.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.13.1731" + VALUE "ProductVersion", "3.14.1732" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index 3c98a0de..3d40193e 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard Dialog Routines (Browse for folder, About, etc) - * Copyright © 2011-2020 Pete Batard + * Copyright © 2011-2021 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -589,7 +589,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP ResizeButtonHeight(hDlg, IDOK); static_sprintf(about_blurb, about_blurb_format, lmprintf(MSG_174|MSG_RTF), lmprintf(MSG_175|MSG_RTF, rufus_version[0], rufus_version[1], rufus_version[2]), - "Copyright © 2011-2020 Pete Batard / Akeo", + "Copyright © 2011-2021 Pete Batard / Akeo", lmprintf(MSG_176|MSG_RTF), lmprintf(MSG_177|MSG_RTF), lmprintf(MSG_178|MSG_RTF)); for (i=0; i