[misc] report executable arch in the log

* Also update VS2017 solution to use 10.0.17134 SDK * Also update README
2018-10-27 14:22:09 +01:00 · 2018-10-27 14:22:09 +01:00 · d90676542b
parent 2727f437fd
commit d90676542b
14 changed files with 39 additions and 28 deletions
--- a/.vs/bled.vcxproj
+++ b/.vs/bled.vcxproj
@ -76,7 +76,7 @@
    <ProjectName>bled</ProjectName>
    <ProjectGuid>{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}</ProjectGuid>
    <RootNamespace>bled</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--- a/.vs/getopt.vcxproj
+++ b/.vs/getopt.vcxproj
@ -37,7 +37,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}</ProjectGuid>
    <RootNamespace>getopt</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--- a/.vs/libcdio-driver.vcxproj
+++ b/.vs/libcdio-driver.vcxproj
@ -69,7 +69,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>driver</RootNamespace>
    <ProjectName>libcdio-driver</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/libcdio-iso9660.vcxproj
+++ b/.vs/libcdio-iso9660.vcxproj
@ -61,7 +61,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>iso9660</RootNamespace>
    <ProjectName>libcdio-iso9660</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/libcdio-udf.vcxproj
+++ b/.vs/libcdio-udf.vcxproj
@ -55,7 +55,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>udf</RootNamespace>
    <ProjectName>libcdio-udf</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/ms-sys.vcxproj
+++ b/.vs/ms-sys.vcxproj
@ -96,7 +96,7 @@
    <ProjectGuid>{2B1D078D-8EB4-4398-9CA4-23457265A7F6}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>mssys</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/rufus.vcxproj
+++ b/.vs/rufus.vcxproj
@ -39,7 +39,7 @@
    <ProjectGuid>{731858A7-0303-4988-877B-9C0DD6471864}</ProjectGuid>
    <RootNamespace>rufus</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--- a/.vs/syslinux-libfat.vcxproj
+++ b/.vs/syslinux-libfat.vcxproj
@ -51,7 +51,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>libfat</RootNamespace>
    <ProjectName>syslinux-libfat</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/syslinux-libinstaller.vcxproj
+++ b/.vs/syslinux-libinstaller.vcxproj
@ -51,7 +51,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>libinstaller</RootNamespace>
    <ProjectName>syslinux-libinstaller</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/.vs/syslinux-win.vcxproj
+++ b/.vs/syslinux-win.vcxproj
@ -45,7 +45,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>win</RootNamespace>
    <ProjectName>syslinux-win</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- 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** |
--- 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<ARRAYSIZE(resource); i++) {
 		buf = (char*)GetResource(hMainInstance, resource[i], _RT_RCDATA, "ldlinux_sys", &len, TRUE);
--- a/src/rufus.h
+++ b/src/rufus.h
@ -34,6 +34,17 @@
 //#define RUFUS_TEST

 #define APPLICATION_NAME            "Rufus"
+#if defined(_M_AMD64)
+#define APPLICATION_ARCH            "x64"
+#elif defined(_M_IX86)
+#define APPLICATION_ARCH            "x86"
+#elif defined(_M_ARM64)
+#define APPLICATION_ARCH            "Arm64"
+#elif defined(_M_ARM)
+#define APPLICATION_ARCH            "Arm"
+#else
+#define APPLICATION_ARCH            "(Unknown Arch)"
+#endif
 #define COMPANY_NAME                "Akeo Consulting"
 #define STR_NO_LABEL                "NO_LABEL"
 // Yes, there exist characters between these seemingly empty quotes!
--- a/src/rufus.rc
+++ b/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 3.4.1417"
+CAPTION "Rufus 3.4.1418"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
    LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,1417,0
- PRODUCTVERSION 3,4,1417,0
+ FILEVERSION 3,4,1418,0
+ PRODUCTVERSION 3,4,1418,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -411,13 +411,13 @@ BEGIN
            VALUE "Comments", "https://akeo.ie"
            VALUE "CompanyName", "Akeo Consulting"
            VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.4.1417"
+            VALUE "FileVersion", "3.4.1418"
            VALUE "InternalName", "Rufus"
            VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
            VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
            VALUE "OriginalFilename", "rufus-3.4.exe"
            VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.4.1417"
+            VALUE "ProductVersion", "3.4.1418"
        END
    END
    BLOCK "VarFileInfo"