mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-21 18:35:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ui] display ToGo radio selection according to ISO content

Browse source 
* Also simplify EFI detection and reporting
This commit is contained in:
Pete Batard 2015-01-13 02:11:57 +00:00
parent bca23cc676
commit 3444a48fce
5 changed files with 58 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/format.c
View file

@ -1324,7 +1324,7 @@ DWORD WINAPI FormatThread(void* param)
pt = GETPARTTYPE((int)ComboBox_GetItemData(hPartitionScheme, ComboBox_GetCurSel(hPartitionScheme)));
bt = GETBIOSTYPE((int)ComboBox_GetItemData(hPartitionScheme, ComboBox_GetCurSel(hPartitionScheme)));
use_large_fat32 = (fs == FS_FAT32) && ((SelectedDrive.DiskSize > LARGE_FAT32_SIZE) || (force_large_fat32));
add_uefi_togo = (fs == FS_NTFS) && (dt == DT_ISO) && (IS_EFI(iso_report)) && (bt == BT_UEFI);
add_uefi_togo = (fs == FS_NTFS) && (dt == DT_ISO) && (iso_report.has_efi) && (bt == BT_UEFI);
PrintInfoDebug(0, MSG_225);
hPhysicalDrive = GetPhysicalHandle(DriveIndex, TRUE, TRUE);
@ -1629,7 +1629,7 @@ DWORD WINAPI FormatThread(void* param)
if (IsChecked(IDC_BOOT)) {
if (bt == BT_UEFI) {
// For once, no need to do anything - just check our sanity
if ( (dt != DT_ISO) || (!IS_EFI(iso_report)) || (fs > FS_NTFS) ) {
if ( (dt != DT_ISO) || (!iso_report.has_efi) || (fs > FS_NTFS) ) {
uprintf("Spock gone crazy error!\n");
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_INSTALL_FAILURE;
goto out;
@ -1706,7 +1706,7 @@ DWORD WINAPI FormatThread(void* param)
uprintf("Warning: loader installation failed - KolibriOS will not boot!\n");
}
}
if ((bt == BT_UEFI) && (!iso_report.has_efi) && (iso_report.has_win7_efi)) {
if ((bt == BT_UEFI) && (!iso_report.has_efi)) {
PrintInfoDebug(0, MSG_232);
wim_image[0] = drive_name[0];
efi_dst[0] = drive_name[0];