Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[mjansen] 74534: [NDK][RTL] Make the Name argument in RtlQueryEnvironmentVariable_U const.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat May 13 17:26:59 2017 New Revision: 74534 URL: http://svn.reactos.org/svn/reactos?rev=74534&view=rev Log: [NDK][RTL] Make the Name argument in RtlQueryEnvironmentVariable_U const. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/lib/rtl/env.c Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Sat May 13 17:26:59 2017 @@ -2967,7 +2967,7 @@ NTAPI RtlQueryEnvironmentVariable_U( _In_opt_ PWSTR Environment, - _In_ PUNICODE_STRING Name, + _In_ PCUNICODE_STRING Name, _Out_ PUNICODE_STRING Value ); Modified: trunk/reactos/sdk/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/env.c?rev=7453… ============================================================================== --- trunk/reactos/sdk/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/env.c [iso-8859-1] Sat May 13 17:26:59 2017 @@ -508,7 +508,7 @@ */ NTSTATUS NTAPI RtlQueryEnvironmentVariable_U(PWSTR Environment, - PUNICODE_STRING Name, + PCUNICODE_STRING Name, PUNICODE_STRING Value) { NTSTATUS Status;

7 years, 7 months

[tfaber] 74533: [0.4.5] - Set version number to final release

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 13 16:42:08 2017 New Revision: 74533 URL: http://svn.reactos.org/svn/reactos?rev=74533&view=rev Log: [0.4.5] - Set version number to final release Modified: branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Sat May 13 16:42:08 2017 @@ -25,7 +25,7 @@ set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "RC2") +set(KERNEL_VERSION_RELEASE_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

7 years, 7 months

[hbelusca] 74532: [USETUP]: Further improvements: - Comment more some of the fields in the PARTENTRY, DISKETNRY and PARTLIST structures; - Remove the redundant members "SystemDisk", "OriginalSystem...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:40:30 2017 New Revision: 74532 URL: http://svn.reactos.org/svn/reactos?rev=74532&view=rev Log: [USETUP]: Further improvements: - Comment more some of the fields in the PARTENTRY, DISKETNRY and PARTLIST structures; - Remove the redundant members "SystemDisk", "OriginalSystemDisk" and "TempDisk" in PARTLIST as these can be consistently deduced from the corresponding (Original)(System)(Temp)Partition members (note that we however keep "CurrentDisk" alongside "CurrentPartition", see the comment in the code why we do it so). - Adjust the rest of the code to take the removal of the redundant members into account. The 2nd parameter of GetNextUnformattedPartition() and GetNextUncheckedPartition() are now really optional. - Introduce a SetPartitionType() helper to simplify the code that sets the partition type, which also automatically adjusts other internal variables of said partition in accordance. - "Mounted" logical drives can have assigned letters too, registered in \DosDevices\. Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/usetup/partlist.h Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat May 13 16:40:30 2017 @@ -2590,9 +2590,7 @@ /* Find or set the active system partition */ CheckActiveSystemPartition(PartitionList, FileSystemList); - - if (PartitionList->SystemDisk == NULL || - PartitionList->SystemPartition == NULL) + if (PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; @@ -2604,7 +2602,6 @@ case Start: if (PartitionList->CurrentPartition != PartitionList->SystemPartition) { - PartitionList->TempDisk = PartitionList->SystemDisk; PartitionList->TempPartition = PartitionList->SystemPartition; PartitionList->TempPartition->NeedsCheck = TRUE; @@ -2613,7 +2610,6 @@ } else { - PartitionList->TempDisk = PartitionList->CurrentDisk; PartitionList->TempPartition = PartitionList->CurrentPartition; PartitionList->TempPartition->NeedsCheck = TRUE; @@ -2623,7 +2619,6 @@ break; case FormatSystemPartition: - PartitionList->TempDisk = PartitionList->CurrentDisk; PartitionList->TempPartition = PartitionList->CurrentPartition; PartitionList->TempPartition->NeedsCheck = TRUE; @@ -2633,7 +2628,7 @@ case FormatInstallPartition: if (GetNextUnformattedPartition(PartitionList, - &PartitionList->TempDisk, + NULL, &PartitionList->TempPartition)) { PartitionList->FormatState = FormatOtherPartition; @@ -2650,7 +2645,7 @@ case FormatOtherPartition: if (GetNextUnformattedPartition(PartitionList, - &PartitionList->TempDisk, + NULL, &PartitionList->TempPartition)) { PartitionList->FormatState = FormatOtherPartition; @@ -2671,8 +2666,8 @@ return QUIT_PAGE; } - DiskEntry = PartitionList->TempDisk; PartEntry = PartitionList->TempPartition; + DiskEntry = PartEntry->DiskEntry; /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2903,15 +2898,14 @@ MUIDisplayPage(FORMAT_PARTITION_PAGE); if (PartitionList == NULL || - PartitionList->TempDisk == NULL || PartitionList->TempPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->TempDisk; PartEntry = PartitionList->TempPartition; + DiskEntry = PartEntry->DiskEntry; while (TRUE) { @@ -2937,7 +2931,7 @@ if (PartEntry->SectorCount.QuadPart < 8192) { /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - PartEntry->PartitionType = PARTITION_FAT_12; + SetPartitionType(PartEntry, PARTITION_FAT_12); } else if (PartEntry->StartSector.QuadPart < 1450560) { @@ -2946,17 +2940,17 @@ if (PartEntry->SectorCount.QuadPart < 65536) { /* FAT16 CHS partition (partition size < 32MB) */ - PartEntry->PartitionType = PARTITION_FAT_16; + SetPartitionType(PartEntry, PARTITION_FAT_16); } else if (PartEntry->SectorCount.QuadPart < 1048576) { /* FAT16 CHS partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_HUGE; + SetPartitionType(PartEntry, PARTITION_HUGE); } else { /* FAT32 CHS partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32; + SetPartitionType(PartEntry, PARTITION_FAT32); } } else @@ -2966,35 +2960,23 @@ if (PartEntry->SectorCount.QuadPart < 1048576) { /* FAT16 LBA partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_XINT13; + SetPartitionType(PartEntry, PARTITION_XINT13); } else { /* FAT32 LBA partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32_XINT13; + SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); } } - - DiskEntry->Dirty = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } #if 0 else if (wcscmp(PartEntry->FileSystem->FileSystemName, L"EXT2") == 0) { - PartEntry->PartitionType = PARTITION_EXT2; - - DiskEntry->Dirty = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; + SetPartitionType(PartEntry, PARTITION_EXT2); } else if (wcscmp(PartEntry->FileSystem->FileSystemName, L"NTFS") == 0) { - PartEntry->PartitionType = PARTITION_IFS; - - DiskEntry->Dirty = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; + SetPartitionType(PartEntry, PARTITION_IFS); } #endif else if (!PartEntry->FileSystem->FormatFunc) @@ -4163,7 +4145,7 @@ RtlFreeUnicodeString(&SystemRootPath); swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->SystemDisk->DiskNumber, + PartitionList->SystemPartition->DiskEntry->DiskNumber, PartitionList->SystemPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT1("SystemRootPath: %wZ\n", &SystemRootPath); @@ -4436,7 +4418,7 @@ /* Step 2: Write the MBR */ swprintf(DestinationDevicePathBuffer, L"\\Device\\Harddisk%d\\Partition0", - PartitionList->SystemDisk->DiskNumber); + PartitionList->SystemPartition->DiskEntry->DiskNumber); wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] Sat May 13 16:40:30 2017 @@ -699,10 +699,28 @@ if (IsContainerPartition(PartEntry->PartitionType)) { PartEntry->FormatState = Unformatted; + PartEntry->FileSystem = NULL; if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; } +#if 0 + else if (IsRecognizedPartition(PartEntry->PartitionType)) + { + // FIXME FIXME! We should completely rework how we get this 'FileSystemList' available... + PartEntry->FileSystem = GetFileSystem(FileSystemList, PartEntry); + if (!PartEntry->FileSystem) + PartEntry->FormatState = Preformatted; + else + PartEntry->FormatState = Unformatted; + // PartEntry->FormatState = UnknownFormat; + } + else + { + /* Unknown partition, so unknown partition format (may or may not be actually formatted) */ + PartEntry->FormatState = UnknownFormat; + } +#endif else if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || (PartEntry->PartitionType == PARTITION_HUGE) || @@ -805,6 +823,7 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; InsertTailList(&DiskEntry->PrimaryPartListHead, &NewPartEntry->ListEntry); @@ -851,6 +870,7 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; /* Insert the table into the list */ InsertTailList(&PartEntry->ListEntry, @@ -891,6 +911,7 @@ DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; /* Append the table to the list */ InsertTailList(&DiskEntry->PrimaryPartListHead, @@ -923,6 +944,7 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; InsertTailList(&DiskEntry->LogicalPartListHead, &NewPartEntry->ListEntry); @@ -970,6 +992,7 @@ DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; /* Insert the table into the list */ InsertTailList(&PartEntry->ListEntry, @@ -1011,6 +1034,7 @@ DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; /* Append the table to the list */ InsertTailList(&DiskEntry->LogicalPartListHead, @@ -1157,6 +1181,11 @@ if (!NT_SUCCESS(Status)) return; + /* + * Check whether the disk is initialized, by looking at its MBR. + * NOTE that this must be generalized to GPT disks as well! + */ + Mbr = (PARTITION_SECTOR*)RtlAllocateHeap(ProcessHeap, 0, DiskGeometry.BytesPerSector); @@ -1206,6 +1235,7 @@ DiskEntry->BiosFound = FALSE; /* Check if this disk has a valid MBR */ + // FIXME: Check for the MBR signature as well, etc... if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) DiskEntry->NoMbr = TRUE; else @@ -1213,6 +1243,7 @@ /* Free the MBR sector buffer */ RtlFreeHeap(ProcessHeap, 0, Mbr); + ListEntry = List->BiosDiskListHead.Flink; while (ListEntry != &List->BiosDiskListHead) @@ -1421,12 +1452,9 @@ List->CurrentDisk = NULL; List->CurrentPartition = NULL; - List->SystemDisk = NULL; List->SystemPartition = NULL; - List->OriginalSystemDisk = NULL; List->OriginalSystemPartition = NULL; - List->TempDisk = NULL; List->TempPartition = NULL; List->FormatState = Start; @@ -2738,6 +2766,7 @@ PartEntry->IsPartitioned = TRUE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; + PartEntry->FileSystem = NULL; PartEntry->AutoCreate = AutoCreate; PartEntry->New = TRUE; PartEntry->BootIndicator = FALSE; @@ -2775,6 +2804,7 @@ NewPartEntry->New = TRUE; NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; NewPartEntry->BootIndicator = FALSE; PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; @@ -2817,6 +2847,7 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; InsertTailList(&DiskEntry->LogicalPartListHead, &NewPartEntry->ListEntry); @@ -2853,7 +2884,8 @@ /* Convert current entry to 'new (unformatted)' */ PartEntry->IsPartitioned = TRUE; - PartEntry->FormatState = Formatted; + PartEntry->FormatState = Formatted; // FIXME???????? Possibly to make GetNextUnformattedPartition work (i.e. skip the extended partition container) + PartEntry->FileSystem = NULL; PartEntry->AutoCreate = FALSE; PartEntry->New = FALSE; PartEntry->BootIndicator = FALSE; @@ -2898,7 +2930,8 @@ NewPartEntry->StartSector.QuadPart; NewPartEntry->New = FALSE; - NewPartEntry->FormatState = Formatted; + NewPartEntry->FormatState = Formatted; // FIXME???????? Possibly to make GetNextUnformattedPartition work (i.e. skip the extended partition container) + NewPartEntry->FileSystem = NULL; NewPartEntry->BootIndicator = FALSE; if (NewPartEntry->StartSector.QuadPart < 1450560) @@ -2966,6 +2999,7 @@ PartEntry->IsPartitioned = TRUE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; + PartEntry->FileSystem = NULL; PartEntry->AutoCreate = FALSE; PartEntry->New = TRUE; PartEntry->BootIndicator = FALSE; @@ -3004,6 +3038,7 @@ NewPartEntry->New = TRUE; NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem = NULL; NewPartEntry->BootIndicator = FALSE; NewPartEntry->LogicalPartition = TRUE; @@ -3041,7 +3076,6 @@ /* Clear the system disk and partition pointers if the system partition is being deleted */ if (List->SystemPartition == List->CurrentPartition) { - List->SystemDisk = NULL; List->SystemPartition = NULL; } @@ -3121,6 +3155,7 @@ PartEntry->IsPartitioned = FALSE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; + PartEntry->FileSystem = NULL; PartEntry->DriveLetter = 0; } @@ -3147,9 +3182,7 @@ /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { - List->SystemDisk = NULL; List->SystemPartition = NULL; - List->OriginalSystemDisk = NULL; List->OriginalSystemPartition = NULL; return; } @@ -3160,35 +3193,31 @@ /* Check for empty partition list */ if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) { - List->SystemDisk = NULL; List->SystemPartition = NULL; - List->OriginalSystemDisk = NULL; List->OriginalSystemPartition = NULL; return; } - if (List->SystemDisk != NULL && List->SystemPartition != NULL) + if (List->SystemPartition != NULL) { /* We already have an active system partition */ DPRINT1("Use the current system partition %lu in disk %lu, drive letter %c\n", List->SystemPartition->PartitionNumber, - List->SystemDisk->DiskNumber, + List->SystemPartition->DiskEntry->DiskNumber, (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); return; } DPRINT1("We are here (1)!\n"); - List->SystemDisk = NULL; List->SystemPartition = NULL; - List->OriginalSystemDisk = NULL; List->OriginalSystemPartition = NULL; /* Retrieve the first partition of the disk */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, PARTENTRY, ListEntry); - List->SystemDisk = DiskEntry; + ASSERT(DiskEntry == PartEntry->DiskEntry); List->SystemPartition = PartEntry; // @@ -3200,16 +3229,14 @@ { if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator == FALSE) { - /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->SystemDisk = DiskEntry; + ASSERT(DiskEntry == PartEntry->DiskEntry); List->SystemPartition = PartEntry; - List->OriginalSystemDisk = List->SystemDisk; List->OriginalSystemPartition = List->SystemPartition; DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %c\n", List->SystemPartition->PartitionNumber, - List->SystemDisk->DiskNumber, + List->SystemPartition->DiskEntry->DiskNumber, (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); goto SetSystemPartition; @@ -3248,22 +3275,18 @@ * OK we haven't encountered any used and active partition, * so use the first one as the system partition. */ - - /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->OriginalSystemDisk = List->SystemDisk; // DiskEntry + ASSERT(DiskEntry == List->SystemPartition->DiskEntry); List->OriginalSystemPartition = List->SystemPartition; // First PartEntry DPRINT1("Use first active system partition %lu in disk %lu, drive letter %c\n", List->SystemPartition->PartitionNumber, - List->SystemDisk->DiskNumber, + List->SystemPartition->DiskEntry->DiskNumber, (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); goto SetSystemPartition; } - List->SystemDisk = NULL; List->SystemPartition = NULL; - List->OriginalSystemDisk = NULL; List->OriginalSystemPartition = NULL; DPRINT1("We are here (3)!\n"); @@ -3286,7 +3309,7 @@ if (PartEntry->BootIndicator) { /* Yes, we found it */ - List->SystemDisk = DiskEntry; + ASSERT(DiskEntry == PartEntry->DiskEntry); List->SystemPartition = PartEntry; DPRINT1("Found active system partition %lu in disk %lu, drive letter %c\n", @@ -3299,15 +3322,14 @@ } /* Check if we have found the system partition */ - if (List->SystemDisk == NULL || List->SystemPartition == NULL) + if (List->SystemPartition == NULL) { /* Nothing, use the alternative system partition */ DPRINT1("No system partition found, use the alternative partition!\n"); goto UseAlternativeSystemPartition; } - /* Save them */ - List->OriginalSystemDisk = List->SystemDisk; + /* Save it */ List->OriginalSystemPartition = List->SystemPartition; /* @@ -3331,7 +3353,7 @@ { DPRINT1("System partition %lu in disk %lu with no FS?!\n", List->OriginalSystemPartition->PartitionNumber, - List->OriginalSystemDisk->DiskNumber); + List->OriginalSystemPartition->DiskEntry->DiskNumber); goto FindAndUseAlternativeSystemPartition; } // HACK: WARNING: We cannot write on this FS yet! @@ -3346,7 +3368,7 @@ DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %c\n", List->SystemPartition->PartitionNumber, - List->SystemDisk->DiskNumber, + List->SystemPartition->DiskEntry->DiskNumber, (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); return; @@ -3363,25 +3385,24 @@ /* Unset the old system partition */ List->SystemPartition->BootIndicator = FALSE; - List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = FALSE; - List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; - List->SystemDisk->Dirty = TRUE; + List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = FALSE; + List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemPartition->DiskEntry->Dirty = TRUE; UseAlternativeSystemPartition: - List->SystemDisk = List->CurrentDisk; List->SystemPartition = List->CurrentPartition; DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %c\n", List->SystemPartition->PartitionNumber, - List->SystemDisk->DiskNumber, + List->SystemPartition->DiskEntry->DiskNumber, (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); SetSystemPartition: /* Set the new active system partition */ List->SystemPartition->BootIndicator = TRUE; - List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = TRUE; - List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; - List->SystemDisk->Dirty = TRUE; + List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = TRUE; + List->SystemPartition->DiskEntry->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemPartition->DiskEntry->Dirty = TRUE; } @@ -3447,6 +3468,16 @@ if (FileHandle != NULL) NtClose(FileHandle); + + // + // NOTE: Originally (see r40437), we used to install here also a new MBR + // for this disk (by calling InstallMbrBootCodeToDisk), only if: + // DiskEntry->NewDisk == TRUE and DiskEntry->BiosDiskNumber == 0. + // Then after that, both DiskEntry->NewDisk and DiskEntry->NoMbr were set + // to FALSE. In the other place (in usetup.c) where InstallMbrBootCodeToDisk + // was called too, the installation test was modified by checking whether + // DiskEntry->NoMbr was TRUE (instead of NewDisk). + // return Status; } @@ -3521,12 +3552,47 @@ Entry2 = Entry2->Flink; } + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + { + /* Assign a "\DosDevices\#:" mount point to this partition */ + if (PartEntry->DriveLetter) + { + StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + if (!SetMountedDeviceValue(PartEntry->DriveLetter, + DiskEntry->LayoutBuffer->Signature, + StartingOffset)) + { + return FALSE; + } + } + } + + Entry2 = Entry2->Flink; + } + Entry1 = Entry1->Flink; } return TRUE; } +VOID +SetPartitionType( + IN PPARTENTRY PartEntry, + IN UCHAR PartitionType) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + + PartEntry->PartitionType = PartitionType; + + DiskEntry->Dirty = TRUE; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; +} ULONG PrimaryPartitionCreationChecks( @@ -3617,9 +3683,10 @@ PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry->IsPartitioned && PartEntry->New) { - *pDiskEntry = DiskEntry; - *pPartEntry = PartEntry; - return TRUE; + ASSERT(DiskEntry == PartEntry->DiskEntry); + if (pDiskEntry) *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; } Entry2 = Entry2->Flink; @@ -3631,9 +3698,10 @@ PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry->IsPartitioned && PartEntry->New) { - *pDiskEntry = DiskEntry; - *pPartEntry = PartEntry; - return TRUE; + ASSERT(DiskEntry == PartEntry->DiskEntry); + if (pDiskEntry) *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; } Entry2 = Entry2->Flink; @@ -3642,7 +3710,7 @@ Entry1 = Entry1->Flink; } - *pDiskEntry = NULL; + if (pDiskEntry) *pDiskEntry = NULL; *pPartEntry = NULL; return FALSE; @@ -3671,9 +3739,10 @@ PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry->NeedsCheck == TRUE) { - *pDiskEntry = DiskEntry; - *pPartEntry = PartEntry; - return TRUE; + ASSERT(DiskEntry == PartEntry->DiskEntry); + if (pDiskEntry) *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; } Entry2 = Entry2->Flink; @@ -3685,9 +3754,10 @@ PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry->NeedsCheck == TRUE) { - *pDiskEntry = DiskEntry; - *pPartEntry = PartEntry; - return TRUE; + ASSERT(DiskEntry == PartEntry->DiskEntry); + if (pDiskEntry) *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; } Entry2 = Entry2->Flink; @@ -3696,7 +3766,7 @@ Entry1 = Entry1->Flink; } - *pDiskEntry = NULL; + if (pDiskEntry) *pDiskEntry = NULL; *pPartEntry = NULL; return FALSE; Modified: branches/setup_improvements/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] Sat May 13 16:40:30 2017 @@ -51,20 +51,22 @@ { LIST_ENTRY ListEntry; + /* The disk this partition belongs to */ struct _DISKENTRY *DiskEntry; + /* Partition geometry */ ULARGE_INTEGER StartSector; ULARGE_INTEGER SectorCount; BOOLEAN BootIndicator; UCHAR PartitionType; ULONG HiddenSectors; - ULONG PartitionNumber; - ULONG PartitionIndex; + ULONG PartitionNumber; /* Enumerated partition number (primary partitions first -- excluding the extended partition container --, then the logical partitions) */ + ULONG PartitionIndex; /* Index in the LayoutBuffer->PartitionEntry[] cached array of the corresponding DiskEntry */ CHAR DriveLetter; - CHAR VolumeLabel[17]; - CHAR FileSystemName[9]; + // CHAR VolumeLabel[17]; // NOTE: On 1st-stage Win setup, the volume label is also displayed in the list + // CHAR FileSystemName[9]; // NOTE: Superseded by the FileSystem member BOOLEAN LogicalPartition; @@ -77,12 +79,12 @@ /* Partition was created automatically */ BOOLEAN AutoCreate; - FORMATSTATE FormatState; - /* Partition must be checked */ BOOLEAN NeedsCheck; + FORMATSTATE FormatState; struct _FILE_SYSTEM_ITEM *FileSystem; + } PARTENTRY, *PPARTENTRY; @@ -102,6 +104,8 @@ { LIST_ENTRY ListEntry; + /* Disk geometry */ + ULONGLONG Cylinders; ULONG TracksPerCylinder; ULONG SectorsPerTrack; @@ -111,11 +115,13 @@ ULONG SectorAlignment; ULONG CylinderAlignment; + /* BIOS parameters */ BOOLEAN BiosFound; ULONG BiosDiskNumber; // ULONG Signature; // ULONG Checksum; + /* SCSI parameters */ ULONG DiskNumber; USHORT Port; USHORT Bus; @@ -125,12 +131,17 @@ BOOLEAN Dirty; BOOLEAN NewDisk; - BOOLEAN NoMbr; /* MBR is absent */ + BOOLEAN NoMbr; /* MBR is absent */ // See r40437 UNICODE_STRING DriverName; PDRIVE_LAYOUT_INFORMATION LayoutBuffer; - + // TODO: When adding support for GPT disks: + // Use PDRIVE_LAYOUT_INFORMATION_EX which indicates whether + // the disk is MBR, GPT, or unknown (uninitialized). + // Depending on the style, either use the MBR or GPT partition info. + + /* Pointer to the unique extended partition on this disk */ PPARTENTRY ExtendedPartition; LIST_ENTRY PrimaryPartListHead; @@ -141,6 +152,7 @@ typedef struct _PARTLIST { + /* UI stuff */ SHORT Left; SHORT Top; SHORT Right; @@ -149,23 +161,32 @@ SHORT Line; SHORT Offset; + /* + * NOTE that when CurrentPartition != NULL, then CurrentPartition->DiskEntry + * must be the same as CurrentDisk. We should however keep the two members + * separated as we can have a current (selected) disk without any current + * partition, if the former does not contain any. + */ PDISKENTRY CurrentDisk; PPARTENTRY CurrentPartition; - /* The system disk and partition where the boot manager resides */ - PDISKENTRY SystemDisk; + /* + * The system partition where the boot manager resides. + * The corresponding system disk is obtained via: + * SystemPartition->DiskEntry. + */ PPARTENTRY SystemPartition; /* - * The original system disk and partition in case we are redefining them - * because we do not have write support on them. - * Please not that this is partly a HACK and MUST NEVER happen on + * The original system partition in case we are redefining it because + * we do not have write support on it. + * Please note that this is partly a HACK and MUST NEVER happen on * architectures where real system partitions are mandatory (because then * they are formatted in FAT FS and we support write operation on them). + * The corresponding original system disk is obtained via: + * OriginalSystemPartition->DiskEntry. */ - PDISKENTRY OriginalSystemDisk; PPARTENTRY OriginalSystemPartition; - PDISKENTRY TempDisk; PPARTENTRY TempPartition; FORMATMACHINESTATE FormatState; @@ -280,6 +301,11 @@ SetMountedDeviceValues( IN PPARTLIST List); +VOID +SetPartitionType( + IN PPARTENTRY PartEntry, + IN UCHAR PartitionType); + ULONG PrimaryPartitionCreationChecks( IN PPARTLIST List);

7 years, 7 months

[hbelusca] 74531: [USETUP]: Code improvements: - Use explicit ansi string safe functions (where they are used ansi, but not explicitely); - Add (old-school) function parameters annotations; - Use P...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:32:53 2017 New Revision: 74531 URL: http://svn.reactos.org/svn/reactos?rev=74531&view=rev Log: [USETUP]: Code improvements: - Use explicit ansi string safe functions (where they are used ansi, but not explicitely); - Add (old-school) function parameters annotations; - Use PARTITION_ENTRY_UNUSED where needed (instead of hardcoding its value); - Turn some functions static to this module; - Turn the 2nd parameter of both GetNextUnformattedPartition() and GetNextUncheckedPartition() optional (for next commit); - Improve some comments; - Use NT types. Modified: branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/usetup/partlist.h Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] Sat May 13 16:32:53 2017 @@ -173,19 +173,19 @@ VOID GetPartTypeStringFromPartitionType( - UCHAR partitionType, - PCHAR strPartType, - DWORD cchPartType) + IN UCHAR partitionType, + OUT PCHAR strPartType, + IN ULONG cchPartType) { /* Determine partition type */ if (IsContainerPartition(partitionType)) { - StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION)); + StringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION)); } else if (partitionType == PARTITION_ENTRY_UNUSED) { - StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED)); + StringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED)); } else { @@ -196,13 +196,13 @@ { if (partitionType == PartitionTypes[i].Type) { - StringCchCopy(strPartType, cchPartType, PartitionTypes[i].Description); + StringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description); return; } } /* We are here because the partition type is unknown */ - StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN)); + StringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN)); } } @@ -252,7 +252,6 @@ return Temp * Alignment; } - ULONGLONG AlignUp( IN ULONGLONG Value, @@ -281,7 +280,7 @@ static VOID GetDriverName( - PDISKENTRY DiskEntry) + IN PDISKENTRY DiskEntry) { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; WCHAR KeyName[32]; @@ -316,7 +315,7 @@ static VOID AssignDriveLetters( - PPARTLIST List) + IN PPARTLIST List) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -395,7 +394,7 @@ } -NTSTATUS +static NTSTATUS NTAPI DiskIdentifierQueryRoutine( PWSTR ValueName, @@ -425,7 +424,7 @@ } -NTSTATUS +static NTSTATUS NTAPI DiskConfigurationDataQueryRoutine( PWSTR ValueName, @@ -469,7 +468,7 @@ } -NTSTATUS +static NTSTATUS NTAPI SystemConfigurationDataQueryRoutine( PWSTR ValueName, @@ -521,7 +520,7 @@ static VOID EnumerateBiosDiskEntries( - PPARTLIST PartList) + IN PPARTLIST PartList) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; WCHAR Name[120]; @@ -662,16 +661,16 @@ static VOID AddPartitionToDisk( - ULONG DiskNumber, - PDISKENTRY DiskEntry, - ULONG PartitionIndex, - BOOLEAN LogicalPartition) + IN ULONG DiskNumber, + IN PDISKENTRY DiskEntry, + IN ULONG PartitionIndex, + IN BOOLEAN LogicalPartition) { PPARTITION_INFORMATION PartitionInfo; PPARTENTRY PartEntry; PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; - if (PartitionInfo->PartitionType == 0 || + if (PartitionInfo->PartitionType == PARTITION_ENTRY_UNUSED || (LogicalPartition == TRUE && IsContainerPartition(PartitionInfo->PartitionType))) return; @@ -772,7 +771,7 @@ static VOID ScanForUnpartitionedDiskSpace( - PDISKENTRY DiskEntry) + IN PDISKENTRY DiskEntry) { ULONGLONG LastStartSector; ULONGLONG LastSectorCount; @@ -787,7 +786,7 @@ { DPRINT1("No primary partition!\n"); - /* Create a partition table that represents the empty disk */ + /* Create a partition entry that represents the empty disk */ NewPartEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(PARTENTRY)); @@ -905,7 +904,7 @@ { DPRINT1("No logical partition!\n"); - /* Create a partition table entry that represents the empty extended partition */ + /* Create a partition entry that represents the empty extended partition */ NewPartEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(PARTENTRY)); @@ -1079,12 +1078,12 @@ static VOID UpdateDiskSignatures( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - /* Print partition lines*/ + /* Print partition lines */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) { @@ -1105,9 +1104,9 @@ static VOID AddDiskToList( - HANDLE FileHandle, - ULONG DiskNumber, - PPARTLIST List) + IN HANDLE FileHandle, + IN ULONG DiskNumber, + IN PPARTLIST List) { DISK_GEOMETRY DiskGeometry; SCSI_ADDRESS ScsiAddress; @@ -1137,9 +1136,7 @@ &DiskGeometry, sizeof(DISK_GEOMETRY)); if (!NT_SUCCESS(Status)) - { return; - } if (DiskGeometry.MediaType != FixedMedia && DiskGeometry.MediaType != RemovableMedia) @@ -1158,17 +1155,13 @@ &ScsiAddress, sizeof(SCSI_ADDRESS)); if (!NT_SUCCESS(Status)) - { return; - } Mbr = (PARTITION_SECTOR*)RtlAllocateHeap(ProcessHeap, 0, DiskGeometry.BytesPerSector); if (Mbr == NULL) - { return; - } FileOffset.QuadPart = 0; Status = NtReadFile(FileHandle, @@ -1218,7 +1211,7 @@ else DiskEntry->NoMbr = FALSE; - /* Free Mbr sector buffer */ + /* Free the MBR sector buffer */ RtlFreeHeap(ProcessHeap, 0, Mbr); ListEntry = List->BiosDiskListHead.Flink; @@ -1227,7 +1220,7 @@ BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); /* FIXME: * Compare the size from bios and the reported size from driver. - * If we have more than one disk with a zero or with the same signatur + * If we have more than one disk with a zero or with the same signature * we must create new signatures and reboot. After the reboot, * it is possible to identify the disks. */ @@ -1347,7 +1340,7 @@ if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && - DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != 0) + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != PARTITION_ENTRY_UNUSED) { if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0) { @@ -1498,7 +1491,7 @@ if (IsListEmpty(&List->CurrentDisk->PrimaryPartListHead)) { - List->CurrentPartition = 0; + List->CurrentPartition = NULL; } else { @@ -1514,7 +1507,7 @@ VOID DestroyPartitionList( - PPARTLIST List) + IN PPARTLIST List) { PDISKENTRY DiskEntry; PBIOSDISKENTRY BiosDiskEntry; @@ -1574,10 +1567,10 @@ static VOID PrintEmptyLine( - PPARTLIST List) + IN PPARTLIST List) { COORD coPos; - DWORD Written; + ULONG Written; USHORT Width; USHORT Height; @@ -1609,13 +1602,13 @@ static VOID PrintPartitionData( - PPARTLIST List, - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) + IN PPARTLIST List, + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) { CHAR LineBuffer[128]; COORD coPos; - DWORD Written; + ULONG Written; USHORT Width; USHORT Height; LARGE_INTEGER PartSize; @@ -1765,14 +1758,14 @@ static VOID PrintDiskData( - PPARTLIST List, - PDISKENTRY DiskEntry) + IN PPARTLIST List, + IN PDISKENTRY DiskEntry) { PPARTENTRY PrimaryPartEntry, LogicalPartEntry; PLIST_ENTRY PrimaryEntry, LogicalEntry; CHAR LineBuffer[128]; COORD coPos; - DWORD Written; + ULONG Written; USHORT Width; USHORT Height; ULARGE_INTEGER DiskSize; @@ -1887,19 +1880,19 @@ VOID DrawPartitionList( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY Entry, Entry2; PDISKENTRY DiskEntry; PPARTENTRY PartEntry = NULL; COORD coPos; - DWORD Written; + ULONG Written; SHORT i; SHORT CurrentDiskLine; SHORT CurrentPartLine; SHORT LastLine; - BOOL CurrentPartLineFound = FALSE; - BOOL CurrentDiskLineFound = FALSE; + BOOLEAN CurrentPartLineFound = FALSE; + BOOLEAN CurrentDiskLineFound = FALSE; /* Calculate the line of the current disk and partition */ CurrentDiskLine = 0; @@ -2129,11 +2122,11 @@ } -DWORD +ULONG SelectPartition( - PPARTLIST List, - ULONG DiskNumber, - ULONG PartitionNumber) + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2180,7 +2173,7 @@ BOOL ScrollDownPartitionList( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY DiskListEntry; PLIST_ENTRY PartListEntry; @@ -2276,7 +2269,7 @@ BOOL ScrollUpPartitionList( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY DiskListEntry; PLIST_ENTRY PartListEntry; @@ -2373,7 +2366,7 @@ static BOOLEAN IsEmptyLayoutEntry( - PPARTITION_INFORMATION PartitionInfo) + IN PPARTITION_INFORMATION PartitionInfo) { if (PartitionInfo->StartingOffset.QuadPart == 0 && PartitionInfo->PartitionLength.QuadPart == 0) @@ -2426,7 +2419,7 @@ static ULONG GetLogicalPartitionCount( - PDISKENTRY DiskEntry) + IN PDISKENTRY DiskEntry) { PLIST_ENTRY ListEntry; PPARTENTRY PartEntry; @@ -2447,9 +2440,9 @@ static -BOOL +BOOLEAN ReAllocateLayoutBuffer( - PDISKENTRY DiskEntry) + IN PDISKENTRY DiskEntry) { PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; ULONG NewPartitionCount; @@ -2485,8 +2478,8 @@ /* If the layout buffer grows, make sure the new (empty) entries are written to the disk */ if (NewPartitionCount > CurrentPartitionCount) { - for (i = CurrentPartitionCount; i < NewPartitionCount; i++) - NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + for (i = CurrentPartitionCount; i < NewPartitionCount; i++) + NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; } DiskEntry->LayoutBuffer = NewLayoutBuffer; @@ -2555,7 +2548,7 @@ ListEntry = ListEntry->Flink; } - /* Update the logical partition tables */ + /* Update the logical partition table */ Index = 4; ListEntry = DiskEntry->LogicalPartListHead.Flink; while (ListEntry != &DiskEntry->LogicalPartListHead) @@ -2580,7 +2573,7 @@ PartEntry->PartitionNumber = PartitionNumber; PartEntry->PartitionIndex = Index; - /* Fill the link entry of the previous partition table */ + /* Fill the link entry of the previous partition entry */ if (LinkInfo != NULL) { LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; @@ -2594,7 +2587,7 @@ LinkInfo->RewritePartition = TRUE; } - /* Save a pointer to the link entry of the current partition table */ + /* Save a pointer to the link entry of the current partition entry */ LinkInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index + 1]; PartitionNumber++; @@ -2604,7 +2597,7 @@ ListEntry = ListEntry->Flink; } - /* Wipe unused primary partition table entries */ + /* Wipe unused primary partition entries */ for (Index = GetPrimaryPartitionCount(DiskEntry); Index < 4; Index++) { DPRINT1("Primary partition entry %lu\n", Index); @@ -2626,7 +2619,7 @@ } } - /* Wipe unused logical partition table entries */ + /* Wipe unused logical partition entries */ for (Index = 4; Index < DiskEntry->LayoutBuffer->PartitionCount; Index++) { if (Index % 4 >= 2) @@ -2660,8 +2653,8 @@ static PPARTENTRY GetPrevUnpartitionedEntry( - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) { PPARTENTRY PrevPartEntry; PLIST_ENTRY ListHead; @@ -2687,8 +2680,8 @@ static PPARTENTRY GetNextUnpartitionedEntry( - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) { PPARTENTRY NextPartEntry; PLIST_ENTRY ListHead; @@ -2713,9 +2706,9 @@ VOID CreatePrimaryPartition( - PPARTLIST List, - ULONGLONG SectorCount, - BOOLEAN AutoCreate) + IN PPARTLIST List, + IN ULONGLONG SectorCount, + IN BOOLEAN AutoCreate) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2799,13 +2792,13 @@ static VOID AddLogicalDiskSpace( - PDISKENTRY DiskEntry) + IN PDISKENTRY DiskEntry) { PPARTENTRY NewPartEntry; DPRINT1("AddLogicalDiskSpace()\n"); - /* Create a partition table entry that represents the empty space in the container partition */ + /* Create a partition entry that represents the empty space in the container partition */ NewPartEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(PARTENTRY)); @@ -2832,8 +2825,8 @@ VOID CreateExtendedPartition( - PPARTLIST List, - ULONGLONG SectorCount) + IN PPARTLIST List, + IN ULONGLONG SectorCount) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2941,9 +2934,9 @@ VOID CreateLogicalPartition( - PPARTLIST List, - ULONGLONG SectorCount, - BOOLEAN AutoCreate) + IN PPARTLIST List, + IN ULONGLONG SectorCount, + IN BOOLEAN AutoCreate) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -3028,7 +3021,7 @@ VOID DeleteCurrentPartition( - PPARTLIST List) + IN PPARTLIST List) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -3045,7 +3038,7 @@ return; } - /* Clear the system disk and partition pointers if the system partition will be deleted */ + /* Clear the system disk and partition pointers if the system partition is being deleted */ if (List->SystemPartition == List->CurrentPartition) { List->SystemDisk = NULL; @@ -3461,7 +3454,7 @@ BOOLEAN WritePartitionsToDisk( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; @@ -3487,9 +3480,9 @@ } -BOOL +BOOLEAN SetMountedDeviceValues( - PPARTLIST List) + IN PPARTLIST List) { PLIST_ENTRY Entry1, Entry2; PDISKENTRY DiskEntry; @@ -3497,9 +3490,7 @@ LARGE_INTEGER StartingOffset; if (List == NULL) - { return FALSE; - } Entry1 = List->DiskListHead.Flink; while (Entry1 != &List->DiskListHead) @@ -3514,6 +3505,7 @@ PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); if (PartEntry->IsPartitioned) { + /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; @@ -3602,10 +3594,10 @@ } -BOOL +BOOLEAN GetNextUnformattedPartition( IN PPARTLIST List, - OUT PDISKENTRY *pDiskEntry, + OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry) { PLIST_ENTRY Entry1, Entry2; @@ -3656,11 +3648,10 @@ return FALSE; } - -BOOL +BOOLEAN GetNextUncheckedPartition( IN PPARTLIST List, - OUT PDISKENTRY *pDiskEntry, + OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry) { PLIST_ENTRY Entry1, Entry2; Modified: branches/setup_improvements/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] Sat May 13 16:32:53 2017 @@ -211,6 +211,12 @@ ULONG Signature; } BIOS_DISK, *PBIOS_DISK; +VOID +GetPartTypeStringFromPartitionType( + IN UCHAR partitionType, + OUT PCHAR strPartType, + IN ULONG cchPartType); + PPARTLIST CreatePartitionList( SHORT Left, @@ -220,50 +226,46 @@ VOID DestroyPartitionList( - PPARTLIST List); + IN PPARTLIST List); VOID DrawPartitionList( - PPARTLIST List); - -DWORD + IN PPARTLIST List); + +ULONG SelectPartition( - PPARTLIST List, - ULONG DiskNumber, - ULONG PartitionNumber); - -BOOL -SetMountedDeviceValues( - PPARTLIST List); + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber); BOOL ScrollDownPartitionList( - PPARTLIST List); + IN PPARTLIST List); BOOL ScrollUpPartitionList( - PPARTLIST List); + IN PPARTLIST List); VOID CreatePrimaryPartition( - PPARTLIST List, - ULONGLONG SectorCount, - BOOLEAN AutoCreate); + IN PPARTLIST List, + IN ULONGLONG SectorCount, + IN BOOLEAN AutoCreate); VOID CreateExtendedPartition( - PPARTLIST List, - ULONGLONG SectorCount); + IN PPARTLIST List, + IN ULONGLONG SectorCount); VOID CreateLogicalPartition( - PPARTLIST List, - ULONGLONG SectorCount, - BOOLEAN AutoCreate); + IN PPARTLIST List, + IN ULONGLONG SectorCount, + IN BOOLEAN AutoCreate); VOID DeleteCurrentPartition( - PPARTLIST List); + IN PPARTLIST List); VOID CheckActiveSystemPartition( @@ -272,7 +274,11 @@ BOOLEAN WritePartitionsToDisk( - PPARTLIST List); + IN PPARTLIST List); + +BOOLEAN +SetMountedDeviceValues( + IN PPARTLIST List); ULONG PrimaryPartitionCreationChecks( @@ -286,22 +292,16 @@ LogicalPartitionCreationChecks( IN PPARTLIST List); -BOOL +BOOLEAN GetNextUnformattedPartition( IN PPARTLIST List, - OUT PDISKENTRY *pDiskEntry, + OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry); -BOOL +BOOLEAN GetNextUncheckedPartition( IN PPARTLIST List, - OUT PDISKENTRY *pDiskEntry, + OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry); -VOID -GetPartTypeStringFromPartitionType( - UCHAR partitionType, - PCHAR strPartType, - DWORD cchPartType); - /* EOF */

7 years, 7 months

[hbelusca] 74530: [USETUP]: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:23:08 2017 New Revision: 74530 URL: http://svn.reactos.org/svn/reactos?rev=74530&view=rev Log: [USETUP]: Code formatting only. Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat May 13 16:23:08 2017 @@ -1604,32 +1604,32 @@ } else if (PartitionList->CurrentPartition->LogicalPartition) { - if (PartitionList->CurrentPartition->IsPartitioned) - { - CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); - } - else - { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATELOGICAL)); - } + if (PartitionList->CurrentPartition->IsPartitioned) + { + CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATELOGICAL)); + } } else { - if (PartitionList->CurrentPartition->IsPartitioned) - { - if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) - { - CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); - } - else - { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); - } - } - else - { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); - } + if (PartitionList->CurrentPartition->IsPartitioned) + { + if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + { + CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); + } + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); + } } CONSOLE_ConInKey(Ir); @@ -1661,7 +1661,7 @@ else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) - continue; //return SELECT_PARTITION_PAGE; + continue; // return SELECT_PARTITION_PAGE; if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->IsPartitioned == FALSE) @@ -2674,7 +2674,7 @@ DiskEntry = PartitionList->TempDisk; PartEntry = PartitionList->TempPartition; - /* adjust disk size */ + /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; if (DiskSize >= 10737418240) /* 10 GB */ { @@ -2687,7 +2687,7 @@ DiskUnit = MUIGetString(STRING_MB); } - /* adjust partition size */ + /* Adjust partition size */ PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; if (PartSize >= 10737418240) /* 10 GB */ { @@ -2700,7 +2700,7 @@ PartUnit = MUIGetString(STRING_MB); } - /* adjust partition type */ + /* Adjust partition type */ GetPartTypeStringFromPartitionType(PartEntry->PartitionType, PartTypeString, ARRAYSIZE(PartTypeString)); @@ -2728,7 +2728,6 @@ CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); - PartEntry->AutoCreate = FALSE; } else if (PartEntry->New == TRUE) @@ -2853,7 +2852,7 @@ { if (!FileSystemList->Selected->FormatFunc) { - return SELECT_FILE_SYSTEM_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } else {

