Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24456: - Part 2.5 of ARC Boot changes. Re-factor IoCreateArcNames not to use a list-entry of detected disk from pool that gets looped and de-referenced, but instead use a simple loop which calls a function that gets disk information one-by-one (IopGetDiskInformation), so that it's used on the spot instead of allocated, linked, and retrieved later. - Inline IopAssignArcNamesToDisk to reduce some stack size abuse and too much parameter shuffling. - Stack use is still very inefficient, will f
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Mon Oct 9 01:09:00 2006 New Revision: 24456 URL: http://svn.reactos.org/svn/reactos?rev=24456&view=rev Log: - Part 2.5 of ARC Boot changes. Re-factor IoCreateArcNames not to use a list-entry of detected disk from pool that gets looped and de-referenced, but instead use a simple loop which calls a function that gets disk information one-by-one (IopGetDiskInformation), so that it's used on the spot instead of allocated, linked, and retrieved later. - Inline IopAssignArcNamesToDisk to reduce some stack size abuse and too much parameter shuffling. - Stack use is still very inefficient, will fix next. Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 9 01:09:00 2006 @@ -8,12 +8,16 @@ * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) */ - /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +UNICODE_STRING IoArcHalDeviceName, IoArcBootDeviceName; +PCHAR IoLoaderArcBootDeviceName; /* FUNCTIONS ****************************************************************/ @@ -78,12 +82,16 @@ return FALSE; } -VOID +BOOLEAN INIT_FUNCTION NTAPI -IopEnumerateDisks(IN PLIST_ENTRY ListHead) +IopGetDiskInformation(IN ULONG i, + OUT PULONG CheckSum, + OUT PULONG Signature, + OUT PULONG PartitionCount, + OUT PDEVICE_OBJECT *DiskDeviceObject) { - ULONG i, j; + ULONG j, Checksum; ANSI_STRING TempString; CHAR Buffer[256]; UNICODE_STRING DeviceName; @@ -97,237 +105,126 @@ IO_STATUS_BLOCK StatusBlock; LARGE_INTEGER PartitionOffset; PPARTITION_SECTOR PartitionBuffer; - PDISKENTRY DiskEntry; - - /* Loop every detected disk */ - for (i = 0; i < IoGetConfigurationInformation()->DiskCount; i++) - { - /* Build the name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); - - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Get the device pointer */ - Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_DATA, - &FileObject, - &DeviceObject); - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - - /* Move on if we failed */ - if (!NT_SUCCESS(Status)) continue; - - /* Allocate the ROS disk Entry */ - DiskEntry = ExAllocatePoolWithTag(PagedPool, sizeof(DISKENTRY), TAG_IO); - DiskEntry->DiskNumber = i; - DiskEntry->DeviceObject = DeviceObject; - - /* Build an IRP to determine the sector size */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, - DeviceObject, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY), - FALSE, - &Event, - &StatusBlock); - if (!Irp) - { - /* Try again */ - ObDereferenceObject(FileObject); - continue; - } - - /* Call the driver and check if we have to wait on it */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on the driver */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = StatusBlock.Status; - } - - /* Check if we failed */ - if (!NT_SUCCESS(Status)) - { - /* Try again */ - ObDereferenceObject(FileObject); - continue; - } - - /* Read the partition table */ - Status = IoReadPartitionTable(DeviceObject, - DiskGeometry.BytesPerSector, - TRUE, - &DriveLayout); - - /* Dereference the file object */ + + /* Build the name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get the device pointer */ + Status = IoGetDeviceObjectPointer(&DeviceName, + FILE_READ_DATA, + &FileObject, + &DeviceObject); + *DiskDeviceObject = DeviceObject; + + /* Free the string */ + RtlFreeUnicodeString(&DeviceName); + + /* Move on if we failed */ + if (!NT_SUCCESS(Status)) return FALSE; + + /* Build an IRP to determine the sector size */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + DeviceObject, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &StatusBlock); + if (!Irp) + { + /* Try again */ ObDereferenceObject(FileObject); - if (!NT_SUCCESS(Status)) continue; - - /* Set the offset to 0 */ - PartitionOffset.QuadPart = 0; - - /* Allocate a buffer for the partition */ - PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, - DiskGeometry.BytesPerSector, - TAG_IO); - if (!PartitionBuffer) continue; - - /* Build an IRP to read the partition sector */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - PartitionBuffer, - DiskGeometry.BytesPerSector, - &PartitionOffset, - &Event, - &StatusBlock); - - /* Call the driver and check if we have to wait */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait for completion */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = StatusBlock.Status; - } - - /* Check if we failed */ - if (!NT_SUCCESS(Status)) - { - /* Try again */ - ExFreePool(PartitionBuffer); - ExFreePool(DriveLayout); - continue; - } - - /* Calculate the MBR checksum */ - DiskEntry->Checksum = 0; - for (j = 0; j < 128; j++) - { - DiskEntry->Checksum += ((PULONG)PartitionBuffer)[j]; - } - - /* Save the signature and checksum */ - DiskEntry->Checksum = ~DiskEntry->Checksum + 1; - DiskEntry->Signature = DriveLayout->Signature; - DiskEntry->PartitionCount = DriveLayout->PartitionCount; - - /* Insert it into the list */ - InsertTailList(ListHead, &DiskEntry->ListEntry); - - /* Free the buffer */ + return FALSE; + } + + /* Call the driver and check if we have to wait on it */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = StatusBlock.Status; + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Try again */ + ObDereferenceObject(FileObject); + return FALSE; + } + + /* Read the partition table */ + Status = IoReadPartitionTable(DeviceObject, + DiskGeometry.BytesPerSector, + TRUE, + &DriveLayout); + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Set the offset to 0 */ + PartitionOffset.QuadPart = 0; + + /* Allocate a buffer for the partition */ + PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, + DiskGeometry.BytesPerSector, + TAG_IO); + if (!PartitionBuffer) return FALSE; + + /* Build an IRP to read the partition sector */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + PartitionBuffer, + DiskGeometry.BytesPerSector, + &PartitionOffset, + &Event, + &StatusBlock); + + /* Call the driver and check if we have to wait */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = StatusBlock.Status; + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Try again */ ExFreePool(PartitionBuffer); ExFreePool(DriveLayout); - } -} - -NTSTATUS -INIT_FUNCTION -NTAPI -IopAssignArcNamesToDisk(IN PDEVICE_OBJECT DeviceObject, - IN PCHAR BootArcName, - IN ULONG DiskNumber, - IN ULONG PartitionCount, - IN PBOOLEAN FoundHdBoot) -{ - CHAR Buffer[256]; - CHAR ArcBuffer[256]; - ANSI_STRING TempString, ArcNameString, BootString; - ANSI_STRING ArcBootString, ArcSystemString; - UNICODE_STRING DeviceName, ArcName, BootPath; - ULONG i; - NTSTATUS Status; - - /* Set default */ - *FoundHdBoot = FALSE; - - /* Build the boot strings */ - RtlInitAnsiString(&ArcBootString, KeLoaderBlock->ArcBootDeviceName); - RtlInitAnsiString(&ArcSystemString, KeLoaderBlock->ArcHalDeviceName); - - /* Build the NT Device Name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", DiskNumber); - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - /* Build the ARC Device Name */ - sprintf(ArcBuffer, "\\ArcName\\%s", BootArcName); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcNameString, ArcBuffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - /* Create the symbolic link and free the strings */ - IoAssignArcName(&ArcName, &DeviceName); - RtlFreeUnicodeString(&ArcName); - RtlFreeUnicodeString(&DeviceName); - - /* Loop all the partitions */ - for (i = 0; i < PartitionCount; i++) - { - /* Build the partition device name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", DiskNumber, i+1); - - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Build the partial ARC name for this partition */ - sprintf(ArcBuffer, "%spartition(%lu)", BootArcName, i + 1); - RtlInitAnsiString(&ArcNameString, ArcBuffer); - - /* Check if this is the boot device */ - if (RtlEqualString(&ArcNameString, &ArcBootString, TRUE)) - { - /* Remember that we found a Hard Disk Boot Device */ - *FoundHdBoot = TRUE; - } - - /* Check if it's the system boot partition */ - if (RtlEqualString(&ArcNameString, &ArcSystemString, TRUE)) - { - /* It is, create a Unicode string for it */ - RtlInitAnsiString(&BootString, KeLoaderBlock->NtHalPathName); - Status = RtlAnsiStringToUnicodeString(&BootPath, &BootString, TRUE); - if (NT_SUCCESS(Status)) - { - /* FIXME: Save in registry */ - - /* Free the string now */ - RtlFreeUnicodeString(&BootPath); - } - } - - /* Build the full ARC name */ - sprintf(Buffer, "\\ArcName\\%spartition(%lu)", BootArcName, i + 1); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcNameString, Buffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Create the symbolic link and free the strings */ - IoAssignArcName(&ArcName, &DeviceName); - RtlFreeUnicodeString(&ArcName); - RtlFreeUnicodeString(&DeviceName); - } - - /* Return success */ - return STATUS_SUCCESS; + return FALSE; + } + + /* Calculate the MBR checksum */ + Checksum = 0; + for (j = 0; j < 128; j++) + { + Checksum += ((PULONG)PartitionBuffer)[j]; + } + + /* Save the signature and checksum */ + *CheckSum = ~Checksum + 1; + *Signature = DriveLayout->Signature; + *PartitionCount = DriveLayout->PartitionCount; + + /* Free the buffer */ + ExFreePool(PartitionBuffer); + ExFreePool(DriveLayout); + return TRUE; } BOOLEAN @@ -441,78 +338,188 @@ return FALSE; } -NTSTATUS INIT_FUNCTION +NTSTATUS +INIT_FUNCTION IoCreateArcNames(VOID) { - PCONFIGURATION_INFORMATION ConfigInfo; - ULONG i; + PLOADER_PARAMETER_BLOCK LoaderBlock = KeLoaderBlock; + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); + PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; + CHAR ArcBuffer[256], Buffer[256]; + ANSI_STRING ArcBootString, ArcSystemString, ArcString, TempString, BootString; + UNICODE_STRING ArcName, BootPath, DeviceName; + BOOLEAN SingleDisk; + ULONG i, j, Length; + PDEVICE_OBJECT DeviceObject; + ULONG Signature, Checksum, PartitionCount; + PLIST_ENTRY NextEntry; + PARC_DISK_SIGNATURE ArcDiskEntry; NTSTATUS Status; - PLIST_ENTRY BiosDiskListHead, Entry; - LIST_ENTRY DiskListHead; - PARC_DISK_SIGNATURE ArcDiskEntry; - PDISKENTRY DiskEntry; BOOLEAN FoundBoot = FALSE; - PULONG Buffer; - - ConfigInfo = IoGetConfigurationInformation(); - - /* Get the boot ARC disk list */ - BiosDiskListHead = &KeLoaderBlock->ArcDiskInformation-> - DiskSignatureListHead; - - /* Enumerate system disks */ - InitializeListHead(&DiskListHead); - IopEnumerateDisks(&DiskListHead); - - while (!IsListEmpty(BiosDiskListHead)) - { - Entry = RemoveHeadList(BiosDiskListHead); - ArcDiskEntry = CONTAINING_RECORD(Entry, ARC_DISK_SIGNATURE, ListEntry); - Entry = DiskListHead.Flink; - while (Entry != &DiskListHead) + PULONG PartitionBuffer; + + /* Check if we only have one disk on the machine */ + SingleDisk = ArcDiskInfo->DiskSignatureListHead.Flink->Flink == + (&ArcDiskInfo->DiskSignatureListHead); + + /* Create the global HAL partition name */ + sprintf(ArcBuffer, "\\ArcName\\%s", LoaderBlock->ArcHalDeviceName); + RtlInitAnsiString(&ArcString, ArcBuffer); + RtlAnsiStringToUnicodeString(&IoArcHalDeviceName, &ArcString, TRUE); + + /* Create the global system partition name */ + sprintf(ArcBuffer, "\\ArcName\\%s", LoaderBlock->ArcBootDeviceName); + RtlInitAnsiString(&ArcString, ArcBuffer); + RtlAnsiStringToUnicodeString(&IoArcBootDeviceName, &ArcString, TRUE); + + /* Allocate memory for the string */ + Length = strlen(LoaderBlock->ArcBootDeviceName) + sizeof(ANSI_NULL); + IoLoaderArcBootDeviceName = ExAllocatePoolWithTag(PagedPool, + Length, + TAG_IO); + if (IoLoaderArcBootDeviceName) + { + /* Copy the name */ + RtlMoveMemory(IoLoaderArcBootDeviceName, + LoaderBlock->ArcBootDeviceName, + Length); + } + + /* Check if we only found a disk, but we're booting from CD-ROM */ + if ((SingleDisk) && strstr(LoaderBlock->ArcBootDeviceName, "cdrom")) + { + /* Then disable single-disk mode, since there's a CD drive out there */ + SingleDisk = FALSE; + } + + /* Build the boot strings */ + RtlInitAnsiString(&ArcBootString, LoaderBlock->ArcBootDeviceName); + RtlInitAnsiString(&ArcSystemString, LoaderBlock->ArcHalDeviceName); + + /* Loop every detected disk */ + for (i = 0; i < ConfigInfo->DiskCount; i++) + { + /* Get information about the disk */ + if (!IopGetDiskInformation(i, + &Checksum, + &Signature, + &PartitionCount, + &DeviceObject)) { - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - DPRINT1("Entry: %s\n", ArcDiskEntry->ArcName); - if (DiskEntry->Checksum == ArcDiskEntry->CheckSum && - DiskEntry->Signature == ArcDiskEntry->Signature) + /* Skip this disk */ + continue; + } + + /* Loop ARC disks */ + for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; + NextEntry != &ArcDiskInfo->DiskSignatureListHead; + NextEntry = NextEntry->Flink) + { + /* Get the current ARC disk signature entry */ + ArcDiskEntry = CONTAINING_RECORD(NextEntry, + ARC_DISK_SIGNATURE, + ListEntry); + + /* + * Now check if the signature and checksum match, unless this is + * the only disk that was in the ARC list, and also in the device + * tree, in which case the check is bypassed and we accept the disk + */ + if (((SingleDisk) && (ConfigInfo->DiskCount == 1)) || + ((Checksum == ArcDiskEntry->CheckSum) && + (Signature == ArcDiskEntry->Signature))) { - Status = IopAssignArcNamesToDisk(DiskEntry->DeviceObject, - ArcDiskEntry->ArcName, - DiskEntry->DiskNumber, - DiskEntry->PartitionCount, - &FoundBoot); - - RemoveEntryList(&DiskEntry->ListEntry); - ExFreePool(DiskEntry); - break; + /* Build the NT Device Name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Build the ARC Device Name */ + sprintf(ArcBuffer, "\\ArcName\\%s", ArcDiskEntry->ArcName); + + /* Convert it to Unicode */ + RtlInitAnsiString(&ArcString, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Create the symbolic link and free the strings */ + IoAssignArcName(&ArcName, &DeviceName); + RtlFreeUnicodeString(&ArcName); + RtlFreeUnicodeString(&DeviceName); + + /* Loop all the partitions */ + for (j = 0; j < PartitionCount; j++) + { + /* Build the partition device name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", i, j + 1); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Build the partial ARC name for this partition */ + sprintf(ArcBuffer, "%spartition(%lu)", ArcDiskEntry->ArcName, j + 1); + RtlInitAnsiString(&ArcString, ArcBuffer); + + /* Check if this is the boot device */ + if (RtlEqualString(&ArcString, &ArcBootString, TRUE)) + { + /* Remember that we found a Hard Disk Boot Device */ + FoundBoot = TRUE; + } + + /* Check if it's the system boot partition */ + if (RtlEqualString(&ArcString, &ArcSystemString, TRUE)) + { + /* It is, create a Unicode string for it */ + RtlInitAnsiString(&BootString, LoaderBlock->NtHalPathName); + Status = RtlAnsiStringToUnicodeString(&BootPath, &BootString, TRUE); + if (NT_SUCCESS(Status)) + { + /* FIXME: Save in registry */ + + /* Free the string now */ + RtlFreeUnicodeString(&BootPath); + } + } + + /* Build the full ARC name */ + sprintf(Buffer, "\\ArcName\\%spartition(%lu)", ArcDiskEntry->ArcName, j + 1); + + /* Convert it to Unicode */ + RtlInitAnsiString(&ArcString, Buffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Create the symbolic link and free the strings */ + IoAssignArcName(&ArcName, &DeviceName); + RtlFreeUnicodeString(&ArcName); + RtlFreeUnicodeString(&DeviceName); + } } - Entry = Entry->Flink; } - } - - while (!IsListEmpty(&DiskListHead)) - { - Entry = RemoveHeadList(&DiskListHead); - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - ExFreePool(DiskEntry); } /* Check if we didn't find the boot disk */ if (!FoundBoot) { /* Allocate a buffer for the CD-ROM MBR */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_IO); - if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_IO); + if (!PartitionBuffer) return STATUS_INSUFFICIENT_RESOURCES; /* Loop every CD-ROM */ for (i = 0; i < ConfigInfo->CdRomCount; i++) { /* Give it an ARC name */ - if (IopAssignArcNamesToCdrom(Buffer, i)) break; + if (IopAssignArcNamesToCdrom(PartitionBuffer, i)) break; } /* Free the buffer */ - ExFreePool(Buffer); + ExFreePool(PartitionBuffer); } /* Return success */

