diff --git a/_sign.cmd b/_sign.cmd
index 73f01ed2..c58f8a28 100644
--- a/_sign.cmd
+++ b/_sign.cmd
@@ -1,3 +1,2 @@
@echo off
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1
-exit
diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest
index 31d3c974..dd955567 100644
--- a/res/appstore/Package.appxmanifest
+++ b/res/appstore/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="3.16.1837.0" />
Rufus
diff --git a/res/appstore/appstore.wapproj.user b/res/appstore/appstore.wapproj.user
index 2b376f06..bbaa8b61 100644
--- a/res/appstore/appstore.wapproj.user
+++ b/res/appstore/appstore.wapproj.user
@@ -11,7 +11,7 @@
..\icons\rufus-512.png
True
x86|x64|arm|arm64
- False
+ True
StoreOnly
diff --git a/res/loc/ChangeLog.txt b/res/loc/ChangeLog.txt
index e54e26b3..e39c5c31 100644
--- a/res/loc/ChangeLog.txt
+++ b/res/loc/ChangeLog.txt
@@ -7,8 +7,8 @@ Or simply download https://rufus-web.akeo.ie/locale/pollock.exe and follow its d
o v3.?? (????.??.??)
- *UPDATED* MSG_305 Reworked the message to mention the new Windows 11 Extended option
- - *NEW* MSG_322 "Standard Windows 11 Installation (TPM 2.0, Secure Boot, 8GB+ RAM)"
- - *NEW* MSG_323 "Extended Windows 11 Installation (no TPM/no Secure Boot/8GB- RAM)"
+ - *NEW* MSG_322 "Standard Windows 11 Installation (TPM 2.0 + Secure Boot)"
+ - *NEW* MSG_323 "Extended Windows 11 Installation (no TPM / no Secure Boot)"
- *NEW* MSG_324 "Removing Windows 11 installation restrictions: %s"
o v3.14 (2021.03.31)
diff --git a/res/loc/po/fr-FR.po b/res/loc/po/fr-FR.po
index 10a85ab8..2be3498f 100644
--- a/res/loc/po/fr-FR.po
+++ b/res/loc/po/fr-FR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 3.14\n"
"Report-Msgid-Bugs-To: pete@akeo.ie\n"
-"POT-Creation-Date: 2021-10-12 10:34+0100\n"
-"PO-Revision-Date: 2021-10-12 10:40+0100\n"
+"POT-Creation-Date: 2021-10-15 12:59+0100\n"
+"PO-Revision-Date: 2021-10-15 13:07+0100\n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1791,12 +1791,12 @@ msgstr ""
"A cause de cela, seule l’écriture en mode DD est applicable."
#. • MSG_322
-msgid "Standard Windows 11 Installation (TPM 2.0, Secure Boot, 8GB+ RAM)"
-msgstr "Installation standard de Windows 11 (TPM 2.0, Secure Boot, 8Go+ RAM)"
+msgid "Standard Windows 11 Installation (TPM 2.0 + Secure Boot)"
+msgstr "Installation standard de Windows 11 (TPM 2.0 + Secure Boot)"
#. • MSG_323
-msgid "Extended Windows 11 Installation (no TPM/no Secure Boot/8GB- RAM)"
-msgstr "Installation Windows 11 étendue (sans TPM/Secure Boot/8Go+ RAM)"
+msgid "Extended Windows 11 Installation (no TPM / no Secure Boot)"
+msgstr "Installation Windows 11 étendue (sans TPM / sans Secure Boot)"
#. • MSG_324
msgid "Removing Windows 11 installation restrictions: %s"
diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc
index f92f12ba..c4dae81f 100644
--- a/res/loc/rufus.loc
+++ b/res/loc/rufus.loc
@@ -584,8 +584,8 @@ t MSG_319 "Ignore Boot Marker"
t MSG_320 "Refreshing partition layout (%s)..."
t MSG_321 "The image you have selected is an ISOHybrid, but its creators have not made it compatible with ISO/File "
"copy mode.\nAs a result, DD image writing mode will be enforced."
-t MSG_322 "Standard Windows 11 Installation (TPM 2.0, Secure Boot, 8GB+ RAM)"
-t MSG_323 "Extended Windows 11 Installation (no TPM/no Secure Boot/8GB- RAM)"
+t MSG_322 "Standard Windows 11 Installation (TPM 2.0 + Secure Boot)"
+t MSG_323 "Extended Windows 11 Installation (no TPM / no Secure Boot)"
t MSG_324 "Removing Windows 11 installation restrictions: %s"
#########################################################################
@@ -4294,8 +4294,8 @@ t MSG_318 "Priorité de thread part default : %d"
t MSG_319 "Ignorer le marqueur de démarrage"
t MSG_320 "Rafraichissement du schéma de partition (%s)..."
t MSG_321 "L’image que vous avez sélectionnée est de type ISOHybrid, mais ses créateurs ne l’ont pas rendue compatible avec le mode ISO (i.e. copie de fichier).\nA cause de cela, seule l’écriture en mode DD est applicable."
-t MSG_322 "Installation standard de Windows 11 (TPM 2.0, Secure Boot, 8Go+ RAM)"
-t MSG_323 "Installation Windows 11 étendue (sans TPM/Secure Boot/8Go+ RAM)"
+t MSG_322 "Installation standard de Windows 11 (TPM 2.0 + Secure Boot)"
+t MSG_323 "Installation Windows 11 étendue (sans TPM / sans Secure Boot)"
t MSG_324 "Elimination des restrictions d’installation de Windows 11: %s"
#########################################################################
diff --git a/src/format.c b/src/format.c
index 86d7d785..4a9f53ae 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1442,7 +1442,7 @@ BOOL RemoveWindows11Restrictions(char drive_letter)
int i;
const int wim_index = 2;
const char* offline_hive_name = "RUFUS_OFFLINE_HIVE";
- const char* key_name[] = { "BypassTPMCheck", "BypassSecureBootCheck", "BypassRAMCheck" };
+ const char* key_name[] = { "BypassTPMCheck", "BypassSecureBootCheck" };
char boot_wim_path[] = "#:\\sources\\boot.wim", key_path[64];
char* mount_path = NULL;
char path[MAX_PATH];
diff --git a/src/rufus.rc b/src/rufus.rc
index 63f182ab..7606d3b7 100644
--- 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.16.1836"
+CAPTION "Rufus 3.16.1837"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,16,1836,0
- PRODUCTVERSION 3,16,1836,0
+ FILEVERSION 3,16,1837,0
+ PRODUCTVERSION 3,16,1837,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
- VALUE "FileVersion", "3.16.1836"
+ VALUE "FileVersion", "3.16.1837"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.16.exe"
VALUE "ProductName", "Rufus"
- VALUE "ProductVersion", "3.16.1836"
+ VALUE "ProductVersion", "3.16.1837"
END
END
BLOCK "VarFileInfo"
diff --git a/src/stdfn.c b/src/stdfn.c
index f8661ef3..6dd0caf3 100644
--- a/src/stdfn.c
+++ b/src/stdfn.c
@@ -242,6 +242,8 @@ int GetCpuArch(void)
static const char* GetEdition(DWORD ProductType)
{
+ static char unknown_edition_str[64];
+
// From: https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getproductinfo
// These values can be found in the winnt.h header.
switch (ProductType) {
@@ -307,7 +309,9 @@ static const char* GetEdition(DWORD ProductType)
case 0x000000B8: return "Cloud E N";
case 0x000000BD: return "Lite";
case 0xABCDABCD: return "(Unlicensed)";
- default: return "(Unknown Edition)";
+ default:
+ static_sprintf(unknown_edition_str, "(Unknown Edition 0x%02X)", ProductType);
+ return unknown_edition_str;
}
}