[iso] improve error reporting on ISO extraction issues

* Also disable NTFS cluster size that no longer work in recent versions of Windows.

Author: pbatard

src/iso.c

@@ -739,7 +739,9 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
 						hash_write[HASH_MD5](&ctx, buf, buf_size);
 					ISO_BLOCKING(r = WriteFileWithRetry(file_handle, buf, buf_size, &wr_size, WRITE_RETRIES));
 					if (!r || (wr_size != buf_size)) {
-						uprintf("  Error writing file: %s", r ? "Short write detected" : WindowsErrorString());
+						if (r)
+							SetLastError(ERROR_WRITE_FAULT);
+						uprintf("  Error writing file: %s", WindowsErrorString());
 						goto out;
 					}
 					file_length -= wr_size;
@@ -776,6 +778,8 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
 	return 0;
 
 out:
+	if (GetLastError() != ERROR_SUCCESS)
+		ErrorStatus = RUFUS_ERROR(GetLastError());
 	udf_dirent_free(p_udf_dirent);
 	ISO_BLOCKING(safe_closehandle(file_handle));
 	safe_free(psz_sanpath);
@@ -1004,7 +1008,9 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
 							hash_write[HASH_MD5](&ctx, buf, buf_size);
 						ISO_BLOCKING(r = WriteFileWithRetry(file_handle, buf, buf_size, &wr_size, WRITE_RETRIES));
 						if (!r || wr_size != buf_size) {
-							uprintf("  Error writing file: %s", r ? "Short write detected" : WindowsErrorString());
+							if (r)
+								SetLastError(ERROR_WRITE_FAULT);
+							uprintf("  Error writing file: %s", WindowsErrorString());
 							goto out;
 						}
 						file_length -= wr_size;
@@ -1039,6 +1045,8 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
 	r = 0;
 
 out:
+	if (r != 0 && GetLastError() != ERROR_SUCCESS)
+		ErrorStatus = RUFUS_ERROR(GetLastError());
 	ISO_BLOCKING(safe_closehandle(file_handle));
 	if (p_entlist != NULL)
 		iso9660_filelist_free(p_entlist);

src/rufus.c

@@ -537,7 +537,7 @@ static BOOL SetFileSystemAndClusterSize(char* fs_name)
 
 	if (SelectedDrive.DiskSize < 256 * TB) {
 		// NTFS
-		SelectedDrive.ClusterSize[FS_NTFS].Allowed = 0x0001FE00;
+		SelectedDrive.ClusterSize[FS_NTFS].Allowed = 0x0001F000;
 		for (i = 16; i <= 256; i <<= 1) {			// 7 MB -> 256 TB
 			if (SelectedDrive.DiskSize < i * TB) {
 				SelectedDrive.ClusterSize[FS_NTFS].Default = ((ULONG)i / 4) * KB;

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 4.12.2288"
+CAPTION "Rufus 4.12.2289"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -408,8 +408,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,12,2288,0
- PRODUCTVERSION 4,12,2288,0
+ FILEVERSION 4,12,2289,0
+ PRODUCTVERSION 4,12,2289,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -427,13 +427,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.12.2288"
+            VALUE "FileVersion", "4.12.2289"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2025 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.12.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.12.2288"
+            VALUE "ProductVersion", "4.12.2289"
         END
     END
     BLOCK "VarFileInfo"

src/stdio.c

@@ -641,13 +641,14 @@ BOOL WriteFileWithRetry(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWr
 		} else {
 			uprintf("Write error %s", WindowsErrorString());
 			LastWriteError = RUFUS_ERROR(GetLastError());
+			if (LastWriteError == RUFUS_ERROR(ERROR_DISK_FULL))
+				break;
 		}
 		// If we can't reposition for the next run, just abort
 		if (!readFilePointer)
 			break;
 		if (nTry < nNumRetries) {
 			uprintf("Retrying in %d seconds...", WRITE_TIMEOUT / 1000);
-			// TODO: Call GetProcessSearch() here?
 			Sleep(WRITE_TIMEOUT);
 		}
 	}