1 0

[cwittich] 24455: set eol-style:native
by cwittich＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: cwittich Date: Mon Oct 9 00:42:19 2006 New Revision: 24455 URL: http://svn.reactos.org/svn/reactos?rev=24455&view=rev Log: set eol-style:native Modified: trunk/tools/buildbot/buildbot/buildbot/__init__.py (props changed) trunk/tools/buildbot/buildbot/buildbot/buildset.py (props changed) trunk/tools/buildbot/buildbot/buildbot/dnotify.py (props changed) trunk/tools/buildbot/buildbot/buildbot/interfaces.py (props changed) trunk/tools/buildbot/buildbot/buildbot/locks.py (props changed) trunk/tools/buildbot/buildbot/buildbot/master.py (props changed) trunk/tools/buildbot/buildbot/buildbot/pbutil.py (props changed) trunk/tools/buildbot/buildbot/buildbot/scheduler.py (props changed) trunk/tools/buildbot/buildbot/buildbot/sourcestamp.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/__init__.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/base.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/builder.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/classic.css (props changed) trunk/tools/buildbot/buildbot/buildbot/status/client.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/html.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/mail.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/progress.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/tests.py (props changed) trunk/tools/buildbot/buildbot/buildbot/status/words.py (props changed) trunk/tools/buildbot/buildbot/buildbot/twcompat.py (props changed) trunk/tools/buildbot/buildbot/buildbot/util.py (props changed) Propchange: trunk/tools/buildbot/buildbot/buildbot/__init__.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/buildset.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/dnotify.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/interfaces.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/locks.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/master.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/pbutil.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/scheduler.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/sourcestamp.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/__init__.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/base.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/builder.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/classic.css ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/client.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/html.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/mail.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/progress.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/tests.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/status/words.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/twcompat.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/buildbot/buildbot/buildbot/util.py ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[weiden] 24454: Some header fixes
by weiden＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: weiden Date: Mon Oct 9 00:28:03 2006 New Revision: 24454 URL: http://svn.reactos.org/svn/reactos?rev=24454&view=rev Log: Some header fixes Modified: trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/win2k.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ddk/winnt4.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/lib/rossym/initkm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=244… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=24… Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=24… Modified: trunk/reactos/include/ddk/win2k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/win2k.h?rev=24… Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… Modified: trunk/reactos/include/ddk/winnt4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winnt4.h?rev=2… Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=24…

