mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[net] add platform to user agent when checking for updates
* Also update Windows version strings for Windows 10 * Also set rufus-next to 1.4.12 * Closes #393
This commit is contained in:
parent
55a5eb07e7
commit
b2628e05d0
8 changed files with 33 additions and 23 deletions
|
@ -1,3 +1,10 @@
|
|||
o Version 1.4.12 (2014.11.??) [BUGFIX RELEASE]
|
||||
Fix support for Red Hat 7 and CentOS 7
|
||||
Fix support for Debian 7.x
|
||||
Fix default listing of Mushkin Ventura Ultra USB 3.0 drives
|
||||
Fix Czech translation, courtesy of doktotnotor
|
||||
Update Windows version listing for Windows 10
|
||||
|
||||
o Version 1.4.11 (2014.11.04)
|
||||
Add Czech translation, courtesy of Richard Kahl
|
||||
Add Ukrainian translation, courtesy of VKS
|
||||
|
|
20
configure
vendored
20
configure
vendored
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.4.11.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.4.12.
|
||||
#
|
||||
# Report bugs to <https://github.com/pbatard/rufus/issues>.
|
||||
#
|
||||
|
@ -560,8 +560,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='rufus'
|
||||
PACKAGE_TARNAME='rufus'
|
||||
PACKAGE_VERSION='1.4.11'
|
||||
PACKAGE_STRING='rufus 1.4.11'
|
||||
PACKAGE_VERSION='1.4.12'
|
||||
PACKAGE_STRING='rufus 1.4.12'
|
||||
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
|
||||
PACKAGE_URL='http://rufus.akeo.ie'
|
||||
|
||||
|
@ -1203,7 +1203,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 1.4.11 to adapt to many kinds of systems.
|
||||
\`configure' configures rufus 1.4.12 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -1269,7 +1269,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of rufus 1.4.11:";;
|
||||
short | recursive ) echo "Configuration of rufus 1.4.12:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -1357,7 +1357,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
rufus configure 1.4.11
|
||||
rufus configure 1.4.12
|
||||
generated by GNU Autoconf 2.68
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
@ -1412,7 +1412,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 1.4.11, which was
|
||||
It was created by rufus $as_me 1.4.12, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
@ -2227,7 +2227,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='rufus'
|
||||
VERSION='1.4.11'
|
||||
VERSION='1.4.12'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
@ -4140,7 +4140,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 1.4.11, which was
|
||||
This file was extended by rufus $as_me 1.4.12, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -4194,7 +4194,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 1.4.11
|
||||
rufus config.status 1.4.12
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
AC_INIT([rufus], [1.4.11], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AC_INIT([rufus], [1.4.12], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
|
||||
AC_CONFIG_SRCDIR([src/rufus.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
|
|
@ -297,7 +297,9 @@ DWORD DownloadFile(const char* url, const char* file, HWND hProgressDialog)
|
|||
uprintf("Network is unavailable: %s\n", WinInetErrorString());
|
||||
goto out;
|
||||
}
|
||||
_snprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d.%d", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
|
||||
_snprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d.%d (WinNT %d.%d%s)",
|
||||
rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3],
|
||||
nWindowsVersion>>4, nWindowsVersion&0x0F, is_x64()?"; WOW64":"");
|
||||
hSession = InternetOpenA(agent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
|
||||
if (hSession == NULL) {
|
||||
uprintf("Could not open Internet session: %s\n", WinInetErrorString());
|
||||
|
|
|
@ -295,7 +295,7 @@ static BOOL DefineClusterSizes(void)
|
|||
|
||||
// ReFS (only supported for Windows 8.1 and later and for fixed disks)
|
||||
if (SelectedDrive.DiskSize >= 512*MB) {
|
||||
if ((nWindowsVersion >= WINDOWS_8_1_OR_LATER) && (SelectedDrive.Geometry.MediaType == FixedMedia)) {
|
||||
if ((nWindowsVersion >= WINDOWS_8_1) && (SelectedDrive.Geometry.MediaType == FixedMedia)) {
|
||||
SelectedDrive.ClusterSize[FS_REFS].Allowed = SINGLE_CLUSTERSIZE_DEFAULT;
|
||||
SelectedDrive.ClusterSize[FS_REFS].Default = 1;
|
||||
}
|
||||
|
|
|
@ -309,7 +309,8 @@ enum WindowsVersion {
|
|||
WINDOWS_VISTA = 0x60,
|
||||
WINDOWS_7 = 0x61,
|
||||
WINDOWS_8 = 0x62,
|
||||
WINDOWS_8_1_OR_LATER = 0x63,
|
||||
WINDOWS_8_1 = 0x63,
|
||||
WINDOWS_10 = 0x64,
|
||||
WINDOWS_MAX
|
||||
};
|
||||
|
||||
|
@ -344,7 +345,7 @@ extern int dialog_showing;
|
|||
*/
|
||||
extern void GetWindowsVersion(void);
|
||||
extern BOOL is_x64(void);
|
||||
extern const char* PrintWindowsVersion(enum WindowsVersion version);
|
||||
//extern const char* PrintWindowsVersion(enum WindowsVersion version);
|
||||
extern const char *WindowsErrorString(void);
|
||||
extern void DumpBufferHex(void *buf, size_t size);
|
||||
extern void PrintStatus(unsigned int duration, BOOL debug, int msg_id, ...);
|
||||
|
|
12
src/rufus.rc
12
src/rufus.rc
|
@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 206, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 1.4.11.532"
|
||||
CAPTION "Rufus 1.4.12.533"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
|
||||
|
@ -165,7 +165,7 @@ END
|
|||
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus 1.4.11.532"
|
||||
CAPTION "Rufus 1.4.12.533"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
|
||||
|
@ -428,8 +428,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,4,11,532
|
||||
PRODUCTVERSION 1,4,11,532
|
||||
FILEVERSION 1,4,12,533
|
||||
PRODUCTVERSION 1,4,12,533
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -446,13 +446,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "1.4.11.532"
|
||||
VALUE "FileVersion", "1.4.12.533"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "1.4.11.532"
|
||||
VALUE "ProductVersion", "1.4.12.533"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
@ -288,13 +288,13 @@ void GetWindowsVersion(void)
|
|||
break;
|
||||
case 0x63: w = (ws?"8.1":"2012_R2");
|
||||
break;
|
||||
case 0x64: w = (ws?"8.2":"2012_R3");
|
||||
case 0x64: w = (ws?"10":"2015");
|
||||
break;
|
||||
default:
|
||||
if (nWindowsVersion < 0x50)
|
||||
nWindowsVersion = WINDOWS_UNSUPPORTED;
|
||||
else
|
||||
w = "9 or later";
|
||||
w = "11 or later";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue