Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 01/01: [WINED3D] Workaround regression CORE-15408

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=082f230ac76087915355c… commit 082f230ac76087915355c962a307f21ade9dae96 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 22 03:06:07 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 22 03:07:09 2019 +0200 [WINED3D] Workaround regression CORE-15408 Many 3D applications crashed with 'WineD3D fake window' msgbox if they were used in VirtualBox with graphics driver 'VBoxDisp.sys from VM guest additions + installed 3D acceleration' That was a regression of SVN r75847 == git 3d13ed394efdd0ce0aef4e10965b1d08334394ec Contrary we had no such issues with the SW emulation. The reason for the bug is that VBoxDisp only supports OpenGL 2.1 (GLSL 120) and WineD3D tried to use shaders for OpenGL 3.2 (GLSL 150). This workaround disables the usage in a hard-coded way for all graphics adapters. Should be ok for now, as ros does not really support any modern GPU drivers yet. Proper working runtime detection would be better ofc. Thx to Doug Lyons & Fabian Maurer --- dll/directx/wine/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/directx/wine/wined3d/utils.c b/dll/directx/wine/wined3d/utils.c index b48293eabb3..3c6d218f27d 100644 --- a/dll/directx/wine/wined3d/utils.c +++ b/dll/directx/wine/wined3d/utils.c @@ -2183,7 +2183,14 @@ static void draw_test_quad(struct wined3d_caps_gl_ctx *ctx, const struct wined3d if (!ctx->test_program_id) { +#ifdef __REACTOS__ + /* workaround CORE-15408 crash for many 3D applications. + VBoxDisp with enabled 3D acceleration only supports OpenGL 2.1 (GLSL 120). + Wine must not use shaders for OpenGL 3.2 (GLSL 150). */ + BOOL use_glsl_150 = FALSE; +#else BOOL use_glsl_150 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50); +#endif ctx->test_program_id = GL_EXTCALL(glCreateProgram());

4 years, 11 months

[reactos] 01/01: [SHELLEXT][ZIPFLDR] Performance: Initialize m_Filename quickly

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cca46453c6adac38a068… commit 6cca46453c6adac38a068580016858abbfa25b31 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 22 09:55:06 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 22 09:55:06 2019 +0900 [SHELLEXT][ZIPFLDR] Performance: Initialize m_Filename quickly --- dll/shellext/zipfldr/CConfirmReplace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/CConfirmReplace.cpp b/dll/shellext/zipfldr/CConfirmReplace.cpp index 93edf99570e..4f51ee6bb69 100644 --- a/dll/shellext/zipfldr/CConfirmReplace.cpp +++ b/dll/shellext/zipfldr/CConfirmReplace.cpp @@ -14,8 +14,8 @@ private: public: CConfirmReplace(const char* filename) + : m_Filename(filename) { - m_Filename = filename; } LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

4 years, 11 months

[reactos] 01/01: [CPL][DESK] hShell32 is always non-NULL in epilogue

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72e5c2e77c447825b82d1… commit 72e5c2e77c447825b82d19977ea3180067483908 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 22 09:43:34 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 22 09:43:34 2019 +0900 [CPL][DESK] hShell32 is always non-NULL in epilogue --- dll/cpl/desk/advmon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/cpl/desk/advmon.c b/dll/cpl/desk/advmon.c index f363b66a160..141f6ffe479 100644 --- a/dll/cpl/desk/advmon.c +++ b/dll/cpl/desk/advmon.c @@ -140,8 +140,7 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice) IDataObject_Release(pdo); #ifdef _MSC_VER - if (hShell32) - FreeLibrary(hShell32); + FreeLibrary(hShell32); #endif return Ret;

4 years, 11 months

[reactos] 01/01: [CPL][HDWWIZ] Move 'Index' and 'Item' variables to prologue

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce498aa5714a42c449b24… commit ce498aa5714a42c449b244feaa70c7df6d59e0af Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 22 09:41:09 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 22 09:41:09 2019 +0900 [CPL][HDWWIZ] Move 'Index' and 'Item' variables to prologue --- dll/cpl/hdwwiz/hdwwiz.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/cpl/hdwwiz/hdwwiz.c b/dll/cpl/hdwwiz/hdwwiz.c index 0b1daccf343..10c5dfd7e31 100644 --- a/dll/cpl/hdwwiz/hdwwiz.c +++ b/dll/cpl/hdwwiz/hdwwiz.c @@ -400,6 +400,7 @@ static INT_PTR CALLBACK ProbeListPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { INT Index; + LVITEM Item; switch (uMsg) { @@ -453,9 +454,6 @@ ProbeListPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { - INT Index; - LVITEM Item; - for (Index = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_PROBELIST)); --Index > 0;) { ZeroMemory(&Item, sizeof(LV_ITEM));

4 years, 11 months

[reactos] 01/01: [WIN32SS][NTGDI] Unite duplicate of condition 'UsesSource'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fc6e3c398cae885eefd5… commit 6fc6e3c398cae885eefd5d6445d3c2532b7e13d6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 22 09:33:32 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 22 09:33:32 2019 +0900 [WIN32SS][NTGDI] Unite duplicate of condition 'UsesSource' --- win32ss/gdi/ntgdi/bitblt.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index 8e9fac9286c..b60ef9047f8 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -471,16 +471,11 @@ NtGdiMaskBlt( if (UsesSource) { - { - BitmapSrc = DCSrc->dclevel.pSurface; - if (!BitmapSrc) - goto cleanup; - } - } + BitmapSrc = DCSrc->dclevel.pSurface; + if (!BitmapSrc) + goto cleanup; - /* Create the XLATEOBJ. */ - if (UsesSource) - { + /* Create the XLATEOBJ. */ EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); XlateObj = &exlo.xlo; }

4 years, 11 months

[reactos] 01/01: [WIN32SS][NTGDI] 'otm' is always non-NULL in epilogue

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bf982ff88b1c0400c1a6… commit 1bf982ff88b1c0400c1a66ed9aaa8faeba74a75c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 22 09:29:15 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 22 09:29:15 2019 +0900 [WIN32SS][NTGDI] 'otm' is always non-NULL in epilogue --- win32ss/gdi/ntgdi/font.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c index ba51f26608d..db79c534ca6 100644 --- a/win32ss/gdi/ntgdi/font.c +++ b/win32ss/gdi/ntgdi/font.c @@ -928,25 +928,24 @@ NtGdiGetOutlineTextMetricsInternalW (HDC hDC, return 0; } IntGetOutlineTextMetrics(FontGDI, Size, potm); - if (otm) + + _SEH2_TRY { - _SEH2_TRY - { - ProbeForWrite(otm, Size, 1); - RtlCopyMemory(otm, potm, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END + ProbeForWrite(otm, Size, 1); + RtlCopyMemory(otm, potm, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END - if (!NT_SUCCESS(Status)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - Size = 0; - } + if (!NT_SUCCESS(Status)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + Size = 0; } + ExFreePoolWithTag(potm,GDITAG_TEXT); return Size; }

4 years, 11 months

[reactos] 01/01: [COMCTL32] Address regression CORE-14622

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2f833c53c27c58cf9b76… commit f2f833c53c27c58cf9b762fcc967aaaf41d2668f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 22 01:10:28 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 22 01:10:28 2019 +0200 [COMCTL32] Address regression CORE-14622 "Avira Antivir Personal 6.35.00.243" had issues painting its setup wizard dialog with correct background color. That part was a regression of SVN r74136 == git b1b42795a94d8e3cb69e2d9e5bd0af4929610361 and also did not draw its umbrella bmp, which did never work in ros up to now afaik. https://reactos.org/testman/compare.php?ids=69394,69478 VBOX https://reactos.org/testman/compare.php?ids=69395,69479 KVM Thanks to patches author Doug Lyons and HBelusca. Wine has been reported to be affected by that bug as well: https://bugs.winehq.org/show_bug.cgi?id=46636 Not sure whether our patch will be accepted by Wine, to my naive eye this looks like an interim solution. --- dll/win32/comctl32/propsheet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index 746d66c8d7c..4dd355a78c8 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -1470,6 +1470,9 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && (ppshpage->dwFlags & PSP_HIDEHEADER)) { +#ifdef __REACTOS__ + if (psInfo->ppshheader.u4.hbmWatermark) +#endif SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, (DWORD_PTR)ppshpage); }

4 years, 11 months

[reactos] 05/05: [NTOSKRNL] Rewrite IoAssignDriveLetters to make NT5 compliant

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ab1cfc553f11731d9a35… commit 5ab1cfc553f11731d9a352f1157084cc1dfd9042 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 18:28:40 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 18:28:40 2019 +0200 [NTOSKRNL] Rewrite IoAssignDriveLetters to make NT5 compliant The major change with this rewrite is the support for the mount manager. Fstub will now assume that most of the devices are PnP and that they are already registered to the mount manager. It will thus ask the mount manager to assign the drive letter. Fstub will keep assigning drive letters non mission critical devices such as CDs, floppies and other removable devices. See MountMgr:QueryPoints API test that will now return mount points :-). --- ntoskrnl/fstub/disksup.c | 1963 ++++++++++++++++++++++++++----------------- ntoskrnl/guid.c | 1 + ntoskrnl/include/ntoskrnl.h | 1 + 3 files changed, 1203 insertions(+), 762 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index dfdbf0c494c..0b81bc561dd 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -6,6 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) +* Pierre Schweitzer */ /* INCLUDES ******************************************************************/ @@ -15,9 +16,6 @@ #include <debug.h> #include <internal/hal.h> -/* DEPRECATED FUNCTIONS ******************************************************/ - -#if 1 const WCHAR DiskMountString[] = L"\\DosDevices\\%C:"; #define AUTO_DRIVE MAXULONG @@ -43,905 +41,1346 @@ typedef enum _DISK_MANAGER EZ_Drive } DISK_MANAGER; -static BOOLEAN -HalpAssignDrive(IN PUNICODE_STRING PartitionName, - IN ULONG DriveNumber, - IN UCHAR DriveType, - IN ULONG Signature, - IN LARGE_INTEGER StartingOffset, - IN HANDLE hKey, - IN PUNICODE_STRING BootDevice, - OUT PUCHAR NtSystemPath) +typedef enum _PARTITION_TYPE +{ + BootablePartition, + PrimaryPartition, + LogicalPartition, + FtPartition, + UnknownPartition, + DataPartition +} PARTITION_TYPE, *PPARTITION_TYPE; + +NTSTATUS +FASTCALL +HalpQueryDriveLayout(IN PUNICODE_STRING DeviceName, + OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo) { - WCHAR DriveNameBuffer[16]; - UNICODE_STRING DriveName; - ULONG i; + IO_STATUS_BLOCK StatusBlock; + PDEVICE_OBJECT DeviceObject = NULL; + PFILE_OBJECT FileObject; + KEVENT Event; + PIRP Irp; NTSTATUS Status; - REG_DISK_MOUNT_INFO DiskMountInfo; + ULONG BufferSize; + PDRIVE_LAYOUT_INFORMATION Buffer; + PAGED_CODE(); + + /* Get device pointers */ + Status = IoGetDeviceObjectPointer(DeviceName, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } - DPRINT("HalpAssignDrive()\n"); + /* Get attached device object */ + DeviceObject = IoGetAttachedDeviceReference(FileObject->DeviceObject); + ObDereferenceObject(FileObject); - if ((DriveNumber != AUTO_DRIVE) && (DriveNumber < 26)) + /* Do not handle removable media */ + if (BooleanFlagOn(DeviceObject->Characteristics, FILE_REMOVABLE_MEDIA)) { - /* Force assignment */ - KeAcquireGuardedMutex(&ObpDeviceMapLock); - if ((ObSystemDeviceMap->DriveMap & (1 << DriveNumber)) != 0) - { - DbgPrint("Drive letter already used!\n"); - KeReleaseGuardedMutex(&ObpDeviceMapLock); - return FALSE; - } - KeReleaseGuardedMutex(&ObpDeviceMapLock); + ObDereferenceObject(DeviceObject); + return STATUS_NO_MEDIA; } - else + + /* We'll loop until our buffer is big enough */ + Buffer = NULL; + BufferSize = 0x1000; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + do { - /* Automatic assignment */ - DriveNumber = AUTO_DRIVE; - KeAcquireGuardedMutex(&ObpDeviceMapLock); - for (i = 2; i < 26; i++) + /* If we already had a buffer, it means it's not big + * enough, so free and multiply size by two + */ + if (Buffer != NULL) { - if ((ObSystemDeviceMap->DriveMap & (1 << i)) == 0) - { - DriveNumber = i; - break; - } + ExFreePoolWithTag(Buffer, TAG_FSTUB); + BufferSize *= 2; } - KeReleaseGuardedMutex(&ObpDeviceMapLock); - if (DriveNumber == AUTO_DRIVE) + /* Allocate buffer for output buffer */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, TAG_FSTUB); + if (Buffer == NULL) { - DbgPrint("No drive letter available!\n"); - return FALSE; + Status = STATUS_NO_MEMORY; + break; } - } - DPRINT("DriveNumber %lu\n", DriveNumber); - - /* Build drive name */ - swprintf(DriveNameBuffer, - L"\\??\\%C:", - 'A' + DriveNumber); - RtlInitUnicodeString(&DriveName, - DriveNameBuffer); - - DPRINT(" %wZ ==> %wZ\n", - &DriveName, - PartitionName); - - /* Create symbolic link */ - Status = IoCreateSymbolicLink(&DriveName, - PartitionName); - - if (hKey && - DriveType == DOSDEVICE_DRIVE_FIXED && - Signature) - { - DiskMountInfo.Signature = Signature; - DiskMountInfo.StartingOffset = StartingOffset; - swprintf(DriveNameBuffer, DiskMountString, L'A' + DriveNumber); - RtlInitUnicodeString(&DriveName, DriveNameBuffer); - - Status = ZwSetValueKey(hKey, - &DriveName, - 0, - REG_BINARY, - &DiskMountInfo, - sizeof(DiskMountInfo)); - if (!NT_SUCCESS(Status)) + /* Build the IRP to query drive layout */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_LAYOUT, + DeviceObject, + NULL, + 0, + Buffer, + BufferSize, + FALSE, + &Event, + &StatusBlock); + if (Irp == NULL) { - DPRINT1("ZwCreateValueKey failed for %wZ, status=%x\n", &DriveName, Status); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; } - } - - /* Check if this is a boot partition */ - if (RtlCompareUnicodeString(PartitionName, BootDevice, FALSE) == 0) - { - /* Set NtSystemPath to that partition's disk letter */ - *NtSystemPath = (UCHAR)('A' + DriveNumber); - } - - return TRUE; -} -ULONG -xHalpGetRDiskCount(VOID) -{ - NTSTATUS Status; - UNICODE_STRING ArcName; - PWCHAR ArcNameBuffer; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE DirectoryHandle; - POBJECT_DIRECTORY_INFORMATION DirectoryInfo; - ULONG Skip; - ULONG ResultLength; - ULONG CurrentRDisk; - ULONG RDiskCount; - BOOLEAN First = TRUE; - ULONG Count; - - DirectoryInfo = ExAllocatePoolWithTag(PagedPool, 2 * PAGE_SIZE, TAG_FILE_SYSTEM); - if (DirectoryInfo == NULL) - { - return 0; - } + /* Call the driver and wait if appropriate */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = StatusBlock.Status; + } + /* If buffer is too small, keep looping */ + } while (Status == STATUS_BUFFER_TOO_SMALL); - RtlInitUnicodeString(&ArcName, L"\\ArcName"); - InitializeObjectAttributes(&ObjectAttributes, - &ArcName, - 0, - NULL, - NULL); + /* We're done with the device */ + ObDereferenceObject(DeviceObject); - Status = ZwOpenDirectoryObject (&DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) + /* If querying worked, then return the buffer to the caller */ + if (NT_SUCCESS(Status)) { - DPRINT1("ZwOpenDirectoryObject for %wZ failed, status=%lx\n", &ArcName, Status); - ExFreePoolWithTag(DirectoryInfo, TAG_FILE_SYSTEM); - return 0; + ASSERT(Buffer != NULL); + *LayoutInfo = Buffer; } - - RDiskCount = 0; - Skip = 0; - while (NT_SUCCESS(Status)) + /* Else, release the buffer if still allocated and fail */ + else { - Status = ZwQueryDirectoryObject (DirectoryHandle, - DirectoryInfo, - 2 * PAGE_SIZE, - FALSE, - First, - &Skip, - &ResultLength); - First = FALSE; - if (NT_SUCCESS(Status)) + if (Buffer != NULL) { - Count = 0; - while (DirectoryInfo[Count].Name.Buffer) - { - DPRINT("Count %x\n", Count); - DirectoryInfo[Count].Name.Buffer[DirectoryInfo[Count].Name.Length / sizeof(WCHAR)] = 0; - ArcNameBuffer = DirectoryInfo[Count].Name.Buffer; - if (DirectoryInfo[Count].Name.Length >= sizeof(L"multi(0)disk(0)rdisk(0)") - sizeof(WCHAR) && - !_wcsnicmp(ArcNameBuffer, L"multi(0)disk(0)rdisk(", (sizeof(L"multi(0)disk(0)rdisk(") - sizeof(WCHAR)) / sizeof(WCHAR))) - { - DPRINT("%S\n", ArcNameBuffer); - ArcNameBuffer += (sizeof(L"multi(0)disk(0)rdisk(") - sizeof(WCHAR)) / sizeof(WCHAR); - CurrentRDisk = 0; - while (iswdigit(*ArcNameBuffer)) - { - CurrentRDisk = CurrentRDisk * 10 + *ArcNameBuffer - L'0'; - ArcNameBuffer++; - } - if (!_wcsicmp(ArcNameBuffer, L")") && - CurrentRDisk >= RDiskCount) - { - RDiskCount = CurrentRDisk + 1; - } - } - Count++; - } + ExFreePoolWithTag(Buffer, TAG_FSTUB); } } - ZwClose(DirectoryHandle); - - ExFreePoolWithTag(DirectoryInfo, TAG_FILE_SYSTEM); - return RDiskCount; + return Status; } NTSTATUS -xHalpGetDiskNumberFromRDisk(ULONG RDisk, PULONG DiskNumber) +HalpQueryPartitionType(IN PUNICODE_STRING DeviceName, + IN PDRIVE_LAYOUT_INFORMATION LayoutInfo, + OUT PPARTITION_TYPE PartitionType) { - WCHAR NameBuffer[80]; - UNICODE_STRING ArcName; - UNICODE_STRING LinkName; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE LinkHandle; + USHORT i; + PIRP Irp; + KEVENT Event; NTSTATUS Status; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + PARTITION_INFORMATION_EX PartitionInfo; - swprintf(NameBuffer, - L"\\ArcName\\multi(0)disk(0)rdisk(%lu)", - RDisk); - - RtlInitUnicodeString(&ArcName, NameBuffer); - InitializeObjectAttributes(&ObjectAttributes, - &ArcName, - 0, - NULL, - NULL); - Status = ZwOpenSymbolicLinkObject(&LinkHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenSymbolicLinkObject failed for %wZ, status=%lx\n", &ArcName, Status); - return Status; - } + PAGED_CODE(); - LinkName.Buffer = NameBuffer; - LinkName.Length = 0; - LinkName.MaximumLength = sizeof(NameBuffer); - Status = ZwQuerySymbolicLinkObject(LinkHandle, - &LinkName, - NULL); - ZwClose(LinkHandle); + /* Get device pointers */ + Status = IoGetDeviceObjectPointer(DeviceName, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwQuerySymbolicLinkObject failed, status=%lx\n", Status); return Status; } - if (LinkName.Length < sizeof(L"\\Device\\Harddisk0\\Partition0") - sizeof(WCHAR) || - LinkName.Length >= sizeof(NameBuffer)) - { - return STATUS_UNSUCCESSFUL; - } - - NameBuffer[LinkName.Length / sizeof(WCHAR)] = 0; - if (_wcsnicmp(NameBuffer, L"\\Device\\Harddisk", (sizeof(L"\\Device\\Harddisk") - sizeof(WCHAR)) / sizeof(WCHAR))) - { - return STATUS_UNSUCCESSFUL; - } - LinkName.Buffer += (sizeof(L"\\Device\\Harddisk") - sizeof(WCHAR)) / sizeof(WCHAR); - - if (!iswdigit(*LinkName.Buffer)) - { - return STATUS_UNSUCCESSFUL; - } - *DiskNumber = 0; - while (iswdigit(*LinkName.Buffer)) - { - *DiskNumber = *DiskNumber * 10 + *LinkName.Buffer - L'0'; - LinkName.Buffer++; - } - if (_wcsicmp(LinkName.Buffer, L"\\Partition0")) - { - return STATUS_UNSUCCESSFUL; - } - return STATUS_SUCCESS; -} - -NTSTATUS -FASTCALL -xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName, - OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo) -{ - IO_STATUS_BLOCK StatusBlock; - DISK_GEOMETRY DiskGeometry; - PDEVICE_OBJECT DeviceObject = NULL; - PFILE_OBJECT FileObject; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - DPRINT("xHalpQueryDriveLayout %wZ %p\n", - DeviceName, - LayoutInfo); + /* Get attached device object */ + DeviceObject = IoGetAttachedDeviceReference(FileObject->DeviceObject); + ObDereferenceObject(FileObject); - /* Get the drives sector size */ - Status = IoGetDeviceObjectPointer(DeviceName, - FILE_READ_ATTRIBUTES, - &FileObject, - &DeviceObject); - if (!NT_SUCCESS(Status)) + /* Assume logical partition for removable devices */ + if (BooleanFlagOn(DeviceObject->Characteristics, FILE_REMOVABLE_MEDIA)) { - DPRINT("Status %x\n", Status); - return(Status); + ObDereferenceObject(DeviceObject); + *PartitionType = LogicalPartition; + return STATUS_SUCCESS; } - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, - DeviceObject, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY), - FALSE, - &Event, - &StatusBlock); + /* For the others, query partition info */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO_EX, + DeviceObject, + NULL, + 0, + &PartitionInfo, + sizeof(PartitionInfo), + FALSE, + &Event, + &IoStatusBlock); if (Irp == NULL) { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); + ObDereferenceObject(DeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; } - Status = IoCallDriver(DeviceObject, - Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = StatusBlock.Status; + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; } + + /* We're done with the device */ + ObDereferenceObject(DeviceObject); + + /* If we failed querying partition info, try to return something + * if caller didn't provide a precise layout, assume logical + * partition and fake success. Otherwise, just fail. + */ if (!NT_SUCCESS(Status)) { - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) - { - DiskGeometry.BytesPerSector = 512; - } - else + if (LayoutInfo == NULL) { - ObDereferenceObject(FileObject); - return(Status); + *PartitionType = LogicalPartition; + return STATUS_SUCCESS; } - } - DPRINT("DiskGeometry.BytesPerSector: %lu\n", - DiskGeometry.BytesPerSector); + return Status; + } - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) + /* First, handle non MBR style (easy cases) */ + if (PartitionInfo.PartitionStyle != PARTITION_STYLE_MBR) { - PDRIVE_LAYOUT_INFORMATION Buffer; - - /* Allocate a partition list for a single entry. */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DRIVE_LAYOUT_INFORMATION), TAG_FILE_SYSTEM); - if (Buffer != NULL) + /* If not GPT, we don't know what it is */ + if (PartitionInfo.PartitionStyle != PARTITION_STYLE_GPT) { - RtlZeroMemory(Buffer, - sizeof(DRIVE_LAYOUT_INFORMATION)); - Buffer->PartitionCount = 1; - *LayoutInfo = Buffer; - - Status = STATUS_SUCCESS; + *PartitionType = UnknownPartition; + return STATUS_SUCCESS; } - else + + /* Check whether that's data partition */ + if (RtlCompareMemory(&PartitionInfo.Gpt.PartitionType, + &PARTITION_BASIC_DATA_GUID, + sizeof(GUID)) == sizeof(GUID)) { - Status = STATUS_UNSUCCESSFUL; + *PartitionType = DataPartition; + return STATUS_SUCCESS; } - } - else - { - /* Read the partition table */ - Status = IoReadPartitionTable(DeviceObject, - DiskGeometry.BytesPerSector, - TRUE, - LayoutInfo); - } - - ObDereferenceObject(FileObject); - - return(Status); -} - -VOID -FASTCALL -xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString) -{ - PDRIVE_LAYOUT_INFORMATION *LayoutArray; - PCONFIGURATION_INFORMATION ConfigInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK StatusBlock; - UNICODE_STRING UnicodeString1; - UNICODE_STRING UnicodeString2; - HANDLE FileHandle; - PWSTR Buffer1; - PWSTR Buffer2; - ULONG i, j, k; - ULONG DiskNumber; - ULONG RDisk; - NTSTATUS Status; - HANDLE hKey; - ULONG Length; - PKEY_VALUE_PARTIAL_INFORMATION PartialInformation; - PREG_DISK_MOUNT_INFO DiskMountInfo; - ULONG RDiskCount; - UNICODE_STRING BootDevice; - - Status = RtlAnsiStringToUnicodeString(&BootDevice, - NtDeviceName, - TRUE); - - DPRINT("xHalIoAssignDriveLetters()\n"); - - ConfigInfo = IoGetConfigurationInformation(); - - RDiskCount = xHalpGetRDiskCount(); - DPRINT("RDiskCount %lu\n", RDiskCount); - - Buffer1 = ExAllocatePoolWithTag(PagedPool, - 64 * sizeof(WCHAR), - TAG_FILE_SYSTEM); - if (!Buffer1) return; + /* Otherwise, we don't know */ + *PartitionType = UnknownPartition; + return STATUS_SUCCESS; + } - Buffer2 = ExAllocatePoolWithTag(PagedPool, - 32 * sizeof(WCHAR), - TAG_FILE_SYSTEM); - if (!Buffer2) + /* If we don't recognize partition type, return unknown */ + if (!IsRecognizedPartition(PartitionInfo.Mbr.PartitionType)) { - ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - return; + *PartitionType = UnknownPartition; + return STATUS_SUCCESS; } - PartialInformation = ExAllocatePoolWithTag(PagedPool, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(REG_DISK_MOUNT_INFO), - TAG_FILE_SYSTEM); - if (!PartialInformation) + /* Check if that's a FT volume */ + if (PartitionInfo.Mbr.PartitionType & PARTITION_NTFT) { - ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); - ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - return; + *PartitionType = FtPartition; + return STATUS_SUCCESS; } - DiskMountInfo = (PREG_DISK_MOUNT_INFO) PartialInformation->Data; - - /* Create or open the 'MountedDevices' key */ - RtlInitUnicodeString(&UnicodeString1, L"\\Registry\\Machine\\SYSTEM\\MountedDevices"); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString1, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - Status = ZwCreateKey(&hKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - if (!NT_SUCCESS(Status)) + /* If the caller didn't provide the complete layout, just return */ + if (LayoutInfo == NULL) { - hKey = NULL; - DPRINT("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); + *PartitionType = LogicalPartition; + return STATUS_SUCCESS; } - /* Create PhysicalDrive links */ - DPRINT("Physical disk drives: %lu\n", ConfigInfo->DiskCount); - for (i = 0; i < ConfigInfo->DiskCount; i++) + /* Now, evaluate the partition to the 4 in the input layout */ + for (i = 0; i < 4; ++i) { - swprintf(Buffer1, L"\\Device\\Harddisk%lu\\Partition0", i); - RtlInitUnicodeString(&UnicodeString1, Buffer1); - - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString1, - 0, - NULL, - NULL); - - Status = ZwOpenFile(&FileHandle, - FILE_READ_DATA | SYNCHRONIZE, - &ObjectAttributes, - &StatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - if (NT_SUCCESS(Status)) + /* If we find a partition matching */ + if (LayoutInfo->PartitionEntry[i].StartingOffset.QuadPart == PartitionInfo.StartingOffset.QuadPart) { - ZwClose(FileHandle); - - swprintf(Buffer2, L"\\??\\PhysicalDrive%lu", i); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - DPRINT("Creating link: %S ==> %S\n", - Buffer2, - Buffer1); + /* Return boot if boot flag is set */ + if (PartitionInfo.Mbr.BootIndicator) + { + *PartitionType = BootablePartition; + } + /* Primary otherwise */ + else + { + *PartitionType = PrimaryPartition; + } - IoCreateSymbolicLink(&UnicodeString2, - &UnicodeString1); + return STATUS_SUCCESS; } } - /* Initialize layout array */ - if (ConfigInfo->DiskCount == 0) - goto end_assign_disks; - LayoutArray = ExAllocatePoolWithTag(NonPagedPool, - ConfigInfo->DiskCount * sizeof(PDRIVE_LAYOUT_INFORMATION), TAG_FILE_SYSTEM); - if (!LayoutArray) - { - ExFreePoolWithTag(PartialInformation, TAG_FILE_SYSTEM); - ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); - ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - if (hKey) ObCloseHandle(hKey, KernelMode); - return; - } + /* Otherwise, assume logical */ + *PartitionType = LogicalPartition; + return STATUS_SUCCESS; +} - RtlZeroMemory(LayoutArray, - ConfigInfo->DiskCount * sizeof(PDRIVE_LAYOUT_INFORMATION)); - for (i = 0; i < ConfigInfo->DiskCount; i++) - { - swprintf(Buffer1, L"\\Device\\Harddisk%lu\\Partition0", i); - RtlInitUnicodeString(&UnicodeString1, Buffer1); +PULONG +IopComputeHarddiskDerangements(IN ULONG DiskCount) +{ + PIRP Irp; + KEVENT Event; + ULONG i, j, k; + PULONG Devices; + NTSTATUS Status; + WCHAR Buffer[100]; + UNICODE_STRING ArcName; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + STORAGE_DEVICE_NUMBER DeviceNumber; - Status = xHalQueryDriveLayout(&UnicodeString1, &LayoutArray[i]); - if (!NT_SUCCESS(Status)) - { - DbgPrint("xHalQueryDriveLayout() failed (Status = 0x%lx)\n", - Status); - LayoutArray[i] = NULL; - continue; - } - /* We don't use the RewritePartition value while mounting the disks. - * We use this value for marking pre-assigned (registry) partitions. - */ - for (j = 0; j < LayoutArray[i]->PartitionCount; j++) - { - LayoutArray[i]->PartitionEntry[j].RewritePartition = FALSE; - } + /* No disks, nothing to do */ + if (DiskCount == 0) + { + return NULL; } -#ifndef NDEBUG - /* Dump layout array */ - for (i = 0; i < ConfigInfo->DiskCount; i++) + /* Allocate a buffer big enough to hold all the disks */ + Devices = ExAllocatePoolWithTag(PagedPool | POOL_COLD_ALLOCATION, + sizeof(ULONG) * DiskCount, + TAG_FSTUB); + if (Devices == NULL) { - DPRINT("Harddisk %d:\n", - i); - - if (LayoutArray[i] == NULL) - continue; - - DPRINT("Logical partitions: %d\n", - LayoutArray[i]->PartitionCount); - - for (j = 0; j < LayoutArray[i]->PartitionCount; j++) - { - DPRINT(" %d: nr:%x boot:%x type:%x startblock:%I64u count:%I64u\n", - j, - LayoutArray[i]->PartitionEntry[j].PartitionNumber, - LayoutArray[i]->PartitionEntry[j].BootIndicator, - LayoutArray[i]->PartitionEntry[j].PartitionType, - LayoutArray[i]->PartitionEntry[j].StartingOffset.QuadPart, - LayoutArray[i]->PartitionEntry[j].PartitionLength.QuadPart); - } + return NULL; } -#endif - /* Assign pre-assigned (registry) partitions */ - if (hKey) + /* Now, we'll query all the disks */ + for (i = 0; i < DiskCount; ++i) { - for (k = 2; k < 26; k++) + /* Using their ARC name */ + swprintf(Buffer, L"\\ArcName\\multi(0)disk(0)rdisk(%d)", i); + RtlInitUnicodeString(&ArcName, Buffer); + /* Get the attached DeviceObject */ + if (NT_SUCCESS(IoGetDeviceObjectPointer(&ArcName, FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject))) { - swprintf(Buffer1, DiskMountString, L'A' + k); - RtlInitUnicodeString(&UnicodeString1, Buffer1); - Status = ZwQueryValueKey(hKey, - &UnicodeString1, - KeyValuePartialInformation, - PartialInformation, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(REG_DISK_MOUNT_INFO), - &Length); - if (NT_SUCCESS(Status) && - PartialInformation->Type == REG_BINARY && - PartialInformation->DataLength == sizeof(REG_DISK_MOUNT_INFO)) + DeviceObject = IoGetAttachedDeviceReference(FileObject->DeviceObject); + ObDereferenceObject(FileObject); + + /* And query it for device number */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_STORAGE_GET_DEVICE_NUMBER, + DeviceObject, + NULL, + 0, + &DeviceNumber, + sizeof(DeviceNumber), + FALSE, + &Event, + &IoStatusBlock); + if (Irp != NULL) { - DPRINT("%wZ => %08x:%08x%08x\n", &UnicodeString1, DiskMountInfo->Signature, - DiskMountInfo->StartingOffset.u.HighPart, DiskMountInfo->StartingOffset.u.LowPart); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) { - BOOLEAN Found = FALSE; - for (i = 0; i < ConfigInfo->DiskCount; i++) - { - DPRINT("%x\n", LayoutArray[i]->Signature); - if (LayoutArray[i] && - LayoutArray[i]->Signature && - LayoutArray[i]->Signature == DiskMountInfo->Signature) - { - for (j = 0; j < LayoutArray[i]->PartitionCount; j++) - { - if (LayoutArray[i]->PartitionEntry[j].StartingOffset.QuadPart == DiskMountInfo->StartingOffset.QuadPart) - { - if (IsRecognizedPartition(LayoutArray[i]->PartitionEntry[j].PartitionType) && - LayoutArray[i]->PartitionEntry[j].RewritePartition == FALSE) - { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - i, - LayoutArray[i]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", &UnicodeString2); - Found = HalpAssignDrive(&UnicodeString2, - k, - DOSDEVICE_DRIVE_FIXED, - DiskMountInfo->Signature, - DiskMountInfo->StartingOffset, - NULL, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE; - } - break; - } - } - } - } - if (Found == FALSE) - { - /* We didn't find a partition for this entry, remove them. */ - Status = ZwDeleteValueKey(hKey, &UnicodeString1); - } + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; } - } - } - } - /* Assign bootable partition on first harddisk */ - DPRINT("Assigning bootable primary partition on first harddisk:\n"); - if (RDiskCount > 0) - { - Status = xHalpGetDiskNumberFromRDisk(0, &DiskNumber); - if (NT_SUCCESS(Status) && - DiskNumber < ConfigInfo->DiskCount && - LayoutArray[DiskNumber]) - { - /* Search for bootable partition */ - for (j = 0; j < NUM_PARTITION_TABLE_ENTRIES && j < LayoutArray[DiskNumber]->PartitionCount; j++) - { - if ((LayoutArray[DiskNumber]->PartitionEntry[j].BootIndicator != FALSE) && - IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType)) + ObDereferenceObject(DeviceObject); + + /* In case of a success remember device number */ + if (NT_SUCCESS(Status)) { - if (LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE) - { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_FIXED, - LayoutArray[DiskNumber]->Signature, - LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; - } - break; + Devices[i] = DeviceNumber.DeviceNumber; + /* Move on, not to fall into our default case */ + continue; } } + else + { + ObDereferenceObject(DeviceObject); + } + + /* Default case, for failures, set -1 */ + Devices[i] = -1; } } - /* Assign remaining primary partitions */ - DPRINT("Assigning remaining primary partitions:\n"); - for (RDisk = 0; RDisk < RDiskCount; RDisk++) + /* Now, we'll check all device numbers */ + for (i = 0; i < DiskCount; ++i) { - Status = xHalpGetDiskNumberFromRDisk(RDisk, &DiskNumber); - if (NT_SUCCESS(Status) && - DiskNumber < ConfigInfo->DiskCount && - LayoutArray[DiskNumber]) + /* First of all, check if we're at the right place */ + for (j = 0; j < DiskCount; ++j) { - /* Search for primary partitions */ - for (j = 0; (j < NUM_PARTITION_TABLE_ENTRIES) && (j < LayoutArray[DiskNumber]->PartitionCount); j++) + if (Devices[j] == i) { - if (LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE && - IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType)) - { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", - &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_FIXED, - LayoutArray[DiskNumber]->Signature, - LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; - } + break; } } - } - /* Assign extended (logical) partitions */ - DPRINT("Assigning extended (logical) partitions:\n"); - for (RDisk = 0; RDisk < RDiskCount; RDisk++) - { - Status = xHalpGetDiskNumberFromRDisk(RDisk, &DiskNumber); - if (NT_SUCCESS(Status) && - DiskNumber < ConfigInfo->DiskCount && - LayoutArray[DiskNumber]) + /* If not, perform the change */ + if (j >= DiskCount) { - /* Search for extended partitions */ - for (j = NUM_PARTITION_TABLE_ENTRIES; j < LayoutArray[DiskNumber]->PartitionCount; j++) + k = 0; + while (Devices[k] != -1) { - if (IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType) && - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE && - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber != 0) + if (++k >= DiskCount) { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", - &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_FIXED, - LayoutArray[DiskNumber]->Signature, - LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; + break; } } - } - } - /* Assign remaining primary partitions without an arc-name */ - DPRINT("Assigning remaining primary partitions:\n"); - for (DiskNumber = 0; DiskNumber < ConfigInfo->DiskCount; DiskNumber++) - { - if (LayoutArray[DiskNumber]) - { - /* Search for primary partitions */ - for (j = 0; (j < NUM_PARTITION_TABLE_ENTRIES) && (j < LayoutArray[DiskNumber]->PartitionCount); j++) + if (k < DiskCount) { - if (LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE && - IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType)) - { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", - &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_FIXED, - LayoutArray[DiskNumber]->Signature, - LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; - } + Devices[k] = i; } } } - /* Assign extended (logical) partitions without an arc-name */ - DPRINT("Assigning extended (logical) partitions:\n"); - for (DiskNumber = 0; DiskNumber < ConfigInfo->DiskCount; DiskNumber++) - { - if (LayoutArray[DiskNumber]) - { - /* Search for extended partitions */ - for (j = NUM_PARTITION_TABLE_ENTRIES; j < LayoutArray[DiskNumber]->PartitionCount; j++) - { - if (IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType) && - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE && - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber != 0) + /* Return our device derangement map */ + return Devices; +} + +NTSTATUS +HalpNextMountLetter(IN PUNICODE_STRING DeviceName, + OUT PUCHAR DriveLetter) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + UNICODE_STRING MountMgr; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + PMOUNTMGR_DRIVE_LETTER_TARGET Target; + MOUNTMGR_DRIVE_LETTER_INFORMATION LetterInfo; + + /* To get next mount letter, we need the MountMgr */ + RtlInitUnicodeString(&MountMgr, L"\\Device\\MountPointManager"); + Status = IoGetDeviceObjectPointer(&MountMgr, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Allocate our input buffer */ + Target = ExAllocatePoolWithTag(PagedPool, + DeviceName->Length + FIELD_OFFSET(MOUNTMGR_DRIVE_LETTER_TARGET, DeviceName), + TAG_FSTUB); + if (Target == NULL) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* And fill it with the device hat needs a drive letter */ + Target->DeviceNameLength = DeviceName->Length; + RtlCopyMemory(&Target->DeviceName[0], DeviceName->Buffer, DeviceName->Length); + + /* Call the mount manager */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER, + DeviceObject, + Target, + DeviceName->Length + FIELD_OFFSET(MOUNTMGR_DRIVE_LETTER_TARGET, DeviceName), + &LetterInfo, + sizeof(LetterInfo), + FALSE, + &Event, + &IoStatusBlock); + if (Irp == NULL) + { + ExFreePoolWithTag(Target, TAG_FSTUB); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + ExFreePoolWithTag(Target, TAG_FSTUB); + ObDereferenceObject(FileObject); + + DPRINT("Done: %d %c\n", LetterInfo.DriveLetterWasAssigned, + LetterInfo.CurrentDriveLetter); + + /* Return the drive letter the MountMgr potentially assigned */ + *DriveLetter = LetterInfo.CurrentDriveLetter; + + /* Also return the success */ + return Status; +} + +NTSTATUS +HalpSetMountLetter(IN PUNICODE_STRING DeviceName, + UCHAR DriveLetter) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + WCHAR Buffer[30]; + ULONG InputBufferLength; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING DosDevice, MountMgr; + PMOUNTMGR_CREATE_POINT_INPUT InputBuffer; + + /* Setup the DosDevice name */ + swprintf(Buffer, L"\\DosDevices\\%c:", DriveLetter); + RtlInitUnicodeString(&DosDevice, Buffer); + + /* Allocate the input buffer for the MountMgr */ + InputBufferLength = DosDevice.Length + DeviceName->Length + sizeof(MOUNTMGR_CREATE_POINT_INPUT); + InputBuffer = ExAllocatePoolWithTag(PagedPool, InputBufferLength, TAG_FSTUB); + if (InputBuffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Fill the input buffer */ + InputBuffer->SymbolicLinkNameOffset = sizeof(MOUNTMGR_CREATE_POINT_INPUT); + InputBuffer->SymbolicLinkNameLength = DosDevice.Length; + InputBuffer->DeviceNameOffset = DosDevice.Length + sizeof(MOUNTMGR_CREATE_POINT_INPUT); + InputBuffer->DeviceNameLength = DeviceName->Length; + RtlCopyMemory(&InputBuffer[1], DosDevice.Buffer, DosDevice.Length); + RtlCopyMemory((PVOID)((ULONG_PTR)InputBuffer + InputBuffer->DeviceNameOffset), + DeviceName->Buffer, + DeviceName->Length); + + /* Get the MountMgr device pointer, to send the IOCTL */ + RtlInitUnicodeString(&MountMgr, L"\\Device\\MountPointManager"); + Status = IoGetDeviceObjectPointer(&MountMgr, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + return Status; + } + + /* Call the MountMgr */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_CREATE_POINT, + DeviceObject, + InputBuffer, + InputBufferLength, + NULL, + 0, + FALSE, + &Event, + &IoStatusBlock); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + ObDereferenceObject(FileObject); + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + + /* Return the MountMgr status */ + return Status; +} + +UCHAR +HalpNextDriveLetter(IN PUNICODE_STRING DeviceName, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + BOOLEAN IsRemovable) +{ + UCHAR i; + WCHAR Buffer[40]; + UCHAR DriveLetter; + UNICODE_STRING FloppyString, CdString, NtDeviceNameU, DosDevice; + + /* Quick path, ask directly the mount manager to assign the next + * free drive letter + */ + if (NT_SUCCESS(HalpNextMountLetter(DeviceName, &DriveLetter))) + { + return DriveLetter; + } + + /* We'll allow MountMgr to fail only for non vital path */ + if (NtDeviceName == NULL || NtSystemPath == NULL) + { + return -1; + } + + /* And for removable devices */ + if (!IsRemovable) + { + return 0; + } + + /* Removable might be floppy or cdrom */ + RtlInitUnicodeString(&FloppyString, L"\\Device\\Floppy"); + RtlInitUnicodeString(&CdString, L"\\Device\\CdRom"); + + /* If floppy, start at A */ + if (RtlPrefixUnicodeString(&FloppyString, DeviceName, TRUE)) + { + DriveLetter = 'A'; + } + /* If CD start C */ + else if (RtlPrefixUnicodeString(&CdString, DeviceName, TRUE)) + { + DriveLetter = 'D'; + } + /* For the rest start at C */ + else + { + DriveLetter = 'C'; + } + + /* Now, try to assign a drive letter manually with the MountMgr */ + for (i = DriveLetter; i <= 'Z'; ++i) + { + if (NT_SUCCESS(HalpSetMountLetter(DeviceName, i))) + { + /* If it worked, if we were managing system path, update manually */ + if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&NtDeviceNameU, NtDeviceName, TRUE))) + { + if (RtlEqualUnicodeString(&NtDeviceNameU, DeviceName, TRUE)) { - swprintf(Buffer2, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", - &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_FIXED, - LayoutArray[DiskNumber]->Signature, - LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey, - &BootDevice, - NtSystemPath); - /* Mark the partition as assigned */ - LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; + *NtSystemPath = i; } + + RtlFreeUnicodeString(&NtDeviceNameU); } + + return i; } } - /* Assign removable disk drives */ - DPRINT("Assigning removable disk drives:\n"); - for (i = 0; i < ConfigInfo->DiskCount; i++) + /* Last fall back, we're not on a PnP device... */ + for (i = DriveLetter; i <= 'Z'; ++i) { - if (LayoutArray[i]) + /* We'll link manually, without MountMgr knowing anything about the device */ + swprintf(Buffer, L"\\DosDevices\\%c:", i); + RtlInitUnicodeString(&DosDevice, Buffer); + + /* If linking worked, then the letter was free ;-) */ + if (NT_SUCCESS(IoCreateSymbolicLink(&DosDevice, DeviceName))) { - /* Search for virtual partitions */ - if (LayoutArray[i]->PartitionCount == 1 && - LayoutArray[i]->PartitionEntry[0].PartitionType == 0) + /* If it worked, if we were managing system path, update manually */ + if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&NtDeviceNameU, NtDeviceName, TRUE))) { - swprintf(Buffer2, L"\\Device\\Harddisk%lu\\Partition1", i); - RtlInitUnicodeString(&UnicodeString2, Buffer2); - - /* Assign drive */ - DPRINT(" %wZ\n", - &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - AUTO_DRIVE, - DOSDEVICE_DRIVE_REMOVABLE, - 0, - RtlConvertLongToLargeInteger(0), - hKey, - &BootDevice, - NtSystemPath); + if (RtlEqualUnicodeString(&NtDeviceNameU, DeviceName, TRUE)) + { + *NtSystemPath = i; + } + + RtlFreeUnicodeString(&NtDeviceNameU); } + + return i; } } - /* Free layout array */ - for (i = 0; i < ConfigInfo->DiskCount; i++) + /* We're done, nothing happened */ + return 0; +} + +BOOLEAN +HalpIsOldStyleFloppy(PUNICODE_STRING DeviceName) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + MOUNTDEV_NAME DevName; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + PAGED_CODE(); + + /* Get the attached device object to our device */ + if (!NT_SUCCESS(IoGetDeviceObjectPointer(DeviceName, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject))) { - if (LayoutArray[i] != NULL) - ExFreePoolWithTag(LayoutArray[i], TAG_FILE_SYSTEM); + return FALSE; } - ExFreePoolWithTag(LayoutArray, TAG_FILE_SYSTEM); -end_assign_disks: - /* Assign floppy drives */ - DPRINT("Floppy drives: %lu\n", ConfigInfo->FloppyCount); - for (i = 0; i < ConfigInfo->FloppyCount; i++) + DeviceObject = IoGetAttachedDeviceReference(FileObject->DeviceObject); + ObDereferenceObject(FileObject); + + /* Query its device name (ie, check floppy.sys implements MountMgr interface) */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, + DeviceObject, + NULL, + 0, + &DevName, + sizeof(DevName), + FALSE, + &Event, + &IoStatusBlock); + if (Irp == NULL) { - swprintf(Buffer1, L"\\Device\\Floppy%lu", i); - RtlInitUnicodeString(&UnicodeString1, Buffer1); + ObDereferenceObject(DeviceObject); + return FALSE; + } - /* Assign drive letters A: or B: or first free drive letter */ - DPRINT(" %wZ\n", - &UnicodeString1); - HalpAssignDrive(&UnicodeString1, - (i < 2) ? i : AUTO_DRIVE, - DOSDEVICE_DRIVE_REMOVABLE, - 0, - RtlConvertLongToLargeInteger(0), - hKey, - &BootDevice, - NtSystemPath); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; } - /* Assign cdrom drives */ - DPRINT("CD-Rom drives: %lu\n", ConfigInfo->CdRomCount); - for (i = 0; i < ConfigInfo->CdRomCount; i++) + /* If status is not STATUS_BUFFER_OVERFLOW, it means + * it's pre-mountmgr driver, aka "Old style". + */ + ObDereferenceObject(DeviceObject); + return (Status != STATUS_BUFFER_OVERFLOW); +} + +NTSTATUS +HalpDeleteMountLetter(UCHAR DriveLetter) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + WCHAR Buffer[30]; + ULONG InputBufferLength; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + PMOUNTMGR_MOUNT_POINT InputBuffer; + UNICODE_STRING DosDevice, MountMgr; + PMOUNTMGR_MOUNT_POINTS OutputBuffer; + + /* Setup the device name of the letter to delete */ + swprintf(Buffer, L"\\DosDevices\\%c:", DriveLetter); + RtlInitUnicodeString(&DosDevice, Buffer); + + /* Allocate the input buffer for MountMgr */ + InputBufferLength = DosDevice.Length + sizeof(MOUNTMGR_MOUNT_POINT); + InputBuffer = ExAllocatePoolWithTag(PagedPool, InputBufferLength, TAG_FSTUB); + if (InputBuffer == NULL) { - swprintf(Buffer1, L"\\Device\\CdRom%lu", i); - RtlInitUnicodeString(&UnicodeString1, Buffer1); + return STATUS_INSUFFICIENT_RESOURCES; + } - /* Assign first free drive letter */ - DPRINT(" %wZ\n", &UnicodeString1); - HalpAssignDrive(&UnicodeString1, - AUTO_DRIVE, - DOSDEVICE_DRIVE_CDROM, - 0, - RtlConvertLongToLargeInteger(0), - hKey, - &BootDevice, - NtSystemPath); + /* Fill it in */ + RtlZeroMemory(InputBuffer, InputBufferLength); + InputBuffer->SymbolicLinkNameOffset = sizeof(MOUNTMGR_MOUNT_POINT); + InputBuffer->SymbolicLinkNameLength = DosDevice.Length; + RtlCopyMemory(&InputBuffer[1], DosDevice.Buffer, DosDevice.Length); + + /* Allocate big enough output buffer (we don't care about the output) */ + OutputBuffer = ExAllocatePoolWithTag(PagedPool, 0x1000, TAG_FSTUB); + if (OutputBuffer == NULL) + { + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + return STATUS_INSUFFICIENT_RESOURCES; } - /* Anything else to do? */ + /* Get the device pointer to the MountMgr */ + RtlInitUnicodeString(&MountMgr, L"\\Device\\MountPointManager"); + Status = IoGetDeviceObjectPointer(&MountMgr, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(OutputBuffer, TAG_FSTUB); + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + return Status; + } - ExFreePoolWithTag(PartialInformation, TAG_FILE_SYSTEM); - ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); - ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - if (hKey) ObCloseHandle(hKey, KernelMode); + /* Call the mount manager to delete the drive letter */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_DELETE_POINTS, + DeviceObject, + InputBuffer, + InputBufferLength, + OutputBuffer, + 0x1000, + FALSE, + &Event, + &IoStatusBlock); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + ExFreePoolWithTag(OutputBuffer, TAG_FSTUB); + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + ObDereferenceObject(FileObject); + ExFreePoolWithTag(OutputBuffer, TAG_FSTUB); + ExFreePoolWithTag(InputBuffer, TAG_FSTUB); + + return Status; +} + +VOID +HalpEnableAutomaticDriveLetterAssignment(VOID) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + UNICODE_STRING MountMgr; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + + /* Get the device pointer to the MountMgr */ + RtlInitUnicodeString(&MountMgr, L"\\Device\\MountPointManager"); + Status = IoGetDeviceObjectPointer(&MountMgr, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return; + } + + /* Just send an IOCTL to enable the feature */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS, + DeviceObject, + NULL, + 0, + NULL, + 0, + FALSE, + &Event, + &IoStatusBlock); + if (Irp == NULL) + { + return; + } + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + ObDereferenceObject(FileObject); + + return; } -#endif +VOID +FASTCALL +xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString) +{ + USHORT i; + PULONG Devices; + NTSTATUS Status; + WCHAR Buffer[50]; + HANDLE FileHandle; + UCHAR DriveLetter; + BOOLEAN SystemFound; + IO_STATUS_BLOCK StatusBlock; + PARTITION_TYPE PartitionType; + ANSI_STRING StringA1, StringA2; + PSTR Buffer1, Buffer2, LoadOptions; + OBJECT_ATTRIBUTES ObjectAttributes; + PDRIVE_LAYOUT_INFORMATION LayoutInfo; + PCONFIGURATION_INFORMATION ConfigInfo; + UNICODE_STRING StringU1, StringU2, StringU3; + ULONG Increment, DiskCount, RealDiskCount, HarddiskCount, PartitionCount, SystemPartition; + + PAGED_CODE(); + + /* Get our disk count */ + ConfigInfo = IoGetConfigurationInformation(); + DiskCount = ConfigInfo->DiskCount; + RealDiskCount = 0; + + /* Allocate two generic string buffers we'll use and reuser later on */ + Buffer1 = ExAllocatePoolWithTag(NonPagedPool, 128, TAG_FSTUB); + Buffer2 = ExAllocatePoolWithTag(NonPagedPool, 64, TAG_FSTUB); + if (Buffer1 == NULL || Buffer2 == NULL) + { + KeBugCheck(ASSIGN_DRIVE_LETTERS_FAILED); + } + + /* In case of a remote boot, setup system path */ + if (IoRemoteBootClient) + { + PSTR Last, Saved; + + /* Find last \ */ + Last = strrchr(LoaderBlock->NtBootPathName, '\\'); + Saved = NULL; + /* Misformed name, fail */ + if (Last == NULL) + { + KeBugCheck(ASSIGN_DRIVE_LETTERS_FAILED); + } + + /* In case the name was terminated by a \... */ + if (Last[1] == ANSI_NULL) + { + /* Erase it, save position and find the previous \ */ + *Last = ANSI_NULL; + Saved = Last; + Last = strrchr(LoaderBlock->NtBootPathName, '\\'); + *Saved = '\\'; + } + + /* Misformed name, fail */ + if (Last == NULL) + { + KeBugCheck(ASSIGN_DRIVE_LETTERS_FAILED); + } + + /* For a remote boot, assign X drive letter */ + NtSystemPath[0] = 'X'; + NtSystemPath[1] = ':'; + /* And copy the end of the boot path */ + strcpy((PSTR)&NtSystemPath[2], Last); + + /* If we had to remove the trailing \, remove it here too */ + if (Saved != NULL) + { + NtSystemPath[strlen((PSTR)NtSystemPath) - 1] = ANSI_NULL; + } + + /* Setup output string */ + RtlInitString(NtSystemPathString, (PSTR)NtSystemPath); + } + + /* For each of our disks, create the physical device DOS device */ + Increment = 0; + if (DiskCount != 0) + { + for (i = 0; i < DiskCount; ++i) + { + /* Setup the origin name */ + sprintf(Buffer1, "\\Device\\Harddisk%d\\Partition%d", i, 0); + RtlInitAnsiString(&StringA1, Buffer1); + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&StringU1, &StringA1, TRUE))) + { + /* We cannot fail */ + KeBugCheck(ASSIGN_DRIVE_LETTERS_FAILED); + } + + /* Open the device */ + InitializeObjectAttributes(&ObjectAttributes, + &StringU1, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenFile(&FileHandle, + SYNCHRONIZE | FILE_READ_DATA, + &ObjectAttributes, + &StatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (NT_SUCCESS(Status)) + { + /* If we managed, create the link */ + sprintf(Buffer2, "\\DosDevices\\PhysicalDrive%d", i); + RtlInitAnsiString(&StringA2, Buffer2); + Status = RtlAnsiStringToUnicodeString(&StringU2, &StringA2, TRUE); + if (NT_SUCCESS(Status)) + { + IoCreateSymbolicLink(&StringU2, &StringU1); + RtlFreeUnicodeString(&StringU2); + } + + ZwClose(FileHandle); + + RealDiskCount = i + 1; + } + + RtlFreeUnicodeString(&StringU1); + + if (!NT_SUCCESS(Status)) + { + if (Increment < 50) + { + ++Increment; + ++DiskCount; + } + } + } + } + + /* We done for our buffers */ + ExFreePoolWithTag(Buffer1, TAG_FSTUB); + ExFreePoolWithTag(Buffer2, TAG_FSTUB); + + /* Upcase our load options, if any */ + if (LoaderBlock->LoadOptions != NULL) + { + LoadOptions = _strupr(LoaderBlock->LoadOptions); + } + else + { + LoadOptions = NULL; + } + + /* If we boot with /MININT (system hive as volatile) option, assign X letter to boot device */ + if (LoadOptions != NULL && + strstr(LoadOptions, "MININT") != 0 && + NT_SUCCESS(RtlAnsiStringToUnicodeString(&StringU1, NtDeviceName, TRUE))) + { + if (NT_SUCCESS(HalpSetMountLetter(&StringU1, 'X'))) + { + *NtSystemPath = 'X'; + } + + RtlFreeUnicodeString(&StringU1); + } + + /* Compute our disks derangements */ + DiskCount -= Increment; + if (RealDiskCount > DiskCount) + { + DiskCount = RealDiskCount; + } + Devices = IopComputeHarddiskDerangements(DiskCount); + + /* Now, start browsing all our disks for assigning drive letters + * Here, we'll only handle boot partition and primary partitions + */ + HarddiskCount = 0; + for (i = 0; i < DiskCount; ++i) + { + /* Get device ID according to derangements map */ + if (Devices != NULL) + { + HarddiskCount = Devices[i]; + } + + /* Query disk layout */ + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition0", HarddiskCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryDriveLayout(&StringU1, &LayoutInfo))) + { + LayoutInfo = NULL; + } + + /* Assume we didn't find system */ + SystemFound = FALSE; + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, 1); + RtlInitUnicodeString(&StringU1, Buffer); + /* Query partition info for our disk */ + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + /* It failed, retry for all the partitions */ + for (PartitionCount = 1; ; ++PartitionCount) + { + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + break; + } + + /* We found a primary partition, assign a drive letter */ + if (PartitionType == PrimaryPartition) + { + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, 0); + break; + } + } + } + else + { + /* All right */ + for (PartitionCount = 2; ; ++PartitionCount) + { + /* If our partition is bootable (MBR) or data (GPT), that's system partition */ + if (PartitionType == BootablePartition || PartitionType == DataPartition) + { + SystemFound = TRUE; + + /* Assign a drive letter and stop here if MBR */ + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, 0); + if (PartitionType == BootablePartition) + { + break; + } + } + + /* Keep looping on all the partitions */ + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + /* Mount every primary partition if we didn't find system */ + if (!SystemFound) + { + for (PartitionCount = 1; ; ++PartitionCount) + { + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + break; + } + + if (PartitionType == PrimaryPartition) + { + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, 0); + break; + } + } + } + + break; + } + } + } + + /* Free layout, we'll reallocate it for next device */ + if (LayoutInfo != NULL) + { + ExFreePoolWithTag(LayoutInfo, TAG_FSTUB); + } + + HarddiskCount = i + 1; + } + + /* Now, assign logical partitions */ + for (i = 0; i < DiskCount; ++i) + { + /* Get device ID according to derangements map */ + if (Devices != NULL) + { + HarddiskCount = Devices[i]; + } + else + { + HarddiskCount = i; + } + + /* Query device layout */ + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition0", HarddiskCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryDriveLayout(&StringU1, &LayoutInfo))) + { + LayoutInfo = NULL; + } + + /* And assign drive letter to logical partitions */ + for (PartitionCount = 1; ; ++PartitionCount) + { + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + break; + } + + if (PartitionType == LogicalPartition) + { + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, 0); + } + } + + /* Free layout, we'll reallocate it for next device */ + if (LayoutInfo != NULL) + { + ExFreePoolWithTag(LayoutInfo, 0); + } + } + + /* Now, assign drive letters to everything else */ + for (i = 0; i < DiskCount; ++i) + { + /* Get device ID according to derangements map */ + if (Devices != NULL) + { + HarddiskCount = Devices[i]; + } + else + { + HarddiskCount = i; + } + + /* Query device layout */ + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition0", HarddiskCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryDriveLayout(&StringU1, &LayoutInfo))) + { + LayoutInfo = NULL; + } + + /* Save system partition if any */ + SystemPartition = 0; + for (PartitionCount = 1; ; ++PartitionCount) + { + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + break; + } + + if ((PartitionType == BootablePartition || PartitionType == PrimaryPartition) && (SystemPartition == 0)) + { + SystemPartition = PartitionCount; + } + } + + /* And assign drive letter to anything but system partition */ + for (PartitionCount = 1; ; ++PartitionCount) + { + if (PartitionCount != SystemPartition) + { + swprintf(Buffer, L"\\Device\\Harddisk%d\\Partition%d", HarddiskCount, PartitionCount); + RtlInitUnicodeString(&StringU1, Buffer); + if (!NT_SUCCESS(HalpQueryPartitionType(&StringU1, LayoutInfo, &PartitionType))) + { + if (LayoutInfo != NULL) + { + ExFreePoolWithTag(LayoutInfo, 0); + } + + break; + } + + if (PartitionType == PrimaryPartition || PartitionType == FtPartition) + { + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, 0); + } + } + } + } + + /* We're done with disks, if we have a device map, free it */ + if (Devices != NULL) + { + ExFreePoolWithTag(Devices, TAG_FSTUB); + } + + /* Now, assign drive letter to floppy drives */ + for (i = 0; i < ConfigInfo->FloppyCount; ++i) + { + swprintf(Buffer, L"\\Device\\Floppy%d", i); + RtlInitUnicodeString(&StringU1, Buffer); + if (HalpIsOldStyleFloppy(&StringU1)) + { + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, TRUE); + } + } + + /* And CD drives */ + for (i = 0; i < ConfigInfo->CdRomCount; ++i) + { + swprintf(Buffer, L"\\Device\\CdRom%d", i); + RtlInitUnicodeString(&StringU1, Buffer); + HalpNextDriveLetter(&StringU1, NtDeviceName, NtSystemPath, TRUE); + } + + /* If not remote boot, handle NtDeviceName */ + if (!IoRemoteBootClient && NT_SUCCESS(RtlAnsiStringToUnicodeString(&StringU1, NtDeviceName, TRUE))) + { + /* Assign it a drive letter */ + DriveLetter = HalpNextDriveLetter(&StringU1, NULL, NULL, TRUE); + if (DriveLetter != 0) + { + if (DriveLetter != 0xFF) + { + *NtSystemPath = DriveLetter; + } + } + /* If it fails through mount manager, retry manually */ + else + { + RtlInitUnicodeString(&StringU2, L"\\Device\\Floppy"); + RtlInitUnicodeString(&StringU3, L"\\Device\\CdRom"); + + if (RtlPrefixUnicodeString(&StringU2, &StringU1, TRUE)) + { + DriveLetter = 'A'; + } + else if (RtlPrefixUnicodeString(&StringU3, &StringU1, TRUE)) + { + DriveLetter = 'D'; + } + else + { + DriveLetter = 'C'; + } + + /* Try any drive letter */ + while (HalpSetMountLetter(&StringU1, DriveLetter) != STATUS_SUCCESS) + { + ++DriveLetter; + + if (DriveLetter > 'Z') + { + break; + } + } + + /* If we're beyond Z (ie, no slot left) */ + if (DriveLetter > 'Z') + { + /* Delete Z, and reuse it for system */ + HalpDeleteMountLetter('Z'); + HalpSetMountLetter(&StringU1, 'Z'); + *NtSystemPath = 'Z'; + } + else + { + /* Return matching drive letter */ + *NtSystemPath = DriveLetter; + } + } + + RtlFreeUnicodeString(&StringU1); + } + + /* Enable auto assignement for mountmgr */ + HalpEnableAutomaticDriveLetterAssignment(); +} /* PRIVATE FUNCTIONS *********************************************************/ diff --git a/ntoskrnl/guid.c b/ntoskrnl/guid.c index 31cc46279ab..4e21994c037 100644 --- a/ntoskrnl/guid.c +++ b/ntoskrnl/guid.c @@ -4,5 +4,6 @@ #include <initguid.h> #include <batclass.h> #include <poclass.h> +#include <diskguid.h> /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 35a243e2a23..08afcb5e8cc 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -33,6 +33,7 @@ #include <ntdef.h> #include <ntifs.h> #include <wdmguid.h> +#include <diskguid.h> #include <arc/arc.h> #include <mountmgr.h> #undef NTHALAPI

4 years, 11 months

[reactos] 04/05: [DISK] Forcibly declare our partitions to the MountMgr

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b68104dd87b61c361c327… commit b68104dd87b61c361c327cf44cc8845436c924ec Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 16:50:36 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 16:50:36 2019 +0200 [DISK] Forcibly declare our partitions to the MountMgr Because our disk.sys doesn't do anything related to PnP (compared to disk_new.sys), forcibly declare our partitions to the MountMgr so that it can references them and assign them a DOS drive letter on demand later on. --- drivers/storage/class/disk/disk.c | 131 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/drivers/storage/class/disk/disk.c b/drivers/storage/class/disk/disk.c index 580c89998d9..535de1fcd5d 100644 --- a/drivers/storage/class/disk/disk.c +++ b/drivers/storage/class/disk/disk.c @@ -1068,6 +1068,129 @@ CreateDiskDeviceObjectsExit: } // end CreateDiskDeviceObjects() +VOID +NTAPI +ReportToMountMgr( + IN PDEVICE_OBJECT DiskDeviceObject + ) + +/*++ + +Routine Description: + + This routine reports the creation of a disk device object to the + MountMgr to fake PnP. + +Arguments: + + DiskDeviceObject - Pointer to the created disk device. + +Return Value: + + VOID + +--*/ +{ + NTSTATUS status; + UNICODE_STRING mountMgrDevice; + PDEVICE_OBJECT deviceObject; + PFILE_OBJECT fileObject; + PMOUNTMGR_TARGET_NAME mountTarget; + ULONG diskLen; + PDEVICE_EXTENSION deviceExtension; + PIRP irp; + KEVENT event; + IO_STATUS_BLOCK ioStatus; + + // + // First, get MountMgr DeviceObject. + // + + RtlInitUnicodeString(&mountMgrDevice, MOUNTMGR_DEVICE_NAME); + status = IoGetDeviceObjectPointer(&mountMgrDevice, FILE_READ_ATTRIBUTES, + &fileObject, &deviceObject); + + if (!NT_SUCCESS(status)) { + + DebugPrint((1, + "ReportToMountMgr: Can't get MountMgr pointers %lx\n", + status)); + + return; + } + + deviceExtension = DiskDeviceObject->DeviceExtension; + diskLen = deviceExtension->DeviceName.Length; + + // + // Allocate input buffer to report our partition device. + // + + mountTarget = ExAllocatePool(NonPagedPool, + sizeof(MOUNTMGR_TARGET_NAME) + diskLen); + + if (!mountTarget) { + + DebugPrint((1, + "ReportToMountMgr: Allocation of mountTarget failed\n")); + + ObDereferenceObject(fileObject); + return; + } + + mountTarget->DeviceNameLength = diskLen; + RtlCopyMemory(mountTarget->DeviceName, deviceExtension->DeviceName.Buffer, diskLen); + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + // + // Build the IRP used to communicate with the MountMgr. + // + + irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION, + deviceObject, + mountTarget, + sizeof(MOUNTMGR_TARGET_NAME) + diskLen, + NULL, + 0, + FALSE, + &event, + &ioStatus); + + if (!irp) { + + DebugPrint((1, + "ReportToMountMgr: Allocation of irp failed\n")); + + ExFreePool(mountTarget); + ObDereferenceObject(fileObject); + return; + } + + // + // Call the MountMgr. + // + + status = IoCallDriver(deviceObject, irp); + + if (status == STATUS_PENDING) { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + status = ioStatus.Status; + } + + // + // We're done. + // + + DPRINT1("Reported to the MountMgr: %lx\n", status); + + ExFreePool(mountTarget); + ObDereferenceObject(fileObject); + + return; +} + + NTSTATUS NTAPI CreatePartitionDeviceObjects( @@ -1460,6 +1583,14 @@ CreatePartitionDeviceObjects( deviceExtension->DeviceObject = deviceObject; deviceExtension->DeviceFlags |= physicalDeviceExtension->DeviceFlags; + // + // Now we're done, report to the MountMgr. + // This is a HACK required to have the driver + // handle the associated DosDevices. + // + + ReportToMountMgr(deviceObject); + } // end for (partitionNumber) ... //

4 years, 11 months

[reactos] 03/05: [CLASS2] Hackplement support for IOCTL_MOUNTDEV_QUERY_UNIQUE_ID

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=410c6069996abfeb51e13… commit 410c6069996abfeb51e134bfec940a9a38598682 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 16:45:28 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 16:45:28 2019 +0200 [CLASS2] Hackplement support for IOCTL_MOUNTDEV_QUERY_UNIQUE_ID This is required so that MountMgr can handle devices that are still using class2 instead of classpnp. Given we have no unique ID to return, we'll return device path, which is far from perfect but which is enough for now to have everything working. --- drivers/storage/class/class2/class2.c | 67 +++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index 2d29f645759..5107c45f7ad 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -4041,8 +4041,7 @@ Return Value: goto SetStatusAndReturn; } - if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUNTDEV_QUERY_UNIQUE_ID || - irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME) { + if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME) { UNIMPLEMENTED; Irp->IoStatus.Information = 0; @@ -4052,6 +4051,70 @@ Return Value: goto SetStatusAndReturn; } + if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUNTDEV_QUERY_UNIQUE_ID) { + + // + // FIXME + // This is a HACK. We don't have unique ID. + // We'll just return device name as unique ID. + // It's unique but may not survive to a reboot, + // which is not matching the requirements for + // a MountMgr unique ID. + // + + PMOUNTDEV_UNIQUE_ID uniqueId = Irp->AssociatedIrp.SystemBuffer; + + // + // Check output buffer is big enough. + // + + if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTDEV_UNIQUE_ID)) { + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + status = STATUS_INVALID_PARAMETER; + goto SetStatusAndReturn; + } + + // + // Set size we'll return so that caller can allocate big enough buffer. + // + + RtlZeroMemory(uniqueId, sizeof(MOUNTDEV_UNIQUE_ID)); + uniqueId->UniqueIdLength = deviceExtension->DeviceName.Length; + + // + // Check buffer is big enough to contain device name. + // + + if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + uniqueId->UniqueIdLength) { + + Irp->IoStatus.Information = sizeof(MOUNTDEV_UNIQUE_ID); + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + status = STATUS_BUFFER_OVERFLOW; + goto SetStatusAndReturn; + } + + // + // Copy device name. + // + + RtlCopyMemory(uniqueId->UniqueId, deviceExtension->DeviceName.Buffer, + uniqueId->UniqueIdLength); + status = STATUS_SUCCESS; + + // + // And return to the caller. + // + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + uniqueId->UniqueIdLength; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + goto SetStatusAndReturn; + } + if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUNTDEV_QUERY_DEVICE_NAME) { PMOUNTDEV_NAME name = Irp->AssociatedIrp.SystemBuffer;

4 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019