7 years, 7 months

[hbelusca] 74529: [USETUP]: On-going improvements for filesystem utility functions: - Introduce code that detects the filesystem of a (mounted?) partition, using NtQueryVolumeInformationFile with F...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:20:10 2017 New Revision: 74529 URL: http://svn.reactos.org/svn/reactos?rev=74529&view=rev Log: [USETUP]: On-going improvements for filesystem utility functions: - Introduce code that detects the filesystem of a (mounted?) partition, using NtQueryVolumeInformationFile with FileFsAttributeInformation class, aka. rely on ReactOS itself (kernel, storage stack, filesystem drivers...) to recognize the FS on a partition that should normally be seen by the system. This currently half-works for whatever reason (to be insvestigated), while it works on Windows. - Fix few comments & a function parameter name. - Use NT string pointer types. Modified: branches/setup_improvements/base/setup/usetup/fslist.c branches/setup_improvements/base/setup/usetup/fslist.h Modified: branches/setup_improvements/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/fslist.c [iso-8859-1] Sat May 13 16:20:10 2017 @@ -35,7 +35,7 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystemName, + IN PCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc) { @@ -69,7 +69,7 @@ PFILE_SYSTEM_ITEM GetFileSystemByName( IN PFILE_SYSTEM_LIST List, - IN LPWSTR FileSystemName) + IN PWSTR FileSystemName) { PLIST_ENTRY ListEntry; PFILE_SYSTEM_ITEM Item; @@ -87,6 +87,80 @@ return NULL; } +#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! + +/* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ +static NTSTATUS +_MyGetFileSystem( + IN struct _PARTENTRY* PartEntry, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; + HANDLE FileHandle; + IO_STATUS_BLOCK IoStatusBlock; + PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; + UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PartitionRootPath; + WCHAR PathBuffer[MAX_PATH]; + + FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; + + /* Set PartitionRootPath */ + swprintf(PathBuffer, + // L"\\Device\\Harddisk%lu\\Partition%lu", // Should work! But because ReactOS sucks atm. it actually doesn't work!! + L"\\Device\\Harddisk%lu\\Partition%lu\\", // HACK: Use this as a temporary hack! + PartEntry->DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Open the partition */ + InitializeObjectAttributes(&ObjectAttributes, + &PartitionRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, // PartitionHandle, + FILE_GENERIC_READ /* | SYNCHRONIZE */, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + return Status; + } + + /* Retrieve the FS attributes */ + Status = NtQueryVolumeInformationFile(FileHandle, + &IoStatusBlock, + FileFsAttribute, + sizeof(Buffer), + FileFsAttributeInformation); + NtClose(FileHandle); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryVolumeInformationFile failed for partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + return Status; + } + + if (FileSystemNameSize * sizeof(WCHAR) < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) + return STATUS_BUFFER_TOO_SMALL; + + RtlCopyMemory(FileSystemName, + FileFsAttribute->FileSystemName, + FileFsAttribute->FileSystemNameLength); + FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = UNICODE_NULL; + + return STATUS_SUCCESS; +} + +#endif PFILE_SYSTEM_ITEM GetFileSystem( @@ -94,7 +168,11 @@ IN struct _PARTENTRY* PartEntry) { PFILE_SYSTEM_ITEM CurrentFileSystem; - LPWSTR FileSystemName = NULL; + PWSTR FileSystemName = NULL; +#if 0 // For code temporarily disabled below + NTSTATUS Status; + WCHAR FsRecFileSystemName[MAX_PATH]; +#endif CurrentFileSystem = PartEntry->FileSystem; @@ -105,6 +183,26 @@ DPRINT1("File system not found, try to guess one...\n"); CurrentFileSystem = NULL; + +#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! + + /* + * We don't have one... + * + * Try to infer one using NT file system recognition. + */ + Status = _MyGetFileSystem(PartEntry, FsRecFileSystemName, ARRAYSIZE(FsRecFileSystemName)); + if (NT_SUCCESS(Status) && *FsRecFileSystemName) + { + /* Temporary HACK: map FAT32 back to FAT */ + if (wcscmp(FsRecFileSystemName, L"FAT32") == 0) + wcscpy(FsRecFileSystemName, L"FAT"); + + FileSystemName = FsRecFileSystemName; + goto Quit; + } + +#endif /* * We don't have one... @@ -141,12 +239,19 @@ FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ } +#if 0 +Quit: // For code temporarily disabled above +#endif + // HACK: WARNING: We cannot write on this FS yet! - if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); + if (FileSystemName) + { + if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); + } DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", - PartEntry->PartitionType, FileSystemName); + PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); if (FileSystemName != NULL) CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); @@ -160,7 +265,7 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem) + IN PCWSTR SelectFileSystem) { PFILE_SYSTEM_LIST List; PFILE_SYSTEM_ITEM Item; @@ -179,16 +284,16 @@ if (!ForceFormat) { - /* Add 'Keep' provider */ - FS_AddProvider(List, NULL, NULL, NULL); - } - - /* Search for ForceFileSystem in list */ + /* Add the 'Keep existing filesystem' dummy provider */ + FS_AddProvider(List, NULL, NULL, NULL); + } + + /* Search for SelectFileSystem in list */ ListEntry = List->ListHead.Flink; while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcscmp(ForceFileSystem, Item->FileSystemName) == 0) + if (Item->FileSystemName && wcscmp(SelectFileSystem, Item->FileSystemName) == 0) { List->Selected = Item; break; @@ -201,7 +306,6 @@ return List; } - VOID DestroyFileSystemList( IN PFILE_SYSTEM_LIST List) @@ -221,7 +325,6 @@ } RtlFreeHeap(ProcessHeap, 0, List); } - VOID DrawFileSystemList( @@ -260,7 +363,9 @@ snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); } else + { snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); + } if (ListEntry == &List->Selected->ListEntry) CONSOLE_SetInvertedTextXY(List->Left, @@ -275,7 +380,6 @@ } } - VOID ScrollDownFileSystemList( IN PFILE_SYSTEM_LIST List) @@ -287,7 +391,6 @@ } } - VOID ScrollUpFileSystemList( IN PFILE_SYSTEM_LIST List) Modified: branches/setup_improvements/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/fslist.h [iso-8859-1] Sat May 13 16:20:10 2017 @@ -31,7 +31,7 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - LPCWSTR FileSystemName; /* Not owned by the item */ + PCWSTR FileSystemName; /* Not owned by the item */ FORMATEX FormatFunc; CHKDSKEX ChkdskFunc; BOOLEAN QuickFormat; @@ -48,14 +48,14 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystemName, + IN PCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc); PFILE_SYSTEM_ITEM GetFileSystemByName( IN PFILE_SYSTEM_LIST List, - IN LPWSTR FileSystemName); + IN PWSTR FileSystemName); struct _PARTENTRY; // Defined in partlist.h PFILE_SYSTEM_ITEM @@ -68,7 +68,7 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem); + IN PCWSTR SelectFileSystem); VOID DestroyFileSystemList(

7 years, 7 months

[hbelusca] 74528: Code simplifications.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:13:49 2017 New Revision: 74528 URL: http://svn.reactos.org/svn/reactos?rev=74528&view=rev Log: Code simplifications. Modified: branches/setup_improvements/base/setup/usetup/filesup.c Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Sat May 13 16:13:49 2017 @@ -509,8 +509,7 @@ wcscat(FullName, FileName); } - RtlInitUnicodeString(&Name, - FullName); + RtlInitUnicodeString(&Name, FullName); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -524,14 +523,10 @@ &IoStatusBlock, 0, FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - return FALSE; - } NtClose(FileHandle); - return TRUE; + return NT_SUCCESS(Status); } /* EOF */

7 years, 7 months

[hbelusca] 74527: [USETUP]: Add code that attempts to detect NT 5.x operating systems (MS Windows <= 2k3, ReactOS) installations. Heavily work in progress. The ultimate aim with this, is to be able...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:13:19 2017 New Revision: 74527 URL: http://svn.reactos.org/svn/reactos?rev=74527&view=rev Log: [USETUP]: Add code that attempts to detect NT 5.x operating systems (MS Windows <= 2k3, ReactOS) installations. Heavily work in progress. The ultimate aim with this, is to be able to select an existing installation of ReactOS for upgrading. The user then could either select one, or skip this step and select a different disk/partition where to install ReactOS. Added: branches/setup_improvements/base/setup/usetup/osdetect.c (with props) Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sat May 13 16:13:19 2017 @@ -28,6 +28,7 @@ inffile.c inicache.c mui.c + osdetect.c partlist.c progress.c registry.c Added: branches/setup_improvements/base/setup/usetup/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.c (added) +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Sat May 13 16:13:19 2017 @@ -0,0 +1,676 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: base/setup/usetup/osdetect.c + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * operating systems detection code. + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#include "usetup.h" + +#include <ndk/ldrtypes.h> +#include <ndk/ldrfuncs.h> + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +extern PPARTLIST PartitionList; + + +/* VERSION RESOURCE API ******************************************************/ + +/* + * NT-oriented version resource management, adapted from dll/win32/version. + * We only deal with 32-bit PE executables. + */ + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL) +{ +// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h +#define VS_VERSION_INFO 1 // See psdk/verrsrc.h +#define VS_FILE_INFO RT_VERSION + + NTSTATUS Status; + LDR_RESOURCE_INFO ResourceInfo; + PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; + PVOID Data = NULL; + ULONG Size = 0; + + /* Try to find the resource */ + ResourceInfo.Type = 16; // RT_VERSION; + ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); + ResourceInfo.Language = 0; // Don't care about the language + + Status = LdrFindResource_U(BaseAddress, + &ResourceInfo, + RESOURCE_DATA_LEVEL, + &ResourceDataEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); + return Status; + } + + /* Access the resource */ + Status = LdrAccessResource(BaseAddress, + ResourceDataEntry, + &Data, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); + return Status; + } + + *Resource = Data; + if (ResourceSize) *ResourceSize = Size; + + return STATUS_SUCCESS; +} + +/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ +typedef struct _VS_VERSION_INFO_STRUCT32 +{ + WORD wLength; + WORD wValueLength; + WORD wType; /* 1:Text, 0:Binary */ + WCHAR szKey[1]; +#if 0 /* variable length structure */ + /* DWORD aligned */ + BYTE Value[]; + /* DWORD aligned */ + VS_VERSION_INFO_STRUCT32 Children[]; +#endif +} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; +typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; + +#define DWORD_ALIGN( base, ptr ) \ + ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) + +#define VersionInfo32_Value( ver ) \ + DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) + +#define VersionInfo32_Children( ver ) \ + (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ + ( ( (ver)->wValueLength * \ + ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) + +#define VersionInfo32_Next( ver ) \ + (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) + +static PCVS_VERSION_INFO_STRUCT32 +VersionInfo32_FindChild( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR szKey, + IN UINT cbKey) +{ + PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); + + while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) + { + if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + return child; + + if (child->wLength == 0) return NULL; + child = VersionInfo32_Next(child); + } + + return NULL; +} + +static NTSTATUS +VersionInfo32_QueryValue( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen OPTIONAL, + OUT BOOL* pbText OPTIONAL) +{ + PCWSTR lpNextSlash; + + DPRINT("lpSubBlock : (%S)\n", lpSubBlock); + + while (*lpSubBlock) + { + /* Find next path component */ + for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) + { + if (*lpNextSlash == '\\') + break; + } + + /* Skip empty components */ + if (lpNextSlash == lpSubBlock) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); + if (!info) + { + if (puLen) *puLen = 0; + return STATUS_RESOURCE_TYPE_NOT_FOUND; + } + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = (PVOID)VersionInfo32_Value(info); + if (puLen) + *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; + + return STATUS_SUCCESS; +} + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen) +{ + PCVS_VERSION_INFO_STRUCT32 info = pBlock; + + DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); + + if (!pBlock) + return FALSE; + + if (!lpSubBlock || !*lpSubBlock) + lpSubBlock = L"\\"; + + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); +} + + + +/* FUNCTIONS ****************************************************************/ + +#if 0 + +BOOL IsWindowsOS(VOID) +{ + // TODO: + // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, + // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, + // check the REG_SZ value "ProductName" and see whether it's "Windows" + // or "ReactOS". One may also check the REG_SZ "CurrentVersion" value, + // the REG_SZ "SystemRoot" and "PathName" values (what are the differences??). + // + // Optionally, looking at the SYSTEM hive, CurrentControlSet\\Control, + // REG_SZ values "SystemBootDevice" (and "FirmwareBootDevice" ??)... + // + + /* ReactOS reports as Windows NT 5.2 */ + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + LONG ret; + DWORD dwType = 0, dwBufSize = 0; + + ret = RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, NULL, &dwBufSize); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + LPTSTR lpszProductName = (LPTSTR)MemAlloc(0, dwBufSize); + RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, (LPBYTE)lpszProductName, &dwBufSize); + + bIsWindowsOS = (FindSubStrI(lpszProductName, _T("Windows")) != NULL); + + MemFree(lpszProductName); + } + + RegCloseKey(hKey); + } + + return bIsWindowsOS; +} + +#endif + +typedef enum _NTOS_BOOT_LOADER_TYPE +{ + FreeLdr, // ReactOS' FreeLDR + NtLdr, // Windows <= 2k3 NTLDR +// BootMgr, // Vista+ BCD-oriented BOOTMGR +} NTOS_BOOT_LOADER_TYPE; + +typedef struct _NTOS_BOOT_LOADER_FILES +{ + NTOS_BOOT_LOADER_TYPE Type; + PCWSTR LoaderExecutable; + PCWSTR LoaderConfigurationFile; + // EnumerateInstallations; +} NTOS_BOOT_LOADER_FILES, *PNTOS_BOOT_LOADER_FILES; + +// Question 1: What if config file is optional? +// Question 2: What if many config files are possible? +NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = +{ + {FreeLdr, L"freeldr.sys", L"freeldr.ini"}, + {NtLdr , L"ntldr" , L"boot.ini"}, + {NtLdr , L"setupldr" , L"txtsetup.sif"}, +// {BootMgr, L"bootmgr" , ???} +}; + +#if 0 + +static VOID +EnumerateInstallationsFreeLdr() +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHESECTION IniSection; + PINICACHESECTION OsIniSection; + WCHAR SectionName[80]; + WCHAR OsName[80]; + WCHAR SystemPath[200]; + WCHAR SectionName2[200]; + PWCHAR KeyData; + ULONG i,j; + + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoad(&IniCache, IniPath, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* NOTE that we enumerate all the valid installations, not just the default one */ + while (TRUE) + { + Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + if (!NT_SUCCESS(Status)) + break; + + // TODO some foobaring... + + // TODO 2 : Remind the entry name so that we may display it as available installation... + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName2); + if (OsIniSection != NULL) + { + BOOLEAN UseExistingEntry = TRUE; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + + if (UseExistingEntry) + { + /* BootType is Windows2003. Now check SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); + if (NT_SUCCESS(Status)) + { + swprintf(SystemPath, L"\"%s\"", ArcPath); + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, ArcPath) != 0) && + (_wcsicmp(KeyData, SystemPath) != 0) )) + { + /* This entry is a ReactOS entry, but the SystemRoot + does not match the one we are looking for. */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + } + } + } + + IniCacheDestroy(IniCache); +} + +#endif + +static BOOLEAN +IsRecognizedOS( + IN ULONG DiskNumber, + IN ULONG PartitionNumber) +{ + BOOLEAN Success = FALSE; + NTSTATUS Status; + UINT i; + HANDLE PartitionHandle, FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PartitionRootPath; + WCHAR PathBuffer[MAX_PATH]; + UNICODE_STRING FileName; + // WCHAR FullName[MAX_PATH]; + + /* Version stuff */ + HANDLE SectionHandle; + SIZE_T ViewSize; + PVOID ViewBase; + PVOID VersionBuffer = NULL; // Read-only + PVOID pvData = NULL; + UINT BufLen = 0; + + /* Set PartitionRootPath */ + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskNumber, PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT1("IsRecognizedOS: PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Open the partition */ + InitializeObjectAttributes(&ObjectAttributes, + &PartitionRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + return FALSE; + } + + /* Try to see whether we recognize some NT boot loaders */ + for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) + { + /* Check whether the loader executable exists */ + RtlInitUnicodeString(&FileName, NtosBootLoaders[i].LoaderExecutable); + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + PartitionHandle, + NULL); + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + continue; + } + NtClose(FileHandle); + + /* Check whether the loader configuration file exists */ + RtlInitUnicodeString(&FileName, NtosBootLoaders[i].LoaderConfigurationFile); + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + PartitionHandle, + NULL); + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + continue; + } + + /* The loader configuration file exists, interpret it to find valid installations */ + // TODO!! + DPRINT1("TODO: Analyse the OS installations inside %S !\n", NtosBootLoaders[i].LoaderConfigurationFile); + + /* Close the file */ + NtClose(FileHandle); + } + + + + + /* Find a version string in \SystemRoot\System32\ntoskrnl.exe (standard name) */ + // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... + // RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\ntoskrnl.exe"); + RtlInitUnicodeString(&FileName, L"WINDOWS\\system32\\ntoskrnl.exe"); + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + PartitionHandle, + NULL); + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + goto Quit; + } + + /* Map the file in memory */ + + /* Create the section */ + Status = NtCreateSection(&SectionHandle, + SECTION_MAP_READ, + NULL, + NULL, + PAGE_READONLY, + SEC_COMMIT /* | SEC_IMAGE (_NO_EXECUTE) */, + FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a memory section for file %wZ, Status 0x%08lx\n", &FileName, Status); + goto SkipFile; + } + + /* Map the section */ + ViewSize = 0; + ViewBase = NULL; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_READONLY); + /* Close handle to the section */ + NtClose(SectionHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &FileName, Status); + goto SkipFile; + } + + /* Make sure it's a valid PE file */ + if (!RtlImageNtHeader(ViewBase)) + { + DPRINT1("File %wZ does not seem to be a valid PE, bail out\n", &FileName); + Status = STATUS_INVALID_IMAGE_FORMAT; + goto UnmapFile; + } + + /* + * Search for a valid executable version and vendor. + * NOTE: The module is loaded as a data file, it should be marked as such. + */ + Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); + goto UnmapFile; + } + + Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); + if (NT_SUCCESS(Status)) + { + USHORT wCodePage = 0, wLangID = 0; + WCHAR FileInfo[MAX_PATH]; + UNICODE_STRING Vendor; + + wCodePage = LOWORD(*(ULONG*)pvData); + wLangID = HIWORD(*(ULONG*)pvData); + + StringCchPrintfW(FileInfo, ARRAYSIZE(FileInfo), + L"StringFileInfo\\%04X%04X\\CompanyName", + wCodePage, wLangID); + + Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); + if (NT_SUCCESS(Status) && pvData) + { + /* BufLen includes the NULL terminator count */ + RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); + Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); + + DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); + + /**/ + Success = TRUE; + /**/ + } + else + { + DPRINT1("No version vendor found for file %wZ\n", &FileName); + } + } + +UnmapFile: + /* Finally, unmap the file */ + NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); + +SkipFile: + /* Close the file */ + NtClose(FileHandle); + +Quit: + /* Close the partition */ + NtClose(PartitionHandle); + return Success; +} + +static BOOLEAN +ShouldICheckThisPartition( + IN PPARTENTRY PartEntry) +{ + if (!PartEntry) + return FALSE; + + return PartEntry->IsPartitioned && + !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ && + !PartEntry->New && + (PartEntry->FormatState == Preformatted /* || PartEntry->FormatState == Formatted */); +} + +VOID +DetectOperatingSystems( + IN PPARTLIST List) +{ + PLIST_ENTRY Entry, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + /* Loop each available disk ... */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + DPRINT1("Disk #%d\n", DiskEntry->DiskNumber); + + /* ... and for each disk, loop each available partition */ + + /* First, the primary partitions */ + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + { + BOOLEAN IsRecognized = IsRecognizedOS(DiskEntry->DiskNumber, PartEntry->PartitionNumber); + DPRINT1("%s OS in partition #%d, index %d\n", + IsRecognized ? "Recognized" : "Unrecognized", + PartEntry->PartitionNumber, PartEntry->PartitionIndex); + } + } + + /* Then, the logical partitions (present in the extended partition) */ + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + { + BOOLEAN IsRecognized = IsRecognizedOS(DiskEntry->DiskNumber, PartEntry->PartitionNumber); + DPRINT1("%s OS in partition #%d, index %d\n", + IsRecognized ? "Recognized" : "Unrecognized", + PartEntry->PartitionNumber, PartEntry->PartitionIndex); + } + } + } +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/usetup/osdetect.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 7 months

[hbelusca] 74526: Create a branch for ROS setup improvements.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 13 16:07:53 2017 New Revision: 74526 URL: http://svn.reactos.org/svn/reactos?rev=74526&view=rev Log: Create a branch for ROS setup improvements. Added: branches/setup_improvements/ (props changed) - copied from r74525, trunk/reactos/ Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat May 13 16:07:53 2017 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat May 13 16:07:53 2017 @@ -0,0 +1,25 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_2016/AHCI:71203-73603 +/branches/GSoC_2016/USB:72365-73604 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/colins-printing-for-freedom/reactos:67543-68405,68407-68414,68417-70595 +/branches/condrv_restructure:63104-65657 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm:59241-63176 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell-experiments:61927-65494 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

7 years, 7 months

[tthompson] 74525: [NTFS] - Fix a bug with last commit, as spotted by Pierre.

by tthompson＠svn.reactos.org

Author: tthompson Date: Sat May 13 09:17:06 2017 New Revision: 74525 URL: http://svn.reactos.org/svn/reactos?rev=74525&view=rev Log: [NTFS] - Fix a bug with last commit, as spotted by Pierre. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sat May 13 09:17:06 2017 @@ -437,7 +437,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Unable to migrate resident attribute!\n"); - if(AttribData != NULL) + if (AttribDataSize.QuadPart > 0) ExFreePoolWithTag(AttribData, TAG_NTFS); return Status; }

7 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
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 May 2017