1 0

[ion] 24453: - Greatly simplify and optimize IoCreateArcNames by using ARC data from FreeLDR/NTLDR (now nearly 100% compatible!) instead of querying registry data (which FreeLdr had already set up, so we cached those values like ntldr does). - Last step is to stop using a list of drives and pool allocated entries, to optimize memory usage and re-factor the code.
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Sun Oct 8 23:59:53 2006 New Revision: 24453 URL: http://svn.reactos.org/svn/reactos?rev=24453&view=rev Log: - Greatly simplify and optimize IoCreateArcNames by using ARC data from FreeLDR/NTLDR (now nearly 100% compatible!) instead of querying registry data (which FreeLdr had already set up, so we cached those values like ntldr does). - Last step is to stop using a list of drives and pool allocated entries, to optimize memory usage and re-factor the code. Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Sun Oct 8 23:59:53 2006 @@ -15,136 +15,7 @@ #define NDEBUG #include <internal/debug.h> -/* MACROS *******************************************************************/ - -#define FS_VOLUME_BUFFER_SIZE (MAX_PATH + sizeof(FILE_FS_VOLUME_INFORMATION)) - /* FUNCTIONS ****************************************************************/ - -static -NTSTATUS -STDCALL -INIT_FUNCTION -DiskQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PLIST_ENTRY ListHead = (PLIST_ENTRY)Context; - PULONG GlobalDiskCount = (PULONG)EntryContext; - PDISKENTRY DiskEntry; - UNICODE_STRING NameU; - - if (ValueType == REG_SZ && - ValueLength == 20 * sizeof(WCHAR)) - { - DiskEntry = ExAllocatePool(PagedPool, sizeof(DISKENTRY)); - if (DiskEntry == NULL) - { - return STATUS_NO_MEMORY; - } - DiskEntry->DiskNumber = (*GlobalDiskCount)++; - - NameU.Buffer = (PWCHAR)ValueData; - NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); - RtlUnicodeStringToInteger(&NameU, 16, &DiskEntry->Checksum); - - NameU.Buffer = (PWCHAR)ValueData + 9; - RtlUnicodeStringToInteger(&NameU, 16, &DiskEntry->Signature); - - InsertTailList(ListHead, &DiskEntry->ListEntry); - } - - return STATUS_SUCCESS; -} - -#define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter" - -static VOID INIT_FUNCTION -IopEnumerateBiosDisks(PLIST_ENTRY ListHead) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - WCHAR Name[255]; - ULONG AdapterCount; - ULONG ControllerCount; - ULONG DiskCount; - NTSTATUS Status; - ULONG GlobalDiskCount=0; - - - memset(QueryTable, 0, sizeof(QueryTable)); - QueryTable[0].Name = L"Identifier"; - QueryTable[0].QueryRoutine = DiskQueryRoutine; - QueryTable[0].EntryContext = (PVOID)&GlobalDiskCount; - - AdapterCount = 0; - while (1) - { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[1], - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - break; - } - - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[1], - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - ControllerCount = 0; - while (1) - { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu", ROOT_NAME, AdapterCount, ControllerCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[1], - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - break; - } - - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral", ROOT_NAME, AdapterCount, ControllerCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[1], - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - DiskCount = 0; - while (1) - { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, ControllerCount, DiskCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - QueryTable, - (PVOID)ListHead, - NULL); - if (!NT_SUCCESS(Status)) - { - break; - } - DiskCount++; - } - } - ControllerCount++; - } - } - AdapterCount++; - } -} BOOLEAN INIT_FUNCTION @@ -363,7 +234,7 @@ INIT_FUNCTION NTAPI IopAssignArcNamesToDisk(IN PDEVICE_OBJECT DeviceObject, - IN ULONG RDisk, + IN PCHAR BootArcName, IN ULONG DiskNumber, IN ULONG PartitionCount, IN PBOOLEAN FoundHdBoot) @@ -375,10 +246,6 @@ UNICODE_STRING DeviceName, ArcName, BootPath; ULONG i; NTSTATUS Status; - - /* HACK: Build the ARC name that FreeLDR should've given us */ - CHAR BootArcName[256]; // should come from FREELDR - sprintf(BootArcName, "multi(0)disk(0)rdisk(%lu)", RDisk); /* Set default */ *FoundHdBoot = FALSE; @@ -578,39 +445,39 @@ IoCreateArcNames(VOID) { PCONFIGURATION_INFORMATION ConfigInfo; - ULONG i, RDiskNumber; + ULONG i; NTSTATUS Status; - LIST_ENTRY BiosDiskListHead; + PLIST_ENTRY BiosDiskListHead, Entry; LIST_ENTRY DiskListHead; - PLIST_ENTRY Entry; - PDISKENTRY BiosDiskEntry; + PARC_DISK_SIGNATURE ArcDiskEntry; PDISKENTRY DiskEntry; - BOOLEAN FoundBoot; + BOOLEAN FoundBoot = FALSE; PULONG Buffer; ConfigInfo = IoGetConfigurationInformation(); - /* create ARC names for hard disk drives */ - InitializeListHead(&BiosDiskListHead); + /* Get the boot ARC disk list */ + BiosDiskListHead = &KeLoaderBlock->ArcDiskInformation-> + DiskSignatureListHead; + + /* Enumerate system disks */ InitializeListHead(&DiskListHead); - IopEnumerateBiosDisks(&BiosDiskListHead); IopEnumerateDisks(&DiskListHead); - RDiskNumber = 0; - while (!IsListEmpty(&BiosDiskListHead)) - { - Entry = RemoveHeadList(&BiosDiskListHead); - BiosDiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + while (!IsListEmpty(BiosDiskListHead)) + { + Entry = RemoveHeadList(BiosDiskListHead); + ArcDiskEntry = CONTAINING_RECORD(Entry, ARC_DISK_SIGNATURE, ListEntry); Entry = DiskListHead.Flink; while (Entry != &DiskListHead) { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->Checksum == BiosDiskEntry->Checksum && - DiskEntry->Signature == BiosDiskEntry->Signature) + DPRINT1("Entry: %s\n", ArcDiskEntry->ArcName); + if (DiskEntry->Checksum == ArcDiskEntry->CheckSum && + DiskEntry->Signature == ArcDiskEntry->Signature) { - Status = IopAssignArcNamesToDisk(DiskEntry->DeviceObject, - RDiskNumber, + ArcDiskEntry->ArcName, DiskEntry->DiskNumber, DiskEntry->PartitionCount, &FoundBoot); @@ -621,8 +488,6 @@ } Entry = Entry->Flink; } - RDiskNumber++; - ExFreePool(BiosDiskEntry); } while (!IsListEmpty(&DiskListHead))

