Browse Source

[wue] fix WUE dialog not being presented on WIMs with a single image

* As opposed to what we used with the old parser, ezxml's indexes now start at 0 rather than 1.
* Closes #2754.
* Also set rufus-next to 4.9.
pull/2779/head
Pete Batard 2 months ago
parent
commit
e128727521
No known key found for this signature in database GPG Key ID: 38E0CF5E69EDD671
  1. 2
      ChangeLog.txt
  2. 20
      configure
  3. 2
      configure.ac
  4. 12
      src/rufus.rc
  5. 4
      src/wue.c

2
ChangeLog.txt

@ -9,7 +9,7 @@ o Version 4.8 (2025.06.11)
Improve reporting of UEFI bootloaders in the log, with info on the Secure Boot status
Fix an issue with size limitations when writing an uncompressed VHD back to the same drive
Fix a crash when opening the log with the 32-bit MinGW compiled version
Fix commandline parameters not being forwared to original Windows setup.exe
Fix commandline parameters not being forwarded to original Windows setup.exe
o Version 4.7 (2025.04.09)
Add a mechanism to detect and download updated DBXs from the official UEFI repository

20
configure

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for rufus 4.8.
# Generated by GNU Autoconf 2.71 for rufus 4.9.
#
# Report bugs to <https://github.com/pbatard/rufus/issues>.
#
@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rufus'
PACKAGE_TARNAME='rufus'
PACKAGE_VERSION='4.8'
PACKAGE_STRING='rufus 4.8'
PACKAGE_VERSION='4.9'
PACKAGE_STRING='rufus 4.9'
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
PACKAGE_URL='https://rufus.ie'
@ -1269,7 +1269,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 4.8 to adapt to many kinds of systems.
\`configure' configures rufus 4.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1336,7 +1336,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rufus 4.8:";;
short | recursive ) echo "Configuration of rufus 4.9:";;
esac
cat <<\_ACEOF
@ -1428,7 +1428,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rufus configure 4.8
rufus configure 4.9
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@ -1504,7 +1504,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 4.8, which was
It was created by rufus $as_me 4.9, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@ -2767,7 +2767,7 @@ fi
# Define the identity of the package.
PACKAGE='rufus'
VERSION='4.8'
VERSION='4.9'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@ -5313,7 +5313,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 4.8, which was
This file was extended by rufus $as_me 4.9, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -5369,7 +5369,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
rufus config.status 4.8
rufus config.status 4.9
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

2
configure.ac

@ -1,4 +1,4 @@
AC_INIT([rufus], [4.8], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie])
AC_INIT([rufus], [4.9], [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])

12
src/rufus.rc

@ -33,7 +33,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 4.8.2253"
CAPTION "Rufus 4.9.2254"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -407,8 +407,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,8,2253,0
PRODUCTVERSION 4,8,2253,0
FILEVERSION 4,9,2254,0
PRODUCTVERSION 4,9,2254,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -426,13 +426,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "4.8.2253"
VALUE "FileVersion", "4.9.2254"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2025 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-4.8.exe"
VALUE "OriginalFilename", "rufus-4.9.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "4.8.2253"
VALUE "ProductVersion", "4.9.2254"
END
END
BLOCK "VarFileInfo"

4
src/wue.c

@ -500,7 +500,7 @@ BOOL PopulateWindowsVersion(void)
goto out;
}
PopulateWindowsVersionFromXml(xml, xml_len, 1);
PopulateWindowsVersionFromXml(xml, xml_len, 0);
out:
free(xml);
@ -621,7 +621,7 @@ int SetWinToGoIndex(void)
wintogo_index = atoi(version_index.String[i - 1]);
if (i > 0) {
// re-populate the version data from the selected XML index
PopulateWindowsVersionFromXml(xml, xml_len, i);
PopulateWindowsVersionFromXml(xml, xml_len, i - 1);
// If we couldn't obtain the major and build, we have a problem
if (img_report.win_version.major == 0 || img_report.win_version.build == 0)
uprintf("Warning: Could not obtain version information from XML index (Nonstandard Windows image?)");

Loading…
Cancel
Save