Ros-diffs June 2018

ros-diffs@reactos.org

26 participants
174 discussions

08/09: [SETUPLIB][USETUP] Diverse additions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cacae6d9a0c5469c91614… commit cacae6d9a0c5469c916143eb6abcf33c36f370bb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 31 03:43:12 2017 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:45 2018 +0200 [SETUPLIB][USETUP] Diverse additions. - Use NT string safe functions. - Add support for other bootloaders; - Update a couple of comments; - Remove deprecated __REACTOS__ #ifdefs. svn path=/branches/setup_improvements/; revision=74713 --- base/setup/lib/fsutil.c | 10 +-- base/setup/lib/partlist.c | 54 ++++++++------ base/setup/lib/setuplib.h | 6 +- base/setup/usetup/bootsup.c | 177 ++++++++++++++++++++++++++++++-------------- base/setup/usetup/usetup.rc | 7 +- 5 files changed, 164 insertions(+), 90 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index b1f498a5ad..bec91c4988 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -127,11 +127,11 @@ _MyGetFileSystem( 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); + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(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); diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index f29b2859a6..71fd77a005 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -110,9 +110,9 @@ GetDriverName( RtlInitUnicodeString(&DiskEntry->DriverName, NULL); - swprintf(KeyName, - L"\\Scsi\\Scsi Port %hu", - DiskEntry->Port); + RtlStringCchPrintfW(KeyName, ARRAYSIZE(KeyName), + L"\\Scsi\\Scsi Port %hu", + DiskEntry->Port); RtlZeroMemory(&QueryTable, sizeof(QueryTable)); @@ -366,7 +366,9 @@ EnumerateBiosDiskEntries( AdapterCount = 0; while (1) { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); + RtlStringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu", + ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -377,7 +379,9 @@ EnumerateBiosDiskEntries( break; } - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); + RtlStringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController", + ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -387,7 +391,9 @@ EnumerateBiosDiskEntries( { while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); + RtlStringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0", + ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -399,7 +405,9 @@ EnumerateBiosDiskEntries( return; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); + RtlStringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral", + ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -421,7 +429,9 @@ EnumerateBiosDiskEntries( break; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); + RtlStringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", + ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, @@ -974,7 +984,8 @@ AddDiskToList( } Checksum = ~Checksum + 1; - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); + RtlStringCchPrintfW(Identifier, ARRAYSIZE(Identifier), + L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); DiskEntry = RtlAllocateHeap(ProcessHeap, @@ -1205,7 +1216,7 @@ CreatePartitionList(VOID) List = (PPARTLIST)RtlAllocateHeap(ProcessHeap, 0, - sizeof (PARTLIST)); + sizeof(PARTLIST)); if (List == NULL) return NULL; @@ -1233,11 +1244,10 @@ CreatePartitionList(VOID) for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) { - swprintf(Buffer, - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); - RtlInitUnicodeString(&Name, - Buffer); + RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%lu\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, Buffer); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -2460,7 +2470,7 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Remove the next entry */ - RemoveEntryList (&NextPartEntry->ListEntry); + RemoveEntryList(&NextPartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, NextPartEntry); /* Update current partition */ @@ -2764,11 +2774,10 @@ WritePartitions( DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); - swprintf(DstPath, - L"\\Device\\Harddisk%d\\Partition0", - DiskEntry->DiskNumber); - RtlInitUnicodeString(&Name, - DstPath); + RtlStringCchPrintfW(DstPath, ARRAYSIZE(DstPath), + L"\\Device\\Harddisk%lu\\Partition0", + DiskEntry->DiskNumber); + RtlInitUnicodeString(&Name, DstPath); InitializeObjectAttributes(&ObjectAttributes, &Name, 0, @@ -2865,7 +2874,8 @@ SetMountedDeviceValue( NTSTATUS Status; HANDLE KeyHandle; - swprintf(ValueNameBuffer, L"\\DosDevices\\%C:", Letter); + RtlStringCchPrintfW(ValueNameBuffer, ARRAYSIZE(ValueNameBuffer), + L"\\DosDevices\\%C:", Letter); RtlInitUnicodeString(&ValueName, ValueNameBuffer); InitializeObjectAttributes(&ObjectAttributes, diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index a53fc3cb2d..bee6e9f87f 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -14,10 +14,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <wingdi.h> // For LF_FACESIZE and TranslateCharsetInfo() -#include <wincon.h> -#include <winnls.h> // For code page support -#include <winreg.h> +#include <winxxx.h> #endif @@ -29,6 +26,7 @@ extern HANDLE ProcessHeap; #include "linklist.h" #include "ntverrsrc.h" // #include "arcname.h" +#include "bldrsup.h" #include "filesup.h" #include "fsutil.h" #include "genlist.h" diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index b48d5c0e07..b59767131b 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -435,13 +435,13 @@ CreateFreeLoaderIniForReactOS( static NTSTATUS CreateFreeLoaderIniForReactOSAndBootSector( - PWCHAR IniPath, - PWCHAR ArcPath, - PWCHAR Section, - PWCHAR Description, - PWCHAR BootDrive, - PWCHAR BootPartition, - PWCHAR BootSector) + IN PCWSTR IniPath, + IN PCWSTR ArcPath, + IN PCWSTR Section, + IN PCWSTR Description, + IN PCWSTR BootDrive, + IN PCWSTR BootPartition, + IN PCWSTR BootSector) { PINICACHE IniCache; PINICACHESECTION IniSection; @@ -453,7 +453,7 @@ CreateFreeLoaderIniForReactOSAndBootSector( CreateCommonFreeLoaderSections(IniCache); /* Add the ReactOS entries */ - CreateFreeLoaderReactOSEntries(IniCache, ArcPath); + CreateFreeLoaderReactOSEntries(IniCache, (PWCHAR)ArcPath); /* Get "Operating Systems" section */ IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); @@ -462,11 +462,11 @@ CreateFreeLoaderIniForReactOSAndBootSector( IniCacheInsertKey(IniSection, NULL, INSERT_LAST, - Section, - Description); + (PWCHAR)Section, + (PWCHAR)Description); /* Create new section */ - IniSection = IniCacheAppendSection(IniCache, Section); + IniSection = IniCacheAppendSection(IniCache, (PWCHAR)Section); /* BootType=BootSector */ IniCacheInsertKey(IniSection, @@ -480,24 +480,24 @@ CreateFreeLoaderIniForReactOSAndBootSector( NULL, INSERT_LAST, L"BootDrive", - BootDrive); + (PWCHAR)BootDrive); /* BootPartition= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"BootPartition", - BootPartition); + (PWCHAR)BootPartition); /* BootSector= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"BootSectorFile", - BootSector); + (PWCHAR)BootSector); /* Save the INI file */ - IniCacheSave(IniCache, IniPath); + IniCacheSave(IniCache, (PWCHAR)IniPath); IniCacheDestroy(IniCache); return STATUS_SUCCESS; @@ -2260,9 +2260,9 @@ InstallFatBootcodeToPartition( /* FAT or FAT32 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the system partition */ + /* Copy FreeLoader to the system partition, always overwriting the older version */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2272,8 +2272,8 @@ InstallFatBootcodeToPartition( return Status; } - /* Prepare for possibly copying 'freeldr.ini' */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + /* Prepare for possibly updating 'freeldr.ini' */ + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.ini"); DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) @@ -2292,10 +2292,12 @@ InstallFatBootcodeToPartition( /* Check for NT and other bootloaders */ // FIXME: Check for Vista+ bootloader! - if (DoesFileExist_2(SystemRootPath->Buffer, L"ntldr") == TRUE || - DoesFileExist_2(SystemRootPath->Buffer, L"boot.ini") == TRUE) + /*** Status = FindNTOSBootLoader(PartitionHandle, NtLdr, &Version); ***/ + /*** Status = FindNTOSBootLoader(PartitionHandle, BootMgr, &Version); ***/ + if (DoesFileExist_2(SystemRootPath->Buffer, L"NTLDR") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"BOOT.INI") == TRUE) { - /* Search root directory for 'ntldr' and 'boot.ini' */ + /* Search root directory for 'NTLDR' and 'BOOT.INI' */ DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n"); /* Create or update 'freeldr.ini' */ @@ -2303,7 +2305,7 @@ InstallFatBootcodeToPartition( { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.ini"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2313,7 +2315,7 @@ InstallFatBootcodeToPartition( } /* Install new bootcode into a file */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.ros"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"bootsect.ros"); if (PartitionType == PARTITION_FAT32 || PartitionType == PARTITION_FAT32_XINT13) @@ -2347,7 +2349,7 @@ InstallFatBootcodeToPartition( } /* Update 'boot.ini' */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\boot.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"boot.ini"); DPRINT1("Update 'boot.ini': %S\n", DstPath); Status = UpdateBootIni(DstPath, @@ -2363,31 +2365,97 @@ InstallFatBootcodeToPartition( { /* Non-NT bootloaders: install our own bootloader */ - PWCHAR Section; - PWCHAR Description; - PWCHAR BootDrive; - PWCHAR BootPartition; - PWCHAR BootSector; - PWCHAR BootSectorFileName; + PCWSTR Section; + PCWSTR Description; + PCWSTR BootDrive; + PCWSTR BootPartition; + PCWSTR BootSector; - if (DoesFileExist_2(SystemRootPath->Buffer, L"io.sys") == TRUE || - DoesFileExist_2(SystemRootPath->Buffer, L"msdos.sys") == TRUE) + /* Search for COMPAQ MS-DOS 1.x (1.11, 1.12, based on MS-DOS 1.25) boot loader */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"IOSYS.COM") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"MSDOS.COM") == TRUE) + { + DPRINT1("Found COMPAQ MS-DOS 1.x (1.11, 1.12) / MS-DOS 1.25 boot loader\n"); + + Section = L"DOS"; + Description = L"\"COMPAQ MS-DOS 1.x / MS-DOS 1.25\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + } + else + /* Search for Microsoft DOS or Windows 9x boot loader */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"IO.SYS") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"MSDOS.SYS") == TRUE) + // WINBOOT.SYS { - /* Search for root directory for 'io.sys' and 'msdos.sys' */ DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); Section = L"DOS"; - Description = L"\"DOS/Windows\""; + Description = L"\"MS-DOS/Windows\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + } + else + /* Search for IBM PC-DOS or DR-DOS 5.x boot loader */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"IBMIO.COM" ) == TRUE || // Some people refer to this file instead of IBMBIO.COM... + DoesFileExist_2(SystemRootPath->Buffer, L"IBMBIO.COM") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"IBMDOS.COM") == TRUE) + { + DPRINT1("Found IBM PC-DOS or DR-DOS 5.x or IBM OS/2 1.0\n"); + + Section = L"DOS"; + Description = L"\"IBM PC-DOS or DR-DOS 5.x or IBM OS/2 1.0\""; BootDrive = L"hd0"; BootPartition = L"1"; BootSector = L"BOOTSECT.DOS"; + } + else + /* Search for DR-DOS 3.x boot loader */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"DRBIOS.SYS") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"DRBDOS.SYS") == TRUE) + { + DPRINT1("Found DR-DOS 3.x\n"); + + Section = L"DOS"; + Description = L"\"DR-DOS 3.x\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + } + else + /* Search for MS OS/2 1.x */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"OS2BOOT.COM") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"OS2BIO.COM" ) == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"OS2DOS.COM" ) == TRUE) + { + DPRINT1("Found MS OS/2 1.x\n"); + + Section = L"DOS"; + Description = L"\"MS OS/2 1.x\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.OS2"; + } + else + /* Search for MS or IBM OS/2 */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"OS2BOOT") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"OS2LDR" ) == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"OS2KRNL") == TRUE) + { + DPRINT1("Found MS/IBM OS/2\n"); - BootSectorFileName = L"\\bootsect.dos"; + Section = L"DOS"; + Description = L"\"MS/IBM OS/2\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.OS2"; } else + /* Search for FreeDOS boot loader */ if (DoesFileExist_2(SystemRootPath->Buffer, L"kernel.sys") == TRUE) { - /* Search for root directory for 'kernel.sys' */ DPRINT1("Found FreeDOS boot loader\n"); Section = L"DOS"; @@ -2395,8 +2463,6 @@ InstallFatBootcodeToPartition( BootDrive = L"hd0"; BootPartition = L"1"; BootSector = L"BOOTSECT.DOS"; - - BootSectorFileName = L"\\bootsect.dos"; } else { @@ -2408,8 +2474,6 @@ InstallFatBootcodeToPartition( BootDrive = L"hd0"; BootPartition = L"1"; BootSector = L"BOOTSECT.OLD"; - - BootSectorFileName = L"\\bootsect.old"; } /* Create or update 'freeldr.ini' */ @@ -2417,7 +2481,7 @@ InstallFatBootcodeToPartition( { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.ini"); if (IsThereAValidBootSector(SystemRootPath->Buffer)) { @@ -2432,7 +2496,7 @@ InstallFatBootcodeToPartition( } /* Save current bootsector */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, BootSectorFileName); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, BootSector); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); @@ -2502,9 +2566,9 @@ InstallExt2BootcodeToPartition( /* EXT2 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the system partition */ + /* Copy FreeLoader to the system partition, always overwriting the older version */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2515,7 +2579,7 @@ InstallExt2BootcodeToPartition( } /* Prepare for possibly copying 'freeldr.ini' */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.ini"); DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) @@ -2545,10 +2609,12 @@ InstallExt2BootcodeToPartition( if (IsThereAValidBootSector(SystemRootPath->Buffer)) { + PCWSTR BootSector = L"BOOTSECT.OLD"; + Status = CreateFreeLoaderIniForReactOSAndBootSector( DstPath, DestinationArcPath->Buffer, L"Linux", L"\"Linux\"", - L"hd0", L"1", L"BOOTSECT.OLD"); + L"hd0", L"1", BootSector); if (!NT_SUCCESS(Status)) { DPRINT1("CreateFreeLoaderIniForReactOSAndBootSector() failed (Status %lx)\n", Status); @@ -2556,7 +2622,7 @@ InstallExt2BootcodeToPartition( } /* Save current bootsector */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, BootSector); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); @@ -2627,6 +2693,7 @@ InstallVBRToPartition( } case PARTITION_IFS: + DPRINT1("Partitions of type NTFS or HPFS are not supported yet!\n"); break; default: @@ -2645,7 +2712,7 @@ InstallFatBootcodeToFloppy( { NTSTATUS Status; PFILE_SYSTEM FatFS; - UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); + UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; @@ -2670,8 +2737,7 @@ InstallFatBootcodeToFloppy( /* Copy FreeLoader to the boot partition */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - - RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice.Buffer, L"freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2682,7 +2748,7 @@ InstallFatBootcodeToFloppy( } /* Create new 'freeldr.ini' */ - RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice.Buffer, L"freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); @@ -2692,16 +2758,15 @@ InstallFatBootcodeToFloppy( return Status; } - /* Install FAT12/16 boosector */ + /* Install FAT12 boosector */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); - - RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0"); + RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), FloppyDevice.Buffer); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status); + DPRINT1("InstallFat12BootCodeToFloppy() failed (Status %lx)\n", Status); return Status; } diff --git a/base/setup/usetup/usetup.rc b/base/setup/usetup/usetup.rc index d7347f31b9..0d9d304e54 100644 --- a/base/setup/usetup/usetup.rc +++ b/base/setup/usetup/usetup.rc @@ -1,4 +1,5 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" -#define REACTOS_STR_INTERNAL_NAME "usetup" -#define REACTOS_STR_ORIGINAL_FILENAME "usetup.exe" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Text-Mode Setup" +#define REACTOS_STR_INTERNAL_NAME "usetup" +#define REACTOS_STR_ORIGINAL_FILENAME "usetup.exe" #include <reactos/version.rc>

6 years, 6 months

07/09: [SETUPLIB] Adjustments in the code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=563d9f26c4ab04145ae5c… commit 563d9f26c4ab04145ae5cf9054e125d9c40b5c87 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 31 01:11:05 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:45 2018 +0200 [SETUPLIB] Adjustments in the code. - Call OpenAndMapFile() with its new ReadWrite parameter; - Add informative comments in osdetect.c; - In partlist.c, check whether a disk has a valid MBR by also checking for its 0xAA55 signature. svn path=/branches/setup_improvements/; revision=74712 --- base/setup/lib/bldrsup.c | 4 ++-- base/setup/lib/osdetect.c | 13 ++++++++++++- base/setup/lib/partlist.c | 9 ++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/base/setup/lib/bldrsup.c b/base/setup/lib/bldrsup.c index 493c52237e..13a1ed34e8 100644 --- a/base/setup/lib/bldrsup.c +++ b/base/setup/lib/bldrsup.c @@ -89,7 +89,7 @@ FindNTOSBootLoader( // By handle #if 0 /* Check whether the loader configuration file exists */ Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase, &FileSize); + &FileHandle, &SectionHandle, &ViewBase, &FileSize, FALSE); if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ @@ -314,7 +314,7 @@ EnumerateNTOSBootEntries( /* Check whether the loader configuration file exists */ Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase, &FileSize); + &FileHandle, &SectionHandle, &ViewBase, &FileSize, FALSE); if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/osdetect.c index 20611bdc02..6b16e5624d 100644 --- a/base/setup/lib/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -150,6 +150,8 @@ EnumerateInstallations( { /* This is not a ReactOS entry */ /* Certainly not a ReactOS installation */ + DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); + /* Continue the enumeration */ return STATUS_SUCCESS; } } @@ -171,6 +173,7 @@ EnumerateInstallations( { DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -183,6 +186,7 @@ EnumerateInstallations( if (!ArcPathToNtPath(&SystemRootPath, BootEntry->OsLoadPath, Data->PartList)) { DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", BootEntry->OsLoadPath); + /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -198,6 +202,7 @@ EnumerateInstallations( { DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -205,7 +210,10 @@ EnumerateInstallations( /* Check if this is a valid NTOS installation; stop there if it isn't one */ if (!IsValidNTOSInstallation_UStr(&SystemRootPath)) + { + /* Continue the enumeration */ return STATUS_SUCCESS; + } DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", BootEntry->OsLoadPath, &SystemRootPath); @@ -228,6 +236,7 @@ EnumerateInstallations( DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); } + /* Add the discovered NTOS installation into the list */ if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ @@ -245,6 +254,7 @@ EnumerateInstallations( DiskNumber, PartitionNumber, PartEntry, InstallNameW); + /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -301,7 +311,8 @@ CheckForValidPEAndVendor( VendorName->Length = 0; Status = OpenAndMapFile(RootDirectory, PathNameToFile, - &FileHandle, &SectionHandle, &ViewBase, NULL); + &FileHandle, &SectionHandle, &ViewBase, + NULL, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", PathNameToFile, Status); diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 7b74cda8f0..f29b2859a6 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -989,9 +989,12 @@ AddDiskToList( // DiskEntry->Signature = Signature; 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) + /* + * Check if this disk has a valid MBR: verify its signature, + * and whether its two first bytes are a valid instruction + * (related to this, see IsThereAValidBootSector() in partlist.c). + */ + if (Mbr->Magic != 0xaa55 || (*(PUSHORT)Mbr->BootCode) == 0x0000) DiskEntry->NoMbr = TRUE; else DiskEntry->NoMbr = FALSE;

6 years, 6 months

06/09: [SETUPLIB] Additions for filesup.c and inicache.c.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f5428633bd72965ef5cf… commit 7f5428633bd72965ef5cf932ac2802ee357b05ba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 31 00:18:13 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:44 2018 +0200 [SETUPLIB] Additions for filesup.c and inicache.c. - In DoesFileExist(): Call NtOpenFile with FILE_GENERIC_READ instead of the more generic GENERIC_READ access right. - OpenAndMapFile(): Add support for opening & mapping files with write access (to be used latter). svn path=/branches/setup_improvements/; revision=74710 - Split IniCacheLoad() and IniCacheSave() into: themselves & IniCacheLoadByHandle() and IniCacheSaveByHandle(), respectively, so that we can load & save INI files if we already have an opened handle to them. svn path=/branches/setup_improvements/; revision=74711 --- base/setup/lib/filesup.c | 25 +++++--- base/setup/lib/filesup.h | 7 ++- base/setup/lib/inicache.c | 157 ++++++++++++++++++++++++++-------------------- base/setup/lib/inicache.h | 11 ++++ 4 files changed, 122 insertions(+), 78 deletions(-) diff --git a/base/setup/lib/filesup.c b/base/setup/lib/filesup.c index 5a9ba0082c..056487771d 100644 --- a/base/setup/lib/filesup.c +++ b/base/setup/lib/filesup.c @@ -179,7 +179,7 @@ DoesFileExist( NULL); Status = NtOpenFile(&FileHandle, - GENERIC_READ | SYNCHRONIZE, + FILE_GENERIC_READ, // Contains SYNCHRONIZE &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -305,20 +305,24 @@ Quit: NTSTATUS OpenAndMapFile( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathNameToFile, + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, - OUT PULONG FileSize OPTIONAL) + OUT PULONG FileSize OPTIONAL, + IN BOOLEAN ReadWriteAccess) { NTSTATUS Status; UNICODE_STRING FileName; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; + ULONG SectionPageProtection; SIZE_T ViewSize; PVOID ViewBase; + /* Open the file */ + RtlInitUnicodeString(&FileName, PathNameToFile); InitializeObjectAttributes(&ObjectAttributes, @@ -331,7 +335,8 @@ OpenAndMapFile( *SectionHandle = NULL; Status = NtOpenFile(FileHandle, - GENERIC_READ | SYNCHRONIZE, + FILE_GENERIC_READ | // Contains SYNCHRONIZE + (ReadWriteAccess ? FILE_GENERIC_WRITE : 0), &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, @@ -369,12 +374,16 @@ OpenAndMapFile( /* Map the file in memory */ + SectionPageProtection = (ReadWriteAccess ? PAGE_READWRITE : PAGE_READONLY); + /* Create the section */ Status = NtCreateSection(SectionHandle, - SECTION_MAP_READ, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | + (ReadWriteAccess ? SECTION_MAP_WRITE : 0), NULL, NULL, - PAGE_READONLY, + SectionPageProtection, SEC_COMMIT /* | SEC_IMAGE (_NO_EXECUTE) */, *FileHandle); if (!NT_SUCCESS(Status)) @@ -396,7 +405,7 @@ OpenAndMapFile( &ViewSize, ViewShare, 0, - PAGE_READONLY); + SectionPageProtection); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to map a view for file '%wZ', Status 0x%08lx\n", &FileName, Status); diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h index f944d960ff..abc1b1c58d 100644 --- a/base/setup/lib/filesup.h +++ b/base/setup/lib/filesup.h @@ -68,12 +68,13 @@ NtPathToDiskPartComponents( NTSTATUS OpenAndMapFile( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathNameToFile, + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, - OUT PULONG FileSize OPTIONAL); + OUT PULONG FileSize OPTIONAL, + IN BOOLEAN ReadWriteAccess); BOOLEAN UnMapFile( diff --git a/base/setup/lib/inicache.c b/base/setup/lib/inicache.c index 295d957057..de0d6f6d92 100644 --- a/base/setup/lib/inicache.c +++ b/base/setup/lib/inicache.c @@ -544,46 +544,20 @@ IniCacheLoadFromMemory( } NTSTATUS -IniCacheLoad( +IniCacheLoadByHandle( PINICACHE *Cache, - PWCHAR FileName, + HANDLE FileHandle, BOOLEAN String) { - UNICODE_STRING Name; - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileInfo; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + FILE_STANDARD_INFORMATION FileInfo; PCHAR FileBuffer; ULONG FileLength; LARGE_INTEGER FileOffset; *Cache = NULL; - /* Open ini file */ - RtlInitUnicodeString(&Name, FileName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - 0, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - GENERIC_READ | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenFile() failed (Status %lx)\n", Status); - return Status; - } - - DPRINT("NtOpenFile() successful\n"); - /* Query file size */ Status = NtQueryInformationFile(FileHandle, &IoStatusBlock, @@ -593,7 +567,6 @@ IniCacheLoad( if (!NT_SUCCESS(Status)) { DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); return Status; } @@ -608,7 +581,6 @@ IniCacheLoad( if (FileBuffer == NULL) { DPRINT1("RtlAllocateHeap() failed\n"); - NtClose(FileHandle); return STATUS_INSUFFICIENT_RESOURCES; } @@ -627,8 +599,6 @@ IniCacheLoad( /* Append NULL-terminator */ FileBuffer[FileLength] = 0; - NtClose(FileHandle); - if (!NT_SUCCESS(Status)) { DPRINT("NtReadFile() failed (Status %lx)\n", Status); @@ -647,6 +617,50 @@ Quit: return Status; } +NTSTATUS +IniCacheLoad( + PINICACHE *Cache, + PWCHAR FileName, + BOOLEAN String) +{ + NTSTATUS Status; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + + *Cache = NULL; + + /* Open the INI file */ + RtlInitUnicodeString(&Name, FileName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenFile() failed (Status %lx)\n", Status); + return Status; + } + + DPRINT("NtOpenFile() successful\n"); + + Status = IniCacheLoadByHandle(Cache, FileHandle, String); + + /* Close the INI file */ + NtClose(FileHandle); + return Status; +} + VOID IniCacheDestroy( @@ -931,24 +945,19 @@ IniCacheCreate(VOID) NTSTATUS -IniCacheSave( +IniCacheSaveByHandle( PINICACHE Cache, - PWCHAR FileName) + HANDLE FileHandle) { - UNICODE_STRING Name; + NTSTATUS Status; PINICACHESECTION Section; PINICACHEKEY Key; ULONG BufferSize; PCHAR Buffer; PCHAR Ptr; ULONG Len; - NTSTATUS Status; - - OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER Offset; - HANDLE FileHandle; - /* Calculate required buffer size */ BufferSize = 0; @@ -1008,7 +1017,40 @@ IniCacheSave( } } - /* Create ini file */ + /* Write to the INI file */ + Offset.QuadPart = 0LL; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + BufferSize, + &Offset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + RtlFreeHeap(ProcessHeap, 0, Buffer); + return Status; + } + + RtlFreeHeap(ProcessHeap, 0, Buffer); + return STATUS_SUCCESS; +} + +NTSTATUS +IniCacheSave( + PINICACHE Cache, + PWCHAR FileName) +{ + NTSTATUS Status; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + + /* Create the INI file */ RtlInitUnicodeString(&Name, FileName); InitializeObjectAttributes(&ObjectAttributes, @@ -1018,46 +1060,27 @@ IniCacheSave( NULL); Status = NtCreateFile(&FileHandle, - GENERIC_WRITE | SYNCHRONIZE, + FILE_GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_SUPERSEDE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY | FILE_NON_DIRECTORY_FILE, NULL, 0); if (!NT_SUCCESS(Status)) { DPRINT("NtCreateFile() failed (Status %lx)\n", Status); - RtlFreeHeap(ProcessHeap, 0, Buffer); return Status; } - Offset.QuadPart = 0LL; - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - BufferSize, - &Offset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); - RtlFreeHeap(ProcessHeap, 0, Buffer); - return Status; - } + Status = IniCacheSaveByHandle(Cache, FileHandle); + /* Close the INI file */ NtClose(FileHandle); - - RtlFreeHeap(ProcessHeap, 0, Buffer); - - return STATUS_SUCCESS; + return Status; } diff --git a/base/setup/lib/inicache.h b/base/setup/lib/inicache.h index d9b7a3d288..7d396d7a6f 100644 --- a/base/setup/lib/inicache.h +++ b/base/setup/lib/inicache.h @@ -60,6 +60,12 @@ IniCacheLoadFromMemory( ULONG FileLength, BOOLEAN String); +NTSTATUS +IniCacheLoadByHandle( + PINICACHE *Cache, + HANDLE FileHandle, + BOOLEAN String); + NTSTATUS IniCacheLoad( PINICACHE *Cache, @@ -109,6 +115,11 @@ IniCacheInsertKey( PINICACHE IniCacheCreate(VOID); +NTSTATUS +IniCacheSaveByHandle( + PINICACHE Cache, + HANDLE FileHandle); + NTSTATUS IniCacheSave( PINICACHE Cache,

6 years, 6 months

05/09: [USETUP] Minor fixes & simplifications.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b6163a5d9e64ed980b36… commit 6b6163a5d9e64ed980b36f757b0b96043e25520a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 30 00:15:54 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:43 2018 +0200 [USETUP] Minor fixes & simplifications. - Remove a redundant NtClose() call; - Return failure if NtQuerySymbolicLinkObject() fails; - Use RTL_CONSTANT_STRING and RtlInitEmptyUnicodeString() where needed; - Reduce code indent level; - Add old-style function annotations; - Remove the deprecated code copyright notice, since the copyright in usage is already reported in the COPYING file in the top level ReactOS source code directory. svn path=/branches/setup_improvements/; revision=74698 --- base/setup/usetup/drivesup.c | 69 +++++++++++++++----------------------------- base/setup/usetup/drivesup.h | 24 ++------------- 2 files changed, 26 insertions(+), 67 deletions(-) diff --git a/base/setup/usetup/drivesup.c b/base/setup/usetup/drivesup.c index c81b987fc1..b8561d77ed 100644 --- a/base/setup/usetup/drivesup.c +++ b/base/setup/usetup/drivesup.c @@ -1,21 +1,3 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup @@ -35,22 +17,19 @@ NTSTATUS GetSourcePaths( - PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING SourceRootDir) + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir) { + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = {L'\0'}; + WCHAR SourceBuffer[MAX_PATH] = L""; HANDLE Handle; - NTSTATUS Status; ULONG Length; PWCHAR Ptr; - RtlInitUnicodeString(&LinkName, - L"\\SystemRoot"); - InitializeObjectAttributes(&ObjectAttributes, &LinkName, OBJ_CASE_INSENSITIVE, @@ -63,35 +42,33 @@ GetSourcePaths( if (!NT_SUCCESS(Status)) return Status; - SourceName.Length = 0; - SourceName.MaximumLength = MAX_PATH * sizeof(WCHAR); - SourceName.Buffer = SourceBuffer; + RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); Status = NtQuerySymbolicLinkObject(Handle, &SourceName, &Length); NtClose(Handle); - if (NT_SUCCESS(Status)) - { - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); + if (!NT_SUCCESS(Status)) + return Status; - /* strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, L'\\'); - if (Ptr) - { - RtlCreateUnicodeString(SourceRootDir, Ptr); - *Ptr = 0; - } - else - RtlCreateUnicodeString(SourceRootDir, L""); + RtlCreateUnicodeString(SourcePath, + SourceName.Buffer); - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); + /* Strip trailing directory */ + Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + { + RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = UNICODE_NULL; + } + else + { + RtlCreateUnicodeString(SourceRootDir, L""); } - NtClose(Handle); + RtlCreateUnicodeString(SourceRootPath, + SourceName.Buffer); return STATUS_SUCCESS; } diff --git a/base/setup/usetup/drivesup.h b/base/setup/usetup/drivesup.h index 5cd200d8fc..01b38a3c57 100644 --- a/base/setup/usetup/drivesup.h +++ b/base/setup/usetup/drivesup.h @@ -1,21 +1,3 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup @@ -28,8 +10,8 @@ NTSTATUS GetSourcePaths( - PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING SourceRootDir); + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir); /* EOF */

6 years, 6 months

04/09: [SETUPLIB] Add a new module "bldrsup.c" (WIP) where I place all the NT boot loaders (i.e. ntldr, freeldr, and possibly bootmgr in the future) management functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6681fb8af5eec6ac2897a… commit 6681fb8af5eec6ac2897a3e4bde973992fa9456c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 25 23:52:50 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:43 2018 +0200 [SETUPLIB] Add a new module "bldrsup.c" (WIP) where I place all the NT boot loaders (i.e. ntldr, freeldr, and possibly bootmgr in the future) management functions. So far we only have: - a function FindNTOSBootLoader() that detects the existence of a given boot loader; - a function EnumerateNTOSBootEntries() (and corresponding helpers) that enumerate the different boot entries in the configuration file(s) for a given boot loader, and for each entry, calls a user-provided callback. Only supported at the moment: ntldr and freeldr. Doing that allows me to simplify large portions of the NT-OS detection code so that it becomes more bootloader-agnostic, and this will help me for simplifying some parts of usetup/bootsup.c too, later... svn path=/branches/setup_improvements/; revision=74661 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/bldrsup.c | 352 ++++++++++++++++++++++++++++ base/setup/lib/bldrsup.h | 59 +++++ base/setup/lib/osdetect.c | 523 ++++++++++++------------------------------ 4 files changed, 556 insertions(+), 379 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 6d687deb1a..819ecf34bd 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,6 +1,7 @@ list(APPEND SOURCE arcname.c + bldrsup.c filesup.c fsutil.c genlist.c diff --git a/base/setup/lib/bldrsup.c b/base/setup/lib/bldrsup.c new file mode 100644 index 0000000000..493c52237e --- /dev/null +++ b/base/setup/lib/bldrsup.c @@ -0,0 +1,352 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * boot loaders management. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +// TODO: Add support for NT 6.x family! (detection + BCD manipulation). + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "bldrsup.h" +#include "filesup.h" +#include "inicache.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +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"}, // FIXME: What about osloader.exe, etc...? +// {NtLdr , L"setupldr" , L"txtsetup.sif"}, // FIXME +// {BootMgr, L"bootmgr" , L"BCD"} +}; + + +/* FUNCTIONS ****************************************************************/ + +// +// We need, for each type of bootloader (FreeLdr, NtLdr, Bootmgr): +// 1. A function that detects its presence and its version; +// 2. A function that opens/closes its corresponding configuration file; +// 3. A function that adds a new boot entry. Note that for the first two BLDRs +// this is a .INI file, while in the latter case this is a registry hive... +// + +NTSTATUS +FindNTOSBootLoader( // By handle + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + OUT PULONG Version OPTIONAL) +// OUT PHANDLE ConfigFileHande OPTIONAL ???? +{ + // UINT i; + + if (Type >= BldrTypeMax) + return STATUS_INVALID_PARAMETER; + + // FIXME: Unused for now, but should be used later!! + *Version = 0; + // TODO: Check for BLDR version ONLY if Version != NULL + + /* Check whether the loader executable exists */ + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[Type].LoaderExecutable)) + { + /* The loader does not exist, continue with another one */ + // DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[Type].LoaderExecutable); + DPRINT1("Loader executable '%S' does not exist\n", NtosBootLoaders[Type].LoaderExecutable); + return STATUS_NOT_FOUND; + } + + /* Check whether the loader configuration file exists */ + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile)) + { + /* 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[Type].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist\n", NtosBootLoaders[Type].LoaderConfigurationFile); + return STATUS_NOT_FOUND; + } + +#if 0 + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase, &FileSize); + 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[Type].LoaderConfigurationFile); + return STATUS_NOT_FOUND; + } +#endif + + return STATUS_SUCCESS; +} + + +static NTSTATUS +FreeLdrEnumerateBootEntries( + IN PCHAR FileBuffer, + IN ULONG FileLength, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection, OsIniSection; + PWCHAR SectionName, KeyData; +/**/NTOS_BOOT_ENTRY xxBootEntry;/**/ + PNTOS_BOOT_ENTRY BootEntry = &xxBootEntry; + UNICODE_STRING InstallName; + + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get the "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do + { + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; + } + else + { + /* Non-quoted name, copy everything */ + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Boot entry '%wZ' in OS section '%S'\n", &InstallName, SectionName); + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName); + if (!OsIniSection) + continue; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + continue; + } + } + else + { + /* Certainly not a ReactOS installation */ + continue; + } + + /* BootType is Windows2003. Now check its SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); + if (!NT_SUCCESS(Status)) + { + DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); + continue; + } + + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); + // KeyData == SystemRoot; + + BootEntry->FriendlyName = &InstallName; + BootEntry->OsLoadPath = KeyData; + /* Unused stuff (for now...) */ + BootEntry->BootFilePath = NULL; + BootEntry->OsOptions = NULL; + BootEntry->OsLoadOptions = NULL; + + Status = EnumBootEntriesRoutine(FreeLdr, BootEntry, Parameter); + // TODO: Stop enumeration if !NT_SUCCESS(Status); + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} + +static NTSTATUS +NtLdrEnumerateBootEntries( + IN PCHAR FileBuffer, + IN ULONG FileLength, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection; + PWCHAR SectionName, KeyData; +/**/NTOS_BOOT_ENTRY xxBootEntry;/**/ + PNTOS_BOOT_ENTRY BootEntry = &xxBootEntry; + UNICODE_STRING InstallName; + + /* Open an *existing* boot.ini configuration file */ + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get the "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"operating systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do + { + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; + } + else + { + /* Non-quoted name, copy everything */ + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Boot entry '%wZ' in OS section '%S'\n", &InstallName, SectionName); + + DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); + // SectionName == SystemRoot; + + BootEntry->FriendlyName = &InstallName; + BootEntry->OsLoadPath = SectionName; + /* Unused stuff (for now...) */ + BootEntry->BootFilePath = NULL; + BootEntry->OsOptions = NULL; + BootEntry->OsLoadOptions = NULL; + + Status = EnumBootEntriesRoutine(NtLdr, BootEntry, Parameter); + // TODO: Stop enumeration if !NT_SUCCESS(Status); + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} + + +// This function may be viewed as being similar to ntos:NtEnumerateBootEntries(). +NTSTATUS +EnumerateNTOSBootEntries( + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + HANDLE FileHandle; + HANDLE SectionHandle; + // SIZE_T ViewSize; + ULONG FileSize; + PVOID ViewBase; + + /* + * NOTE: Currently we open & map the loader configuration file without + * further tests. It's OK as long as we only deal with FreeLdr's freeldr.ini + * and NTLDR's boot.ini files. But as soon as we'll implement support for + * BOOTMGR detection, the "configuration file" will be the BCD registry + * hive and then, we'll have instead to mount the hive & open it. + */ + + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase, &FileSize); + 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[Type].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist\n", NtosBootLoaders[Type].LoaderConfigurationFile); + return Status; + } + + /* The loader configuration file exists, interpret it to find valid installations */ + switch (NtosBootLoaders[Type].Type) + { + case FreeLdr: + Status = FreeLdrEnumerateBootEntries(ViewBase, FileSize, /* Flags, */ + EnumBootEntriesRoutine, Parameter); + break; + + case NtLdr: + Status = NtLdrEnumerateBootEntries(ViewBase, FileSize, /* Flags, */ + EnumBootEntriesRoutine, Parameter); + break; + + default: + DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[Type].Type); + Status = STATUS_SUCCESS; + } + + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + + return Status; +} + +/* EOF */ diff --git a/base/setup/lib/bldrsup.h b/base/setup/lib/bldrsup.h new file mode 100644 index 0000000000..a0965e88e9 --- /dev/null +++ b/base/setup/lib/bldrsup.h @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * boot loaders management. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +// TODO: Add support for NT 6.x family! (detection + BCD manipulation). + +#pragma once + +typedef enum _NTOS_BOOT_LOADER_TYPE +{ + FreeLdr, // ReactOS' FreeLoader + NtLdr, // Windows <= 2k3 NT "FlexBoot" OS Loader NTLDR +// BootMgr, // Vista+ BCD-oriented BOOTMGR + BldrTypeMax +} NTOS_BOOT_LOADER_TYPE; + +/* + * This structure is inspired from the EFI boot entry structures + * BOOT_ENTRY, BOOT_OPTIONS and FILE_PATH that are defined in ndk/iotypes.h . + */ +typedef struct _NTOS_BOOT_ENTRY +{ + // ULONG Version; // We might use the ntldr version here?? Or the "BootType" as in freeldr? + // ULONG Length; + // ULONG Id; // Boot entry number (position) in the list +/** PCWSTR FriendlyName; // Human-readable boot entry description **/ + PUNICODE_STRING FriendlyName; + PCWSTR BootFilePath; // Path to e.g. osloader.exe, or winload.efi + PCWSTR OsLoadPath; // The OS SystemRoot path + PCWSTR OsOptions; + PCWSTR OsLoadOptions; +} NTOS_BOOT_ENTRY, *PNTOS_BOOT_ENTRY; + + +typedef NTSTATUS +(NTAPI *PENUM_BOOT_ENTRIES_ROUTINE)( + IN NTOS_BOOT_LOADER_TYPE Type, + IN PNTOS_BOOT_ENTRY BootEntry, + IN PVOID Parameter OPTIONAL); + + +NTSTATUS +FindNTOSBootLoader( // By handle + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + OUT PULONG Version); + +NTSTATUS +EnumerateNTOSBootEntries( + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL); + +/* EOF */ diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/osdetect.c index a803910fc1..20611bdc02 100644 --- a/base/setup/lib/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -12,9 +12,9 @@ #include "ntverrsrc.h" // #include "arcname.h" +#include "bldrsup.h" #include "filesup.h" #include "genlist.h" -#include "inicache.h" #include "partlist.h" #include "arcname.h" #include "osdetect.h" @@ -78,31 +78,6 @@ BOOL IsWindowsOS(VOID) #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" , ???} -}; - static BOOLEAN IsValidNTOSInstallation_UStr( @@ -130,339 +105,146 @@ AddNTOSInstallation( IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName); +typedef struct _ENUM_INSTALLS_DATA +{ + IN OUT PGENERIC_LIST List; + IN PPARTLIST PartList; + // IN PPARTENTRY PartEntry; +} ENUM_INSTALLS_DATA, *PENUM_INSTALLS_DATA; + +// PENUM_BOOT_ENTRIES_ROUTINE static NTSTATUS -FreeLdrEnumerateInstallations( - IN OUT PGENERIC_LIST List, - IN PPARTLIST PartList, - // IN PPARTENTRY PartEntry, - IN PCHAR FileBuffer, - IN ULONG FileLength) +NTAPI +EnumerateInstallations( + IN NTOS_BOOT_LOADER_TYPE Type, + IN PNTOS_BOOT_ENTRY BootEntry, + IN PVOID Parameter OPTIONAL) { - NTSTATUS Status; - PINICACHE IniCache; - PINICACHEITERATOR Iterator; - PINICACHESECTION IniSection, OsIniSection; - PWCHAR SectionName, KeyData; - UNICODE_STRING InstallName; + PENUM_INSTALLS_DATA Data = (PENUM_INSTALLS_DATA)Parameter; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; WCHAR InstallNameW[MAX_PATH]; - /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); - if (!NT_SUCCESS(Status)) - return Status; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; + PDISKENTRY DiskEntry = NULL; + PPARTENTRY PartEntry = NULL; - /* Get the "Operating Systems" section */ - IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); - if (IniSection == NULL) - { - IniCacheDestroy(IniCache); - return STATUS_UNSUCCESSFUL; - } + /* We have a boot entry */ - /* Enumerate all the valid installations */ - Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); - if (!Iterator) goto Quit; - do - { - // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). - if (KeyData[0] == L'"') - { - /* Quoted name, copy up to the closing quote */ - PWCHAR Begin = &KeyData[1]; - PWCHAR End = wcschr(Begin, L'"'); - if (!End) - End = Begin + wcslen(Begin); - RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); - InstallName.Length = InstallName.MaximumLength; - } - else - { - /* Non-quoted name, copy everything */ - RtlInitUnicodeString(&InstallName, KeyData); - } - - DPRINT1("Possible installation '%wZ' in OS section '%S'\n", &InstallName, SectionName); - - /* Search for an existing ReactOS entry */ - OsIniSection = IniCacheGetSection(IniCache, SectionName); - if (!OsIniSection) - continue; + UNICODE_STRING InstallName; + // /**/RtlInitUnicodeString(&InstallName, BootEntry->FriendlyName);/**/ + InstallName = *BootEntry->FriendlyName; +#if 0 + if (Type == FreeLdr) + { /* Check for supported boot type "Windows2003" */ - Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); - if (NT_SUCCESS(Status)) - { - // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"Windows2003") != 0) && - (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) - { - /* This is not a ReactOS entry */ - continue; - } - } - else - { - /* Certainly not a ReactOS installation */ - continue; - } - - /* BootType is Windows2003. Now check SystemPath. */ - Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); - if (!NT_SUCCESS(Status)) - { - DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); - continue; - } - DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); - - // TODO: Normalize the ARC path. - - /* - * Check whether we already have an installation with this ARC path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, KeyData, NULL); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); - continue; - } - - /* - * Convert the ARC path into an NT path, from which we will deduce - * the real disk drive & partition on which the candidate installation - * resides, as well verifying whether it is indeed an NTOS installation. - */ - RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); - if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) + // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? + if ((BootType == NULL) || + ( (_wcsicmp(BootType, L"Windows2003") != 0) && + (_wcsicmp(BootType, L"\"Windows2003\"") != 0) )) { - DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", KeyData); - continue; - } - - DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", KeyData, &SystemRootPath); - - /* - * Check whether we already have an installation with this NT path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, NULL /*KeyData*/, &SystemRootPath); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); - continue; - } - - /* Set SystemRootPath */ - DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - - if (IsValidNTOSInstallation_UStr(&SystemRootPath)) - { - ULONG DiskNumber = 0, PartitionNumber = 0; - PCWSTR PathComponent = NULL; - PDISKENTRY DiskEntry = NULL; - PPARTENTRY PartEntry = NULL; - - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", KeyData, &SystemRootPath); - - /* From the NT path, compute the disk, partition and path components */ - if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) - { - DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", - &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); - - /* Retrieve the corresponding disk and partition */ - if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) - DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); - } - else - { - DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); - } - - if (PartEntry && PartEntry->DriveLetter) - { - /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", - PartEntry->DriveLetter, PathComponent, &InstallName); - } - else - { - /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", - &SystemRootPath, &InstallName); - } - AddNTOSInstallation(List, KeyData, &SystemRootPath, PathComponent, - DiskNumber, PartitionNumber, PartEntry, - InstallNameW); + /* This is not a ReactOS entry */ + /* Certainly not a ReactOS installation */ + return STATUS_SUCCESS; } } - while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); - - IniCacheFindClose(Iterator); - -Quit: - IniCacheDestroy(IniCache); - return STATUS_SUCCESS; -} - -static NTSTATUS -NtLdrEnumerateInstallations( - IN OUT PGENERIC_LIST List, - IN PPARTLIST PartList, - // IN PPARTENTRY PartEntry, - IN PCHAR FileBuffer, - IN ULONG FileLength) -{ - NTSTATUS Status; - PINICACHE IniCache; - PINICACHEITERATOR Iterator; - PINICACHESECTION IniSection; - PWCHAR SectionName, KeyData; - UNICODE_STRING InstallName; +#endif - PNTOS_INSTALLATION NtOsInstall; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", + &InstallName, BootEntry->OsLoadPath); + // DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", + // &InstallName, BootEntry->OsLoadPath); - /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); - if (!NT_SUCCESS(Status)) - return Status; + // TODO: Normalize the ARC path. - /* Get the "Operating Systems" section */ - IniSection = IniCacheGetSection(IniCache, L"operating systems"); - if (IniSection == NULL) + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(Data->List, BootEntry->OsLoadPath, NULL); + if (NtOsInstall) { - IniCacheDestroy(IniCache); - return STATUS_UNSUCCESSFUL; + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + return STATUS_SUCCESS; } - /* Enumerate all the valid installations */ - Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); - if (!Iterator) goto Quit; - do + /* + * Convert the ARC path into an NT path, from which we will deduce + * the real disk drive & partition on which the candidate installation + * resides, as well verifying whether it is indeed an NTOS installation. + */ + RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); + if (!ArcPathToNtPath(&SystemRootPath, BootEntry->OsLoadPath, Data->PartList)) { - // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). - if (KeyData[0] == L'"') - { - /* Quoted name, copy up to the closing quote */ - PWCHAR Begin = &KeyData[1]; - PWCHAR End = wcschr(Begin, L'"'); - if (!End) - End = Begin + wcslen(Begin); - RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); - InstallName.Length = InstallName.MaximumLength; - } - else - { - /* Non-quoted name, copy everything */ - RtlInitUnicodeString(&InstallName, KeyData); - } - - DPRINT1("Possible installation '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - - DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", BootEntry->OsLoadPath); + return STATUS_SUCCESS; + } - // TODO: Normalize the ARC path. + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", + BootEntry->OsLoadPath, &SystemRootPath); - /* - * Check whether we already have an installation with this ARC path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, SectionName, NULL); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); - continue; - } + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(Data->List, NULL /*BootEntry->OsLoadPath*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + return STATUS_SUCCESS; + } - /* - * Convert the ARC path into an NT path, from which we will deduce - * the real disk drive & partition on which the candidate installation - * resides, as well verifying whether it is indeed an NTOS installation. - */ - RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); - if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) - { - DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", SectionName); - continue; - } + DPRINT1("EnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", SectionName, &SystemRootPath); + /* Check if this is a valid NTOS installation; stop there if it isn't one */ + if (!IsValidNTOSInstallation_UStr(&SystemRootPath)) + return STATUS_SUCCESS; - /* - * Check whether we already have an installation with this NT path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, NULL /*SectionName*/, &SystemRootPath); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); - continue; - } + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", + BootEntry->OsLoadPath, &SystemRootPath); - /* Set SystemRootPath */ - DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); + /* From the NT path, compute the disk, partition and path components */ + if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) + { + DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", + &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); - if (IsValidNTOSInstallation_UStr(&SystemRootPath)) + /* Retrieve the corresponding disk and partition */ + if (!GetDiskOrPartition(Data->PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) { - ULONG DiskNumber = 0, PartitionNumber = 0; - PCWSTR PathComponent = NULL; - PDISKENTRY DiskEntry = NULL; - PPARTENTRY PartEntry = NULL; - - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", SectionName, &SystemRootPath); - - /* From the NT path, compute the disk, partition and path components */ - if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) - { - DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", - &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); - - /* Retrieve the corresponding disk and partition */ - if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) - DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); - } - else - { - DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); - } - - if (PartEntry && PartEntry->DriveLetter) - { - /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", - PartEntry->DriveLetter, PathComponent, &InstallName); - } - else - { - /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", - &SystemRootPath, &InstallName); - } - AddNTOSInstallation(List, SectionName, &SystemRootPath, PathComponent, - DiskNumber, PartitionNumber, PartEntry, - InstallNameW); + DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", + DiskNumber, PartitionNumber); } } - while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + else + { + DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); + } - IniCacheFindClose(Iterator); + if (PartEntry && PartEntry->DriveLetter) + { + /* We have retrieved a partition that is mounted */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); + } + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); + } + AddNTOSInstallation(Data->List, BootEntry->OsLoadPath, + &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); -Quit: - IniCacheDestroy(IniCache); return STATUS_SUCCESS; } @@ -599,28 +381,32 @@ IsValidNTOSInstallationByHandle( IN HANDLE SystemRootDirectory) { BOOLEAN Success = FALSE; + PCWSTR PathName; USHORT i; UNICODE_STRING VendorName; WCHAR VendorNameBuffer[MAX_PATH]; /* Check for the existence of \SystemRoot\System32 */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\")) + PathName = L"System32\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\drivers */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\drivers\\")) + PathName = L"System32\\drivers\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\config */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\config\\")) + PathName = L"System32\\config\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } @@ -629,14 +415,16 @@ IsValidNTOSInstallationByHandle( * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SYSTEM")) + PathName = L"System32\\config\\SYSTEM"; + if (!DoesFileExist(SystemRootDirectory, PathName)) { - // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } - if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SOFTWARE")) + PathName = L"System32\\config\\SOFTWARE"; + if (!DoesFileExist(SystemRootDirectory, PathName)) { - // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } #endif @@ -644,9 +432,10 @@ IsValidNTOSInstallationByHandle( RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntoskrnl.exe", &VendorName); + PathName = L"System32\\ntoskrnl.exe"; + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); if (!Success) - DPRINT1("Kernel file ntoskrnl.exe is either not a PE file, or does not have any vendor?\n"); + DPRINT1("Kernel executable '%S' is either not a PE file, or does not have any vendor?\n", PathName); /* The kernel gives the OS its flavour */ if (Success) @@ -666,9 +455,10 @@ IsValidNTOSInstallationByHandle( /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntdll.dll", &VendorName); + PathName = L"System32\\ntdll.dll"; + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); if (!Success) - DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); + DPRINT1("User-mode DLL '%S' is either not a PE file, or does not have any vendor?\n", PathName); if (Success) { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) @@ -676,7 +466,7 @@ IsValidNTOSInstallationByHandle( if (!!FindSubStrI(VendorName.Buffer, KnownVendors[i])) { /* We have found a correct vendor combination */ - DPRINT1("IsValidNTOSInstallation: The user-mode file ntdll.dll is from %S\n", KnownVendors[i]); + DPRINT1("IsValidNTOSInstallation: The user-mode DLL '%S' is from %S\n", PathName, KnownVendors[i]); break; } } @@ -876,15 +666,13 @@ FindNTOSInstallations( NTSTATUS Status; ULONG DiskNumber = PartEntry->DiskEntry->DiskNumber; ULONG PartitionNumber = PartEntry->PartitionNumber; - HANDLE PartitionHandle, FileHandle; + HANDLE PartitionHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; - UINT i; - HANDLE SectionHandle; - // SIZE_T ViewSize; - ULONG FileSize; - PVOID ViewBase; + NTOS_BOOT_LOADER_TYPE Type; + ENUM_INSTALLS_DATA Data; + ULONG Version; WCHAR PathBuffer[MAX_PATH]; /* Set PartitionRootPath */ @@ -912,49 +700,26 @@ FindNTOSInstallations( return; } + Data.List = List; + Data.PartList = PartList; + /* Try to see whether we recognize some NT boot loaders */ - for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) + for (Type = FreeLdr; Type < BldrTypeMax; ++Type) { - /* Check whether the loader executable exists */ - if (!DoesFileExist(PartitionHandle, NtosBootLoaders[i].LoaderExecutable)) - { - /* 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; - } - - /* Check whether the loader configuration file exists */ - Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[i].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase, &FileSize); + Status = FindNTOSBootLoader(PartitionHandle, Type, &Version); 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); + DPRINT1("Loader type '%d' does not exist, or an error happened (Status 0x%08lx), continue with another one...\n", + Type, Status); continue; } - /* The loader configuration file exists, interpret it to find valid installations */ - DPRINT1("Analyse the OS installations inside '%S' in disk #%d, partition #%d\n", - NtosBootLoaders[i].LoaderConfigurationFile, DiskNumber, PartitionNumber); - switch (NtosBootLoaders[i].Type) - { - case FreeLdr: - Status = FreeLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); - break; - - case NtLdr: - Status = NtLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); - break; - - default: - DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[i].Type); - Status = STATUS_SUCCESS; - } + /* The loader exists, try to enumerate its boot entries */ + DPRINT1("Analyse the OS installations for loader type '%d' in disk #%d, partition #%d\n", + Type, DiskNumber, PartitionNumber); - /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(FileHandle); + EnumerateNTOSBootEntries(PartitionHandle, Type, EnumerateInstallations, &Data); } /* Close the partition */

6 years, 6 months

03/09: [SETUPLIB][USETUP] Refactor the DoesFileExist() function so that it now looks closer to DoesPathExist() and use it almost everywhere.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b53b7b11e3311a7bd27e9… commit b53b7b11e3311a7bd27e962ee6ab83ed248552e1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 24 16:37:49 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:43 2018 +0200 [SETUPLIB][USETUP] Refactor the DoesFileExist() function so that it now looks closer to DoesPathExist() and use it almost everywhere. - Adjust also its callers, adjust OpenAndMapFile() parameters. - Related to that, simplify IsValidNTOSInstallation() parameters & introduce a IsValidNTOSInstallation_UStr() that does the same, but takes a UNICODE_STRING instead. - Simplify CheckForValidPEAndVendor(). Now only exactly 5 calls use the "old" 'DoesFileExist' syntax, using a temporarily auxiliary function "DoesFileExist_2"... svn path=/branches/setup_improvements/; revision=74641 --- base/setup/lib/filesup.c | 45 +++++++------ base/setup/lib/filesup.h | 8 ++- base/setup/lib/osdetect.c | 160 ++++++++++++++++++++------------------------ base/setup/usetup/bootsup.c | 14 ++-- base/setup/usetup/usetup.c | 2 +- 5 files changed, 110 insertions(+), 119 deletions(-) diff --git a/base/setup/lib/filesup.c b/base/setup/lib/filesup.c index 290c4cb414..5a9ba0082c 100644 --- a/base/setup/lib/filesup.c +++ b/base/setup/lib/filesup.c @@ -154,7 +154,7 @@ DoesPathExist( if (NT_SUCCESS(Status)) NtClose(FileHandle); else - DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &Name, Status); return NT_SUCCESS(Status); } @@ -162,21 +162,18 @@ DoesPathExist( BOOLEAN DoesFileExist( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName) + IN PCWSTR PathNameToFile) { NTSTATUS Status; + UNICODE_STRING FileName; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); - RtlInitUnicodeString(&Name, FullName); + RtlInitUnicodeString(&FileName, PathNameToFile); InitializeObjectAttributes(&ObjectAttributes, - &Name, + &FileName, OBJ_CASE_INSENSITIVE, RootDirectory, NULL); @@ -190,11 +187,22 @@ DoesFileExist( if (NT_SUCCESS(Status)) NtClose(FileHandle); else - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return NT_SUCCESS(Status); } +// FIXME: DEPRECATED! HACKish function that needs to be deprecated! +BOOLEAN +DoesFileExist_2( + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName) +{ + WCHAR FullName[MAX_PATH]; + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); + return DoesFileExist(NULL, FullName); +} + /* * The format of NtPath should be: * \Device\HarddiskXXX\PartitionYYY[\path] , @@ -298,26 +306,23 @@ Quit: NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, OUT PULONG FileSize OPTIONAL) { NTSTATUS Status; + UNICODE_STRING FileName; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; SIZE_T ViewSize; PVOID ViewBase; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); - RtlInitUnicodeString(&Name, FullName); + RtlInitUnicodeString(&FileName, PathNameToFile); InitializeObjectAttributes(&ObjectAttributes, - &Name, + &FileName, OBJ_CASE_INSENSITIVE, RootDirectory, NULL); @@ -333,7 +338,7 @@ OpenAndMapFile( FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return Status; } @@ -355,7 +360,7 @@ OpenAndMapFile( } if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &FileName); *FileSize = FileInfo.EndOfFile.LowPart; @@ -374,7 +379,7 @@ OpenAndMapFile( *FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &FileName, Status); NtClose(*FileHandle); *FileHandle = NULL; return Status; @@ -394,7 +399,7 @@ OpenAndMapFile( PAGE_READONLY); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to map a view for file '%wZ', Status 0x%08lx\n", &FileName, Status); NtClose(*SectionHandle); *SectionHandle = NULL; NtClose(*FileHandle); diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h index 9ba528a0c7..f944d960ff 100644 --- a/base/setup/lib/filesup.h +++ b/base/setup/lib/filesup.h @@ -51,6 +51,11 @@ DoesPathExist( BOOLEAN DoesFileExist( IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathNameToFile); + +// FIXME: DEPRECATED! HACKish function that needs to be deprecated! +BOOLEAN +DoesFileExist_2( IN PCWSTR PathName OPTIONAL, IN PCWSTR FileName); @@ -64,8 +69,7 @@ NtPathToDiskPartComponents( NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/osdetect.c index a695da7466..a803910fc1 100644 --- a/base/setup/lib/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -105,9 +105,12 @@ NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = static BOOLEAN +IsValidNTOSInstallation_UStr( + IN PUNICODE_STRING SystemRootPath); + +/*static*/ BOOLEAN IsValidNTOSInstallation( - IN HANDLE SystemRootDirectory OPTIONAL, - IN PCWSTR SystemRoot OPTIONAL); + IN PCWSTR SystemRoot); static PNTOS_INSTALLATION FindExistingNTOSInstall( @@ -142,9 +145,6 @@ FreeLdrEnumerateInstallations( PWCHAR SectionName, KeyData; UNICODE_STRING InstallName; - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; @@ -264,25 +264,7 @@ FreeLdrEnumerateInstallations( /* Set SystemRootPath */ DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - /* Open SystemRootPath */ - InitializeObjectAttributes(&ObjectAttributes, - &SystemRootPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&SystemRootDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); - continue; - } - - if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) + if (IsValidNTOSInstallation_UStr(&SystemRootPath)) { ULONG DiskNumber = 0, PartitionNumber = 0; PCWSTR PathComponent = NULL; @@ -322,8 +304,6 @@ FreeLdrEnumerateInstallations( DiskNumber, PartitionNumber, PartEntry, InstallNameW); } - - NtClose(SystemRootDirectory); } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -349,9 +329,6 @@ NtLdrEnumerateInstallations( PWCHAR SectionName, KeyData; UNICODE_STRING InstallName; - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; @@ -439,25 +416,7 @@ NtLdrEnumerateInstallations( /* Set SystemRootPath */ DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - /* Open SystemRootPath */ - InitializeObjectAttributes(&ObjectAttributes, - &SystemRootPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&SystemRootDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); - continue; - } - - if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) + if (IsValidNTOSInstallation_UStr(&SystemRootPath)) { ULONG DiskNumber = 0, PartitionNumber = 0; PCWSTR PathComponent = NULL; @@ -497,8 +456,6 @@ NtLdrEnumerateInstallations( DiskNumber, PartitionNumber, PartEntry, InstallNameW); } - - NtClose(SystemRootDirectory); } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -542,8 +499,7 @@ PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) static BOOLEAN CheckForValidPEAndVendor( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PUNICODE_STRING VendorName ) { @@ -562,18 +518,18 @@ CheckForValidPEAndVendor( *VendorName->Buffer = UNICODE_NULL; VendorName->Length = 0; - Status = OpenAndMapFile(RootDirectory, PathName, FileName, + Status = OpenAndMapFile(RootDirectory, PathNameToFile, &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", PathNameToFile, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", FileName); + DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -585,7 +541,7 @@ CheckForValidPEAndVendor( Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status); goto UnmapFile; } @@ -611,7 +567,7 @@ CheckForValidPEAndVendor( if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, FileName); + DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, PathNameToFile); StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); @@ -622,7 +578,7 @@ CheckForValidPEAndVendor( } if (!NT_SUCCESS(Status)) - DPRINT1("No version vendor found for file '%S'\n", FileName); + DPRINT1("No version vendor found for file '%S'\n", PathNameToFile); UnmapFile: /* Finally, unmap and close the file */ @@ -639,48 +595,30 @@ UnmapFile: // - if it's broken or not (aka. needs for repair, or just upgrading). // static BOOLEAN -IsValidNTOSInstallation( - IN HANDLE SystemRootDirectory OPTIONAL, - IN PCWSTR SystemRoot OPTIONAL) +IsValidNTOSInstallationByHandle( + IN HANDLE SystemRootDirectory) { BOOLEAN Success = FALSE; USHORT i; UNICODE_STRING VendorName; - WCHAR PathBuffer[MAX_PATH]; - - /* - * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, - * depending on what the user gave to us in entry. - */ - if (SystemRootDirectory) - SystemRoot = NULL; - // else SystemRootDirectory == NULL and SystemRoot is what it is. - - /* If both the parameters are NULL we cannot do anything else more */ - if (!SystemRootDirectory && !SystemRoot) - return FALSE; - - // DoesPathExist(SystemRootDirectory, SystemRoot, L"System32\\"); etc... + WCHAR VendorNameBuffer[MAX_PATH]; /* Check for the existence of \SystemRoot\System32 */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\drivers */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\drivers\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\config */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\config\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; @@ -691,22 +629,22 @@ IsValidNTOSInstallation( * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) + if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SYSTEM")) { // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } - if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) + if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SOFTWARE")) { // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif - RtlInitEmptyUnicodeString(&VendorName, PathBuffer, sizeof(PathBuffer)); + RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntoskrnl.exe", &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntoskrnl.exe", &VendorName); if (!Success) DPRINT1("Kernel file ntoskrnl.exe is either not a PE file, or does not have any vendor?\n"); @@ -728,7 +666,7 @@ IsValidNTOSInstallation( /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntdll.dll", &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntdll.dll", &VendorName); if (!Success) DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); if (Success) @@ -747,6 +685,50 @@ IsValidNTOSInstallation( return Success; } +static BOOLEAN +IsValidNTOSInstallation_UStr( + IN PUNICODE_STRING SystemRootPath) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE SystemRootDirectory; + BOOLEAN Success; + + /* Open SystemRootPath */ + InitializeObjectAttributes(&ObjectAttributes, + SystemRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&SystemRootDirectory, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", SystemRootPath, Status); + return FALSE; + } + + Success = IsValidNTOSInstallationByHandle(SystemRootDirectory); + + /* Done! */ + NtClose(SystemRootDirectory); + return Success; +} + +/*static*/ BOOLEAN +IsValidNTOSInstallation( + IN PCWSTR SystemRoot) +{ + UNICODE_STRING SystemRootPath; + RtlInitUnicodeString(&SystemRootPath, SystemRoot); + return IsValidNTOSInstallationByHandle(&SystemRootPath); +} + static VOID DumpNTOSInstalls( IN PGENERIC_LIST List) @@ -934,7 +916,7 @@ FindNTOSInstallations( for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) { /* Check whether the loader executable exists */ - if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[i].LoaderExecutable)) { /* The loader does not exist, continue with another one */ DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); @@ -942,7 +924,7 @@ FindNTOSInstallations( } /* Check whether the loader configuration file exists */ - Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[i].LoaderConfigurationFile, &FileHandle, &SectionHandle, &ViewBase, &FileSize); if (!NT_SUCCESS(Status)) { diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index c3ce35cb56..b48d5c0e07 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2275,7 +2275,7 @@ InstallFatBootcodeToPartition( /* Prepare for possibly copying 'freeldr.ini' */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); + DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2292,8 +2292,8 @@ InstallFatBootcodeToPartition( /* Check for NT and other bootloaders */ // FIXME: Check for Vista+ bootloader! - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"ntldr") == TRUE || - DoesFileExist(NULL, SystemRootPath->Buffer, L"boot.ini") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"ntldr") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"boot.ini") == TRUE) { /* Search root directory for 'ntldr' and 'boot.ini' */ DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n"); @@ -2370,8 +2370,8 @@ InstallFatBootcodeToPartition( PWCHAR BootSector; PWCHAR BootSectorFileName; - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"io.sys") == TRUE || - DoesFileExist(NULL, SystemRootPath->Buffer, L"msdos.sys") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"io.sys") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"msdos.sys") == TRUE) { /* Search for root directory for 'io.sys' and 'msdos.sys' */ DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); @@ -2385,7 +2385,7 @@ InstallFatBootcodeToPartition( BootSectorFileName = L"\\bootsect.dos"; } else - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"kernel.sys") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"kernel.sys") == TRUE) { /* Search for root directory for 'kernel.sys' */ DPRINT1("Found FreeDOS boot loader\n"); @@ -2517,7 +2517,7 @@ InstallExt2BootcodeToPartition( /* Prepare for possibly copying 'freeldr.ini' */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); + DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b35ea0b8a4..1a7940c6e3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -429,7 +429,7 @@ CheckUnattendedSetup(VOID) CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"\\unattend.inf"); - if (DoesFileExist(NULL, NULL, UnattendInfPath) == FALSE) + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); return;

6 years, 6 months

02/09: [SETUPLIB][USETUP] Transform the existing ConcatPaths() function into a variadic function, and derive a CombinePaths() from it (plus their equivalent taking va_list).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d27ef70aabb81181f2c03… commit d27ef70aabb81181f2c0368e9b411e466f48304e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 23 22:30:54 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:43 2018 +0200 [SETUPLIB][USETUP] Transform the existing ConcatPaths() function into a variadic function, and derive a CombinePaths() from it (plus their equivalent taking va_list). This allows building concatenated paths with an arbitrary number of separated components. - Use the newly-introduced CombinePaths() and ConcatPaths() functions. - Fix also few comments, and place some UNICODE_NULLs here & there. svn path=/branches/setup_improvements/; revision=74637 svn path=/branches/setup_improvements/; revision=74640 --- base/setup/lib/arcname.c | 2 +- base/setup/lib/filesup.c | 133 +++++++++++++++++++++++++++++++----------- base/setup/lib/filesup.h | 26 ++++++++- base/setup/usetup/bootsup.c | 75 +++++++++--------------- base/setup/usetup/devinst.c | 8 +-- base/setup/usetup/filequeue.c | 45 +++++--------- base/setup/usetup/registry.c | 5 +- base/setup/usetup/usetup.c | 72 +++++++++-------------- 8 files changed, 200 insertions(+), 166 deletions(-) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index f40b79173e..2a2f2a1076 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -798,7 +798,7 @@ ArcPathToNtPath( */ if (BeginOfPath && *BeginOfPath) { - Status = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); + Status = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), 1, BeginOfPath); if (!NT_SUCCESS(Status)) { /* Buffer not large enough, or whatever...: just bail out */ diff --git a/base/setup/lib/filesup.c b/base/setup/lib/filesup.c index 7550905895..290c4cb414 100644 --- a/base/setup/lib/filesup.c +++ b/base/setup/lib/filesup.c @@ -13,36 +13,113 @@ #include <debug.h> /* FUNCTIONS ****************************************************************/ + NTSTATUS -ConcatPaths( - IN OUT PWSTR PathElem1, +ConcatPathsV( + IN OUT PWSTR PathBuffer, IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL) + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; SIZE_T cchPathLen; + PCWSTR PathComponent; - if (!PathElem2) - return STATUS_SUCCESS; - if (cchPathSize <= 1) + if (cchPathSize < 1) return STATUS_SUCCESS; - cchPathLen = min(cchPathSize, wcslen(PathElem1)); - - if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') + while (NumberOfPathComponents--) { - /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ - Status = RtlStringCchCatW(PathElem1, cchPathSize, L"\\"); + PathComponent = va_arg(PathComponentsList, PCWSTR); + if (!PathComponent) + continue; + + cchPathLen = min(cchPathSize, wcslen(PathBuffer)); + if (cchPathLen >= cchPathSize) + return STATUS_BUFFER_OVERFLOW; + + if (PathComponent[0] != OBJ_NAME_PATH_SEPARATOR && + cchPathLen > 0 && PathBuffer[cchPathLen-1] != OBJ_NAME_PATH_SEPARATOR) + { + /* PathComponent does not start with '\' and PathBuffer does not end with '\' */ + Status = RtlStringCchCatW(PathBuffer, cchPathSize, L"\\"); + if (!NT_SUCCESS(Status)) + return Status; + } + else if (PathComponent[0] == OBJ_NAME_PATH_SEPARATOR && + cchPathLen > 0 && PathBuffer[cchPathLen-1] == OBJ_NAME_PATH_SEPARATOR) + { + /* PathComponent starts with '\' and PathBuffer ends with '\' */ + while (*PathComponent == OBJ_NAME_PATH_SEPARATOR) + ++PathComponent; // Skip any backslash + } + Status = RtlStringCchCatW(PathBuffer, cchPathSize, PathComponent); if (!NT_SUCCESS(Status)) return Status; } - else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') - { - /* PathElem2 starts with '\' and PathElem1 ends with '\' */ - while (*PathElem2 == L'\\') - ++PathElem2; // Skip any backslash - } - Status = RtlStringCchCatW(PathElem1, cchPathSize, PathElem2); + + return Status; +} + +NTSTATUS +CombinePathsV( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList) +{ + if (cchPathSize < 1) + return STATUS_SUCCESS; + + *PathBuffer = UNICODE_NULL; + return ConcatPathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, + PathComponentsList); +} + +NTSTATUS +ConcatPaths( + IN OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...) +{ + NTSTATUS Status; + va_list PathComponentsList; + + if (cchPathSize < 1) + return STATUS_SUCCESS; + + va_start(PathComponentsList, NumberOfPathComponents); + Status = ConcatPathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, + PathComponentsList); + va_end(PathComponentsList); + + return Status; +} + +NTSTATUS +CombinePaths( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...) +{ + NTSTATUS Status; + va_list PathComponentsList; + + if (cchPathSize < 1) + return STATUS_SUCCESS; + + *PathBuffer = UNICODE_NULL; + + va_start(PathComponentsList, NumberOfPathComponents); + Status = CombinePathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, + PathComponentsList); + va_end(PathComponentsList); + return Status; } @@ -95,14 +172,7 @@ DoesFileExist( UNICODE_STRING Name; WCHAR FullName[MAX_PATH]; - if (PathName) - RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - if (FileName) - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); RtlInitUnicodeString(&Name, FullName); InitializeObjectAttributes(&ObjectAttributes, @@ -243,14 +313,7 @@ OpenAndMapFile( UNICODE_STRING Name; WCHAR FullName[MAX_PATH]; - if (PathName) - RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - if (FileName) - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); RtlInitUnicodeString(&Name, FullName); InitializeObjectAttributes(&ObjectAttributes, diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h index bf5a2835f2..9ba528a0c7 100644 --- a/base/setup/lib/filesup.h +++ b/base/setup/lib/filesup.h @@ -15,11 +15,33 @@ IsValidPath( #endif +NTSTATUS +ConcatPathsV( + IN OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList); + +NTSTATUS +CombinePathsV( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList); + NTSTATUS ConcatPaths( - IN OUT PWSTR PathElem1, + IN OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...); + +NTSTATUS +CombinePaths( + OUT PWSTR PathBuffer, IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL); + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...); BOOLEAN DoesPathExist( diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index dd681f4787..c3ce35cb56 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -1269,7 +1269,10 @@ InstallMbrBootCodeToDisk( return Status; } - /* Copy partition table from old MBR to new */ + /* + * Copy the disk signature, the reserved fields and + * the partition table from the old MBR to the new one. + */ RtlCopyMemory(&NewBootSector->Signature, &OrigBootSector->Signature, sizeof(PARTITION_SECTOR) - offsetof(PARTITION_SECTOR, Signature) /* Length of partition table */); @@ -2258,10 +2261,8 @@ InstallFatBootcodeToPartition( DPRINT("System path: '%wZ'\n", SystemRootPath); /* Copy FreeLoader to the system partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2272,10 +2273,9 @@ InstallFatBootcodeToPartition( } /* Prepare for possibly copying 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, SystemRootPath->Buffer, L"freeldr.ini"); + DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2303,8 +2303,7 @@ InstallFatBootcodeToPartition( { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // wcscpy(DstPath, SystemRootPath->Buffer); - // wcscat(DstPath, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2314,15 +2313,13 @@ InstallFatBootcodeToPartition( } /* Install new bootcode into a file */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.ros"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.ros"); if (PartitionType == PARTITION_FAT32 || PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat32BootCodeToFile(SrcPath, DstPath, @@ -2336,8 +2333,7 @@ InstallFatBootcodeToPartition( else { /* Install FAT16 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToFile(SrcPath, DstPath, @@ -2351,8 +2347,7 @@ InstallFatBootcodeToPartition( } /* Update 'boot.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\boot.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\boot.ini"); DPRINT1("Update 'boot.ini': %S\n", DstPath); Status = UpdateBootIni(DstPath, @@ -2422,8 +2417,7 @@ InstallFatBootcodeToPartition( { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // wcscpy(DstPath, SystemRootPath->Buffer); - // wcscat(DstPath, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); if (IsThereAValidBootSector(SystemRootPath->Buffer)) { @@ -2438,8 +2432,7 @@ InstallFatBootcodeToPartition( } /* Save current bootsector */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, BootSectorFileName); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, BootSectorFileName); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); @@ -2464,8 +2457,7 @@ InstallFatBootcodeToPartition( PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat32BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2478,8 +2470,7 @@ InstallFatBootcodeToPartition( else { /* Install FAT16 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); DPRINT1("Install FAT16 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat16BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2512,10 +2503,8 @@ InstallExt2BootcodeToPartition( DPRINT("System path: '%wZ'\n", SystemRootPath); /* Copy FreeLoader to the system partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2526,10 +2515,9 @@ InstallExt2BootcodeToPartition( } /* Prepare for possibly copying 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, SystemRootPath->Buffer, L"freeldr.ini"); + DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2550,8 +2538,7 @@ InstallExt2BootcodeToPartition( { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); /* Certainly SysLinux, GRUB, LILO... or an unknown boot loader */ DPRINT1("*nix or unknown boot loader found\n"); @@ -2569,8 +2556,7 @@ InstallExt2BootcodeToPartition( } /* Save current bootsector */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.old"); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); @@ -2594,8 +2580,7 @@ InstallExt2BootcodeToPartition( // if (PartitionType == PARTITION_EXT2) { /* Install EXT2 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\ext2.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\ext2.bin"); DPRINT1("Install EXT2 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallExt2BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2684,10 +2669,9 @@ InstallFatBootcodeToFloppy( } /* Copy FreeLoader to the boot partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); + RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2698,7 +2682,7 @@ InstallFatBootcodeToFloppy( } /* Create new 'freeldr.ini' */ - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); + RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); @@ -2709,10 +2693,9 @@ InstallFatBootcodeToFloppy( } /* Install FAT12/16 boosector */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); - wcscpy(DstPath, L"\\Device\\Floppy0"); + RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index ef4c6840a8..b1e4baf64f 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -50,13 +50,13 @@ InstallDriver( OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hService; INFCONTEXT Context; - LPWSTR Driver, ClassGuid, ImagePath, FullImagePath; + PWSTR Driver, ClassGuid, ImagePath, FullImagePath; ULONG dwValue; ULONG Disposition; NTSTATUS Status; BOOLEAN deviceInstalled = FALSE; UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); - LPWSTR keyboardClass = L"kbdclass\0"; + PWSTR keyboardClass = L"kbdclass\0"; /* Check if we know the hardware */ if (!SetupFindFirstLineW(hInf, L"HardwareIdsDatabase", HardwareId, &Context)) @@ -84,14 +84,14 @@ InstallDriver( /* Prepare full driver path */ dwValue = PathPrefix.MaximumLength + wcslen(ImagePath) * sizeof(WCHAR); - FullImagePath = (LPWSTR)RtlAllocateHeap(ProcessHeap, 0, dwValue); + FullImagePath = (PWSTR)RtlAllocateHeap(ProcessHeap, 0, dwValue); if (!FullImagePath) { DPRINT1("RtlAllocateHeap() failed\n"); return FALSE; } RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); - wcscat(FullImagePath, ImagePath); + ConcatPaths(FullImagePath, dwValue / sizeof(WCHAR), 1, ImagePath); DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index e5d55908c3..f672e2b23e 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -368,46 +368,32 @@ SetupCommitFileQueueW( while (Entry != NULL) { /* Build the full source path */ - wcscpy(FileSrcPath, Entry->SourceRootPath); - if (Entry->SourcePath != NULL) - wcscat(FileSrcPath, Entry->SourcePath); - wcscat(FileSrcPath, L"\\"); - wcscat(FileSrcPath, Entry->SourceFilename); + CombinePaths(FileSrcPath, ARRAYSIZE(FileSrcPath), 3, + Entry->SourceRootPath, Entry->SourcePath, + Entry->SourceFilename); /* Build the full target path */ wcscpy(FileDstPath, TargetRootPath); - if (Entry->TargetDirectory[0] == 0) + if (Entry->TargetDirectory[0] == UNICODE_NULL) { /* Installation path */ /* Add the installation path */ - if (TargetPath != NULL) - { - if (TargetPath[0] != L'\\') - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, TargetPath); - } + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, TargetPath); } else if (Entry->TargetDirectory[0] == L'\\') { /* Absolute path */ - if (Entry->TargetDirectory[1] != 0) - wcscat(FileDstPath, Entry->TargetDirectory); + if (Entry->TargetDirectory[1] != UNICODE_NULL) + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->TargetDirectory); } else // if (Entry->TargetDirectory[0] != L'\\') { /* Path relative to the installation path */ /* Add the installation path */ - if (TargetPath != NULL) - { - if (TargetPath[0] != L'\\') - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, TargetPath); - } - - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, Entry->TargetDirectory); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + TargetPath, Entry->TargetDirectory); } /* @@ -416,11 +402,10 @@ SetupCommitFileQueueW( */ if (Entry->SourceCabinet == NULL) { - wcscat(FileDstPath, L"\\"); if (Entry->TargetFilename != NULL) - wcscat(FileDstPath, Entry->TargetFilename); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->TargetFilename); else - wcscat(FileDstPath, Entry->SourceFilename); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->SourceFilename); } /* FIXME: Do it! */ @@ -434,11 +419,9 @@ SetupCommitFileQueueW( if (Entry->SourceCabinet != NULL) { /* Extract the file */ - wcscpy(CabinetName, Entry->SourceRootPath); - if (Entry->SourcePath != NULL) - wcscat(CabinetName, Entry->SourcePath); - wcscat(CabinetName, L"\\"); - wcscat(CabinetName, Entry->SourceCabinet); + CombinePaths(CabinetName, ARRAYSIZE(CabinetName), 3, + Entry->SourceRootPath, Entry->SourcePath, + Entry->SourceCabinet); Status = SetupExtractFile(CabinetName, Entry->SourceFilename, FileDstPath); } else diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index d86705b3d5..2587741892 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -584,9 +584,8 @@ ImportRegistryFile( UINT ErrorLine; /* Load inf file from install media. */ - wcscpy(FileNameBuffer, SourcePath.Buffer); - wcscat(FileNameBuffer, L"\\"); - wcscat(FileNameBuffer, Filename); + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, + SourcePath.Buffer, Filename); hInf = SetupOpenInfFileW(FileNameBuffer, NULL, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index bb12f96970..b35ea0b8a4 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -427,15 +427,14 @@ CheckUnattendedSetup(VOID) INT IntValue; PWCHAR Value; - if (DoesFileExist(NULL, SourcePath.Buffer, L"unattend.inf") == FALSE) + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"\\unattend.inf"); + + if (DoesFileExist(NULL, NULL, UnattendInfPath) == FALSE) { - DPRINT("Does not exist: %S\\%S\n", SourcePath.Buffer, L"unattend.inf"); + DPRINT("Does not exist: %S\n", UnattendInfPath); return; } - wcscpy(UnattendInfPath, SourcePath.Buffer); - wcscat(UnattendInfPath, L"\\unattend.inf"); - /* Load 'unattend.inf' from install media. */ UnattendInf = SetupOpenInfFileW(UnattendInfPath, NULL, @@ -527,7 +526,7 @@ CheckUnattendedSetup(VOID) return; } - UnattendDestinationPartitionNumber = IntValue; + UnattendDestinationPartitionNumber = (LONG)IntValue; /* Search for 'InstallationDirectory' in the 'Unattend' section */ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) @@ -824,9 +823,7 @@ SetupStartPage(PINPUT_RECORD Ir) #endif /* Load txtsetup.sif from install media. */ - wcscpy(FileNameBuffer, SourcePath.Buffer); - wcscat(FileNameBuffer, L"\\txtsetup.sif"); - + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"\\txtsetup.sif"); SetupInf = SetupOpenInfFileW(FileNameBuffer, NULL, INF_STYLE_WIN4, @@ -1379,8 +1376,8 @@ ComputerSettingsPage(PINPUT_RECORD Ir) return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } - - + + /* * Displays the DisplaySettingsPage. * @@ -3203,12 +3200,8 @@ BuildInstallPaths(PWCHAR InstallDir, /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); - wcscpy(PathBuffer, DestinationRootPath.Buffer); - - if (InstallDir[0] != L'\\') - wcscat(PathBuffer, L"\\"); - - wcscat(PathBuffer, InstallDir); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationRootPath.Buffer, InstallDir); RtlCreateUnicodeString(&DestinationPath, PathBuffer); /* Create 'DestinationArcPath' */ @@ -3217,11 +3210,7 @@ BuildInstallPaths(PWCHAR InstallDir, L"multi(0)disk(0)rdisk(%lu)partition(%lu)", DiskEntry->BiosDiskNumber, PartEntry->PartitionNumber); - - if (InstallDir[0] != L'\\') - wcscat(PathBuffer, L"\\"); - - wcscat(PathBuffer, InstallDir); + ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); } @@ -3558,7 +3547,7 @@ AddSectionToCopyQueue(HINF InfFile, break; } - if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) { /* Installation path */ wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); @@ -3571,16 +3560,15 @@ AddSectionToCopyQueue(HINF InfFile, else // if (DirKeyValue[0] != L'\\') { /* Path relative to the installation path */ - wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); - wcscat(CompleteOrigDirName, L"\\"); - wcscat(CompleteOrigDirName, DirKeyValue); + CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, + SourceRootDir.Buffer, DirKeyValue); } /* Remove trailing backslash */ Length = wcslen(CompleteOrigDirName); if ((Length > 0) && (CompleteOrigDirName[Length - 1] == L'\\')) { - CompleteOrigDirName[Length - 1] = 0; + CompleteOrigDirName[Length - 1] = UNICODE_NULL; } if (!SetupQueueCopy(SetupFileQueue, @@ -3647,7 +3635,7 @@ PrepareCopyPageInfFile(HINF InfFile, Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } /* Create the install directory */ @@ -3683,7 +3671,7 @@ PrepareCopyPageInfFile(HINF InfFile, break; } - if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) { /* Installation path */ DPRINT("InstallationPath: '%S'\n", DirKeyValue); @@ -3697,14 +3685,14 @@ PrepareCopyPageInfFile(HINF InfFile, /* Absolute path */ DPRINT("Absolute Path: '%S'\n", DirKeyValue); - wcscpy(PathBuffer, DestinationRootPath.Buffer); - wcscat(PathBuffer, DirKeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationRootPath.Buffer, DirKeyValue); /* Remove trailing backslash */ Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } DPRINT("FullPath: '%S'\n", PathBuffer); @@ -3722,15 +3710,14 @@ PrepareCopyPageInfFile(HINF InfFile, /* Path relative to the installation path */ DPRINT("RelativePath: '%S'\n", DirKeyValue); - wcscpy(PathBuffer, DestinationPath.Buffer); - wcscat(PathBuffer, L"\\"); - wcscat(PathBuffer, DirKeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationPath.Buffer, DirKeyValue); /* Remove trailing backslash */ Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } DPRINT("FullPath: '%S'\n", PathBuffer); @@ -3805,9 +3792,8 @@ PrepareCopyPage(PINPUT_RECORD Ir) if (!INF_GetData(&CabinetsContext, NULL, &KeyValue)) break; - wcscpy(PathBuffer, SourcePath.Buffer); - wcscat(PathBuffer, L"\\"); - wcscat(PathBuffer, KeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + SourcePath.Buffer, KeyValue); CabinetInitialize(); CabinetSetEventHandlers(NULL, NULL, NULL); @@ -4387,7 +4373,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesFileExist(NULL, L"\\Device\\Floppy0", L"\\") == FALSE) + if (DoesPathExist(NULL, L"\\Device\\Floppy0\\") == FALSE) { MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE; @@ -4484,14 +4470,12 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) L"\\Device\\Harddisk%d\\Partition0", PartitionList->SystemPartition->DiskEntry->DiskNumber); - wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); - wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); + CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); if (IsThereAValidBootSector(DestinationDevicePathBuffer)) { /* Save current MBR */ - wcscpy(DstPath, SystemRootPath.Buffer); - wcscat(DstPath, L"\\mbr.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath.Buffer, L"\\mbr.old"); DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR));

6 years, 6 months

01/09: [SETUPLIB][USETUP] Move some code to the SetupLib.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92b99b865eca36e356626… commit 92b99b865eca36e35662641f09680bb86ea2c5fe Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 23 11:39:12 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 3 22:12:35 2018 +0200 [SETUPLIB][USETUP] Move some code to the SetupLib. - filesup.c's functions ConcatPaths(), Does[Path|File]Exist(), NtPathToDiskPartComponents(), OpenAndMapFile(), UnMapFile(); - Move the inicache library to setuplib as it'll be used for the 1st stage GUI setup too (indeed, there is no good INI file API under Win32; the Win32 profile "API" is just good enough to manipulate the win16 ini files, and are here anyways for backward compatibility purposes only); - Move the OS detector too. - Remove the duplicated ConcatPaths() code in arcname.c. svn path=/branches/setup_improvements/; revision=74634 svn path=/branches/setup_improvements/; revision=74638 --- base/setup/lib/CMakeLists.txt | 3 + base/setup/lib/arcname.c | 136 +++++------- base/setup/lib/filesup.c | 372 +++++++++++++++++++++++++++++++++ base/setup/lib/filesup.h | 57 ++++++ base/setup/{usetup => lib}/inicache.c | 31 +-- base/setup/{usetup => lib}/inicache.h | 27 +-- base/setup/{usetup => lib}/osdetect.c | 15 +- base/setup/{usetup => lib}/osdetect.h | 4 + base/setup/lib/precomp.h | 5 +- base/setup/lib/setuplib.h | 3 + base/setup/usetup/CMakeLists.txt | 2 - base/setup/usetup/filesup.c | 375 +--------------------------------- base/setup/usetup/filesup.h | 57 ------ base/setup/usetup/usetup.h | 2 - 14 files changed, 520 insertions(+), 569 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index a37be9d1fb..6d687deb1a 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,9 +1,12 @@ list(APPEND SOURCE arcname.c + filesup.c fsutil.c genlist.c + inicache.c ntverrsrc.c + osdetect.c partlist.c precomp.h) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index 60af00dbb1..f40b79173e 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -23,6 +23,7 @@ #include "precomp.h" +#include "filesup.h" #include "partlist.h" #include "arcname.h" @@ -114,7 +115,7 @@ ArcGetNextTokenA( OUT PANSI_STRING TokenSpecifier, OUT PULONG Key) { - HRESULT hr; + NTSTATUS Status; PCSTR p = ArcPath; ULONG SpecifierLength; ULONG KeyValue; @@ -154,9 +155,10 @@ ArcGetNextTokenA( #endif /* We should have succeeded, copy the token specifier in the buffer */ - hr = StringCbCopyNA(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, - ArcPath, SpecifierLength); - if (FAILED(hr)) + Status = RtlStringCbCopyNA(TokenSpecifier->Buffer, + TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (!NT_SUCCESS(Status)) return NULL; TokenSpecifier->Length = strlen(TokenSpecifier->Buffer) * sizeof(CHAR); @@ -174,7 +176,7 @@ ArcGetNextTokenU( OUT PUNICODE_STRING TokenSpecifier, OUT PULONG Key) { - HRESULT hr; + NTSTATUS Status; PCWSTR p = ArcPath; ULONG SpecifierLength; ULONG KeyValue; @@ -216,9 +218,10 @@ ArcGetNextTokenU( #endif /* We should have succeeded, copy the token specifier in the buffer */ - hr = StringCbCopyNW(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, - ArcPath, SpecifierLength); - if (FAILED(hr)) + Status = RtlStringCbCopyNW(TokenSpecifier->Buffer, + TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (!NT_SUCCESS(Status)) return NULL; TokenSpecifier->Length = wcslen(TokenSpecifier->Buffer) * sizeof(WCHAR); @@ -298,7 +301,7 @@ ArcPathNormalize( OUT PUNICODE_STRING NormalizedArcPath, IN PCWSTR ArcPath) { - HRESULT hr; + NTSTATUS Status; PCWSTR EndOfArcName; PCWSTR p; @@ -315,24 +318,32 @@ ArcPathNormalize( while ((p = wcsstr(ArcPath, L"()")) && (p < EndOfArcName)) { #if 0 - hr = StringCbCopyNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, - ArcPath, (p - ArcPath) * sizeof(WCHAR)); + Status = RtlStringCbCopyNW(NormalizedArcPath->Buffer, + NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); #else - hr = StringCbCatNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, - ArcPath, (p - ArcPath) * sizeof(WCHAR)); + Status = RtlStringCbCatNW(NormalizedArcPath->Buffer, + NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); #endif - if (FAILED(hr)) + if (!NT_SUCCESS(Status)) return FALSE; - hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, L"(0)"); - if (FAILED(hr)) + + Status = RtlStringCbCatW(NormalizedArcPath->Buffer, + NormalizedArcPath->MaximumLength, + L"(0)"); + if (!NT_SUCCESS(Status)) return FALSE; #if 0 NormalizedArcPath->Buffer += wcslen(NormalizedArcPath->Buffer); #endif ArcPath = p + 2; } - hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, ArcPath); - if (FAILED(hr)) + + Status = RtlStringCbCatW(NormalizedArcPath->Buffer, + NormalizedArcPath->MaximumLength, + ArcPath); + if (!NT_SUCCESS(Status)) return FALSE; NormalizedArcPath->Length = wcslen(NormalizedArcPath->Buffer) * sizeof(WCHAR); @@ -450,7 +461,7 @@ ResolveArcNameManually( IN OUT PCWSTR* ArcNamePath, IN PPARTLIST PartList OPTIONAL) { - HRESULT hr; + NTSTATUS Status; WCHAR TokenBuffer[50]; UNICODE_STRING Token; PCWSTR p, q; @@ -525,7 +536,8 @@ ResolveArcNameManually( return STATUS_NOT_SUPPORTED; } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Ramdisk%lu", AdapterKey); + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Ramdisk%lu", AdapterKey); goto Quit; } } @@ -644,14 +656,23 @@ ResolveArcNameManually( if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + { + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + } else /* Now, ControllerType == DiskController */ if (PeripheralType == CdRomPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\CdRom%lu", PeripheralKey); + { + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\CdRom%lu", PeripheralKey); + } else if (PeripheralType == FDiskPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Floppy%lu", PeripheralKey); + { + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Floppy%lu", PeripheralKey); + } else if (PeripheralType == RDiskPeripheral) { @@ -676,78 +697,30 @@ ResolveArcNameManually( ASSERT(PartEntry->DiskEntry == DiskEntry); } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, PartitionNumber); + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, PartitionNumber); } #if 0 else if (PeripheralType == VDiskPeripheral) { // TODO: Check how Win 7+ deals with virtual disks. - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\VirtualHarddisk%lu\\Partition%lu", - PeripheralKey, PartitionNumber); + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\VirtualHarddisk%lu\\Partition%lu", + PeripheralKey, PartitionNumber); } #endif Quit: - if (FAILED(hr)) - { - /* - * We can directly cast the HRESULTs into NTSTATUS since the error codes - * returned by StringCbPrintfW: - * STRSAFE_E_INVALID_PARAMETER == 0x80070057, - * STRSAFE_E_INSUFFICIENT_BUFFER == 0x8007007a, - * do not have assigned values in the NTSTATUS space. - */ - return (NTSTATUS)hr; - } + if (!NT_SUCCESS(Status)) + return Status; *ArcNamePath = p; return STATUS_SUCCESS; } -/**** FIXME: Redundant with filesup.c ! ****\ -|** (but filesup.c is not yet included in **| -\** setuplib, hence this code copy) **/ - -static -HRESULT -ConcatPaths( - IN OUT PWSTR PathElem1, - IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL) -{ - HRESULT hr; - SIZE_T cchPathLen; - - if (!PathElem2) - return S_OK; - if (cchPathSize <= 1) - return S_OK; - - cchPathLen = min(cchPathSize, wcslen(PathElem1)); - - if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') - { - /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ - hr = StringCchCatW(PathElem1, cchPathSize, L"\\"); - if (FAILED(hr)) - return hr; - } - else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') - { - /* PathElem2 starts with '\' and PathElem1 ends with '\' */ - while (*PathElem2 == L'\\') - ++PathElem2; // Skip any backslash - } - hr = StringCchCatW(PathElem1, cchPathSize, PathElem2); - return hr; -} - -/*******************************************/ - - BOOLEAN ArcPathToNtPath( OUT PUNICODE_STRING NtPath, @@ -825,9 +798,8 @@ ArcPathToNtPath( */ if (BeginOfPath && *BeginOfPath) { - HRESULT hr; - hr = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); - if (FAILED(hr)) + Status = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); + if (!NT_SUCCESS(Status)) { /* Buffer not large enough, or whatever...: just bail out */ return FALSE; diff --git a/base/setup/lib/filesup.c b/base/setup/lib/filesup.c new file mode 100644 index 0000000000..7550905895 --- /dev/null +++ b/base/setup/lib/filesup.c @@ -0,0 +1,372 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: File support functions. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ +NTSTATUS +ConcatPaths( + IN OUT PWSTR PathElem1, + IN SIZE_T cchPathSize, + IN PCWSTR PathElem2 OPTIONAL) +{ + NTSTATUS Status; + SIZE_T cchPathLen; + + if (!PathElem2) + return STATUS_SUCCESS; + if (cchPathSize <= 1) + return STATUS_SUCCESS; + + cchPathLen = min(cchPathSize, wcslen(PathElem1)); + + if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') + { + /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ + Status = RtlStringCchCatW(PathElem1, cchPathSize, L"\\"); + if (!NT_SUCCESS(Status)) + return Status; + } + else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') + { + /* PathElem2 starts with '\' and PathElem1 ends with '\' */ + while (*PathElem2 == L'\\') + ++PathElem2; // Skip any backslash + } + Status = RtlStringCchCatW(PathElem1, cchPathSize, PathElem2); + return Status; +} + +// +// NOTE: It may be possible to merge both DoesPathExist and DoesFileExist... +// +BOOLEAN +DoesPathExist( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName) +{ + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, PathName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + RootDirectory, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (NT_SUCCESS(Status)) + NtClose(FileHandle); + else + DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &Name, Status); + + return NT_SUCCESS(Status); +} + +BOOLEAN +DoesFileExist( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName) +{ + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + WCHAR FullName[MAX_PATH]; + + if (PathName) + RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); + else + FullName[0] = UNICODE_NULL; + + if (FileName) + ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); + + RtlInitUnicodeString(&Name, FullName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + RootDirectory, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (NT_SUCCESS(Status)) + NtClose(FileHandle); + else + DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + + return NT_SUCCESS(Status); +} + +/* + * The format of NtPath should be: + * \Device\HarddiskXXX\PartitionYYY[\path] , + * where XXX and YYY respectively represent the hard disk and partition numbers, + * and [\path] represent an optional path (separated by '\\'). + * + * If a NT path of such a form is correctly parsed, the function returns respectively: + * - in pDiskNumber: the hard disk number XXX, + * - in pPartNumber: the partition number YYY, + * - in PathComponent: pointer value (inside NtPath) to the beginning of \path. + * + * NOTE: The function does not accept leading whitespace. + */ +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL) +{ + ULONG DiskNumber, PartNumber; + PCWSTR Path; + + *pDiskNumber = 0; + *pPartNumber = 0; + if (PathComponent) *PathComponent = NULL; + + Path = NtPath; + + if (_wcsnicmp(Path, L"\\Device\\Harddisk", 16) != 0) + { + /* The NT path doesn't start with the prefix string, thus it cannot be a hard disk device path */ + DPRINT1("'%S' : Not a possible hard disk device.\n", NtPath); + return FALSE; + } + + Path += 16; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + DPRINT1("'%S' : expected a number! Not a regular hard disk device.\n", Path); + return FALSE; + } + DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + DPRINT1("'%S' : expected a path separator!\n", Path); + return FALSE; + } + + if (!*Path) + { + DPRINT1("The path only specified a hard disk (and nothing else, like a partition...), so we stop there.\n"); + goto Quit; + } + + /* Here, *Path == L'\\' */ + + if (_wcsnicmp(Path, L"\\Partition", 10) != 0) + { + /* Actually, \Partition is optional so, if we don't have it, we still return success. Or should we? */ + DPRINT1("'%S' : unexpected format!\n", NtPath); + goto Quit; + } + + Path += 10; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + /* If we don't have a number it means this part of path is actually not a partition specifier, so we shouldn't fail either. Or should we? */ + DPRINT1("'%S' : expected a number!\n", Path); + goto Quit; + } + PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ + DPRINT1("'%S' : expected a path separator!\n", Path); + goto Quit; + } + + /* OK, here we really have a partition specifier: return its number */ + *pPartNumber = PartNumber; + +Quit: + /* Return the disk number */ + *pDiskNumber = DiskNumber; + + /* Return the path component also, if the user wants it */ + if (PathComponent) *PathComponent = Path; + + return TRUE; +} + +NTSTATUS +OpenAndMapFile( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName, // OPTIONAL + OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL + OUT PHANDLE SectionHandle, + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + SIZE_T ViewSize; + PVOID ViewBase; + UNICODE_STRING Name; + WCHAR FullName[MAX_PATH]; + + if (PathName) + RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); + else + FullName[0] = UNICODE_NULL; + + if (FileName) + ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); + + RtlInitUnicodeString(&Name, FullName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + RootDirectory, + NULL); + + *FileHandle = NULL; + *SectionHandle = NULL; + + Status = NtOpenFile(FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); + return Status; + } + + if (FileSize) + { + /* Query the file size */ + FILE_STANDARD_INFORMATION FileInfo; + Status = NtQueryInformationFile(*FileHandle, + &IoStatusBlock, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + NtClose(*FileHandle); + *FileHandle = NULL; + return Status; + } + + if (FileInfo.EndOfFile.HighPart != 0) + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); + + *FileSize = FileInfo.EndOfFile.LowPart; + + DPRINT("File size: %lu\n", *FileSize); + } + + /* 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", &Name, Status); + NtClose(*FileHandle); + *FileHandle = NULL; + return Status; + } + + /* Map the section */ + ViewSize = 0; + ViewBase = NULL; + Status = NtMapViewOfSection(*SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &Name, Status); + NtClose(*SectionHandle); + *SectionHandle = NULL; + NtClose(*FileHandle); + *FileHandle = NULL; + return Status; + } + + *BaseAddress = ViewBase; + return STATUS_SUCCESS; +} + +BOOLEAN +UnMapFile( + IN HANDLE SectionHandle, + IN PVOID BaseAddress) +{ + NTSTATUS Status; + BOOLEAN Success = TRUE; + + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + if (!NT_SUCCESS(Status)) + { + DPRINT1("UnMapFile: NtUnmapViewOfSection(0x%p) failed with Status 0x%08lx\n", + BaseAddress, Status); + Success = FALSE; + } + Status = NtClose(SectionHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("UnMapFile: NtClose(0x%p) failed with Status 0x%08lx\n", + SectionHandle, Status); + Success = FALSE; + } + + return Success; +} + +/* EOF */ diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h new file mode 100644 index 0000000000..bf5a2835f2 --- /dev/null +++ b/base/setup/lib/filesup.h @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: File support functions. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#pragma once + +#if 0 + +BOOLEAN +IsValidPath( + IN PCWSTR InstallDir); + +#endif + +NTSTATUS +ConcatPaths( + IN OUT PWSTR PathElem1, + IN SIZE_T cchPathSize, + IN PCWSTR PathElem2 OPTIONAL); + +BOOLEAN +DoesPathExist( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName); + +BOOLEAN +DoesFileExist( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName); + +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL); + +NTSTATUS +OpenAndMapFile( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName, // OPTIONAL + OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL + OUT PHANDLE SectionHandle, + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL); + +BOOLEAN +UnMapFile( + IN HANDLE SectionHandle, + IN PVOID BaseAddress); + +/* EOF */ diff --git a/base/setup/usetup/inicache.c b/base/setup/lib/inicache.c similarity index 95% rename from base/setup/usetup/inicache.c rename to base/setup/lib/inicache.c index 38dd44fefd..295d957057 100644 --- a/base/setup/usetup/inicache.c +++ b/base/setup/lib/inicache.c @@ -1,32 +1,15 @@ /* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/inicache.c - * PURPOSE: INI file parser that caches contents of INI file in memory - * PROGRAMMER: Royce Mitchell III + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: INI file parser that caches contents of INI file in memory. + * COPYRIGHT: Copyright 2002-2018 Royce Mitchell III */ /* INCLUDES *****************************************************************/ -#include "usetup.h" +#include "precomp.h" + +#include "inicache.h" #define NDEBUG #include <debug.h> diff --git a/base/setup/usetup/inicache.h b/base/setup/lib/inicache.h similarity index 64% rename from base/setup/usetup/inicache.h rename to base/setup/lib/inicache.h index 33db2a38e9..d9b7a3d288 100644 --- a/base/setup/usetup/inicache.h +++ b/base/setup/lib/inicache.h @@ -1,27 +1,8 @@ /* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/inicache.h - * PURPOSE: INI file parser that caches contents of INI file in memory - * PROGRAMMER: Royce Mitchell III + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: INI file parser that caches contents of INI file in memory. + * COPYRIGHT: Copyright 2002-2018 Royce Mitchell III */ #pragma once diff --git a/base/setup/usetup/osdetect.c b/base/setup/lib/osdetect.c similarity index 99% rename from base/setup/usetup/osdetect.c rename to base/setup/lib/osdetect.c index 97cc6430ea..a695da7466 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -6,7 +6,18 @@ * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito */ -#include "usetup.h" +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "ntverrsrc.h" +// #include "arcname.h" +#include "filesup.h" +#include "genlist.h" +#include "inicache.h" +#include "partlist.h" +#include "arcname.h" +#include "osdetect.h" // HACK! #include <strsafe.h> @@ -17,8 +28,6 @@ /* GLOBALS ******************************************************************/ -extern PPARTLIST PartitionList; - /* Language-independent Vendor strings */ static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; diff --git a/base/setup/usetup/osdetect.h b/base/setup/lib/osdetect.h similarity index 97% rename from base/setup/usetup/osdetect.h rename to base/setup/lib/osdetect.h index 5076784086..b20fc427b7 100644 --- a/base/setup/usetup/osdetect.h +++ b/base/setup/lib/osdetect.h @@ -6,6 +6,8 @@ * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito */ +#pragma once + typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; @@ -24,3 +26,5 @@ typedef struct _NTOS_INSTALLATION PGENERIC_LIST CreateNTOSInstallationsList( IN PPARTLIST List); + +/* EOF */ diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index ea82da4f39..0ce5c12e09 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -16,8 +16,6 @@ #include <winreg.h> #include <winuser.h> -#include <strsafe.h> - #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> @@ -29,6 +27,9 @@ #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> +#include <ntstrsafe.h> + + /* Filesystem headers */ #include <reactos/rosioctl.h> // For extra partition IDs diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 055ed5eef7..a53fc3cb2d 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -29,9 +29,12 @@ extern HANDLE ProcessHeap; #include "linklist.h" #include "ntverrsrc.h" // #include "arcname.h" +#include "filesup.h" #include "fsutil.h" #include "genlist.h" +#include "inicache.h" #include "partlist.h" #include "arcname.h" +#include "osdetect.h" /* EOF */ diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 714182e7e7..13aea12e16 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -24,10 +24,8 @@ list(APPEND SOURCE fslist.c genlist.c inffile.c - inicache.c keytrans.c mui.c - osdetect.c partlist.c progress.c registry.c diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index b466e4e38d..6094ba3365 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -1,22 +1,5 @@ /* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.c * PURPOSE: File support functions @@ -520,360 +503,4 @@ IsValidPath( return TRUE; } -NTSTATUS -ConcatPaths( - IN OUT PWSTR PathElem1, - IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL) -{ - NTSTATUS Status; - SIZE_T cchPathLen; - - if (!PathElem2) - return STATUS_SUCCESS; - if (cchPathSize <= 1) - return STATUS_SUCCESS; - - cchPathLen = min(cchPathSize, wcslen(PathElem1)); - - if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') - { - /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ - Status = RtlStringCchCatW(PathElem1, cchPathSize, L"\\"); - if (!NT_SUCCESS(Status)) - return Status; - } - else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') - { - /* PathElem2 starts with '\' and PathElem1 ends with '\' */ - while (*PathElem2 == L'\\') - ++PathElem2; // Skip any backslash - } - Status = RtlStringCchCatW(PathElem1, cchPathSize, PathElem2); - return Status; -} - -// -// NOTE: It may be possible to merge both DoesPathExist and DoesFileExist... -// -BOOLEAN -DoesPathExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName) -{ - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; - - RtlInitUnicodeString(&Name, PathName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - RootDirectory, - NULL); - - Status = NtOpenFile(&FileHandle, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (NT_SUCCESS(Status)) - NtClose(FileHandle); - else - DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &Name, Status); - - return NT_SUCCESS(Status); -} - -BOOLEAN -DoesFileExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName) -{ - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - - if (PathName) - RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - if (FileName) - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - - RtlInitUnicodeString(&Name, FullName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - RootDirectory, - NULL); - - Status = NtOpenFile(&FileHandle, - GENERIC_READ | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); - if (NT_SUCCESS(Status)) - NtClose(FileHandle); - else - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); - - return NT_SUCCESS(Status); -} - -/* - * The format of NtPath should be: - * \Device\HarddiskXXX\PartitionYYY[\path] , - * where XXX and YYY respectively represent the hard disk and partition numbers, - * and [\path] represent an optional path (separated by '\\'). - * - * If a NT path of such a form is correctly parsed, the function returns respectively: - * - in pDiskNumber: the hard disk number XXX, - * - in pPartNumber: the partition number YYY, - * - in PathComponent: pointer value (inside NtPath) to the beginning of \path. - * - * NOTE: The function does not accept leading whitespace. - */ -BOOLEAN -NtPathToDiskPartComponents( - IN PCWSTR NtPath, - OUT PULONG pDiskNumber, - OUT PULONG pPartNumber, - OUT PCWSTR* PathComponent OPTIONAL) -{ - ULONG DiskNumber, PartNumber; - PCWSTR Path; - - *pDiskNumber = 0; - *pPartNumber = 0; - if (PathComponent) *PathComponent = NULL; - - Path = NtPath; - - if (_wcsnicmp(Path, L"\\Device\\Harddisk", 16) != 0) - { - /* The NT path doesn't start with the prefix string, thus it cannot be a hard disk device path */ - DPRINT1("'%S' : Not a possible hard disk device.\n", NtPath); - return FALSE; - } - - Path += 16; - - /* A number must be present now */ - if (!iswdigit(*Path)) - { - DPRINT1("'%S' : expected a number! Not a regular hard disk device.\n", Path); - return FALSE; - } - DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); - - /* Either NULL termination, or a path separator must be present now */ - if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) - { - DPRINT1("'%S' : expected a path separator!\n", Path); - return FALSE; - } - - if (!*Path) - { - DPRINT1("The path only specified a hard disk (and nothing else, like a partition...), so we stop there.\n"); - goto Quit; - } - - /* Here, *Path == L'\\' */ - - if (_wcsnicmp(Path, L"\\Partition", 10) != 0) - { - /* Actually, \Partition is optional so, if we don't have it, we still return success. Or should we? */ - DPRINT1("'%S' : unexpected format!\n", NtPath); - goto Quit; - } - - Path += 10; - - /* A number must be present now */ - if (!iswdigit(*Path)) - { - /* If we don't have a number it means this part of path is actually not a partition specifier, so we shouldn't fail either. Or should we? */ - DPRINT1("'%S' : expected a number!\n", Path); - goto Quit; - } - PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); - - /* Either NULL termination, or a path separator must be present now */ - if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) - { - /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ - DPRINT1("'%S' : expected a path separator!\n", Path); - goto Quit; - } - - /* OK, here we really have a partition specifier: return its number */ - *pPartNumber = PartNumber; - -Quit: - /* Return the disk number */ - *pDiskNumber = DiskNumber; - - /* Return the path component also, if the user wants it */ - if (PathComponent) *PathComponent = Path; - - return TRUE; -} - -NTSTATUS -OpenAndMapFile( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL - OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL - OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress, - OUT PULONG FileSize OPTIONAL) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - SIZE_T ViewSize; - PVOID ViewBase; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - - if (PathName) - RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - if (FileName) - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - - RtlInitUnicodeString(&Name, FullName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - RootDirectory, - NULL); - - *FileHandle = NULL; - *SectionHandle = NULL; - - Status = NtOpenFile(FileHandle, - GENERIC_READ | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); - return Status; - } - - if (FileSize) - { - /* Query the file size */ - FILE_STANDARD_INFORMATION FileInfo; - Status = NtQueryInformationFile(*FileHandle, - &IoStatusBlock, - &FileInfo, - sizeof(FileInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); - NtClose(*FileHandle); - *FileHandle = NULL; - return Status; - } - - if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); - - *FileSize = FileInfo.EndOfFile.LowPart; - - DPRINT("File size: %lu\n", *FileSize); - } - - /* 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", &Name, Status); - NtClose(*FileHandle); - *FileHandle = NULL; - return Status; - } - - /* Map the section */ - ViewSize = 0; - ViewBase = NULL; - Status = NtMapViewOfSection(*SectionHandle, - NtCurrentProcess(), - &ViewBase, - 0, 0, - NULL, - &ViewSize, - ViewShare, - 0, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &Name, Status); - NtClose(*SectionHandle); - *SectionHandle = NULL; - NtClose(*FileHandle); - *FileHandle = NULL; - return Status; - } - - *BaseAddress = ViewBase; - return STATUS_SUCCESS; -} - -BOOLEAN -UnMapFile( - IN HANDLE SectionHandle, - IN PVOID BaseAddress) -{ - NTSTATUS Status; - BOOLEAN Success = TRUE; - - Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - if (!NT_SUCCESS(Status)) - { - DPRINT1("UnMapFile: NtUnmapViewOfSection(0x%p) failed with Status 0x%08lx\n", - BaseAddress, Status); - Success = FALSE; - } - Status = NtClose(SectionHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("UnMapFile: NtClose(0x%p) failed with Status 0x%08lx\n", - SectionHandle, Status); - Success = FALSE; - } - - return Success; -} - /* EOF */ diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 87ab8354fe..5c2c296ecf 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -1,21 +1,3 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup @@ -46,43 +28,4 @@ BOOLEAN IsValidPath( IN PCWSTR InstallDir); -NTSTATUS -ConcatPaths( - IN OUT PWSTR PathElem1, - IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL); - -BOOLEAN -DoesPathExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName); - -BOOLEAN -DoesFileExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName); - -BOOLEAN -NtPathToDiskPartComponents( - IN PCWSTR NtPath, - OUT PULONG pDiskNumber, - OUT PULONG pPartNumber, - OUT PCWSTR* PathComponent OPTIONAL); - -NTSTATUS -OpenAndMapFile( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL - OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL - OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress, - OUT PULONG FileSize OPTIONAL); - -BOOLEAN -UnMapFile( - IN HANDLE SectionHandle, - IN PVOID BaseAddress); - /* EOF */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index aed5dcec4c..eeb11545b4 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -60,7 +60,6 @@ /* Internal Headers */ #include "consup.h" #include "inffile.h" -#include "inicache.h" #include "progress.h" #include "infros.h" #include "filequeue.h" @@ -70,7 +69,6 @@ #include "cabinet.h" #include "filesup.h" #include "genlist.h" -#include "osdetect.h" #include "mui.h" extern HANDLE ProcessHeap;

6 years, 6 months

02/02: [NTOSKRNL] Ignore IMAGE_SCN_CNT_UNINITIALIZED_DATA CORE-12582 CORE-14556

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7eb46d9fdda30a3b286e… commit c7eb46d9fdda30a3b286e244eba023d95f0a4a9b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 19 21:58:09 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 3 20:40:51 2018 +0200 [NTOSKRNL] Ignore IMAGE_SCN_CNT_UNINITIALIZED_DATA CORE-12582 CORE-14556 --- ntoskrnl/mm/section.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index e79ff5f07b..9bf9f3cd50 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -684,7 +684,7 @@ l_ReadHeaderFromFile: pssSegments[0].Length.QuadPart = nPrevVirtualEndOfSegment; pssSegments[0].RawLength.QuadPart = nFileSizeOfHeaders; pssSegments[0].Image.VirtualAddress = 0; - pssSegments[0].Image.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; + pssSegments[0].Image.Characteristics = 0; pssSegments[0].WriteCopy = TRUE; /* skip the headers segment */ @@ -1365,7 +1365,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, HasSwapEntry = MmIsPageSwapEntry(Process, Address); /* See if we should use a private page */ - if ((HasSwapEntry) || (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + if (HasSwapEntry) { SWAPENTRY DummyEntry; @@ -1956,9 +1956,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace, */ MmUnlockSectionSegment(Context.Segment); Context.WasDirty = FALSE; - if (Context.Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || - IS_SWAP_FROM_SSE(Entry) || - PFN_FROM_SSE(Entry) != Page) + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { Context.Private = TRUE; } @@ -2346,9 +2344,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, /* * Check for a private (COWed) page. */ - if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || - IS_SWAP_FROM_SSE(Entry) || - PFN_FROM_SSE(Entry) != Page) + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { Private = TRUE; } @@ -2481,9 +2477,7 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace, Page = MmGetPfnForProcess(Process, Address); Protect = PAGE_READONLY; - if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || - IS_SWAP_FROM_SSE(Entry) || - PFN_FROM_SSE(Entry) != Page) + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { Protect = NewProtect; }

6 years, 6 months

01/02: [NTDLL_APITEST] Add tests for mapping and relocating an image with IMAGE_SCN_CNT_UNINITIALIZED_DATA CORE-12582 CORE-14556

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffa94ca0f079e19cae8f6… commit ffa94ca0f079e19cae8f6f257d77a44f31d3be3e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Apr 19 21:55:35 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 3 20:40:51 2018 +0200 [NTDLL_APITEST] Add tests for mapping and relocating an image with IMAGE_SCN_CNT_UNINITIALIZED_DATA CORE-12582 CORE-14556 --- .../rostests/apitests/ntdll/NtMapViewOfSection.c | 100 ++++++++++++++++----- 1 file changed, 77 insertions(+), 23 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index 000c4a2738..081ddc7b7d 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -1173,10 +1173,12 @@ static struct _MY_IMAGE_FILE IMAGE_SECTION_HEADER text_header; IMAGE_SECTION_HEADER rossym_header; IMAGE_SECTION_HEADER rsrc_header; - BYTE pad[16]; + IMAGE_SECTION_HEADER clc_header; + BYTE pad[488]; BYTE text_data[0x400]; BYTE rossym_data[0x400]; BYTE rsrc_data[0x400]; + BYTE clc_data[0x1000]; } ImageFile = { /* IMAGE_DOS_HEADER */ @@ -1197,7 +1199,7 @@ static struct _MY_IMAGE_FILE /* IMAGE_FILE_HEADER */ { IMAGE_FILE_MACHINE_I386, /* Machine */ - 3, /* NumberOfSections */ + 4, /* NumberOfSections */ 0x47EFDF09, /* TimeDateStamp */ 0, /* PointerToSymbolTable */ 0, /* NumberOfSymbols */ @@ -1227,8 +1229,8 @@ static struct _MY_IMAGE_FILE 4, /* MajorSubsystemVersion */ 0, /* MinorSubsystemVersion */ 0, /* Win32VersionValue */ - 0x8000, /* SizeOfImage */ - 0x200, /* SizeOfHeaders */ + 0xa000, /* SizeOfImage */ + 0x400, /* SizeOfHeaders */ 0x0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | @@ -1267,13 +1269,13 @@ static struct _MY_IMAGE_FILE { 0x394 }, /* Misc.VirtualSize */ 0x2000, /* VirtualAddress */ 0x400, /* SizeOfRawData */ - 0x200, /* PointerToRawData */ + 0x400, /* PointerToRawData */ 0, /* PointerToRelocations */ 0, /* PointerToLinenumbers */ 0, /* NumberOfRelocations */ 0, /* NumberOfLinenumbers */ IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE | - IMAGE_SCN_CNT_CODE, /* Characteristics */ + IMAGE_SCN_CNT_CODE, /* Characteristics */ }, /* IMAGE_SECTION_HEADER */ { @@ -1281,11 +1283,12 @@ static struct _MY_IMAGE_FILE { 0x100 }, /* Misc.VirtualSize */ 0x4000, /* VirtualAddress */ 0x400, /* SizeOfRawData */ - 0x600, /* PointerToRawData */ + 0x800, /* PointerToRawData */ 0, /* PointerToRelocations */ 0, /* PointerToLinenumbers */ 0, /* NumberOfRelocations */ 0, /* NumberOfLinenumbers */ + /* CORE-8384 */ IMAGE_SCN_MEM_READ | IMAGE_SCN_TYPE_NOLOAD, /* Characteristics */ }, /* IMAGE_SECTION_HEADER */ @@ -1294,37 +1297,75 @@ static struct _MY_IMAGE_FILE { 0x100 }, /* Misc.VirtualSize */ 0x6000, /* VirtualAddress */ 0x400, /* SizeOfRawData */ - 0xA00, /* PointerToRawData */ + 0xC00, /* PointerToRawData */ 0, /* PointerToRelocations */ 0, /* PointerToLinenumbers */ 0, /* NumberOfRelocations */ 0, /* NumberOfLinenumbers */ - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, /* Characteristics */ + IMAGE_SCN_MEM_READ | + IMAGE_SCN_CNT_INITIALIZED_DATA, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + ".clc", /* Name */ + { 0x2000 }, /* Misc.VirtualSize */ + 0x8000, /* VirtualAddress */ + 0x1000, /* SizeOfRawData */ + 0x1000, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + /* CORE-12582 */ + IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE | + IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_CODE, /* Characteristics */ }, /* fill */ { 0 }, /* text */ { 0xc3, 0 }, /* rossym */ - { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, - BYTES8(0xaa), - BYTES16(0xbb), - BYTES32(0xcc), - BYTES64(0xdd), - BYTES64(0xee), - BYTES64(0xff), + { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + BYTES8(0xaa), + BYTES16(0xbb), + BYTES32(0xcc), + BYTES64(0xdd), + BYTES64(0xee), + BYTES64(0xff), }, /* rsrc */ - { 0 }, + { + BYTES128(0xee), + BYTES128(0x55), + BYTES128(0xee), + BYTES128(0x11), + BYTES128(0xff), + BYTES128(0x00), + BYTES128(0x00), + BYTES128(0xdd), + }, + /* clc */ + { + BYTES512(0x11), + BYTES512(0x22), + BYTES512(0x33), + BYTES512(0x44), + BYTES512(0x55), + BYTES512(0x66), + BYTES512(0x77), + BYTES512(0x88), + }, }; -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, text_data) == 0x200); -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rossym_data) == 0x600); -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rsrc_data) == 0xa00); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, text_data) == 0x400); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rossym_data) == 0x800); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rsrc_data) == 0xc00); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, clc_data) == 0x1000); static void -Test_NoLoadSection(BOOL Relocate) +Test_SectionContents(BOOL Relocate) { NTSTATUS Status; WCHAR TempPath[MAX_PATH]; @@ -1405,8 +1446,12 @@ Test_NoLoadSection(BOOL Relocate) { PUCHAR Bytes = BaseAddress; #define TEST_BYTE(n, v) StartSeh() ok_hex(Bytes[n], v); EndSeh(STATUS_SUCCESS); +#define TEST_WRITE(n) StartSeh() *(volatile UCHAR *)&Bytes[n] = Bytes[n]; EndSeh(STATUS_SUCCESS); +#define TEST_NOWRITE(n) StartSeh() *(volatile UCHAR *)&Bytes[n] = Bytes[n]; EndSeh(STATUS_ACCESS_VIOLATION); + TEST_NOWRITE(0x2000); TEST_BYTE(0x2000, 0xc3); TEST_BYTE(0x2001, 0x00); + TEST_NOWRITE(0x4000); TEST_BYTE(0x4000, 0x01); TEST_BYTE(0x4001, 0x23); TEST_BYTE(0x4007, 0xef); @@ -1419,6 +1464,15 @@ Test_NoLoadSection(BOOL Relocate) TEST_BYTE(0x40ff, 0xff); TEST_BYTE(0x4100, 0x00); TEST_BYTE(0x41ff, 0x00); + TEST_NOWRITE(0x6000); + TEST_BYTE(0x6000, 0xee); + TEST_BYTE(0x60ff, 0x55); + TEST_BYTE(0x6100, 0xee); + TEST_BYTE(0x63ff, 0xdd); + TEST_BYTE(0x6400, 0x00); + TEST_WRITE(0x8000); + TEST_BYTE(0x8000, 0x11); + TEST_BYTE(0x8400, 0x33); Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); ok_ntstatus(Status, STATUS_SUCCESS); } @@ -1577,8 +1631,8 @@ START_TEST(NtMapViewOfSection) Test_PageFileSection(); Test_ImageSection(); Test_BasedSection(); - Test_NoLoadSection(FALSE); - Test_NoLoadSection(TRUE); + Test_SectionContents(FALSE); + Test_SectionContents(TRUE); Test_EmptyFile(); Test_Truncate(); }

6 years, 6 months

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 June 2018