1 0

[ion] 24452: - Have FreeLDR fill out ARC_DISK_SIGNATURE information for each detected disk, as it's filling the registry. - Add code to KiRosFrldrLpbToLpb to convert this array to the official ARC_DISK_INFORMATION structure that contains LIST_ENTRYies for each ARC_DISK_SIGNATURE, and initialize the ArcDiskSignatureListHead. - The end result will be that in the next patch we can remove a bunch of registry-reading code in IoCreateArcNames.
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Sun Oct 8 23:34:16 2006 New Revision: 24452 URL: http://svn.reactos.org/svn/reactos?rev=24452&view=rev Log: - Have FreeLDR fill out ARC_DISK_SIGNATURE information for each detected disk, as it's filling the registry. - Add code to KiRosFrldrLpbToLpb to convert this array to the official ARC_DISK_INFORMATION structure that contains LIST_ENTRYies for each ARC_DISK_SIGNATURE, and initialize the ArcDiskSignatureListHead. - The end result will be that in the next patch we can remove a bunch of registry-reading code in IoCreateArcNames. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Sun Oct 8 23:34:16 2006 @@ -120,6 +120,9 @@ static WCHAR Hex[] = L"0123456789ABCDEF"; static unsigned int delay_count = 1; +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern char reactos_arc_strings[32][256]; /* FUNCTIONS ****************************************************************/ @@ -512,6 +515,7 @@ ULONG Checksum; ULONG Signature; WCHAR Identifier[20]; + CHAR ArcName[256]; LONG Error; /* Read the MBR */ @@ -535,6 +539,15 @@ } Checksum = ~Checksum + 1; DbgPrint((DPRINT_HWDETECT, "Checksum: %x\n", Checksum)); + + /* Fill out the ARC disk block */ + reactos_arc_disk_info[reactos_disk_count].Signature = Signature; + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); + strcpy(reactos_arc_strings[reactos_disk_count], ArcName); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sun Oct 8 23:34:16 2006 @@ -30,6 +30,9 @@ char reactos_module_strings[64][256]; // Array to hold module names unsigned long reactos_memory_map_descriptor_size; memory_map_t reactos_memory_map[32]; // Memory map +ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information +char reactos_arc_strings[32][256]; +unsigned long reactos_disk_count = 0; static CHAR szLoadingMsg[] = "Loading ReactOS..."; @@ -605,6 +608,7 @@ LoaderBlock.CommandLine = (unsigned long)reactos_kernel_cmdline; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = (unsigned long)reactos_modules; + LoaderBlock.DrivesAddr = (unsigned long)reactos_arc_disk_info; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { @@ -692,6 +696,7 @@ UiDrawProgressBarCenter(5, 100, szLoadingMsg); if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; + LoaderBlock.DrivesCount = reactos_disk_count; UiDrawStatusText("Loading..."); Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 8 23:34:16 2006 @@ -18,6 +18,7 @@ LOADER_MODULE KeLoaderModules[64]; ULONG KeLoaderModuleCount; static CHAR KeLoaderModuleStrings[64][256]; +static ARC_DISK_SIGNATURE KeArcDiskInfo[32]; /* FreeLDR Memory Data */ ADDRESS_RANGE KeMemoryMap[64]; @@ -48,6 +49,9 @@ WCHAR BldrModuleStrings[64][260]; NLS_DATA_BLOCK BldrNlsDataBlock; SETUP_LOADER_BLOCK BldrSetupBlock; +ARC_DISK_INFORMATION BldrArcDiskInfo; +CHAR BldrArcNames[32][256]; +ARC_DISK_SIGNATURE BldrDiskInfo[32]; /* FUNCTIONS *****************************************************************/ @@ -65,6 +69,7 @@ PCHAR DriverName; PCHAR BootPath, HalPath; CHAR CommandLine[256]; + PARC_DISK_SIGNATURE RosDiskInfo, ArcDiskInfo; /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; @@ -79,6 +84,9 @@ /* Set the NLS Data block */ LoaderBlock->NlsData = &BldrNlsDataBlock; + /* Set the ARC Data block */ + LoaderBlock->ArcDiskInformation = &BldrArcDiskInfo; + /* Assume this is from FreeLDR's SetupLdr */ LoaderBlock->SetupLdrBlock = &BldrSetupBlock; @@ -86,6 +94,7 @@ InitializeListHead(&LoaderBlock->LoadOrderListHead); InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); + InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); /* Loop boot driver list */ for (i = 0; i < KeLoaderModuleCount; i++) @@ -285,6 +294,28 @@ /* Parse it and change every slash to a space */ BootPath = LoaderBlock->LoadOptions; do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); + + /* Now let's loop ARC disk information */ + for (i = 0; i < RosLoaderBlock->DrivesCount; i++) + { + /* Get the ROS loader entry */ + RosDiskInfo = &KeArcDiskInfo[i]; + + /* Get the ARC structure */ + ArcDiskInfo = &BldrDiskInfo[i]; + + /* Copy the data over */ + ArcDiskInfo->Signature = RosDiskInfo->Signature; + ArcDiskInfo->CheckSum = RosDiskInfo->CheckSum; + + /* Copy the ARC Name */ + strcpy(BldrArcNames[i], RosDiskInfo->ArcName); + ArcDiskInfo->ArcName = BldrArcNames[i]; + + /* Insert into the list */ + InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, + &ArcDiskInfo->ListEntry); + } } VOID @@ -322,6 +353,10 @@ (PVOID)KeRosLoaderBlock.ModsAddr, sizeof(LOADER_MODULE) * KeRosLoaderBlock.ModsCount); KeRosLoaderBlock.ModsAddr = (ULONG)&KeLoaderModules; + memcpy(&KeArcDiskInfo[0], + (PVOID)KeRosLoaderBlock.DrivesAddr, + sizeof(ARC_DISK_SIGNATURE) * KeRosLoaderBlock.DrivesCount); + KeRosLoaderBlock.DrivesAddr = (ULONG)&KeArcDiskInfo; /* Check for BIOS memory map */ KeMemoryMapRangeCount = 0;

1 0

[ion] 24451: - Part 2 of ARC boot changes: Major modifications done to the existing code, as well as re-formatting and cleanup. Floppy ARC names are not created anymore (they don't exist), and CD-ROM ARC name is only created 1) when there is a boot CD and 2) only for the boot CD. This mimics NT functionality. - Optimize some code paths, mostly by not querying the whole GET_DRIVE_GEOMETRY IRP twice and reducing some buffer usage. Also re-factor some code better into smaller functions. - Document
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Sun Oct 8 20:58:03 2006 New Revision: 24451 URL: http://svn.reactos.org/svn/reactos?rev=24451&view=rev Log: - Part 2 of ARC boot changes: Major modifications done to the existing code, as well as re-formatting and cleanup. Floppy ARC names are not created anymore (they don't exist), and CD-ROM ARC name is only created 1) when there is a boot CD and 2) only for the boot CD. This mimics NT functionality. - Optimize some code paths, mostly by not querying the whole GET_DRIVE_GEOMETRY IRP twice and reducing some buffer usage. Also re-factor some code better into smaller functions. - Document and work around currently FreeLDR incompatibility (lack of ARC_DISK_INFORMATION) data in LoaderBlock. Modified: trunk/reactos/include/reactos/arc/arc.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sun Oct 8 20:58:03 2006 @@ -73,6 +73,19 @@ struct _LDR_DATA_TABLE_ENTRY *DataTableEntry; } BOOT_DRIVER_LIST_ENTRY, *PBOOT_DRIVER_LIST_ENTRY; +typedef struct _ARC_DISK_SIGNATURE +{ + LIST_ENTRY ListEntry; + ULONG Signature; + PCHAR ArcName; + ULONG CheckSum; + BOOLEAN ValidPartitionTable; + BOOLEAN xInt13; + BOOLEAN IsGpt; + BOOLEAN Reserved; + CHAR GptSignature[16]; +} ARC_DISK_SIGNATURE, *PARC_DISK_SIGNATURE; + typedef struct _CONFIGURATION_COMPONENT { CONFIGURATION_CLASS Class; Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Oct 8 20:58:03 2006 @@ -423,6 +423,7 @@ ULONG Signature; ULONG Checksum; PDEVICE_OBJECT DeviceObject; + ULONG PartitionCount; } DISKENTRY, *PDISKENTRY; // Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Sun Oct 8 20:58:03 2006 @@ -14,34 +14,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -static NTSTATUS -STDCALL INIT_FUNCTION -DiskQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext); - -static VOID INIT_FUNCTION -IopEnumerateBiosDisks(PLIST_ENTRY ListHead); - -static VOID INIT_FUNCTION -IopEnumerateDisks(PLIST_ENTRY ListHead); - -static NTSTATUS INIT_FUNCTION -IopAssignArcNamesToDisk(PDEVICE_OBJECT DeviceObject, ULONG RDisk, ULONG DiskNumber); - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, DiskQueryRoutine) -#pragma alloc_text(INIT, IopEnumerateBiosDisks) -#pragma alloc_text(INIT, IopEnumerateDisks) -#pragma alloc_text(INIT, IopAssignArcNamesToDisk) -#pragma alloc_text(INIT, IoCreateArcNames) -#pragma alloc_text(INIT, IoCreateSystemRootLink) -#endif - /* MACROS *******************************************************************/ @@ -174,420 +146,47 @@ } } -static VOID INIT_FUNCTION -IopEnumerateDisks(PLIST_ENTRY ListHead) -{ - ULONG i, k; - PDISKENTRY DiskEntry; - DISK_GEOMETRY DiskGeometry; - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; - LARGE_INTEGER PartitionOffset; - PULONG Buffer; - WCHAR DeviceNameBuffer[80]; - UNICODE_STRING DeviceName; - NTSTATUS Status; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - BOOLEAN IsRemovableMedia; - PPARTITION_SECTOR PartitionBuffer = NULL; - ULONG PartitionBufferSize = 0; - - - for (i = 0; i < IoGetConfigurationInformation()->DiskCount; i++) - { - - swprintf(DeviceNameBuffer, - L"\\Device\\Harddisk%lu\\Partition0", - i); - RtlInitUnicodeString(&DeviceName, - DeviceNameBuffer); - - - Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_DATA, - &FileObject, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - continue; - } - IsRemovableMedia = DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA ? TRUE : FALSE; - ObDereferenceObject(FileObject); - if (IsRemovableMedia) - { - ObDereferenceObject(DeviceObject); - continue; - } - DiskEntry = ExAllocatePool(PagedPool, sizeof(DISKENTRY)); - if (DiskEntry == NULL) - { - KEBUGCHECK(0); - } - DiskEntry->DiskNumber = i; - DiskEntry->DeviceObject = DeviceObject; - - /* determine the sector size */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, - DeviceObject, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY), - FALSE, - &Event, - &StatusBlock); - if (Irp == NULL) - { - KEBUGCHECK(0); - } - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = StatusBlock.Status; - } - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - if (PartitionBuffer != NULL && PartitionBufferSize < DiskGeometry.BytesPerSector) - { - ExFreePool(PartitionBuffer); - PartitionBuffer = NULL; - } - if (PartitionBuffer == NULL) - { - PartitionBufferSize = max(DiskGeometry.BytesPerSector, PAGE_SIZE); - PartitionBuffer = ExAllocatePool(PagedPool, PartitionBufferSize); - if (PartitionBuffer == NULL) - { - KEBUGCHECK(0); - } - } - - /* read the partition sector */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - PartitionOffset.QuadPart = 0; - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - PartitionBuffer, - DiskGeometry.BytesPerSector, - &PartitionOffset, - &Event, - &StatusBlock); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = StatusBlock.Status; - } - - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - - /* Calculate the MBR checksum */ - DiskEntry->Checksum = 0; - Buffer = (PULONG)PartitionBuffer; - for (k = 0; k < 128; k++) - { - DiskEntry->Checksum += Buffer[k]; - } - DiskEntry->Checksum = ~DiskEntry->Checksum + 1; - DiskEntry->Signature = PartitionBuffer->Signature; - - InsertTailList(ListHead, &DiskEntry->ListEntry); - } - if (PartitionBuffer) - { - ExFreePool(PartitionBuffer); - } -} - -static NTSTATUS INIT_FUNCTION -IopAssignArcNamesToDisk(PDEVICE_OBJECT DeviceObject, ULONG RDisk, ULONG DiskNumber) -{ - WCHAR DeviceNameBuffer[80]; - WCHAR ArcNameBuffer[80]; - UNICODE_STRING DeviceName; - UNICODE_STRING ArcName; - PDRIVE_LAYOUT_INFORMATION LayoutInfo = NULL; - NTSTATUS Status; - ULONG i; - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; - ULONG PartitionNumber; - - swprintf(DeviceNameBuffer, - L"\\Device\\Harddisk%lu\\Partition0", - DiskNumber); - RtlInitUnicodeString(&DeviceName, - DeviceNameBuffer); - - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)rdisk(%lu)", - RDisk); - RtlInitUnicodeString(&ArcName, - ArcNameBuffer); - - DPRINT("%wZ ==> %wZ\n", &ArcName, &DeviceName); - - Status = IoAssignArcName(&ArcName, &DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoAssignArcName failed, status=%lx\n", Status); - return(Status); - } - - LayoutInfo = ExAllocatePool(PagedPool, 2 * PAGE_SIZE); - if (LayoutInfo == NULL) - { - return STATUS_NO_MEMORY; - } - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_LAYOUT, - DeviceObject, - NULL, - 0, - LayoutInfo, - 2 * PAGE_SIZE, - FALSE, - &Event, - &StatusBlock); - if (Irp == NULL) - { - ExFreePool(LayoutInfo); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = StatusBlock.Status; - } - if (!NT_SUCCESS(Status)) - { - ExFreePool(LayoutInfo); - return Status; - } - - DPRINT("Number of partitions: %u\n", LayoutInfo->PartitionCount); - - PartitionNumber = 1; - for (i = 0; i < LayoutInfo->PartitionCount; i++) - { - if (!IsContainerPartition(LayoutInfo->PartitionEntry[i].PartitionType) && - LayoutInfo->PartitionEntry[i].PartitionType != PARTITION_ENTRY_UNUSED) - { - - swprintf(DeviceNameBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskNumber, - PartitionNumber); - RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); - - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)rdisk(%lu)partition(%lu)", - RDisk, - PartitionNumber); - RtlInitUnicodeString(&ArcName, ArcNameBuffer); - - DPRINT("%wZ ==> %wZ\n", &ArcName, &DeviceName); - - Status = IoAssignArcName(&ArcName, &DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoAssignArcName failed, status=%lx\n", Status); - ExFreePool(LayoutInfo); - return(Status); - } - PartitionNumber++; - } - } - ExFreePool(LayoutInfo); - return STATUS_SUCCESS; -} - -NTSTATUS INIT_FUNCTION -IoCreateArcNames(VOID) -{ - PCONFIGURATION_INFORMATION ConfigInfo; - WCHAR DeviceNameBuffer[80]; - WCHAR ArcNameBuffer[80]; - UNICODE_STRING DeviceName; - UNICODE_STRING ArcName; - ULONG i, RDiskNumber; - NTSTATUS Status; - LIST_ENTRY BiosDiskListHead; - LIST_ENTRY DiskListHead; - PLIST_ENTRY Entry; - PDISKENTRY BiosDiskEntry; - PDISKENTRY DiskEntry; - - DPRINT("IoCreateArcNames() called\n"); - - ConfigInfo = IoGetConfigurationInformation(); - - /* create ARC names for floppy drives */ - DPRINT("Floppy drives: %lu\n", ConfigInfo->FloppyCount); - for (i = 0; i < ConfigInfo->FloppyCount; i++) - { - swprintf(DeviceNameBuffer, - L"\\Device\\Floppy%lu", - i); - RtlInitUnicodeString(&DeviceName, - DeviceNameBuffer); - - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)fdisk(%lu)", - i); - RtlInitUnicodeString(&ArcName, - ArcNameBuffer); - DPRINT("%wZ ==> %wZ\n", - &ArcName, - &DeviceName); - - Status = IoAssignArcName(&ArcName, - &DeviceName); - if (!NT_SUCCESS(Status)) - return(Status); - } - - /* create ARC names for hard disk drives */ - InitializeListHead(&BiosDiskListHead); - InitializeListHead(&DiskListHead); - IopEnumerateBiosDisks(&BiosDiskListHead); - IopEnumerateDisks(&DiskListHead); - - RDiskNumber = 0; - while (!IsListEmpty(&BiosDiskListHead)) - { - Entry = RemoveHeadList(&BiosDiskListHead); - BiosDiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - Entry = DiskListHead.Flink; - while (Entry != &DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->Checksum == BiosDiskEntry->Checksum && - DiskEntry->Signature == BiosDiskEntry->Signature) - { - - Status = IopAssignArcNamesToDisk(DiskEntry->DeviceObject, RDiskNumber, DiskEntry->DiskNumber); - - RemoveEntryList(&DiskEntry->ListEntry); - ExFreePool(DiskEntry); - break; - } - Entry = Entry->Flink; - } - RDiskNumber++; - ExFreePool(BiosDiskEntry); - } - - while (!IsListEmpty(&DiskListHead)) - { - Entry = RemoveHeadList(&DiskListHead); - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - ExFreePool(DiskEntry); - } - - /* create ARC names for cdrom drives */ - DPRINT("CD-ROM drives: %lu\n", ConfigInfo->CdRomCount); - for (i = 0; i < ConfigInfo->CdRomCount; i++) - { - swprintf(DeviceNameBuffer, - L"\\Device\\CdRom%lu", - i); - RtlInitUnicodeString(&DeviceName, - DeviceNameBuffer); - - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)cdrom(%lu)", - i); - RtlInitUnicodeString(&ArcName, - ArcNameBuffer); - DPRINT("%wZ ==> %wZ\n", - &ArcName, - &DeviceName); - - Status = IoAssignArcName(&ArcName, - &DeviceName); - if (!NT_SUCCESS(Status)) - return(Status); - } - - DPRINT("IoCreateArcNames() done\n"); - - return(STATUS_SUCCESS); -} - -VOID +BOOLEAN INIT_FUNCTION NTAPI -IopApplyRosCdromArcHack(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +IopApplyRosCdromArcHack(IN ULONG i) { ULONG DeviceNumber = -1; - PCONFIGURATION_INFORMATION ConfigInfo; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING DeviceName; WCHAR Buffer[MAX_PATH]; CHAR AnsiBuffer[MAX_PATH]; - ULONG i; FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; /* Only ARC Name left - Build full ARC Name */ - p = strstr(LoaderBlock->ArcBootDeviceName, "cdrom"); + p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); if (p) { - /* Get configuration information */ - ConfigInfo = IoGetConfigurationInformation(); - for (i = 0; i < ConfigInfo->CdRomCount; i++) - { - /* Try to find the installer */ - swprintf(Buffer, L"\\Device\\CdRom%lu\\reactos\\ntoskrnl.exe", i); - RtlInitUnicodeString(&DeviceName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; - - /* Try to find live CD boot */ - swprintf(Buffer, - L"\\Device\\CdRom%lu\\reactos\\system32\\ntoskrnl.exe", - i); - RtlInitUnicodeString(&DeviceName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; - } + /* Try to find the installer */ + swprintf(Buffer, L"\\Device\\CdRom%lu\\reactos\\ntoskrnl.exe", i); + RtlInitUnicodeString(&DeviceName, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); + if (NT_SUCCESS(Status)) DeviceNumber = i; + + /* Try to find live CD boot */ + swprintf(Buffer, + L"\\Device\\CdRom%lu\\reactos\\system32\\ntoskrnl.exe", + i); + RtlInitUnicodeString(&DeviceName, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); + if (NT_SUCCESS(Status)) DeviceNumber = i; /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); @@ -602,6 +201,457 @@ strcat(p, AnsiBuffer); } } + + /* Return whether this is the CD or not */ + if (DeviceNumber != 1) return TRUE; + return FALSE; +} + +VOID +INIT_FUNCTION +NTAPI +IopEnumerateDisks(IN PLIST_ENTRY ListHead) +{ + ULONG i, j; + ANSI_STRING TempString; + CHAR Buffer[256]; + UNICODE_STRING DeviceName; + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + DISK_GEOMETRY DiskGeometry; + PDRIVE_LAYOUT_INFORMATION DriveLayout; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK StatusBlock; + LARGE_INTEGER PartitionOffset; + PPARTITION_SECTOR PartitionBuffer; + PDISKENTRY DiskEntry; + + /* Loop every detected disk */ + for (i = 0; i < IoGetConfigurationInformation()->DiskCount; i++) + { + /* Build the name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Get the device pointer */ + Status = IoGetDeviceObjectPointer(&DeviceName, + FILE_READ_DATA, + &FileObject, + &DeviceObject); + + /* Free the string */ + RtlFreeUnicodeString(&DeviceName); + + /* Move on if we failed */ + if (!NT_SUCCESS(Status)) continue; + + /* Allocate the ROS disk Entry */ + DiskEntry = ExAllocatePoolWithTag(PagedPool, sizeof(DISKENTRY), TAG_IO); + DiskEntry->DiskNumber = i; + DiskEntry->DeviceObject = DeviceObject; + + /* Build an IRP to determine the sector size */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + DeviceObject, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &StatusBlock); + if (!Irp) + { + /* Try again */ + ObDereferenceObject(FileObject); + continue; + } + + /* Call the driver and check if we have to wait on it */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = StatusBlock.Status; + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Try again */ + ObDereferenceObject(FileObject); + continue; + } + + /* Read the partition table */ + Status = IoReadPartitionTable(DeviceObject, + DiskGeometry.BytesPerSector, + TRUE, + &DriveLayout); + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + if (!NT_SUCCESS(Status)) continue; + + /* Set the offset to 0 */ + PartitionOffset.QuadPart = 0; + + /* Allocate a buffer for the partition */ + PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, + DiskGeometry.BytesPerSector, + TAG_IO); + if (!PartitionBuffer) continue; + + /* Build an IRP to read the partition sector */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + PartitionBuffer, + DiskGeometry.BytesPerSector, + &PartitionOffset, + &Event, + &StatusBlock); + + /* Call the driver and check if we have to wait */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = StatusBlock.Status; + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Try again */ + ExFreePool(PartitionBuffer); + ExFreePool(DriveLayout); + continue; + } + + /* Calculate the MBR checksum */ + DiskEntry->Checksum = 0; + for (j = 0; j < 128; j++) + { + DiskEntry->Checksum += ((PULONG)PartitionBuffer)[j]; + } + + /* Save the signature and checksum */ + DiskEntry->Checksum = ~DiskEntry->Checksum + 1; + DiskEntry->Signature = DriveLayout->Signature; + DiskEntry->PartitionCount = DriveLayout->PartitionCount; + + /* Insert it into the list */ + InsertTailList(ListHead, &DiskEntry->ListEntry); + + /* Free the buffer */ + ExFreePool(PartitionBuffer); + ExFreePool(DriveLayout); + } +} + +NTSTATUS +INIT_FUNCTION +NTAPI +IopAssignArcNamesToDisk(IN PDEVICE_OBJECT DeviceObject, + IN ULONG RDisk, + IN ULONG DiskNumber, + IN ULONG PartitionCount, + IN PBOOLEAN FoundHdBoot) +{ + CHAR Buffer[256]; + CHAR ArcBuffer[256]; + ANSI_STRING TempString, ArcNameString, BootString; + ANSI_STRING ArcBootString, ArcSystemString; + UNICODE_STRING DeviceName, ArcName, BootPath; + ULONG i; + NTSTATUS Status; + + /* HACK: Build the ARC name that FreeLDR should've given us */ + CHAR BootArcName[256]; // should come from FREELDR + sprintf(BootArcName, "multi(0)disk(0)rdisk(%lu)", RDisk); + + /* Set default */ + *FoundHdBoot = FALSE; + + /* Build the boot strings */ + RtlInitAnsiString(&ArcBootString, KeLoaderBlock->ArcBootDeviceName); + RtlInitAnsiString(&ArcSystemString, KeLoaderBlock->ArcHalDeviceName); + + /* Build the NT Device Name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", DiskNumber); + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* Build the ARC Device Name */ + sprintf(ArcBuffer, "\\ArcName\\%s", BootArcName); + + /* Convert it to Unicode */ + RtlInitAnsiString(&ArcNameString, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the symbolic link and free the strings */ + IoAssignArcName(&ArcName, &DeviceName); + RtlFreeUnicodeString(&ArcName); + RtlFreeUnicodeString(&DeviceName); + + /* Loop all the partitions */ + for (i = 0; i < PartitionCount; i++) + { + /* Build the partition device name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", DiskNumber, i+1); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Build the partial ARC name for this partition */ + sprintf(ArcBuffer, "%spartition(%lu)", BootArcName, i + 1); + RtlInitAnsiString(&ArcNameString, ArcBuffer); + + /* Check if this is the boot device */ + if (RtlEqualString(&ArcNameString, &ArcBootString, TRUE)) + { + /* Remember that we found a Hard Disk Boot Device */ + *FoundHdBoot = TRUE; + } + + /* Check if it's the system boot partition */ + if (RtlEqualString(&ArcNameString, &ArcSystemString, TRUE)) + { + /* It is, create a Unicode string for it */ + RtlInitAnsiString(&BootString, KeLoaderBlock->NtHalPathName); + Status = RtlAnsiStringToUnicodeString(&BootPath, &BootString, TRUE); + if (NT_SUCCESS(Status)) + { + /* FIXME: Save in registry */ + + /* Free the string now */ + RtlFreeUnicodeString(&BootPath); + } + } + + /* Build the full ARC name */ + sprintf(Buffer, "\\ArcName\\%spartition(%lu)", BootArcName, i + 1); + + /* Convert it to Unicode */ + RtlInitAnsiString(&ArcNameString, Buffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); + if (!NT_SUCCESS(Status)) continue; + + /* Create the symbolic link and free the strings */ + IoAssignArcName(&ArcName, &DeviceName); + RtlFreeUnicodeString(&ArcName); + RtlFreeUnicodeString(&DeviceName); + } + + /* Return success */ + return STATUS_SUCCESS; +} + +BOOLEAN +INIT_FUNCTION +NTAPI +IopAssignArcNamesToCdrom(IN PULONG Buffer, + IN ULONG DiskNumber) +{ + CHAR ArcBuffer[256]; + ANSI_STRING TempString, ArcNameString; + UNICODE_STRING DeviceName, ArcName; + NTSTATUS Status; + LARGE_INTEGER PartitionOffset; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + ULONG i, CheckSum = 0; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + + /* Build the device name */ + sprintf(ArcBuffer, "\\Device\\CdRom%lu", DiskNumber); + + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get the device for it */ + Status = IoGetDeviceObjectPointer(&DeviceName, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Free the string and fail */ + RtlFreeUnicodeString(&DeviceName); + return FALSE; + } + + /* Setup the event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Set the offset and build the read IRP */ + PartitionOffset.QuadPart = 0x8000; + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + Buffer, + 2048, + &PartitionOffset, + &Event, + &IoStatusBlock); + if (!Irp) + { + /* Free the string and fail */ + RtlFreeUnicodeString(&DeviceName); + return FALSE; + } + + /* Call the driver and check if we have to wait on it */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Now calculate the checksum */ + for (i = 0; i < 2048 / sizeof(ULONG); i++) CheckSum += Buffer[i]; + + /* + * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM + * ARC Path name, and what happens here is a comparision of both checksums + * in order to see if this is the actual boot CD. + * + * In ReactOS this doesn't currently happen, instead we have a hack on top + * of this file which scans the CD for the ntoskrnl.exe file, then modifies + * the LoaderBlock's ARC Path with the right CDROM path. Consequently, we + * get the same state as if NTLDR had properly booted us, except that we do + * not actually need to check the signature, since the hack already did the + * check for ntoskrnl.exe, which is just as good. + * + * The signature code stays however, because eventually FreeLDR will work + * like NTLDR, and, conversly, we do want to be able to be booted by NTLDR. + */ + if (IopApplyRosCdromArcHack(DiskNumber)) + { + /* This is the boot CD-ROM, build the ARC name */ + sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); + + /* Convert it to Unicode */ + RtlInitAnsiString(&ArcNameString, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Create the symbolic link and free the strings */ + IoAssignArcName(&ArcName, &DeviceName); + RtlFreeUnicodeString(&ArcName); + RtlFreeUnicodeString(&DeviceName); + + /* Let caller know that we've found the boot CD */ + return TRUE; + } + + /* No boot CD found */ + return FALSE; +} + +NTSTATUS INIT_FUNCTION +IoCreateArcNames(VOID) +{ + PCONFIGURATION_INFORMATION ConfigInfo; + ULONG i, RDiskNumber; + NTSTATUS Status; + LIST_ENTRY BiosDiskListHead; + LIST_ENTRY DiskListHead; + PLIST_ENTRY Entry; + PDISKENTRY BiosDiskEntry; + PDISKENTRY DiskEntry; + BOOLEAN FoundBoot; + PULONG Buffer; + + ConfigInfo = IoGetConfigurationInformation(); + + /* create ARC names for hard disk drives */ + InitializeListHead(&BiosDiskListHead); + InitializeListHead(&DiskListHead); + IopEnumerateBiosDisks(&BiosDiskListHead); + IopEnumerateDisks(&DiskListHead); + + RDiskNumber = 0; + while (!IsListEmpty(&BiosDiskListHead)) + { + Entry = RemoveHeadList(&BiosDiskListHead); + BiosDiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + if (DiskEntry->Checksum == BiosDiskEntry->Checksum && + DiskEntry->Signature == BiosDiskEntry->Signature) + { + + Status = IopAssignArcNamesToDisk(DiskEntry->DeviceObject, + RDiskNumber, + DiskEntry->DiskNumber, + DiskEntry->PartitionCount, + &FoundBoot); + + RemoveEntryList(&DiskEntry->ListEntry); + ExFreePool(DiskEntry); + break; + } + Entry = Entry->Flink; + } + RDiskNumber++; + ExFreePool(BiosDiskEntry); + } + + while (!IsListEmpty(&DiskListHead)) + { + Entry = RemoveHeadList(&DiskListHead); + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + ExFreePool(DiskEntry); + } + + /* Check if we didn't find the boot disk */ + if (!FoundBoot) + { + /* Allocate a buffer for the CD-ROM MBR */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_IO); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop every CD-ROM */ + for (i = 0; i < ConfigInfo->CdRomCount; i++) + { + /* Give it an ARC name */ + if (IopAssignArcNamesToCdrom(Buffer, i)) break; + } + + /* Free the buffer */ + ExFreePool(Buffer); + } + + /* Return success */ + return STATUS_SUCCESS; } NTSTATUS @@ -617,9 +667,6 @@ UNICODE_STRING LinkName, TargetName, ArcName; HANDLE LinkHandle; - /* Check if this is a CD-ROM boot */ - IopApplyRosCdromArcHack(LoaderBlock); - /* Create the Unicode name for the current ARC boot device */ sprintf(Buffer, "\\ArcName\\%s", LoaderBlock->ArcBootDeviceName); RtlInitAnsiString(&TargetString, Buffer);

1 0

[arty] 24450: Simplify this since we now have intrin.h
by arty＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: arty Date: Sun Oct 8 14:50:50 2006 New Revision: 24450 URL: http://svn.reactos.org/svn/reactos?rev=24450&view=rev Log: Simplify this since we now have intrin.h Modified: branches/powerpc/reactos/include/ndk/psfuncs.h Modified: branches/powerpc/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ndk/psf… ============================================================================== --- branches/powerpc/reactos/include/ndk/psfuncs.h (original) +++ branches/powerpc/reactos/include/ndk/psfuncs.h Sun Oct 8 14:50:50 2006 @@ -180,19 +180,7 @@ PTEB NtCurrentTeb(VOID) { -#ifndef __GNUC__ return (PTEB)(ULONG_PTR)__readfsdword(0x18); -#else - struct _TEB *ret; - - __asm__ __volatile__ ( - "movl %%fs:0x18, %0\n" - : "=r" (ret) - : /* no inputs */ - ); - - return ret; -#endif } #endif

1 0

[arty] 24449: Also added for merge.
by arty＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: arty Date: Sun Oct 8 14:31:52 2006 New Revision: 24449 URL: http://svn.reactos.org/svn/reactos?rev=24449&view=rev Log: Also added for merge. Added: branches/powerpc/reactos/lib/rtl/mem.c Added: branches/powerpc/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/mem.c?r… ============================================================================== --- branches/powerpc/reactos/lib/rtl/mem.c (added) +++ branches/powerpc/reactos/lib/rtl/mem.c Sun Oct 8 14:31:52 2006 @@ -1,0 +1,173 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/mem.c + * PURPOSE: Memory functions + * PROGRAMMER: David Welch (welch(a)mcmail.com) + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS *****************************************************************/ + +/****************************************************************************** + * RtlCompareMemory [NTDLL.@] + * + * Compare one block of memory with another + * + * PARAMS + * Source1 [I] Source block + * Source2 [I] Block to compare to Source1 + * Length [I] Number of bytes to fill + * + * RETURNS + * The length of the first byte at which Source1 and Source2 differ, or Length + * if they are the same. + * + * @implemented + */ +SIZE_T NTAPI +RtlCompareMemory(IN const VOID *Source1, + IN const VOID *Source2, + IN SIZE_T Length) +{ + SIZE_T i; + for(i=0; (i<Length) && (((PUCHAR)Source1)[i]==((PUCHAR)Source2)[i]); i++) + ; + return i; +} + + +/* + * @implemented + */ +ULONG +NTAPI +RtlCompareMemoryUlong ( + PVOID Source, + ULONG Length, + ULONG Value +) +/* + * FUNCTION: Compares a block of ULONGs with an ULONG and returns the number of equal bytes + * ARGUMENTS: + * Source = Block to compare + * Length = Number of bytes to compare + * Value = Value to compare + * RETURNS: Number of equal bytes + */ +{ + PULONG ptr = (PULONG)Source; + ULONG len = Length / sizeof(ULONG); + ULONG i; + + for (i = 0; i < len; i++) + { + if (*ptr != Value) + break; + ptr++; + } + + return (ULONG)((PCHAR)ptr - (PCHAR)Source); +} + + +#undef RtlFillMemory +/* + * @implemented + */ +VOID +NTAPI +RtlFillMemory ( + PVOID Destination, + ULONG Length, + UCHAR Fill +) +{ + memset(Destination, Fill, Length); +} + + + +/* + * @implemented + */ +VOID +NTAPI +RtlFillMemoryUlong ( + PVOID Destination, + ULONG Length, + ULONG Fill +) +{ + PULONG Dest = Destination; + ULONG Count = Length / sizeof(ULONG); + + while (Count > 0) + { + *Dest = Fill; + Dest++; + Count--; + } +} + + +#undef RtlMoveMemory +/* + * @implemented + */ +VOID +NTAPI +RtlMoveMemory ( + PVOID Destination, + CONST VOID * Source, + ULONG Length +) +{ + memmove ( + Destination, + Source, + Length + ); +} + +/* +* @implemented +*/ +VOID +FASTCALL +RtlPrefetchMemoryNonTemporal( + IN PVOID Source, + IN SIZE_T Length + ) +{ + /* By nature of prefetch, this is non-portable. */ + (void)Source; + (void)Length; +} + + +#undef RtlZeroMemory +/* + * @implemented + */ +VOID +NTAPI +RtlZeroMemory ( + PVOID Destination, + ULONG Length +) +{ + RtlFillMemory ( + Destination, + Length, + 0 + ); +} + +/* EOF */

1 0

[arty] 24448: Move mmu.h to make it more generally accessible since we need translation functions in windows subdir.
by arty＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: arty Date: Sun Oct 8 14:27:42 2006 New Revision: 24448 URL: http://svn.reactos.org/svn/reactos?rev=24448&view=rev Log: Move mmu.h to make it more generally accessible since we need translation functions in windows subdir. Added: branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h Removed: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h Removed: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h (removed) @@ -1,19 +1,0 @@ -#ifndef FREELDR_MMU_H -#define FREELDR_MMU_H - -int GetDEC(); -int GetMSR(); -int GetPhys( int addr ); -void SetPhys( int addr, int val ); -void SetPhysByte( int addr, int val ); -int GetSR(int n); -void GetBat( int bat, int inst, int *batHi, int *batLo ); -void SetBat( int bat, int inst, int batHi, int batLo ); -int GetSDR1(); -int BatHit( int bath, int batl, int virt ); -int BatTranslate( int bath, int batl, int virt ); -/* translate address */ -int PpcVirt2phys( int virt, int inst ); -BOOLEAN InsertPageEntry( int virt, int phys, int slot ); - -#endif/*FREELDR_MMU_H*/ Added: branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h Sun Oct 8 14:27:42 2006 @@ -1,0 +1,21 @@ +#ifndef FREELDR_MMU_H +#define FREELDR_MMU_H + +extern int mmu_handle; + +int GetDEC(); +int GetMSR(); +int GetPhys( int addr ); +void SetPhys( int addr, int val ); +void SetPhysByte( int addr, int val ); +int GetSR(int n); +void GetBat( int bat, int inst, int *batHi, int *batLo ); +void SetBat( int bat, int inst, int batHi, int batLo ); +int GetSDR1(); +int BatHit( int bath, int batl, int virt ); +int BatTranslate( int bath, int batl, int virt ); +/* translate address */ +int PpcVirt2phys( int virt, int inst ); +BOOLEAN InsertPageEntry( int virt, int phys, int slot ); + +#endif/*FREELDR_MMU_H*/

1 0

[arty] 24447: Really fix font.h
by arty＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: arty Date: Sun Oct 8 14:18:28 2006 New Revision: 24447 URL: http://svn.reactos.org/svn/reactos?rev=24447&view=rev Log: Really fix font.h Modified: branches/powerpc/reactos/include/reactos/font.h Modified: branches/powerpc/reactos/include/reactos/font.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/font.h (original) +++ branches/powerpc/reactos/include/reactos/font.h Sun Oct 8 14:18:28 2006 @@ -67,6 +67,13 @@ " ", " XXXX " " X X " + " X X " + " XXXXX " + " X " + " XXXX " + " ", + " XXXX " + " X X " " XXXXXX " " X X " " X X "

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs