JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: raw disk I/O: lock floppys as well 

The workaround to access the full disk required since Vista
and described in http://support.microsoft.com/kb/942448
(NOT ACCESSIBLE at the time of writing this commit message)
is required on floppy drives as well.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2020-04-24 16:22:26 +02:00
parent b834921895
commit 39a1c3c96f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/fhandler_floppy.cc
View File

@ -161,7 +161,8 @@ fhandler_dev_floppy::lock_partition (DWORD to_write)
If there's some file handle open on one of the affected partitions, If there's some file handle open on one of the affected partitions,
this fails, but that's how it works... this fails, but that's how it works...
The high partition major numbers don't have a partition 0. */ The high partition major numbers don't have a partition 0. */
if (get_major () >= DEV_SD_HIGHPART_START || get_minor () % 16 != 0) if (get_major () == DEV_FLOPPY_MAJOR
|| get_major () >= DEV_SD_HIGHPART_START || get_minor () % 16 != 0)
{ {
if (!DeviceIoControl (get_handle (), FSCTL_LOCK_VOLUME, if (!DeviceIoControl (get_handle (), FSCTL_LOCK_VOLUME,
NULL, 0, NULL, 0, &bytes_read, NULL)) NULL, 0, NULL, 0, &bytes_read, NULL))
@ -302,7 +303,6 @@ fhandler_dev_floppy::write_file (const void *buf, DWORD to_write,
See http://support.microsoft.com/kb/942448 for details. See http://support.microsoft.com/kb/942448 for details.
What we do here is to lock the affected partition(s) and retry. */ What we do here is to lock the affected partition(s) and retry. */
if (*err == ERROR_ACCESS_DENIED if (*err == ERROR_ACCESS_DENIED
&& get_major () != DEV_FLOPPY_MAJOR
&& get_major () != DEV_CDROM_MAJOR && get_major () != DEV_CDROM_MAJOR
&& (get_flags () & O_ACCMODE) != O_RDONLY && (get_flags () & O_ACCMODE) != O_RDONLY
&& lock_partition (to_write)) && lock_partition (to_write))