mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Determine floppy drive type

Browse source
This commit is contained in:
Alexander Koblov 2021-02-17 20:08:54 +00:00
commit e4c32a47a7
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/platform/udrivewatcher.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
Enumerating and monitoring drives in the system.
Copyright (C) 2006-2020 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2006-2021 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2010 Przemyslaw Nagay (cobines@gmail.com)
This program is free software; you can redistribute it and/or modify
@ -61,7 +61,7 @@ uses
{$ENDIF}
{$IFDEF MSWINDOWS}
uMyWindows, Windows, JwaDbt, LazUTF8, JwaWinNetWk, ShlObj, DCOSUtils, uDebug,
uShlObjAdditional
uShlObjAdditional, JwaNative
{$ENDIF}
;
@ -566,7 +566,8 @@ begin
case WinDriveType of
DRIVE_REMOVABLE:
begin
if DriveLetter in ['a', 'b'] then
WinDriveType:= mbGetDriveType(DriveLetter);
if (WinDriveType and FILE_FLOPPY_DISKETTE <> 0) then
DriveType := dtFloppy
else begin
DriveType := dtFlash;

34
src/platform/win/umywindows.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
This unit contains specific WINDOWS functions.
Copyright (C) 2006-2020 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2006-2021 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -83,6 +83,7 @@ procedure mbWaitLabelChange(const sDrv: String; const sCurLabel: String);
@param(sDrv String specifying the root directory of a drive)
}
procedure mbCloseCD(const sDrv: String);
function mbGetDriveType(Drive: AnsiChar): UInt32;
function mbDriveBusType(Drive: AnsiChar): UInt32;
{en
Get physical drive serial number
@ -452,6 +453,11 @@ const
IOCTL_STORAGE_QUERY_PROPERTY = $2D1400;
type
FILE_FS_DEVICE_INFORMATION = record
DeviceType: ULONG;
Characteristics: ULONG;
end;
STORAGE_PROPERTY_QUERY = record
PropertyId: DWORD;
QueryType: DWORD;
@ -474,6 +480,30 @@ type
RawDeviceProperties: array[0..0] of Byte;
end;
function mbGetDriveType(Drive: AnsiChar): UInt32;
var
Handle: THandle;
IoStatusBlock: IO_STATUS_BLOCK;
VolumePath: UnicodeString = '\\.\X:';
FileFsDeviceInfo: FILE_FS_DEVICE_INFORMATION;
begin
Result:= 0;
VolumePath[5] := WideChar(Drive);
Handle:= CreateFileW(PWideChar(VolumePath), 0,
FILE_SHARE_READ or FILE_SHARE_WRITE, nil, OPEN_EXISTING, 0, 0);
if Handle <> INVALID_HANDLE_VALUE then
begin
if (NtQueryVolumeInformationFile(Handle, @IoStatusBlock,
@FileFsDeviceInfo, SizeOf(FileFsDeviceInfo),
FileFsDeviceInformation) = STATUS_SUCCESS) then
begin
Result:= FileFsDeviceInfo.Characteristics;
end;
CloseHandle(Handle);
end;
end;
function mbDriveBusType(Drive: AnsiChar): UInt32;
var
Dummy: DWORD;
@ -521,7 +551,7 @@ begin
if Handle <> INVALID_HANDLE_VALUE then
begin
ZeroMemory(@ABuffer[0], SizeOf(ABuffer));
ZeroMemory(@ABuffer[0], SizeOf(ABuffer));
ZeroMemory(@Query, SizeOf(STORAGE_PROPERTY_QUERY));
if DeviceIoControl(Handle, IOCTL_STORAGE_QUERY_PROPERTY,