[iso] fix Rufus saving images as FFU instead of ISO, when FFU is not supported

* Our image type selection forgot to shift the actual type to ISO when FFU is not supported,
  leading to dism being invoked instead of oscdimg.
* Closes #2889.
* Also make sure the UDF label is no more than 32 characters.
* Also increase the oscdimg.exe commandline size as 256 characters may not be enough with long paths.
* Also try to report 'oscdimg.exe` errors in the log instead of silencing them.
* Also fix devices with (non-USB-compliant) VID 0000 being ignored by default.

Author: pbatard

src/dev.c

@@ -838,7 +838,8 @@ BOOL GetDevices(DWORD devnum)
 				}
 				// Also ignore USB devices that have been specifically flagged by the user
 				for (s = 0; s < ARRAYSIZE(ignore_vid_pid); s++) {
-					if ((props.vid == (ignore_vid_pid[s] >> 16)) && (props.pid == (ignore_vid_pid[s] & 0xffff))) {
+					if (ignore_vid_pid[s] != 0 && (props.vid == (ignore_vid_pid[s] >> 16)) &&
+						(props.pid == (ignore_vid_pid[s] & 0xffff))) {
 						uprintf("Ignoring '%s' (%s), per user settings", buffer, str);
 						break;
 					}

src/iso.c

@@ -2200,10 +2200,16 @@ DWORD WINAPI IsoSaveImageThread(void* param)
 {
 	DWORD r;
 	IMG_SAVE* img_save = (IMG_SAVE*)param;
-	char cmd[2 * MAX_PATH], letters[27], * label;
+	char cmd[2 * KB], letters[27], *label;
 
 	if (!GetDriveLabel(SelectedDrive.DeviceNumber, letters, &label, TRUE) || letters[0] == '\0')
 		ExitThread(ERROR_NOT_FOUND);
+
+	// UDF labels cannot be more than 32 characters (and if we have more than 32 chars we are
+	// using the static modifiable char buffer from GetDriveLabel(), so we can alter it).
+	if (strlen(label) > 32)
+		label[32] = '\0';
+
 	// Save to UDF only, as Microsoft's implementation of ISO-9660 doesn't support multiextent
 	// and produces BROKEN images if you try to add files larger than 4 GB.
 	// Plus ISO-9660/Joliet limits labels to 16 characters and has issues with long paths.

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.2306"
+CAPTION "Rufus 4.12.2307"
 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,2306,0
- PRODUCTVERSION 4,12,2306,0
+ FILEVERSION 4,12,2307,0
+ PRODUCTVERSION 4,12,2307,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.2306"
+            VALUE "FileVersion", "4.12.2307"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2026 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.2306"
+            VALUE "ProductVersion", "4.12.2307"
         END
     END
     BLOCK "VarFileInfo"

src/stdfn.c

@@ -1,7 +1,7 @@
 /*
  * Rufus: The Reliable USB Formatting Utility
  * Standard Windows function calls
- * Copyright © 2013-2025 Pete Batard <[email protected]>
+ * Copyright © 2013-2026 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -803,7 +803,7 @@ DWORD RunCommandWithProgress(const char* cmd, const char* dir, BOOL log, int msg
 	PROCESS_INFORMATION pi = { 0 };
 	SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
 	HANDLE hOutputRead = INVALID_HANDLE_VALUE, hOutputWrite = INVALID_HANDLE_VALUE;
-	static char* output;
+	static char *output, *p;
 	cregex_node_t* node = NULL;
 	cregex_program_t* program = NULL;
 	char* matches[REGEX_VM_MAX_MATCHES];
@@ -880,6 +880,9 @@ DWORD RunCommandWithProgress(const char* cmd, const char* dir, BOOL log, int msg
 						} else if (log) {
 							// output may contain a '%' so don't feed it as a naked format string
 							uprintf("%s", output);
+						} else if ((p = strstr(output, "ERROR:")) != NULL) {
+							// Mostly for oscdimg.exe errors
+							uprintf("%s", p);
 						}
 					}
 					free(output);

src/vhd.c

@@ -1,7 +1,7 @@
 /*
  * Rufus: The Reliable USB Formatting Utility
  * Virtual Disk Handling functions
- * Copyright © 2013-2025 Pete Batard <[email protected]>
+ * Copyright © 2013-2026 Pete Batard <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -564,7 +564,7 @@ static DWORD WINAPI FfuSaveImageThread(void* param)
 {
 	DWORD r;
 	IMG_SAVE* img_save = (IMG_SAVE*)param;
-	char cmd[MAX_PATH + 128], letters[27], *label;
+	char cmd[2 * KB], letters[27], *label;
 
 	GetDriveLabel(SelectedDrive.DeviceNumber, letters, &label, TRUE);
 	static_sprintf(cmd, "dism /Capture-Ffu /CaptureDrive:%s /ImageFile:\"%s\" "
@@ -593,9 +593,10 @@ BOOL SaveImage(void)
 	static IMG_SAVE img_save;
 	char filename[128], letters[27], path[MAX_PATH];
 	int DriveIndex = ComboBox_GetCurSel(hDeviceList);
-	enum { image_type_vhd = 1, image_type_vhdx = 2, image_type_ffu = 3, image_type_iso = 4 };
+	enum { image_type_none = 0, image_type_vhd, image_type_vhdx, image_type_ffu, image_type_iso };
 	static EXT_DECL(img_ext, filename, __VA_GROUP__("*.vhd", "*.vhdx", "*.ffu", "*.iso"),
 		__VA_GROUP__(lmprintf(MSG_343), lmprintf(MSG_342), lmprintf(MSG_344), lmprintf(MSG_036)));
+	int i_to_type[5] = { image_type_none, image_type_vhd, image_type_vhdx, image_type_ffu, image_type_iso };
 	ULARGE_INTEGER free_space;
 
 	memset(&img_save, 0, sizeof(IMG_SAVE));
@@ -611,8 +612,10 @@ BOOL SaveImage(void)
 		img_ext.count += 1;
 	} else {
 		// Move the ISO extension one place down
-		img_ext.extension[2] = img_ext.extension[3];
-		img_ext.description[2] = img_ext.description[3];
+		img_ext.extension[image_type_ffu - 1] = img_ext.extension[image_type_iso - 1];
+		img_ext.description[image_type_ffu - 1] = img_ext.description[image_type_iso - 1];
+		i_to_type[image_type_ffu] = image_type_iso;
+		i_to_type[image_type_iso] = image_type_none;
 	}
 	// ISO support requires a mounted file system
 	if (GetDriveLetters(SelectedDrive.DeviceNumber, letters) && letters[0] != '\0')
@@ -632,7 +635,8 @@ BOOL SaveImage(void)
 		save_image_type = (char*)&img_ext.extension[i - 1][2];
 		WriteSettingStr(SETTING_PREFERRED_SAVE_IMAGE_TYPE, save_image_type);
 	}
-	switch (i) {
+	assert(i < ARRAYSIZE(i_to_type));
+	switch (i_to_type[i]) {
 	case image_type_vhd:
 		img_save.Type = VIRTUAL_STORAGE_TYPE_DEVICE_VHD;
 		break;