From 15ea99777455b66042d708ea0eb794891eb536a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 13 Sep 2022 22:37:04 +0200 Subject: [PATCH] [VFATFS] Use device name FatX, to not collide with fastfat.sys CORE-16373 --- drivers/filesystems/vfatfs/iface.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/filesystems/vfatfs/iface.c b/drivers/filesystems/vfatfs/iface.c index d09365d09f5..6ed08d0ab1f 100644 --- a/drivers/filesystems/vfatfs/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -52,7 +52,7 @@ DriverEntry( IN PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\FatX"); NTSTATUS Status; UNREFERENCED_PARAMETER(RegistryPath); @@ -64,20 +64,6 @@ DriverEntry( 0, FALSE, &DeviceObject); - if (Status == STATUS_OBJECT_NAME_EXISTS || - Status == STATUS_OBJECT_NAME_COLLISION) - { - /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ - RtlInitUnicodeString(&DeviceName, L"\\RosFat"); - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - } - if (!NT_SUCCESS(Status)) { return Status;