nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[core] don't analyse boot records of deleted partition

Browse source 
* 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:
Pete Batard 2018-11-28 11:12:54 +00:00
parent c0526b3e8b
commit 4cd308a1c0
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dev.c
View file

@ -320,12 +320,6 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
*/ */
BOOL GetDevices(DWORD devnum) 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! // List of USB storage drivers we know - list may be incomplete!
const char* usbstor_name[] = { const char* usbstor_name[] = {
// Standard MS USB storage driver // Standard MS USB storage driver

5
src/format.c
View file

@ -1831,9 +1831,6 @@ DWORD WINAPI FormatThread(void* param)
if (!zero_drive && !write_as_image) { if (!zero_drive && !write_as_image) {
PrintInfoDebug(0, MSG_226); PrintInfoDebug(0, MSG_226);
AnalyzeMBR(hPhysicalDrive, "Drive", FALSE); AnalyzeMBR(hPhysicalDrive, "Drive", FALSE);
if ((hLogicalVolume != NULL) && (hLogicalVolume != INVALID_HANDLE_VALUE)) {
AnalyzePBR(hLogicalVolume);
}
UpdateProgress(OP_ANALYZE_MBR, -1.0f); UpdateProgress(OP_ANALYZE_MBR, -1.0f);
} }
@ -1842,7 +1839,7 @@ DWORD WINAPI FormatThread(void* param)
goto out; 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 // 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 // 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. // or formatting under Windows. See https://github.com/pbatard/rufus/issues/759 for details.

10
src/rufus.rc
View file

@ -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.4.1428" CAPTION "Rufus 3.4.1429"
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
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,4,1428,0 FILEVERSION 3,4,1429,0
PRODUCTVERSION 3,4,1428,0 PRODUCTVERSION 3,4,1429,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.4.1428" VALUE "FileVersion", "3.4.1429"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "OriginalFilename", "rufus-3.4.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.4.1428" VALUE "ProductVersion", "3.4.1429"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"