Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Giannis Adamopoulos <johnyadams@hotmail.com>

Browse source 
- Correctly assign NtSystemRoot and remove assumption that number of partitions equals number of harddisks.
- Remove a hack from IopApplyRosCdromArcHack. Fixes LiveCD issues.
See issue #3170 for more details.

svn path=/trunk/; revision=39116
This commit is contained in:
Aleksey Bragin 2009-01-26 20:00:59 +00:00
parent 1c203e354e
commit c41b00f625
2 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

53
reactos/ntoskrnl/fstub/disksup.c
View file

@ -47,7 +47,9 @@ HalpAssignDrive(IN PUNICODE_STRING PartitionName,
IN UCHAR DriveType, IN UCHAR DriveType,
IN ULONG Signature, IN ULONG Signature,
IN LARGE_INTEGER StartingOffset, IN LARGE_INTEGER StartingOffset,
IN HANDLE hKey) IN HANDLE hKey,
IN PUNICODE_STRING BootDevice,
OUT PUCHAR NtSystemPath)
{ {
WCHAR DriveNameBuffer[16]; WCHAR DriveNameBuffer[16];
UNICODE_STRING DriveName; UNICODE_STRING DriveName;
@ -128,6 +130,14 @@ HalpAssignDrive(IN PUNICODE_STRING PartitionName,
DPRINT1("ZwCreateValueKey failed for %wZ, status=%x\n", &DriveName, Status); DPRINT1("ZwCreateValueKey failed for %wZ, status=%x\n", &DriveName, Status);
} }
} }
/* Check if this is a boot partition */
if (RtlCompareUnicodeString(PartitionName, BootDevice, FALSE) == 0)
{
/* Set NtSystemPath to that partition's disk letter */
*NtSystemPath = 'A' + DriveNumber;
}
return TRUE; return TRUE;
} }
@ -420,6 +430,11 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
PKEY_VALUE_PARTIAL_INFORMATION PartialInformation; PKEY_VALUE_PARTIAL_INFORMATION PartialInformation;
PREG_DISK_MOUNT_INFO DiskMountInfo; PREG_DISK_MOUNT_INFO DiskMountInfo;
ULONG RDiskCount; ULONG RDiskCount;
UNICODE_STRING BootDevice;
Status = RtlAnsiStringToUnicodeString(&BootDevice,
NtDeviceName,
TRUE);
DPRINT("xHalIoAssignDriveLetters()\n"); DPRINT("xHalIoAssignDriveLetters()\n");
@ -612,7 +627,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
DiskMountInfo->Signature, DiskMountInfo->Signature,
DiskMountInfo->StartingOffset, DiskMountInfo->StartingOffset,
NULL); NULL,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -662,7 +679,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->Signature,
LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset,
hKey); hKey,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -702,7 +721,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->Signature,
LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset,
hKey); hKey,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -741,7 +762,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->Signature,
LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset,
hKey); hKey,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -776,7 +799,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->Signature,
LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset,
hKey); hKey,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -812,7 +837,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_FIXED, DOSDEVICE_DRIVE_FIXED,
LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->Signature,
LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset,
hKey); hKey,
&BootDevice,
NtSystemPath);
/* Mark the partition as assigned */ /* Mark the partition as assigned */
LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE;
} }
@ -844,7 +871,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_REMOVABLE, DOSDEVICE_DRIVE_REMOVABLE,
0, 0,
RtlConvertLongToLargeInteger(0), RtlConvertLongToLargeInteger(0),
hKey); hKey,
&BootDevice,
NtSystemPath);
} }
} }
} }
@ -875,7 +904,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_REMOVABLE, DOSDEVICE_DRIVE_REMOVABLE,
0, 0,
RtlConvertLongToLargeInteger(0), RtlConvertLongToLargeInteger(0),
hKey); hKey,
&BootDevice,
NtSystemPath);
} }
/* Assign cdrom drives */ /* Assign cdrom drives */
@ -895,7 +926,9 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
DOSDEVICE_DRIVE_CDROM, DOSDEVICE_DRIVE_CDROM,
0, 0,
RtlConvertLongToLargeInteger(0), RtlConvertLongToLargeInteger(0),
hKey); hKey,
&BootDevice,
NtSystemPath);
} }
/* Anything else to do? */ /* Anything else to do? */

2
reactos/ntoskrnl/io/iomgr/arcname.c
View file

@ -114,8 +114,6 @@ IopApplyRosCdromArcHack(IN ULONG i)
/* Return whether this is the CD or not */ /* Return whether this is the CD or not */
if ((InitIsWinPEMode) || (ExpInTextModeSetup)) if ((InitIsWinPEMode) || (ExpInTextModeSetup))
{ {
/* Hack until IoAssignDriveLetters is fixed */
swprintf(SharedUserData->NtSystemRoot, L"%c:\\%hs", 'C' + DeviceNumber, RosSysPath);
return TRUE; return TRUE;
} }