Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MOUNTMGR] Rectify "NoAutoMount" usage (#7030)

Browse source 
This "NoAutoMount" member was not consistently used. Sometimes it was
used correctly, some other times it was used as "not NoAutoMount" i.e.
"AutoMount" enabled.
Fix this consistently throughout the source, and fix also some comments.
This commit is contained in:
Hermès Bélusca-Maïto 2024-06-11 20:53:58 +02:00
parent 2aad6b133f
commit 5f26356079
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 44 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/storage/mountmgr/database.c
View file

@ -1641,12 +1641,12 @@ ReconcileThisDatabaseWithMaster(IN PDEVICE_EXTENSION DeviceExtension,
WorkItem->DeviceInformation = DeviceInformation; WorkItem->DeviceInformation = DeviceInformation;
QueueWorkItem(DeviceExtension, WorkItem, &(WorkItem->DeviceExtension)); QueueWorkItem(DeviceExtension, WorkItem, &(WorkItem->DeviceExtension));
/* If there's no automount, and automatic letters /* If the worker thread isn't started yet, automatic drive letter is
* all volumes to find those online and notify there presence * enabled but automount disabled, manually set mounted volumes online.
*/ * Otherwise, they will be set online during database reconciliation. */
if (DeviceExtension->WorkerThreadStatus == 0 && if (DeviceExtension->WorkerThreadStatus == 0 &&
DeviceExtension->AutomaticDriveLetter == 1 && DeviceExtension->AutomaticDriveLetter &&
DeviceExtension->NoAutoMount == FALSE) DeviceExtension->NoAutoMount)
{ {
OnlineMountedVolumes(DeviceExtension, DeviceInformation); OnlineMountedVolumes(DeviceExtension, DeviceInformation);
} }

48
drivers/storage/mountmgr/device.c
View file

@ -94,7 +94,6 @@ MountmgrWriteNoAutoMount(IN PDEVICE_EXTENSION DeviceExtension)
REG_DWORD, REG_DWORD,
&Value, &Value,
sizeof(Value)); sizeof(Value));
} }
/* /*
@ -115,16 +114,17 @@ MountMgrSetAutoMount(IN PDEVICE_EXTENSION DeviceExtension,
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
/* Only change if there's a real difference */ /* Change the state only if there is a real difference
* with the user-provided NewState (normalized) */
SetState = (PMOUNTMGR_SET_AUTO_MOUNT)Irp->AssociatedIrp.SystemBuffer; SetState = (PMOUNTMGR_SET_AUTO_MOUNT)Irp->AssociatedIrp.SystemBuffer;
if (SetState->NewState == !DeviceExtension->NoAutoMount) if ((SetState->NewState != Enabled) == DeviceExtension->NoAutoMount)
{ {
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
/* Set new state; ! on purpose */ /* Set new state */
DeviceExtension->NoAutoMount = !SetState->NewState; DeviceExtension->NoAutoMount = (SetState->NewState != Enabled);
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
return MountmgrWriteNoAutoMount(DeviceExtension); return MountmgrWriteNoAutoMount(DeviceExtension);
} }
@ -480,7 +480,7 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension,
return STATUS_OBJECT_NAME_NOT_FOUND; return STATUS_OBJECT_NAME_NOT_FOUND;
} }
/* Now, mark we have assigned a letter (assumption) */ /* Now, assume we will assign a letter */
DeviceInformation->LetterAssigned = DeviceInformation->LetterAssigned =
DriveLetterInfo->DriveLetterWasAssigned = TRUE; DriveLetterInfo->DriveLetterWasAssigned = TRUE;
@ -501,39 +501,35 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension,
NextEntry = NextEntry->Flink; NextEntry = NextEntry->Flink;
} }
/* If we didn't find a drive letter online /* If we didn't find a drive letter online, ensure this is not
* ensure this is not a no drive entry * a no-drive entry by querying GPT attributes & database */
* by querying GPT attributes & database
*/
if (NextEntry == &(DeviceInformation->SymbolicLinksListHead)) if (NextEntry == &(DeviceInformation->SymbolicLinksListHead))
{ {
if (!GptDriveLetter || HasNoDriveLetterEntry(DeviceInformation->UniqueId)) if (!GptDriveLetter || HasNoDriveLetterEntry(DeviceInformation->UniqueId))
{ {
DriveLetterInfo->DriveLetterWasAssigned = FALSE; DriveLetterInfo->DriveLetterWasAssigned = FALSE;
DriveLetterInfo->CurrentDriveLetter = 0; DriveLetterInfo->CurrentDriveLetter = 0;
goto Release; goto Release;
} }
} }
/* No, ensure that the device is not automounted nor removable */ /* If automount is disabled, and the device is not removable
if (!DeviceExtension->NoAutoMount && !Removable) * but needs a drive letter, don't assign one and bail out */
if (DeviceExtension->NoAutoMount && !Removable)
{ {
if (DriveLetterInfo->DriveLetterWasAssigned) if (DriveLetterInfo->DriveLetterWasAssigned)
{ {
DriveLetterInfo->DriveLetterWasAssigned = FALSE; DriveLetterInfo->DriveLetterWasAssigned = FALSE;
DriveLetterInfo->CurrentDriveLetter = 0; DriveLetterInfo->CurrentDriveLetter = 0;
goto Release; goto Release;
} }
} }
/* Stop now if we don't need to assign the drive a letter */
if (!DriveLetterInfo->DriveLetterWasAssigned) if (!DriveLetterInfo->DriveLetterWasAssigned)
{
goto Release; goto Release;
}
/* Now everything is fine, start processing */ /* Now everything is fine, begin drive letter assignment */
if (RtlPrefixUnicodeString(&DeviceFloppy, &TargetDeviceName, TRUE)) if (RtlPrefixUnicodeString(&DeviceFloppy, &TargetDeviceName, TRUE))
{ {
@ -559,7 +555,6 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension,
{ {
DriveLetterInfo->DriveLetterWasAssigned = FALSE; DriveLetterInfo->DriveLetterWasAssigned = FALSE;
DriveLetterInfo->CurrentDriveLetter = 0; DriveLetterInfo->CurrentDriveLetter = 0;
goto Release; goto Release;
} }
@ -775,7 +770,7 @@ MountMgrAssignDriveLetters(IN PDEVICE_EXTENSION DeviceExtension)
&DriveLetterInformation); &DriveLetterInformation);
} }
/* If it was the system volume */ /* If it's the system volume */
if (NT_SUCCESS(Status) && RtlEqualUnicodeString(&SystemVolumeName, &(DeviceInformation->DeviceName), TRUE)) if (NT_SUCCESS(Status) && RtlEqualUnicodeString(&SystemVolumeName, &(DeviceInformation->DeviceName), TRUE))
{ {
/* Keep track of it */ /* Keep track of it */
@ -788,16 +783,19 @@ MountMgrAssignDriveLetters(IN PDEVICE_EXTENSION DeviceExtension)
DeviceInformation->UniqueId->UniqueIdLength + sizeof(MOUNTDEV_UNIQUE_ID)); DeviceInformation->UniqueId->UniqueIdLength + sizeof(MOUNTDEV_UNIQUE_ID));
} }
/* If it was not automount, ensure it gets mounted */ /* Ensure it gets mounted if automount is disabled */
if (!DeviceExtension->NoAutoMount) if (DeviceExtension->NoAutoMount)
{ {
DeviceExtension->NoAutoMount = TRUE; /* Temporarily re-enable automount for the
* worker to mount and set a drive letter */
DeviceExtension->NoAutoMount = FALSE;
MountMgrNextDriveLetterWorker(DeviceExtension, MountMgrNextDriveLetterWorker(DeviceExtension,
&(DeviceInformation->DeviceName), &(DeviceInformation->DeviceName),
&DriveLetterInformation); &DriveLetterInformation);
DeviceExtension->NoAutoMount = FALSE; /* And re-disable automount */
DeviceExtension->NoAutoMount = TRUE;
} }
} }
} }
@ -2700,12 +2698,12 @@ MountMgrDeviceControl(IN PDEVICE_OBJECT DeviceObject,
break; break;
case IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS: case IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS:
// NOTE: On Win7+, this is handled during driver re-initialization.
DeviceExtension->AutomaticDriveLetter = TRUE; DeviceExtension->AutomaticDriveLetter = TRUE;
Status = STATUS_SUCCESS;
MountMgrAssignDriveLetters(DeviceExtension); MountMgrAssignDriveLetters(DeviceExtension);
ReconcileAllDatabasesWithMaster(DeviceExtension); ReconcileAllDatabasesWithMaster(DeviceExtension);
WaitForOnlinesToComplete(DeviceExtension); WaitForOnlinesToComplete(DeviceExtension);
Status = STATUS_SUCCESS;
break; break;
case IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: case IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED:

8
drivers/storage/mountmgr/mntmgr.h
View file

@ -19,7 +19,7 @@ typedef struct _DEVICE_EXTENSION
PVOID NotificationEntry; PVOID NotificationEntry;
KSEMAPHORE DeviceLock; KSEMAPHORE DeviceLock;
KSEMAPHORE RemoteDatabaseLock; KSEMAPHORE RemoteDatabaseLock;
ULONG AutomaticDriveLetter; BOOLEAN AutomaticDriveLetter;
LIST_ENTRY IrpListHead; LIST_ENTRY IrpListHead;
ULONG EpicNumber; ULONG EpicNumber;
LIST_ENTRY SavedLinksListHead; LIST_ENTRY SavedLinksListHead;
@ -240,12 +240,6 @@ HasDriveLetter(
IN PDEVICE_INFORMATION DeviceInformation IN PDEVICE_INFORMATION DeviceInformation
); );
CODE_SEG("INIT")
BOOLEAN
MountmgrReadNoAutoMount(
IN PUNICODE_STRING RegistryPath
);
/* database.c */ /* database.c */
extern PWSTR DatabasePath; extern PWSTR DatabasePath;

33
drivers/storage/mountmgr/mountmgr.c
View file

@ -835,26 +835,27 @@ MountMgrUnload(IN PDRIVER_OBJECT DriverObject)
IoDeleteDevice(gdeviceObject); IoDeleteDevice(gdeviceObject);
} }
/* /**
* @implemented * @brief Retrieves the "NoAutoMount" setting.
*/ * @return TRUE if AutoMount is disabled; FALSE if AutoMount is enabled.
**/
CODE_SEG("INIT") CODE_SEG("INIT")
BOOLEAN BOOLEAN
MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) MountmgrReadNoAutoMount(
_In_ PUNICODE_STRING RegistryPath)
{ {
NTSTATUS Status; NTSTATUS Status;
ULONG Result, Default = 0; ULONG Result, Default = 0;
RTL_QUERY_REGISTRY_TABLE QueryTable[2]; RTL_QUERY_REGISTRY_TABLE QueryTable[2];
/* Retrieve data from registry */
RtlZeroMemory(QueryTable, sizeof(QueryTable)); RtlZeroMemory(QueryTable, sizeof(QueryTable));
/* Simply read data from register */
QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[0].Name = L"NoAutoMount"; QueryTable[0].Name = L"NoAutoMount";
QueryTable[0].EntryContext = &Result; QueryTable[0].EntryContext = &Result;
QueryTable[0].DefaultType = REG_NONE; QueryTable[0].DefaultType = REG_DWORD;
QueryTable[0].DefaultData = &Default; QueryTable[0].DefaultData = &Default;
QueryTable[0].DefaultLength = sizeof(ULONG); QueryTable[0].DefaultLength = sizeof(Default);
Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE,
RegistryPath->Buffer, RegistryPath->Buffer,
@ -862,9 +863,7 @@ MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath)
NULL, NULL,
NULL); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ Result = Default;
return (Default != 0);
}
return (Result != 0); return (Result != 0);
} }
@ -1258,7 +1257,7 @@ MountMgrMountedDeviceArrival(IN PDEVICE_EXTENSION DeviceExtension,
DeviceInformation->SuggestedDriveLetter = 0; DeviceInformation->SuggestedDriveLetter = 0;
} }
/* Else, it's time to set up one */ /* Else, it's time to set up one */
else if ((DeviceExtension->NoAutoMount || DeviceInformation->Removable) && else if ((!DeviceExtension->NoAutoMount || DeviceInformation->Removable) &&
DeviceExtension->AutomaticDriveLetter && DeviceExtension->AutomaticDriveLetter &&
(HasGptDriveLetter || DeviceInformation->SuggestedDriveLetter) && (HasGptDriveLetter || DeviceInformation->SuggestedDriveLetter) &&
!HasNoDriveLetterEntry(UniqueId)) !HasNoDriveLetterEntry(UniqueId))
@ -1316,16 +1315,14 @@ MountMgrMountedDeviceArrival(IN PDEVICE_EXTENSION DeviceExtension,
RtlCopyMemory(NewUniqueId->UniqueId, UniqueId->UniqueId, UniqueId->UniqueIdLength); RtlCopyMemory(NewUniqueId->UniqueId, UniqueId->UniqueId, UniqueId->UniqueIdLength);
} }
/* If device's offline or valid, skip its notifications */ /* If the device is offline or valid, skip its notifications */
if (IsOff || Valid) if (IsOff || Valid)
{ {
DeviceInformation->SkipNotifications = TRUE; DeviceInformation->SkipNotifications = TRUE;
} }
/* In case device is valid and is set to no automount, /* If automount is enabled or the device already mounted, set it offline */
* set it offline. if (!DeviceExtension->NoAutoMount || IsDrvLetter)
*/
if (DeviceExtension->NoAutoMount || IsDrvLetter)
{ {
IsOff = !DeviceInformation->SkipNotifications; IsOff = !DeviceInformation->SkipNotifications;
} }
@ -1337,7 +1334,7 @@ MountMgrMountedDeviceArrival(IN PDEVICE_EXTENSION DeviceExtension,
/* Finally, release the exclusive lock */ /* Finally, release the exclusive lock */
KeReleaseSemaphore(&(DeviceExtension->DeviceLock), IO_NO_INCREMENT, 1, FALSE); KeReleaseSemaphore(&(DeviceExtension->DeviceLock), IO_NO_INCREMENT, 1, FALSE);
/* If device is not offline, notify its arrival */ /* If the device is not offline, notify its arrival */
if (!IsOff) if (!IsOff)
{ {
SendOnlineNotification(SymbolicName); SendOnlineNotification(SymbolicName);