mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[core] don't analyse boot records of deleted partition
* Also revert a472e96e87
as this is creating
unwanted detection issues as per #1239. We'll try to devise a better way
to avoid intempestive refreshes later on.
This commit is contained in:
parent
c0526b3e8b
commit
4cd308a1c0
3 changed files with 6 additions and 15 deletions
|
@ -320,12 +320,6 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
|
|||
*/
|
||||
BOOL GetDevices(DWORD devnum)
|
||||
{
|
||||
// Make sure at least one second has elapsed since we last displayed devices
|
||||
static ULONGLONG LastRefresh = 0;
|
||||
if (GetTickCount64() < LastRefresh + 1000)
|
||||
return FALSE;
|
||||
LastRefresh = GetTickCount64();
|
||||
|
||||
// List of USB storage drivers we know - list may be incomplete!
|
||||
const char* usbstor_name[] = {
|
||||
// Standard MS USB storage driver
|
||||
|
|
|
@ -1831,9 +1831,6 @@ DWORD WINAPI FormatThread(void* param)
|
|||
if (!zero_drive && !write_as_image) {
|
||||
PrintInfoDebug(0, MSG_226);
|
||||
AnalyzeMBR(hPhysicalDrive, "Drive", FALSE);
|
||||
if ((hLogicalVolume != NULL) && (hLogicalVolume != INVALID_HANDLE_VALUE)) {
|
||||
AnalyzePBR(hLogicalVolume);
|
||||
}
|
||||
UpdateProgress(OP_ANALYZE_MBR, -1.0f);
|
||||
}
|
||||
|
||||
|
@ -1842,7 +1839,7 @@ DWORD WINAPI FormatThread(void* param)
|
|||
goto out;
|
||||
}
|
||||
|
||||
// Zap any existing partitions. This helps prevent access errors.
|
||||
// Zap partition records. This helps prevent access errors.
|
||||
// Note, Microsoft's way of cleaning partitions (IOCTL_DISK_CREATE_DISK, which is what we apply
|
||||
// in InitializeDisk) is *NOT ENOUGH* to reset a disk and can render it inoperable for partitioning
|
||||
// or formatting under Windows. See https://github.com/pbatard/rufus/issues/759 for details.
|
||||
|
|
10
src/rufus.rc
10
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 3.4.1428"
|
||||
CAPTION "Rufus 3.4.1429"
|
||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||
|
@ -394,8 +394,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,4,1428,0
|
||||
PRODUCTVERSION 3,4,1428,0
|
||||
FILEVERSION 3,4,1429,0
|
||||
PRODUCTVERSION 3,4,1429,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -413,13 +413,13 @@ BEGIN
|
|||
VALUE "Comments", "https://akeo.ie"
|
||||
VALUE "CompanyName", "Akeo Consulting"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "3.4.1428"
|
||||
VALUE "FileVersion", "3.4.1429"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus-3.4.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "3.4.1428"
|
||||
VALUE "ProductVersion", "3.4.1429"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
Loading…
Reference in a new issue