From d90676542b79be15b215a9cddd460f822bf70039 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 27 Oct 2018 14:22:09 +0100 Subject: [PATCH] [misc] report executable arch in the log * Also update VS2017 solution to use 10.0.17134 SDK * Also update README --- .vs/bled.vcxproj | 2 +- .vs/getopt.vcxproj | 2 +- .vs/libcdio-driver.vcxproj | 2 +- .vs/libcdio-iso9660.vcxproj | 2 +- .vs/libcdio-udf.vcxproj | 2 +- .vs/ms-sys.vcxproj | 2 +- .vs/rufus.vcxproj | 2 +- .vs/syslinux-libfat.vcxproj | 2 +- .vs/syslinux-libinstaller.vcxproj | 2 +- .vs/syslinux-win.vcxproj | 2 +- README.md | 24 ++++++++++++------------ src/rufus.c | 2 +- src/rufus.h | 11 +++++++++++ src/rufus.rc | 10 +++++----- 14 files changed, 39 insertions(+), 28 deletions(-) diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 54508404..50d904e0 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -76,7 +76,7 @@ bled {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} bled - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index b6104e5d..a929b362 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -37,7 +37,7 @@ {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 1e8165d5..2a7b0606 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -69,7 +69,7 @@ Win32Proj driver libcdio-driver - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index 31274d6d..24a8f436 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -61,7 +61,7 @@ Win32Proj iso9660 libcdio-iso9660 - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 6aaea493..39f5e606 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -55,7 +55,7 @@ Win32Proj udf libcdio-udf - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index c5323556..bdab55ed 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -96,7 +96,7 @@ {2B1D078D-8EB4-4398-9CA4-23457265A7F6} Win32Proj mssys - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index a0675ccf..d35b90eb 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -39,7 +39,7 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index 2060a0a9..42e1fc88 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -51,7 +51,7 @@ Win32Proj libfat syslinux-libfat - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index 91975cce..3585f8fb 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -51,7 +51,7 @@ Win32Proj libinstaller syslinux-libinstaller - 10.0.16299.0 + 10.0.17134.0 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index cf03e2e0..3924a358 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -45,7 +45,7 @@ Win32Proj win syslinux-win - 10.0.16299.0 + 10.0.17134.0 diff --git a/README.md b/README.md index 18f4cf56..faa79815 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ Rufus: The Reliable USB Formatting Utility ========================================== -[![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=for-the-badge)](https://ci.appveyor.com/project/pbatard/rufus) -[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=for-the-badge)](https://scan.coverity.com/projects/pbatard-rufus) -[![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=for-the-badge)](https://github.com/pbatard/rufus/graphs/contributors) -[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=for-the-badge)](https://www.gnu.org/licenses/gpl-3.0.en.html) +[![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=flat-square)](https://ci.appveyor.com/project/pbatard/rufus) +[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square)](https://scan.coverity.com/projects/pbatard-rufus) +[![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/graphs/contributors) +[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html) ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png) @@ -12,7 +12,7 @@ Features -------- * Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS -* Create DOS bootable USB drives, using [FreeDOS](http://www.freedos.org/) or MS-DOS (Windows 8.1 or earlier) +* Create DOS bootable USB drives, using [FreeDOS](http://www.freedos.org) or MS-DOS (Windows 8.1 or earlier) * Create BIOS or UEFI bootable drives, including [UEFI bootable NTFS](https://github.com/pbatard/uefi-ntfs) * Create bootable drives from bootable ISOs (Windows, Linux, etc.) * Create bootable drives from bootable disk images, including compressed ones @@ -23,12 +23,12 @@ Features * Modern and familiar UI, with [39 languages natively supported](https://github.com/pbatard/rufus/wiki/FAQ#What_languages_are_natively_supported_by_Rufus) * Small footprint. No installation required. * Portable -* 100% [Free Software](http://www.gnu.org/philosophy/free-sw.en.html) ([GPL v3](http://www.gnu.org/licenses/gpl-3.0.en.html)) +* 100% [Free Software](https://www.gnu.org/philosophy/free-sw) ([GPL v3](https://www.gnu.org/licenses/gpl-3.0)) Compilation ----------- -Use either Visual Studio 2017 (with Update 4 and SDK 10.0.16299 installed) or MinGW and +Use either Visual Studio 2017 (version 15.8 or later with SDK 10.0.17134 installed) or MinGW and then invoke the `.sln` or `configure`/`make` respectively. #### Visual Studio @@ -40,10 +40,10 @@ this applies regardless of whether you are an individual or a corporate user. Additional information ---------------------- -Rufus provides extensive information about what it is doing, either through -its easily accessible log, or through the Windows debug facility. +Rufus provides extensive information about what it is doing, either through its +easily accessible log, or through the [Windows debug facility](https://docs.microsoft.com/en-us/sysinternals/downloads/debugview). -* [Official Website](https://rufus.ie) +* [__Official Website__](https://rufus.ie) * [FAQ](https://github.com/pbatard/rufus/wiki/FAQ) Enhancements/Bugs @@ -58,6 +58,6 @@ ISO: `en_windows_7_ultimate_with_sp1_x64_dvd_618240.iso` | Name of tool | Version | Time | | ------------ | ------- | ---- | -| [Windows USB/DVD Download Tool](http://www.microsoft.com/en-us/download/windows-usb-dvd-download-tool) | v1.0.30 | 8 mins 10s | -| [UNetbootin](http://unetbootin.sourceforge.net) | v1.1.1.1 | 6 mins 20s | +| [Windows USB/DVD Download Tool](https://www.microsoft.com/en-us/download/windows-usb-dvd-download-tool) | v1.0.30 | 8 mins 10s | +| [UNetbootin](https://unetbootin.github.io) | v1.1.1.1 | 6 mins 20s | | **Rufus** | v1.1.0 | **3 mins 25s** | diff --git a/src/rufus.c b/src/rufus.c index 5a4918aa..b55b88a9 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1536,7 +1536,7 @@ static void InitDialog(HWND hDlg) SetWindowTextU(hDlg, tmp); // Now that we have a title, we can find the handle of our Dialog dialog_handle = FindWindowA(NULL, tmp); - uprintf(APPLICATION_NAME " version: %d.%d.%d%s%s", rufus_version[0], rufus_version[1], rufus_version[2], + uprintf(APPLICATION_NAME " " APPLICATION_ARCH " v%d.%d.%d%s%s", rufus_version[0], rufus_version[1], rufus_version[2], IsAlphaOrBeta(), (ini_file != NULL)?"(Portable)":""); for (i=0; i