mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[ui] fix progress not being displayed for syslinux/grub downloads
* Also make download of .sig files a bit less verbose
This commit is contained in:
		
							parent
							
								
									7c142fadbc
								
							
						
					
					
						commit
						c12640b547
					
				
					 4 changed files with 140 additions and 114 deletions
				
			
		
							
								
								
									
										14
									
								
								src/net.c
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								src/net.c
									
										
									
									
									
								
							|  | @ -274,9 +274,10 @@ static DWORD DownloadToFileOrBuffer(const char* url, const char* file, BYTE** bu | ||||||
| 
 | 
 | ||||||
| 	short_name = (file != NULL) ? PathFindFileNameU(file) : PathFindFileNameU(url); | 	short_name = (file != NULL) ? PathFindFileNameU(file) : PathFindFileNameU(url); | ||||||
| 
 | 
 | ||||||
| 	if (hProgressDialog != NULL) | 	if (hProgressDialog != NULL) { | ||||||
| 		PrintInfo(0, MSG_085, short_name); | 		PrintInfo(0, MSG_085, short_name); | ||||||
| 	uprintf("Downloading %s", url); | 		uprintf("Downloading %s", url); | ||||||
|  | 	} | ||||||
| 
 | 
 | ||||||
| 	if ( (!pfInternetCrackUrlA(url, (DWORD)safe_strlen(url), 0, &UrlParts)) | 	if ( (!pfInternetCrackUrlA(url, (DWORD)safe_strlen(url), 0, &UrlParts)) | ||||||
| 	  || (UrlParts.lpszHostName == NULL) || (UrlParts.lpszUrlPath == NULL)) { | 	  || (UrlParts.lpszHostName == NULL) || (UrlParts.lpszUrlPath == NULL)) { | ||||||
|  | @ -337,7 +338,8 @@ static DWORD DownloadToFileOrBuffer(const char* url, const char* file, BYTE** bu | ||||||
| 		uprintf("Unable to retrieve file length: %s", WinInetErrorString()); | 		uprintf("Unable to retrieve file length: %s", WinInetErrorString()); | ||||||
| 		goto out; | 		goto out; | ||||||
| 	} | 	} | ||||||
| 	uprintf("File length: %d bytes", dwTotalSize); | 	if (hProgressDialog != NULL) | ||||||
|  | 		uprintf("File length: %d bytes", dwTotalSize); | ||||||
| 
 | 
 | ||||||
| 	if (file != NULL) { | 	if (file != NULL) { | ||||||
| 		hFile = CreateFileU(file, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); | 		hFile = CreateFileU(file, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); | ||||||
|  | @ -390,8 +392,8 @@ static DWORD DownloadToFileOrBuffer(const char* url, const char* file, BYTE** bu | ||||||
| 	} else { | 	} else { | ||||||
| 		DownloadStatus = 200; | 		DownloadStatus = 200; | ||||||
| 		r = TRUE; | 		r = TRUE; | ||||||
| 		uprintf("Successfully downloaded '%s'", short_name); |  | ||||||
| 		if (hProgressDialog != NULL) { | 		if (hProgressDialog != NULL) { | ||||||
|  | 			uprintf("Successfully downloaded '%s'", short_name); | ||||||
| 			SendMessage(hProgressBar, PBM_SETPOS, (WPARAM)MAX_PROGRESS, 0); | 			SendMessage(hProgressBar, PBM_SETPOS, (WPARAM)MAX_PROGRESS, 0); | ||||||
| 			PrintInfo(0, MSG_241, 100.0f); | 			PrintInfo(0, MSG_241, 100.0f); | ||||||
| 		} | 		} | ||||||
|  | @ -439,13 +441,13 @@ DWORD DownloadSignedFile(const char* url, const char* file, HWND hProgressDialog | ||||||
| 		goto out; | 		goto out; | ||||||
| 	sig_len = DownloadToFileOrBuffer(url_sig, NULL, &sig, NULL); | 	sig_len = DownloadToFileOrBuffer(url_sig, NULL, &sig, NULL); | ||||||
| 	if ((sig_len != RSA_SIGNATURE_SIZE) || (!ValidateOpensslSignature(buf, buf_len, sig, sig_len))) { | 	if ((sig_len != RSA_SIGNATURE_SIZE) || (!ValidateOpensslSignature(buf, buf_len, sig, sig_len))) { | ||||||
| 		uprintf("FATAL: Server signature is invalid!"); | 		uprintf("FATAL: Download signature is invalid ✗"); | ||||||
| 		DownloadStatus = 403;	// Forbidden
 | 		DownloadStatus = 403;	// Forbidden
 | ||||||
| 		FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_BAD_SIGNATURE); | 		FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_BAD_SIGNATURE); | ||||||
| 		goto out; | 		goto out; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	uprintf("Download signature is valid"); | 	uprintf("Download signature is valid ✓"); | ||||||
| 	DownloadStatus = 206;	// Partial content
 | 	DownloadStatus = 206;	// Partial content
 | ||||||
| 	hFile = CreateFileU(file, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); | 	hFile = CreateFileU(file, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); | ||||||
| 	if (hFile == INVALID_HANDLE_VALUE) { | 	if (hFile == INVALID_HANDLE_VALUE) { | ||||||
|  |  | ||||||
							
								
								
									
										229
									
								
								src/rufus.c
									
										
									
									
									
								
							
							
						
						
									
										229
									
								
								src/rufus.c
									
										
									
									
									
								
							|  | @ -1443,11 +1443,12 @@ out: | ||||||
| 	ExitThread(0); | 	ExitThread(0); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| static BOOL BootCheck(void) | static DWORD WINAPI BootCheckThread(LPVOID param) | ||||||
| { | { | ||||||
| 	int i, r; | 	int i, r; | ||||||
| 	FILE *fd; | 	FILE *fd; | ||||||
| 	DWORD len; | 	DWORD len; | ||||||
|  | 	WPARAM ret = -1; | ||||||
| 	BOOL in_files_dir = FALSE; | 	BOOL in_files_dir = FALSE; | ||||||
| 	const char* grub = "grub"; | 	const char* grub = "grub"; | ||||||
| 	const char* core_img = "core.img"; | 	const char* core_img = "core.img"; | ||||||
|  | @ -1458,32 +1459,42 @@ static BOOL BootCheck(void) | ||||||
| 
 | 
 | ||||||
| 	syslinux_ldlinux_len[0] = 0; syslinux_ldlinux_len[1] = 0; | 	syslinux_ldlinux_len[0] = 0; syslinux_ldlinux_len[1] = 0; | ||||||
| 	safe_free(grub2_buf); | 	safe_free(grub2_buf); | ||||||
|  | 
 | ||||||
|  | 	if (ComboBox_GetCurSel(hDeviceList) == CB_ERR) | ||||||
|  | 		goto out; | ||||||
|  | 
 | ||||||
|  | 	if ((zero_drive) || (bt == BT_NON_BOOTABLE)) { | ||||||
|  | 		// Nothing to check
 | ||||||
|  | 		ret = 0; | ||||||
|  | 		goto out; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
| 	if (bt == BT_IMAGE) { | 	if (bt == BT_IMAGE) { | ||||||
| 		// We should never be there
 |  | ||||||
| 		assert(image_path != NULL); | 		assert(image_path != NULL); | ||||||
| 		if (image_path == NULL) | 		if (image_path == NULL) | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		if ((size_check) && (img_report.projected_size > (uint64_t)SelectedDrive.DiskSize)) { | 		if ((size_check) && (img_report.projected_size > (uint64_t)SelectedDrive.DiskSize)) { | ||||||
| 			// This ISO image is too big for the selected target
 | 			// This ISO image is too big for the selected target
 | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_089), lmprintf(MSG_088), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_089), lmprintf(MSG_088), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} | 		} | ||||||
| 		if (IS_DD_BOOTABLE(img_report) && !img_report.is_iso) { | 		if (IS_DD_BOOTABLE(img_report) && !img_report.is_iso) { | ||||||
| 			// Pure DD images are fine at this stage
 | 			// Pure DD images are fine at this stage
 | ||||||
| 			return TRUE; | 			ret = 0; | ||||||
|  | 			goto out; | ||||||
| 		} | 		} | ||||||
| 		if ((display_togo_option) && (ComboBox_GetCurSel(GetDlgItem(hMainDialog, IDC_IMAGE_OPTION)) == 1)) { | 		if ((display_togo_option) && (ComboBox_GetCurSel(GetDlgItem(hMainDialog, IDC_IMAGE_OPTION)) == 1)) { | ||||||
| 			if (fs != FS_NTFS) { | 			if (fs != FS_NTFS) { | ||||||
| 				// Windows To Go only works for NTFS
 | 				// Windows To Go only works for NTFS
 | ||||||
| 				MessageBoxExU(hMainDialog, lmprintf(MSG_097, "Windows To Go"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 				MessageBoxExU(hMainDialog, lmprintf(MSG_097, "Windows To Go"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			} | 			} | ||||||
| 			if (SelectedDrive.MediaType != FixedMedia) { | 			if (SelectedDrive.MediaType != FixedMedia) { | ||||||
| 				if ((tt == TT_UEFI) && (pt == PARTITION_STYLE_GPT) && (nWindowsBuildNumber < 15000)) { | 				if ((tt == TT_UEFI) && (pt == PARTITION_STYLE_GPT) && (nWindowsBuildNumber < 15000)) { | ||||||
| 					// Up to Windows 10 Creators Update, we were screwed, since we need access to 2 partitions at the same time.
 | 					// Up to Windows 10 Creators Update, we were screwed, since we need access to 2 partitions at the same time.
 | ||||||
| 					// Thankfully, the newer Windows allow mounting multiple partitions on the same REMOVABLE drive.
 | 					// Thankfully, the newer Windows allow mounting multiple partitions on the same REMOVABLE drive.
 | ||||||
| 					MessageBoxExU(hMainDialog, lmprintf(MSG_198), lmprintf(MSG_190), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 					MessageBoxExU(hMainDialog, lmprintf(MSG_198), lmprintf(MSG_190), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 					return FALSE; | 					goto out; | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 			// If multiple versions are available, asks the user to select one before we commit to format the drive
 | 			// If multiple versions are available, asks the user to select one before we commit to format the drive
 | ||||||
|  | @ -1492,7 +1503,7 @@ static BOOL BootCheck(void) | ||||||
| 				MessageBoxExU(hMainDialog, lmprintf(MSG_073), lmprintf(MSG_291), MB_OK | MB_ICONERROR | MB_IS_RTL, selected_langid); | 				MessageBoxExU(hMainDialog, lmprintf(MSG_073), lmprintf(MSG_291), MB_OK | MB_ICONERROR | MB_IS_RTL, selected_langid); | ||||||
| 				// fall through
 | 				// fall through
 | ||||||
| 			case -2: | 			case -2: | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			default: | 			default: | ||||||
| 				break; | 				break; | ||||||
| 			} | 			} | ||||||
|  | @ -1500,13 +1511,13 @@ static BOOL BootCheck(void) | ||||||
| 			if (!IS_EFI_BOOTABLE(img_report)) { | 			if (!IS_EFI_BOOTABLE(img_report)) { | ||||||
| 				// Unsupported ISO
 | 				// Unsupported ISO
 | ||||||
| 				MessageBoxExU(hMainDialog, lmprintf(MSG_091), lmprintf(MSG_090), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 				MessageBoxExU(hMainDialog, lmprintf(MSG_091), lmprintf(MSG_090), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			} | 			} | ||||||
| 			if (HAS_WIN7_EFI(img_report) && (!WimExtractCheck())) { | 			if (HAS_WIN7_EFI(img_report) && (!WimExtractCheck())) { | ||||||
| 				// Your platform cannot extract files from WIM archives => download 7-zip?
 | 				// Your platform cannot extract files from WIM archives => download 7-zip?
 | ||||||
| 				if (MessageBoxExU(hMainDialog, lmprintf(MSG_102), lmprintf(MSG_101), MB_YESNO|MB_ICONERROR|MB_IS_RTL, selected_langid) == IDYES) | 				if (MessageBoxExU(hMainDialog, lmprintf(MSG_102), lmprintf(MSG_101), MB_YESNO|MB_ICONERROR|MB_IS_RTL, selected_langid) == IDYES) | ||||||
| 					ShellExecuteA(hMainDialog, "open", SEVENZIP_URL, NULL, NULL, SW_SHOWNORMAL); | 					ShellExecuteA(hMainDialog, "open", SEVENZIP_URL, NULL, NULL, SW_SHOWNORMAL); | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			} | 			} | ||||||
| 		} else if ( ((fs == FS_NTFS) && !HAS_WINDOWS(img_report) && !HAS_GRUB(img_report) &&  | 		} else if ( ((fs == FS_NTFS) && !HAS_WINDOWS(img_report) && !HAS_GRUB(img_report) &&  | ||||||
| 					 (!HAS_SYSLINUX(img_report) || (SL_MAJOR(img_report.sl_version) <= 5))) | 					 (!HAS_SYSLINUX(img_report) || (SL_MAJOR(img_report.sl_version) <= 5))) | ||||||
|  | @ -1515,16 +1526,16 @@ static BOOL BootCheck(void) | ||||||
| 				 || ((IS_FAT(fs)) && (HAS_WINDOWS(img_report) || HAS_INSTALL_WIM(img_report)) && (!allow_dual_uefi_bios)) ) { | 				 || ((IS_FAT(fs)) && (HAS_WINDOWS(img_report) || HAS_INSTALL_WIM(img_report)) && (!allow_dual_uefi_bios)) ) { | ||||||
| 			// Incompatible FS and ISO
 | 			// Incompatible FS and ISO
 | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} else if ((fs == FS_FAT16) && HAS_KOLIBRIOS(img_report)) { | 		} else if ((fs == FS_FAT16) && HAS_KOLIBRIOS(img_report)) { | ||||||
| 			// KolibriOS doesn't support FAT16
 | 			// KolibriOS doesn't support FAT16
 | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_189), lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_189), lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} | 		} | ||||||
| 		if ((IS_FAT(fs)) && (img_report.has_4GB_file)) { | 		if ((IS_FAT(fs)) && (img_report.has_4GB_file)) { | ||||||
| 			// This ISO image contains a file larger than 4GB file (FAT32)
 | 			// This ISO image contains a file larger than 4GB file (FAT32)
 | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_100), lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_100), lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		// If the selected target doesn't include include BIOS, skip file downloads for GRUB/Syslinux
 | 		// If the selected target doesn't include include BIOS, skip file downloads for GRUB/Syslinux
 | ||||||
|  | @ -1559,7 +1570,7 @@ static BOOL BootCheck(void) | ||||||
| 				r = MessageBoxExU(hMainDialog, lmprintf(MSG_116, img_report.grub2_version, GRUB2_PACKAGE_VERSION), | 				r = MessageBoxExU(hMainDialog, lmprintf(MSG_116, img_report.grub2_version, GRUB2_PACKAGE_VERSION), | ||||||
| 					lmprintf(MSG_115), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | 					lmprintf(MSG_115), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | ||||||
| 				if (r == IDCANCEL) | 				if (r == IDCANCEL) | ||||||
| 					return FALSE; | 					goto out; | ||||||
| 				else if (r == IDYES) { | 				else if (r == IDYES) { | ||||||
| 					static_sprintf(tmp, "%s-%s", grub, img_report.grub2_version); | 					static_sprintf(tmp, "%s-%s", grub, img_report.grub2_version); | ||||||
| 					IGNORE_RETVAL(_mkdir(tmp)); | 					IGNORE_RETVAL(_mkdir(tmp)); | ||||||
|  | @ -1622,7 +1633,7 @@ static BOOL BootCheck(void) | ||||||
| 								len = DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE); | 								len = DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE); | ||||||
| 								if (len == 0) { | 								if (len == 0) { | ||||||
| 									uprintf("Could not download file - cancelling"); | 									uprintf("Could not download file - cancelling"); | ||||||
| 									return FALSE; | 									goto out; | ||||||
| 								} | 								} | ||||||
| 								use_own_c32[i] = TRUE; | 								use_own_c32[i] = TRUE; | ||||||
| 							} | 							} | ||||||
|  | @ -1655,7 +1666,7 @@ static BOOL BootCheck(void) | ||||||
| 						embedded_sl_version_str[1], embedded_sl_version_ext[1]), | 						embedded_sl_version_str[1], embedded_sl_version_ext[1]), | ||||||
| 						lmprintf(MSG_115), MB_YESNO|MB_ICONWARNING|MB_IS_RTL, selected_langid); | 						lmprintf(MSG_115), MB_YESNO|MB_ICONWARNING|MB_IS_RTL, selected_langid); | ||||||
| 					if (r != IDYES) | 					if (r != IDYES) | ||||||
| 						return FALSE; | 						goto out; | ||||||
| 					for (i=0; i<2; i++) { | 					for (i=0; i<2; i++) { | ||||||
| 						static_sprintf(tmp, "%s-%s", syslinux, img_report.sl_version_str); | 						static_sprintf(tmp, "%s-%s", syslinux, img_report.sl_version_str); | ||||||
| 						IGNORE_RETVAL(_mkdir(tmp)); | 						IGNORE_RETVAL(_mkdir(tmp)); | ||||||
|  | @ -1689,7 +1700,7 @@ static BOOL BootCheck(void) | ||||||
| 								uprintf("Could not download the file - will try to use embedded %s version instead", img_report.sl_version_str); | 								uprintf("Could not download the file - will try to use embedded %s version instead", img_report.sl_version_str); | ||||||
| 							} else { | 							} else { | ||||||
| 								uprintf("Could not download the file - cancelling"); | 								uprintf("Could not download the file - cancelling"); | ||||||
| 								return FALSE; | 								goto out; | ||||||
| 							} | 							} | ||||||
| 						} | 						} | ||||||
| 					} | 					} | ||||||
|  | @ -1712,20 +1723,20 @@ static BOOL BootCheck(void) | ||||||
| 			r = MessageBoxExU(hMainDialog, lmprintf(MSG_104, "Syslinux v5.0", tmp, "Syslinux v5+", tmp), | 			r = MessageBoxExU(hMainDialog, lmprintf(MSG_104, "Syslinux v5.0", tmp, "Syslinux v5+", tmp), | ||||||
| 				lmprintf(MSG_103, tmp), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | 				lmprintf(MSG_103, tmp), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | ||||||
| 			if (r == IDCANCEL) | 			if (r == IDCANCEL) | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			if (r == IDYES) { | 			if (r == IDYES) { | ||||||
| 				static_sprintf(tmp, "%s-%s", syslinux, embedded_sl_version_str[1]); | 				static_sprintf(tmp, "%s-%s", syslinux, embedded_sl_version_str[1]); | ||||||
| 				IGNORE_RETVAL(_mkdir(tmp)); | 				IGNORE_RETVAL(_mkdir(tmp)); | ||||||
| 				static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, embedded_sl_version_str[1], ldlinux, ldlinux_ext[2]); | 				static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, embedded_sl_version_str[1], ldlinux, ldlinux_ext[2]); | ||||||
| 				if (DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE) == 0) | 				if (DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE) == 0) | ||||||
| 					return FALSE; | 					goto out; | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} else if (bt == BT_MSDOS) { | 	} else if (bt == BT_MSDOS) { | ||||||
| 		if ((size_check) && (ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)) >= 65536)) { | 		if ((size_check) && (ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)) >= 65536)) { | ||||||
| 			// MS-DOS cannot boot from a drive using a 64 kilobytes Cluster size
 | 			// MS-DOS cannot boot from a drive using a 64 kilobytes Cluster size
 | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_110), lmprintf(MSG_111), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_110), lmprintf(MSG_111), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} | 		} | ||||||
| 	} else if (bt == BT_GRUB4DOS) { | 	} else if (bt == BT_GRUB4DOS) { | ||||||
| 		IGNORE_RETVAL(_chdirU(app_dir)); | 		IGNORE_RETVAL(_chdirU(app_dir)); | ||||||
|  | @ -1742,13 +1753,13 @@ static BOOL BootCheck(void) | ||||||
| 			r = MessageBoxExU(hMainDialog, lmprintf(MSG_104, "Grub4DOS 0.4", tmp, "Grub4DOS", tmp), | 			r = MessageBoxExU(hMainDialog, lmprintf(MSG_104, "Grub4DOS 0.4", tmp, "Grub4DOS", tmp), | ||||||
| 				lmprintf(MSG_103, tmp), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | 				lmprintf(MSG_103, tmp), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid); | ||||||
| 			if (r == IDCANCEL) | 			if (r == IDCANCEL) | ||||||
| 				return FALSE; | 				goto out; | ||||||
| 			if (r == IDYES) { | 			if (r == IDYES) { | ||||||
| 				static_sprintf(tmp, "grub4dos-%s", GRUB4DOS_VERSION); | 				static_sprintf(tmp, "grub4dos-%s", GRUB4DOS_VERSION); | ||||||
| 				IGNORE_RETVAL(_mkdir(tmp)); | 				IGNORE_RETVAL(_mkdir(tmp)); | ||||||
| 				static_sprintf(tmp, "%s/grub4dos-%s/grldr", FILES_URL, GRUB4DOS_VERSION); | 				static_sprintf(tmp, "%s/grub4dos-%s/grldr", FILES_URL, GRUB4DOS_VERSION); | ||||||
| 				if (DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE) == 0) | 				if (DownloadSignedFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog, TRUE) == 0) | ||||||
| 					return FALSE; | 					goto out; | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  | @ -1758,10 +1769,14 @@ uefi_target: | ||||||
| 		fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); | 		fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); | ||||||
| 		if (fs != FS_NTFS) { | 		if (fs != FS_NTFS) { | ||||||
| 			MessageBoxExU(hMainDialog, lmprintf(MSG_097, "UEFI:NTFS"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_097, "UEFI:NTFS"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); | ||||||
| 			return FALSE; | 			goto out; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 	return TRUE; | 	ret = 0; | ||||||
|  | 
 | ||||||
|  | out: | ||||||
|  | 	PostMessage(hMainDialog, UM_FORMAT_START, ret, 0); | ||||||
|  | 	return (DWORD)ret; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| static __inline const char* IsAlphaOrBeta(void) | static __inline const char* IsAlphaOrBeta(void) | ||||||
|  | @ -3254,86 +3269,13 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA | ||||||
| 			SetTaskbarProgressValue(0, MAX_PROGRESS); | 			SetTaskbarProgressValue(0, MAX_PROGRESS); | ||||||
| 			SendMessage(hProgress, PBM_SETPOS, 0, 0); | 			SendMessage(hProgress, PBM_SETPOS, 0, 0); | ||||||
| 			selection_default = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)); | 			selection_default = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)); | ||||||
| 			nDeviceIndex = ComboBox_GetCurSel(hDeviceList); | 			// Create a thread to validate options and download files as needed (so that we can update the UI).
 | ||||||
| 			if (nDeviceIndex != CB_ERR) { | 			// On exit, this thread sends message UM_FORMAT_START back to this dialog.
 | ||||||
| 				if (!zero_drive) { | 			if (CreateThread(NULL, 0, BootCheckThread, NULL, 0, NULL) == NULL) { | ||||||
| 					if ((bt != BT_NON_BOOTABLE) && (!BootCheck())) | 				uprintf("Unable to start boot check thread"); | ||||||
| 						goto aborted_start; | 				FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_CANT_START_THREAD); | ||||||
| 
 | 				PostMessage(hMainDialog, UM_FORMAT_COMPLETED, (WPARAM)FALSE, 0); | ||||||
| 					// Display a warning about UDF formatting times
 |  | ||||||
| 					if (fs == FS_UDF) { |  | ||||||
| 						dur_secs = (uint32_t)(((double)SelectedDrive.DiskSize) / 1073741824.0f / UDF_FORMAT_SPEED); |  | ||||||
| 						if (dur_secs > UDF_FORMAT_WARN) { |  | ||||||
| 							dur_mins = dur_secs / 60; |  | ||||||
| 							dur_secs -= dur_mins * 60; |  | ||||||
| 							MessageBoxExU(hMainDialog, lmprintf(MSG_112, dur_mins, dur_secs), lmprintf(MSG_113), |  | ||||||
| 								MB_OK | MB_ICONASTERISK | MB_IS_RTL, selected_langid); |  | ||||||
| 						} else { |  | ||||||
| 							dur_secs = 0; |  | ||||||
| 							dur_mins = 0; |  | ||||||
| 						} |  | ||||||
| 					} |  | ||||||
| 
 |  | ||||||
| 					if ((bt == BT_IMAGE) && IS_DD_BOOTABLE(img_report)) { |  | ||||||
| 						if (img_report.is_iso) { |  | ||||||
| 							// Ask users how they want to write ISOHybrid images
 |  | ||||||
| 							char* iso_image = lmprintf(MSG_036); |  | ||||||
| 							char* dd_image = lmprintf(MSG_095); |  | ||||||
| 							char* choices[2] = { lmprintf(MSG_276, iso_image), lmprintf(MSG_277, dd_image) }; |  | ||||||
| 							i = SelectionDialog(lmprintf(MSG_274), lmprintf(MSG_275, iso_image, dd_image, iso_image, dd_image), |  | ||||||
| 								choices, 2); |  | ||||||
| 							if (i < 0)	// Cancel
 |  | ||||||
| 								goto aborted_start; |  | ||||||
| 							else if (i == 2) |  | ||||||
| 								write_as_image = TRUE; |  | ||||||
| 						} else { |  | ||||||
| 							write_as_image = TRUE; |  | ||||||
| 						} |  | ||||||
| 					} |  | ||||||
| 				} |  | ||||||
| 
 |  | ||||||
| 				if (!CheckDriveAccess(2000)) |  | ||||||
| 					goto aborted_start; |  | ||||||
| 
 |  | ||||||
| 				GetWindowTextU(hDeviceList, tmp, ARRAYSIZE(tmp)); |  | ||||||
| 				if (MessageBoxExU(hMainDialog, lmprintf(MSG_003, tmp), |  | ||||||
| 					APPLICATION_NAME, MB_OKCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid) == IDCANCEL)  |  | ||||||
| 					goto aborted_start; |  | ||||||
| 				if ((SelectedDrive.nPartitions > 1) && (MessageBoxExU(hMainDialog, lmprintf(MSG_093), |  | ||||||
| 					lmprintf(MSG_094), MB_OKCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid) == IDCANCEL)) |  | ||||||
| 					goto aborted_start; |  | ||||||
| 				if ((!zero_drive) && (bt != BT_NON_BOOTABLE) && (SelectedDrive.SectorSize != 512) && |  | ||||||
| 					(MessageBoxExU(hMainDialog, lmprintf(MSG_196, SelectedDrive.SectorSize), |  | ||||||
| 						lmprintf(MSG_197), MB_OKCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid) == IDCANCEL)) |  | ||||||
| 					goto aborted_start; |  | ||||||
| 
 |  | ||||||
| 				DeviceNum = (DWORD)ComboBox_GetItemData(hDeviceList, nDeviceIndex); |  | ||||||
| 				InitProgress(zero_drive || write_as_image); |  | ||||||
| 				format_thid = CreateThread(NULL, 0, FormatThread, (LPVOID)(uintptr_t)DeviceNum, 0, NULL); |  | ||||||
| 				if (format_thid == NULL) { |  | ||||||
| 					uprintf("Unable to start formatting thread"); |  | ||||||
| 					FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_START_THREAD); |  | ||||||
| 					PostMessage(hMainDialog, UM_FORMAT_COMPLETED, (WPARAM)FALSE, 0); |  | ||||||
| 				} else { |  | ||||||
| 					uprintf("\r\nFormat operation started"); |  | ||||||
| 					PrintInfo(0, -1); |  | ||||||
| 					timer = 0; |  | ||||||
| 					static_sprintf(szTimer, "00:00:00"); |  | ||||||
| 					SendMessageA(hStatus, SB_SETTEXTA, SBT_OWNERDRAW | SB_SECTION_RIGHT, (LPARAM)szTimer); |  | ||||||
| 					SetTimer(hMainDialog, TID_APP_TIMER, 1000, ClockTimer); |  | ||||||
| 					// Set focus to the Cancel button
 |  | ||||||
| 					SendMessage(hMainDialog, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(hMainDialog, IDCANCEL), TRUE); |  | ||||||
| 				} |  | ||||||
| 			} | 			} | ||||||
| 			if (format_thid != NULL) |  | ||||||
| 				break; |  | ||||||
| 		aborted_start: |  | ||||||
| 			format_op_in_progress = FALSE; |  | ||||||
| 			EnableControls(TRUE); |  | ||||||
| 			zero_drive = FALSE; |  | ||||||
| 			if (queued_hotplug_event) |  | ||||||
| 				SendMessage(hDlg, UM_MEDIA_CHANGE, 0, 0); |  | ||||||
| 			EnableWindow(GetDlgItem(hDlg, IDCANCEL), TRUE); |  | ||||||
| 			break; | 			break; | ||||||
| 		case IDC_LANG: | 		case IDC_LANG: | ||||||
| 			// Show the language menu such that it doesn't overlap the button
 | 			// Show the language menu such that it doesn't overlap the button
 | ||||||
|  | @ -3610,6 +3552,87 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA | ||||||
| 		SendMessage(hUpdatesDlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(hUpdatesDlg, IDC_CHECK_NOW), TRUE); | 		SendMessage(hUpdatesDlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(hUpdatesDlg, IDC_CHECK_NOW), TRUE); | ||||||
| 		break; | 		break; | ||||||
| 
 | 
 | ||||||
|  | 	case UM_FORMAT_START: | ||||||
|  | 		if (wParam != 0) | ||||||
|  | 			goto aborted_start; | ||||||
|  | 
 | ||||||
|  | 		if (!zero_drive) { | ||||||
|  | 			// Display a warning about UDF formatting times
 | ||||||
|  | 			if (fs == FS_UDF) { | ||||||
|  | 				dur_secs = (uint32_t)(((double)SelectedDrive.DiskSize) / 1073741824.0f / UDF_FORMAT_SPEED); | ||||||
|  | 				if (dur_secs > UDF_FORMAT_WARN) { | ||||||
|  | 					dur_mins = dur_secs / 60; | ||||||
|  | 					dur_secs -= dur_mins * 60; | ||||||
|  | 					MessageBoxExU(hMainDialog, lmprintf(MSG_112, dur_mins, dur_secs), lmprintf(MSG_113), | ||||||
|  | 						MB_OK | MB_ICONASTERISK | MB_IS_RTL, selected_langid); | ||||||
|  | 				} else { | ||||||
|  | 					dur_secs = 0; | ||||||
|  | 					dur_mins = 0; | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			if ((bt == BT_IMAGE) && IS_DD_BOOTABLE(img_report)) { | ||||||
|  | 				if (img_report.is_iso) { | ||||||
|  | 					// Ask users how they want to write ISOHybrid images
 | ||||||
|  | 					char* iso_image = lmprintf(MSG_036); | ||||||
|  | 					char* dd_image = lmprintf(MSG_095); | ||||||
|  | 					char* choices[2] = { lmprintf(MSG_276, iso_image), lmprintf(MSG_277, dd_image) }; | ||||||
|  | 					i = SelectionDialog(lmprintf(MSG_274), lmprintf(MSG_275, iso_image, dd_image, iso_image, dd_image), | ||||||
|  | 						choices, 2); | ||||||
|  | 					if (i < 0)	// Cancel
 | ||||||
|  | 						goto aborted_start; | ||||||
|  | 					else if (i == 2) | ||||||
|  | 						write_as_image = TRUE; | ||||||
|  | 				} else { | ||||||
|  | 					write_as_image = TRUE; | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		if (!CheckDriveAccess(2000)) | ||||||
|  | 			goto aborted_start; | ||||||
|  | 
 | ||||||
|  | 		GetWindowTextU(hDeviceList, tmp, ARRAYSIZE(tmp)); | ||||||
|  | 		if (MessageBoxExU(hMainDialog, lmprintf(MSG_003, tmp), | ||||||
|  | 			APPLICATION_NAME, MB_OKCANCEL | MB_ICONWARNING | MB_IS_RTL, selected_langid) == IDCANCEL) | ||||||
|  | 			goto aborted_start; | ||||||
|  | 		if ((SelectedDrive.nPartitions > 1) && (MessageBoxExU(hMainDialog, lmprintf(MSG_093), | ||||||
|  | 			lmprintf(MSG_094), MB_OKCANCEL | MB_ICONWARNING | MB_IS_RTL, selected_langid) == IDCANCEL)) | ||||||
|  | 			goto aborted_start; | ||||||
|  | 		if ((!zero_drive) && (bt != BT_NON_BOOTABLE) && (SelectedDrive.SectorSize != 512) && | ||||||
|  | 			(MessageBoxExU(hMainDialog, lmprintf(MSG_196, SelectedDrive.SectorSize), | ||||||
|  | 				lmprintf(MSG_197), MB_OKCANCEL | MB_ICONWARNING | MB_IS_RTL, selected_langid) == IDCANCEL)) | ||||||
|  | 			goto aborted_start; | ||||||
|  | 
 | ||||||
|  | 		nDeviceIndex = ComboBox_GetCurSel(hDeviceList); | ||||||
|  | 		DeviceNum = (DWORD)ComboBox_GetItemData(hDeviceList, nDeviceIndex); | ||||||
|  | 		InitProgress(zero_drive || write_as_image); | ||||||
|  | 		format_thid = CreateThread(NULL, 0, FormatThread, (LPVOID)(uintptr_t)DeviceNum, 0, NULL); | ||||||
|  | 		if (format_thid == NULL) { | ||||||
|  | 			uprintf("Unable to start formatting thread"); | ||||||
|  | 			FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_CANT_START_THREAD); | ||||||
|  | 			PostMessage(hMainDialog, UM_FORMAT_COMPLETED, (WPARAM)FALSE, 0); | ||||||
|  | 		} else { | ||||||
|  | 			uprintf("\r\nFormat operation started"); | ||||||
|  | 			PrintInfo(0, -1); | ||||||
|  | 			timer = 0; | ||||||
|  | 			static_sprintf(szTimer, "00:00:00"); | ||||||
|  | 			SendMessageA(hStatus, SB_SETTEXTA, SBT_OWNERDRAW | SB_SECTION_RIGHT, (LPARAM)szTimer); | ||||||
|  | 			SetTimer(hMainDialog, TID_APP_TIMER, 1000, ClockTimer); | ||||||
|  | 			// Set focus to the Cancel button
 | ||||||
|  | 			SendMessage(hMainDialog, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(hMainDialog, IDCANCEL), TRUE); | ||||||
|  | 		} | ||||||
|  | 		if (format_thid != NULL) | ||||||
|  | 			break; | ||||||
|  | 	aborted_start: | ||||||
|  | 		format_op_in_progress = FALSE; | ||||||
|  | 		EnableControls(TRUE); | ||||||
|  | 		zero_drive = FALSE; | ||||||
|  | 		if (queued_hotplug_event) | ||||||
|  | 			SendMessage(hDlg, UM_MEDIA_CHANGE, 0, 0); | ||||||
|  | 		EnableWindow(GetDlgItem(hDlg, IDCANCEL), TRUE); | ||||||
|  | 		break; | ||||||
|  | 
 | ||||||
| 	case UM_FORMAT_COMPLETED: | 	case UM_FORMAT_COMPLETED: | ||||||
| 		format_thid = NULL; | 		format_thid = NULL; | ||||||
| 		// Stop the timer
 | 		// Stop the timer
 | ||||||
|  |  | ||||||
|  | @ -163,6 +163,7 @@ enum user_message_type { | ||||||
| 	UM_NO_UPDATE, | 	UM_NO_UPDATE, | ||||||
| 	UM_UPDATE_CSM_TOOLTIP, | 	UM_UPDATE_CSM_TOOLTIP, | ||||||
| 	UM_RESIZE_BUTTONS, | 	UM_RESIZE_BUTTONS, | ||||||
|  | 	UM_FORMAT_START, | ||||||
| 	// Start of the WM IDs for the language menu items
 | 	// Start of the WM IDs for the language menu items
 | ||||||
| 	UM_LANGUAGE_MENU = WM_APP + 0x100 | 	UM_LANGUAGE_MENU = WM_APP + 0x100 | ||||||
| }; | }; | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | ||||||
| IDD_DIALOG DIALOGEX 12, 12, 232, 326 | IDD_DIALOG DIALOGEX 12, 12, 232, 326 | ||||||
| STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | ||||||
| EXSTYLE WS_EX_ACCEPTFILES | EXSTYLE WS_EX_ACCEPTFILES | ||||||
| CAPTION "Rufus 3.2.1326" | CAPTION "Rufus 3.2.1327" | ||||||
| FONT 9, "Segoe UI Symbol", 400, 0, 0x0 | FONT 9, "Segoe UI Symbol", 400, 0, 0x0 | ||||||
| BEGIN | BEGIN | ||||||
|     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP |     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP | ||||||
|  | @ -389,8 +389,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 3,2,1326,0 |  FILEVERSION 3,2,1327,0 | ||||||
|  PRODUCTVERSION 3,2,1326,0 |  PRODUCTVERSION 3,2,1327,0 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -407,13 +407,13 @@ BEGIN | ||||||
|         BEGIN |         BEGIN | ||||||
|             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" |             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" | ||||||
|             VALUE "FileDescription", "Rufus" |             VALUE "FileDescription", "Rufus" | ||||||
|             VALUE "FileVersion", "3.2.1326" |             VALUE "FileVersion", "3.2.1327" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" | ||||||
|             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" |             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" | ||||||
|             VALUE "OriginalFilename", "rufus.exe" |             VALUE "OriginalFilename", "rufus.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "3.2.1326" |             VALUE "ProductVersion", "3.2.1327" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue