diff --git a/ChangeLog.txt b/ChangeLog.txt index cfc6d792..624746bc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -o Version 3.18 (2022.03.??) +o Version 3.18 (2022.03.11) Fix DLL sideloading vulnerabilities Fix ISO → ESP creation when running on Windows 11 Fix an issue when detecting network connectivity when the DHCP service is disabled diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index fd0c5ff8..0a57c945 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -25,7 +25,6 @@ del /q *.map >NUL 2>&1 set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64 set ZIP_PATH=C:\Program Files\7-Zip set SIGNATURE_SHA1=3dbc3a2a0e9ce8803b422cfdbc60acd33164965d -set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin set MANIFEST=AppxManifest.xml set ARCHS=x86 x64 arm arm64 set DEFAULT_SCALE=200 diff --git a/src/rufus.c b/src/rufus.c index 2ff45b52..a03266b0 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -1168,7 +1168,8 @@ static void UpdateImage(BOOL update_image_option_only) ComboBox_ResetContent(hImageOption); if (!img_report.is_windows_img) { // Straight install.wim/install.esd only have Windows To Go option - if (img_report.win_version.major == 11) { + // Can't remove restrictions if running on Windows 7 or when running the appstore version + if (nWindowsVersion >= WINDOWS_8 && !appstore_version && img_report.win_version.major == 11) { IGNORE_RETVAL(ComboBox_SetItemData(hImageOption, ComboBox_AddStringU(hImageOption, lmprintf(MSG_322)), IMOP_WIN_STANDARD)); IGNORE_RETVAL(ComboBox_SetItemData(hImageOption, ComboBox_AddStringU(hImageOption, lmprintf(MSG_323)), IMOP_WIN_EXTENDED)); } else { diff --git a/src/rufus.rc b/src/rufus.rc index 4a3174e7..5c66e470 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.18.1876" +CAPTION "Rufus 3.18.1877" 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,18,1876,0 - PRODUCTVERSION 3,18,1876,0 + FILEVERSION 3,18,1877,0 + PRODUCTVERSION 3,18,1877,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.18.1876" + VALUE "FileVersion", "3.18.1877" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.18.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.18.1876" + VALUE "ProductVersion", "3.18.1877" END END BLOCK "VarFileInfo"