diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest index f162a28e..ab298cb1 100644 --- a/res/appstore/Package.appxmanifest +++ b/res/appstore/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="3.14.1790.0" /> Rufus diff --git a/src/format.c b/src/format.c index 0a2e3085..fdaee4fc 100644 --- a/src/format.c +++ b/src/format.c @@ -1546,9 +1546,8 @@ static BOOL WriteDrive(HANDLE hPhysicalDrive, BOOL bZeroDrive) uprintfs("+"); } // Don't overflow our projected size (mostly for VHDs) - if (wb + read_size[0] > target_size) { + if (wb + read_size[0] > target_size) read_size[0] = (DWORD)(target_size - wb); - } // WriteFile fails unless the size is a multiple of sector size if (read_size[0] % SelectedDrive.SectorSize != 0) @@ -1561,7 +1560,6 @@ static BOOL WriteDrive(HANDLE hPhysicalDrive, BOOL bZeroDrive) if (throttle_fast_zeroing) { throttle_fast_zeroing--; } else if (fast_zeroing) { - assert(hSourceImage == NULL); // Only enabled for zeroing CHECK_FOR_USER_CANCEL; // Read block and compare against the block that needs to be written diff --git a/src/rufus.rc b/src/rufus.rc index 185de3cd..e9d17999 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.14.1789" +CAPTION "Rufus 3.14.1790" 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,14,1789,0 - PRODUCTVERSION 3,14,1789,0 + FILEVERSION 3,14,1790,0 + PRODUCTVERSION 3,14,1790,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.14.1789" + VALUE "FileVersion", "3.14.1790" 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.14.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.14.1789" + VALUE "ProductVersion", "3.14.1790" END END BLOCK "VarFileInfo"