Author: cgutman Date: Wed Jun 15 17:07:07 2011 New Revision: 52247
URL: http://svn.reactos.org/svn/reactos?rev=52247&view=rev Log: [FLOPPY] - Validate the handle type - Fix a bug that broke file system remounting after a media change
Modified: trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/ioctl.c trunk/reactos/drivers/storage/floppy/readwrite.c
Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flop... ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -1189,7 +1189,7 @@ return STATUS_INSUFFICIENT_RESOURCES; }
- if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) + if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, PsThreadType, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "Unable to reference returned thread handle; failing init\n"); return STATUS_UNSUCCESSFUL;
Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioct... ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -126,7 +126,7 @@ * Therefore if we see one below in the switch, we can return STATUS_SUCCESS * immediately. */ - if(DriveInfo->DeviceObject->Flags & DO_VERIFY_VOLUME && !(DriveInfo->DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) + if(DriveInfo->DeviceObject->Flags & DO_VERIFY_VOLUME && !(Stack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { INFO_(FLOPPY, "DeviceIoctl(): completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED;
Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/read... ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -454,7 +454,7 @@ * Check to see if the volume needs to be verified. If so, * we can get out of here quickly. */ - if(DeviceObject->Flags & DO_VERIFY_VOLUME && !(DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) + if(DeviceObject->Flags & DO_VERIFY_VOLUME && !(Stack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { INFO_(FLOPPY, "ReadWritePassive(): DO_VERIFY_VOLUME set; Completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED;