mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[ui] fix application exit when cancelling the ISO scan
This commit is contained in:
parent
c12640b547
commit
5602494690
2 changed files with 21 additions and 16 deletions
27
src/rufus.c
27
src/rufus.c
|
@ -1345,14 +1345,13 @@ static void UpdateImage(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (image_path != NULL) {
|
ComboBox_DeleteString(hBootType, index);
|
||||||
ComboBox_DeleteString(hBootType, index);
|
ComboBox_InsertStringU(hBootType, index,
|
||||||
ComboBox_InsertStringU(hBootType, index, short_image_path);
|
(image_path == NULL) ? lmprintf(MSG_281, lmprintf(MSG_280)) : short_image_path);
|
||||||
ComboBox_SetItemData(hBootType, index, BT_IMAGE);
|
ComboBox_SetItemData(hBootType, index, BT_IMAGE);
|
||||||
IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, index));
|
IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, index));
|
||||||
bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
|
bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
|
||||||
SetBootTypeDropdownWidth();
|
SetBootTypeDropdownWidth();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The scanning process can be blocking for message processing => use a thread
|
// The scanning process can be blocking for message processing => use a thread
|
||||||
|
@ -1362,6 +1361,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
|
||||||
|
|
||||||
if (image_path == NULL)
|
if (image_path == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
format_op_in_progress = TRUE;
|
||||||
PrintInfoDebug(0, MSG_202);
|
PrintInfoDebug(0, MSG_202);
|
||||||
user_notified = FALSE;
|
user_notified = FALSE;
|
||||||
EnableControls(FALSE);
|
EnableControls(FALSE);
|
||||||
|
@ -1369,15 +1369,16 @@ DWORD WINAPI ISOScanThread(LPVOID param)
|
||||||
img_report.is_iso = (BOOLEAN)ExtractISO(image_path, "", TRUE);
|
img_report.is_iso = (BOOLEAN)ExtractISO(image_path, "", TRUE);
|
||||||
img_report.is_bootable_img = (BOOLEAN)IsBootableImage(image_path);
|
img_report.is_bootable_img = (BOOLEAN)IsBootableImage(image_path);
|
||||||
|
|
||||||
if ((img_report.image_size == 0) || (!img_report.is_iso && !img_report.is_bootable_img)) {
|
if (IS_ERROR(FormatStatus) || (img_report.image_size == 0) || (!img_report.is_iso && !img_report.is_bootable_img)) {
|
||||||
// Failed to scan image
|
// Failed to scan image
|
||||||
SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0);
|
SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0);
|
||||||
safe_free(image_path);
|
safe_free(image_path);
|
||||||
EnableControls(TRUE);
|
UpdateImage();
|
||||||
SetMBRProps();
|
SetMBRProps();
|
||||||
PopulateProperties();
|
PopulateProperties();
|
||||||
PrintInfoDebug(0, MSG_203);
|
PrintInfoDebug(0, MSG_203);
|
||||||
PrintStatus(0, MSG_203);
|
PrintStatus(0, MSG_203);
|
||||||
|
EnableControls(TRUE);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1439,10 +1440,12 @@ DWORD WINAPI ISOScanThread(LPVOID param)
|
||||||
|
|
||||||
out:
|
out:
|
||||||
dont_display_image_name = FALSE;
|
dont_display_image_name = FALSE;
|
||||||
|
format_op_in_progress = FALSE;
|
||||||
PrintInfo(0, MSG_210);
|
PrintInfo(0, MSG_210);
|
||||||
ExitThread(0);
|
ExitThread(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Likewise, boot check will block message processing => use a thread
|
||||||
static DWORD WINAPI BootCheckThread(LPVOID param)
|
static DWORD WINAPI BootCheckThread(LPVOID param)
|
||||||
{
|
{
|
||||||
int i, r;
|
int i, r;
|
||||||
|
@ -1776,7 +1779,7 @@ uefi_target:
|
||||||
|
|
||||||
out:
|
out:
|
||||||
PostMessage(hMainDialog, UM_FORMAT_START, ret, 0);
|
PostMessage(hMainDialog, UM_FORMAT_START, ret, 0);
|
||||||
return (DWORD)ret;
|
ExitThread((DWORD)ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline const char* IsAlphaOrBeta(void)
|
static __inline const char* IsAlphaOrBeta(void)
|
||||||
|
@ -3035,6 +3038,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
|
||||||
// User might be trying to cancel during preliminary checks
|
// User might be trying to cancel during preliminary checks
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_CANCELLED;
|
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_CANCELLED;
|
||||||
PrintInfo(0, MSG_201);
|
PrintInfo(0, MSG_201);
|
||||||
|
EnableWindow(GetDlgItem(hDlg, IDCANCEL), TRUE);
|
||||||
return (INT_PTR)TRUE;
|
return (INT_PTR)TRUE;
|
||||||
}
|
}
|
||||||
if (ulRegister != 0)
|
if (ulRegister != 0)
|
||||||
|
@ -3232,6 +3236,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FormatStatus = 0;
|
FormatStatus = 0;
|
||||||
|
format_op_in_progress = FALSE;
|
||||||
if (CreateThread(NULL, 0, ISOScanThread, NULL, 0, NULL) == NULL) {
|
if (CreateThread(NULL, 0, ISOScanThread, NULL, 0, NULL) == NULL) {
|
||||||
uprintf("Unable to start ISO scanning thread");
|
uprintf("Unable to start ISO scanning thread");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_START_THREAD);
|
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_START_THREAD);
|
||||||
|
|
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.1327"
|
CAPTION "Rufus 3.2.1328"
|
||||||
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,1327,0
|
FILEVERSION 3,2,1328,0
|
||||||
PRODUCTVERSION 3,2,1327,0
|
PRODUCTVERSION 3,2,1328,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.1327"
|
VALUE "FileVersion", "3.2.1328"
|
||||||
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.1327"
|
VALUE "ProductVersion", "3.2.1328"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Reference in a new issue