Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[tfaber] 74624: [HHPCOMP] - Avoid casting pointers to 'unsigned long'

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 22 12:50:08 2017 New Revision: 74624 URL: http://svn.reactos.org/svn/reactos?rev=74624&view=rev Log: [HHPCOMP] - Avoid casting pointers to 'unsigned long' Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/list.h Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/hhpcomp/chmc/lis… ============================================================================== --- trunk/reactos/sdk/tools/hhpcomp/chmc/list.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/hhpcomp/chmc/list.h [iso-8859-1] Mon May 22 12:50:08 2017 @@ -186,8 +186,13 @@ * @type: the type of the struct this is embedded in. * @member: the name of the list_struct within the struct. */ +#ifdef __REACTOS__ +#define list_entry(ptr, type, member) \ + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) +#else /* __REACTOS__ */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) +#endif /* __REACTOS__ */ /** * list_for_each - iterate over a list

7 years, 7 months

[tfaber] 74623: [HAL] - Correctly prepare the I/O port map for V86 mode by making HalpSavedIoMap actually point to it instead of to the parent structure. Fixes boot with video BIOS code that relies...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 22 12:20:31 2017 New Revision: 74623 URL: http://svn.reactos.org/svn/reactos?rev=74623&view=rev Log: [HAL] - Correctly prepare the I/O port map for V86 mode by making HalpSavedIoMap actually point to it instead of to the parent structure. Fixes boot with video BIOS code that relies on I/O ports FF00 through FFFF. CORE-13306 #resolve Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Mon May 22 12:20:31 2017 @@ -390,7 +390,7 @@ // // Loop the I/O Map // - for (i = j = 0; i < (IOPM_SIZE) / 2; i++) + for (i = j = 0; i < IOPM_SIZE / sizeof(USHORT); i++) { // // Check for non-FFFF entry @@ -415,7 +415,10 @@ // // Terminate it // - while (i++ < (IOPM_FULL_SIZE / 2)) *Entry++ = 0xFFFF; + while (i++ < IOPM_FULL_SIZE / sizeof(USHORT)) + { + *Entry++ = 0xFFFF; + } // // Return the entries we saved @@ -542,7 +545,7 @@ // // Save a copy of the I/O Map and delete it // - HalpSavedIoMap = (PUSHORT)&(KeGetPcr()->TSS->IoMaps[0]); + HalpSavedIoMap = (PUSHORT)KeGetPcr()->TSS->IoMaps[0].IoMap; HalpStoreAndClearIopm(); //

7 years, 7 months

[hbelusca] 74622: [USETUP]: Improve the NTOS installations detector. In all the disks/partitions available, it searches for the presence of freeldr.ini / boot.ini, open & parse them, and enumerates...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 22 01:19:08 2017 New Revision: 74622 URL: http://svn.reactos.org/svn/reactos?rev=74622&view=rev Log: [USETUP]: Improve the NTOS installations detector. In all the disks/partitions available, it searches for the presence of freeldr.ini / boot.ini, open & parse them, and enumerates the available boot entries (as candidates for installations). For each of them, it maps their ARC paths into the NT namespace (hence the ARC 2 NT path resolver committed in r74621), then attempts to detect in these paths the existence of NTOS installations. The code needs some cleaning (and factoring out redundancies, etc...) but works: http://i.imgur.com/cSDN3La.png In this example, there is a ReactOS installation on the second primary partition "D:" formatted in FAT32, and a Windows installation on the logical partition "F:" and they are correctly recognized as such (the ARC paths in the freeldr.ini/boot.ini are mapped to NT paths from which we can recognize the presence of an installation, then the hard-disk & partition numbers are mapped back to the correct partition, and from there the partition letters are retrieved correctly and displayed in the installations list on the left in the screenshot). NOTE: If you try to compile the usetup branch, it won't (yet), because I don't commit yet some local changes I have regarding how the functions DoesPathExist() and DoesFileExist() are used (I'm trying to stabilize their interface). Modified: branches/setup_improvements/base/setup/usetup/osdetect.c branches/setup_improvements/base/setup/usetup/osdetect.h Modified: branches/setup_improvements/base/setup/usetup/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Mon May 22 01:19:08 2017 @@ -92,28 +92,41 @@ // {BootMgr, L"bootmgr" , ???} }; -#if 0 - -static VOID -EnumerateInstallationsFreeLdr() + +static BOOLEAN +IsValidNTOSInstallation( + IN HANDLE SystemRootDirectory OPTIONAL, + IN PCWSTR SystemRoot OPTIONAL); + +static PNTOS_INSTALLATION +AddNTOSInstallation( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot, + IN PCWSTR InstallationName); + +static NTSTATUS +FreeLdrEnumerateInstallations( + IN OUT PGENERIC_LIST List, + IN PPARTLIST PartList, + // IN PPARTENTRY PartEntry, + IN PCHAR FileBuffer, + IN ULONG FileLength) { NTSTATUS Status; PINICACHE IniCache; - PINICACHESECTION IniSection; - PINICACHESECTION OsIniSection; - WCHAR SectionName[80]; - WCHAR OsName[80]; - WCHAR SystemPath[200]; - WCHAR SectionName2[200]; - PWCHAR KeyData; - ULONG i,j; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection, OsIniSection; + PWCHAR SectionName, KeyData; + WCHAR InstallName[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoad(&IniCache, IniPath, FALSE); + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); if (!NT_SUCCESS(Status)) return Status; - /* Get "Operating Systems" section */ + /* Get the "Operating Systems" section */ IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); if (IniSection == NULL) { @@ -121,69 +134,335 @@ return STATUS_UNSUCCESSFUL; } - /* NOTE that we enumerate all the valid installations, not just the default one */ - while (TRUE) - { - Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + /* 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); + StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), + Begin, End - Begin); + } + else + { + /* Non-quoted name, copy everything */ + StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + } + + DPRINT1("Possible installation '%S' 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 SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (!NT_SUCCESS(Status)) - break; - - // TODO some foobaring... - - // TODO 2 : Remind the entry name so that we may display it as available installation... - - /* Search for an existing ReactOS entry */ - OsIniSection = IniCacheGetSection(IniCache, SectionName2); - if (OsIniSection != NULL) - { - BOOLEAN UseExistingEntry = TRUE; - - /* Check for supported boot type "Windows2003" */ - Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); - if (NT_SUCCESS(Status)) + { + DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); + continue; + } + + { + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + DPRINT1(" Found a candidate Win2k3 install '%S' with ARC path '%S'\n", InstallName, KeyData); + + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + + // TODO 1: Normalize the ARC path. + + // TODO 2: Check whether we already have an installation with this ARC path. + // If that's the case, stop there. If not, 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)) + { + DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", KeyData); + // FIXME: Do not continue! + continue; + } + + DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", KeyData, &SystemRootPath); + + // TODO 3: Check whether we already have an installation with this NT path. + // If that's the case, stop there. If not, continue... + + /* 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)) + { + ULONG DiskNumber, PartitionNumber; + PCWSTR PathComponent; + 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)) { - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"Windows2003") != 0) && - (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) - { - /* This is not a ReactOS entry */ - UseExistingEntry = FALSE; - } + 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 { - UseExistingEntry = FALSE; + DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); } - if (UseExistingEntry) + if (PartEntry && PartEntry->DriveLetter) { - /* BootType is Windows2003. Now check SystemPath. */ - Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); - if (NT_SUCCESS(Status)) - { - swprintf(SystemPath, L"\"%s\"", ArcPath); - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, ArcPath) != 0) && - (_wcsicmp(KeyData, SystemPath) != 0) )) - { - /* This entry is a ReactOS entry, but the SystemRoot - does not match the one we are looking for. */ - UseExistingEntry = FALSE; - } - } - else - { - UseExistingEntry = FALSE; - } + /* We have retrieved a partition that is mounted */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", + PartEntry->DriveLetter, PathComponent, InstallName); } - } - } - + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", + &SystemRootPath, InstallName); + } + AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, KeyData, InstallNameW); + } + + NtClose(SystemRootDirectory); + } + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: IniCacheDestroy(IniCache); -} - -#endif - + 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; + WCHAR InstallName[MAX_PATH]; + + /* 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); + StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), + Begin, End - Begin); + } + else + { + /* Non-quoted name, copy everything */ + StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + } + + DPRINT1("Possible installation '%S' with ARC path '%S'\n", InstallName, SectionName); + + // FIXME TODO: Determine whether we indeed have an ARC path, in which case + // this is an NT installation, or, whether we have something else like a DOS + // path, which means that we are booting a boot sector... + + DPRINT1(" Found a Win2k3 install '%S' with ARC path '%S'\n", InstallName, SectionName); + // TODO: Dissect it in order to retrieve the real disk drive & partition numbers. + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + { + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + + // TODO 1: Normalize the ARC path. + + // TODO 2: Check whether we already have an installation with this ARC path. + // If that's the case, stop there. If not, 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, SectionName, PartList)) + { + DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", SectionName); + // FIXME: Do not continue! + continue; + } + + DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", SectionName, &SystemRootPath); + + // TODO 3: Check whether we already have an installation with this NT path. + // If that's the case, stop there. If not, continue... + + /* 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)) + { + ULONG DiskNumber, PartitionNumber; + PCWSTR PathComponent; + 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 \"%s\"", + PartEntry->DriveLetter, PathComponent, InstallName); + } + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", + &SystemRootPath, InstallName); + } + AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, SectionName, InstallNameW); + } + + NtClose(SystemRootDirectory); + } + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} /*** *wchar_t *wcsstr(string1, string2) - search for string2 in string1 @@ -234,8 +513,8 @@ CheckForValidPEAndVendor( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL - IN PCWSTR VendorName // Better would be OUT PCWSTR*, and the function returning NTSTATUS ? + IN PCWSTR FileName, // OPTIONAL + OUT PUNICODE_STRING VendorName ) { BOOLEAN Success = FALSE; @@ -247,18 +526,24 @@ PVOID pvData = NULL; UINT BufLen = 0; + if (VendorName->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *VendorName->Buffer = UNICODE_NULL; + VendorName->Length = 0; + Status = OpenAndMapFile(RootDirectory, PathName, FileName, - &FileHandle, &SectionHandle, &ViewBase); + &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file %wZ, Status 0x%08lx\n", &FileName, Status); + DPRINT1("Failed to open and map file %S, Status 0x%08lx\n", FileName, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File %wZ does not seem to be a valid PE, bail out\n", &FileName); + DPRINT1("File %S does not seem to be a valid PE, bail out\n", FileName); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -270,7 +555,7 @@ Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); + DPRINT1("Failed to get version resource for file %S, Status 0x%08lx\n", FileName, Status); goto UnmapFile; } @@ -279,7 +564,6 @@ { USHORT wCodePage = 0, wLangID = 0; WCHAR FileInfo[MAX_PATH]; - UNICODE_STRING Vendor; wCodePage = LOWORD(*(ULONG*)pvData); wLangID = HIWORD(*(ULONG*)pvData); @@ -289,21 +573,26 @@ wCodePage, wLangID); Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); - if (NT_SUCCESS(Status) && pvData) + + /* Fixup the Status in case pvData is NULL */ + if (NT_SUCCESS(Status) && !pvData) + Status = STATUS_NOT_FOUND; + + if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); - Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); - - DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); - - Success = !!FindSubStrI(pvData, VendorName); - } - else - { - DPRINT1("No version vendor found for file %wZ\n", &FileName); - } - } + DPRINT1("Found version vendor: \"%S\" for file %S\n", pvData, FileName); + + StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, + pvData, BufLen * sizeof(WCHAR)); + VendorName->Length = wcslen(VendorName->Buffer) * sizeof(WCHAR); + + Success = TRUE; + } + } + + if (!NT_SUCCESS(Status)) + DPRINT1("No version vendor found for file %S\n", FileName); UnmapFile: /* Finally, unmap and close the file */ @@ -313,36 +602,55 @@ return Success; } +// +// TODO: Instead of returning TRUE/FALSE, it would be nice to return +// a flag indicating: +// - whether the installation is actually valid; +// - if it's broken or not (aka. needs for repair, or just upgrading). +// static BOOLEAN IsValidNTOSInstallation( - IN HANDLE PartitionHandle, - IN PCWSTR SystemRoot) + IN HANDLE SystemRootDirectory OPTIONAL, + IN PCWSTR SystemRoot OPTIONAL) { BOOLEAN Success = FALSE; USHORT i; WCHAR PathBuffer[MAX_PATH]; - - // DoesPathExist(PartitionHandle, SystemRoot, L"System32\\"); etc... + UNICODE_STRING VendorName; + + /* + * 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... /* Check for the existence of \SystemRoot\System32 */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // 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, L"System32\\drivers\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // 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, L"System32\\config\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; @@ -353,38 +661,64 @@ * 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(PartitionHandle, SystemRoot, L"System32\\config\\SYSTEM")) + if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) { // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } - if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SOFTWARE")) + if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) { // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif - for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) - { - /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and verify its version */ - Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntoskrnl.exe", KnownVendors[i]); - - /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ - - /* Check for the existence of \SystemRoot\System32\ntdll.dll */ - Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntdll.dll", KnownVendors[i]); - - /* We have found a correct vendor combination */ - if (Success) - break; + RtlInitEmptyUnicodeString(&VendorName, PathBuffer, sizeof(PathBuffer)); + + /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ + Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, 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"); + + /* The kernel gives the OS its flavour */ + if (Success) + { + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) + { + Success = !!FindSubStrI(VendorName.Buffer, KnownVendors[i]); + if (Success) + { + /* We have found a correct vendor combination */ + DPRINT1("IsValidNTOSInstallation: We've got an NTOS installation from %S !\n", KnownVendors[i]); + break; + } + } + } + + /* 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); + if (!Success) + DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); + if (Success) + { + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) + { + 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]); + break; + } + } } return Success; } static VOID -ListNTOSInstalls( +DumpNTOSInstalls( IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; @@ -455,6 +789,10 @@ { DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot %S\n", NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, NtOsInstall->SystemRoot); + // + // NOTE: We may use its "IsDefault" attribute, and only keep the entries that have IsDefault == TRUE... + // Setting IsDefault to TRUE would imply searching for the "Default" entry in the loader configuration file. + // return NtOsInstall; } @@ -477,9 +815,9 @@ static VOID FindNTOSInstallations( - IN PGENERIC_LIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber) + IN OUT PGENERIC_LIST List, + IN PPARTLIST PartList, + IN PPARTENTRY PartEntry) { NTSTATUS Status; UINT i; @@ -489,15 +827,18 @@ UNICODE_STRING PartitionRootPath; HANDLE SectionHandle; // SIZE_T ViewSize; + ULONG FileSize; PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; + +PDISKENTRY DiskEntry = PartEntry->DiskEntry; +ULONG DiskNumber = DiskEntry->DiskNumber; +ULONG PartitionNumber = PartEntry->PartitionNumber; /* Set PartitionRootPath */ - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu\\", - DiskNumber, PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskNumber, PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); @@ -532,7 +873,7 @@ /* Check whether the loader configuration file exists */ Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase); + &FileHandle, &SectionHandle, &ViewBase, &FileSize); if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ @@ -542,31 +883,21 @@ } /* The loader configuration file exists, interpret it to find valid installations */ - // TODO!! - DPRINT1("TODO: Analyse the OS installations inside %S !\n", NtosBootLoaders[i].LoaderConfigurationFile); - - // Here we get a SystemRootPath for each installation // FIXME! - // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... - StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"WINDOWS\\"); - if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) - { - DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", - DiskNumber, PartitionNumber, SystemRoot); - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", - 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"Windows (placeholder)"); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); - } - - // Here we get a SystemRootPath for each installation // FIXME! - // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... - StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"ReactOS\\"); - if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) - { - DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", - DiskNumber, PartitionNumber, SystemRoot); - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", - 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"ReactOS (placeholder)"); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); + 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; } /* Finally, unmap and close the file */ @@ -623,6 +954,8 @@ { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); Entry2 = Entry2->Flink; + + ASSERT(PartEntry->DiskEntry == DiskEntry); DPRINT1(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, @@ -634,7 +967,7 @@ ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); if (ShouldICheckThisPartition(PartEntry)) - FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + FindNTOSInstallations(List, PartList, PartEntry); } /* Then, the logical partitions (present in the extended partition) */ @@ -643,6 +976,8 @@ { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); Entry2 = Entry2->Flink; + + ASSERT(PartEntry->DiskEntry == DiskEntry); DPRINT1(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, @@ -654,12 +989,12 @@ ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); if (ShouldICheckThisPartition(PartEntry)) - FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + FindNTOSInstallations(List, PartList, PartEntry); } } /**** Debugging: List all the collected installations ****/ - ListNTOSInstalls(List); + DumpNTOSInstalls(List); return List; } Modified: branches/setup_improvements/base/setup/usetup/osdetect.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.h [iso-8859-1] Mon May 22 01:19:08 2017 @@ -4,8 +4,12 @@ LIST_ENTRY ListEntry; ULONG DiskNumber; ULONG PartitionNumber; -// Vendor???? - WCHAR SystemRoot[MAX_PATH]; + PPARTENTRY PartEntry; +// BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. +// Vendor???? (Microsoft / ReactOS) +/**/WCHAR SystemRoot[MAX_PATH];/**/ + UNICODE_STRING SystemArcPath; // Normalized ARC path + UNICODE_STRING SystemNtPath; // Corresponding NT path /**/WCHAR InstallationName[MAX_PATH];/**/ } NTOS_INSTALLATION, *PNTOS_INSTALLATION;

7 years, 7 months

[hbelusca] 74621: [USETUP]: SetupLib: Add an ARC path to (and from) NT path resolver. It allows mapping between an ARC path as specified in freeldr.ini / boot.ini , to its corresponding NT path, if...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 22 01:09:35 2017 New Revision: 74621 URL: http://svn.reactos.org/svn/reactos?rev=74621&view=rev Log: [USETUP]: SetupLib: Add an ARC path to (and from) NT path resolver. It allows mapping between an ARC path as specified in freeldr.ini / boot.ini , to its corresponding NT path, if possible. Currently, only the mapping direction "ARC to NT" is implemented. It will be used wherever such mappings are needed, for example when identifying the ReactOS / Windows installations from the available freeldr.ini / boot.ini entries (for upgrading / repair purposes). The resolver supports the usual ARC paths: multi()disk()[r|f]disk()[partition()] ; eisa()disk()[r|f]disk()[partition()] ; multi()disk()cdrom() ; scsi()disk()[r|f]disk()[partition()] ; scsi()cdrom()fdisk() ; ramdisk(x) ; net(x) (actually reported as "unsupported" since it would map to some path on some network), and the newly-introduced Win2k signature()disk()rdisk()[partition()]. Code is in progress, I need to clean up the references list. I also add some validation tests I used during implementing the resolver. Added: branches/setup_improvements/base/setup/lib/arcname.c (with props) branches/setup_improvements/base/setup/lib/arcname.h (with props) branches/setup_improvements/base/setup/lib/arcname_tests.c (with props) Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/setuplib.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Mon May 22 01:09:35 2017 @@ -1,5 +1,6 @@ list(APPEND SOURCE + arcname.c fsutil.c genlist.c ntverrsrc.c Added: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c (added) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Mon May 22 01:09:35 2017 @@ -0,0 +1,861 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: base/setup/lib/arcname.c + * PURPOSE: ARC path to-and-from NT path resolver. + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ +/* + * References: + * + * - ARC Specification v1.2: http://netbsd.org./docs/Hardware/Machines/ARC/riscspec.pdf + * - "Setup and Startup", MSDN article: https://technet.microsoft.com/en-us/library/cc977184.aspx + * - Answer for "How do I determine the ARC path for a particular drive letter in Windows?": https://serverfault.com/a/5929 + * - ARC - LinuxMIPS: https://www.linux-mips.org/wiki/ARC + * - ARCLoad - LinuxMIPS: https://www.linux-mips.org/wiki/ARCLoad + * - Inside Windows 2000 Server: https://books.google.fr/books?id=kYT7gKnwUQ8C&pg=PA71&lpg=PA71&dq=nt+arc+pa… + * - Inside Windows Server 2003: https://books.google.fr/books?id=zayrcM9ZYdAC&pg=PA61&lpg=PA61&dq=arc+path+… + * + * Stuff to read: http://www.adminxp.com/windows2000/index.php?aid=46 and http://www.trcb.com/Computers-and-Technology/Windows-XP/Windows-XP-ARC-Nami… + * concerning which values of disk() or rdisk() are valid when either scsi() or multi() adapters are specified. + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "partlist.h" +#include "arcname.h" + +#define NDEBUG +#include <debug.h> + + +/* Supported adapter types */ +typedef enum _ADAPTER_TYPE +{ + EisaAdapter, + ScsiAdapter, + MultiAdapter, + NetAdapter, + RamdiskAdapter, + AdapterTypeMax +} ADAPTER_TYPE, *PADAPTER_TYPE; +const PCSTR AdapterTypes_A[] = +{ + "eisa", + "scsi", + "multi", + "net", + "ramdisk", + NULL +}; +const PCWSTR AdapterTypes_U[] = +{ + L"eisa", + L"scsi", + L"multi", + L"net", + L"ramdisk", + NULL +}; + +/* Supported controller types */ +typedef enum _CONTROLLER_TYPE +{ + DiskController, + CdRomController, + ControllerTypeMax +} CONTROLLER_TYPE, *PCONTROLLER_TYPE; +const PCSTR ControllerTypes_A[] = +{ + "disk", + "cdrom", + NULL +}; +const PCWSTR ControllerTypes_U[] = +{ + L"disk", + L"cdrom", + NULL +}; + +/* Supported peripheral types */ +typedef enum _PERIPHERAL_TYPE +{ +// VDiskPeripheral, + RDiskPeripheral, + FDiskPeripheral, + CdRomPeripheral, + PeripheralTypeMax +} PERIPHERAL_TYPE, *PPERIPHERAL_TYPE; +const PCSTR PeripheralTypes_A[] = +{ +// "vdisk", // Enable this when we'll support boot from virtual disks! + "rdisk", + "fdisk", + "cdrom", + NULL +}; +const PCWSTR PeripheralTypes_U[] = +{ +// L"vdisk", // Enable this when we'll support boot from virtual disks! + L"rdisk", + L"fdisk", + L"cdrom", + NULL +}; + + +/* FUNCTIONS ****************************************************************/ + +PCSTR +ArcGetNextTokenA( + IN PCSTR ArcPath, + OUT PANSI_STRING TokenSpecifier, + OUT PULONG Key) +{ + HRESULT hr; + PCSTR p = ArcPath; + ULONG SpecifierLength; + ULONG KeyValue; + + /* + * We must have a valid "specifier(key)" string, where 'specifier' + * cannot be the empty string, and is followed by '('. + */ + p = strchr(p, '('); + if (p == NULL) + return NULL; /* No '(' found */ + if (p == ArcPath) + return NULL; /* Path starts with '(' and is thus invalid */ + + SpecifierLength = (p - ArcPath) * sizeof(CHAR); + + /* + * The strtoul function skips any leading whitespace. + * + * Note that if the token is "specifier()" then strtoul won't perform + * any conversion and return 0, therefore effectively making the token + * equivalent to "specifier(0)", as it should be. + */ + // KeyValue = atoi(p); + KeyValue = strtoul(p, (PSTR*)&p, 10); + + /* Skip any trailing whitespace */ + while (*p && isspace(*p)) ++p; + + /* The token must terminate with ')' */ + if (*p != ')') + return NULL; +#if 0 + p = strchr(p, ')'); + if (p == NULL) + return NULL; +#endif + + /* We should have succeeded, copy the token specifier in the buffer */ + hr = StringCbCopyNA(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (FAILED(hr)) + return NULL; + + TokenSpecifier->Length = strlen(TokenSpecifier->Buffer) * sizeof(CHAR); + + /* We succeeded, return the token key value */ + *Key = KeyValue; + + /* Next token starts just after */ + return ++p; +} + +PCWSTR +ArcGetNextTokenU( + IN PCWSTR ArcPath, + OUT PUNICODE_STRING TokenSpecifier, + OUT PULONG Key) +{ + HRESULT hr; + PCWSTR p = ArcPath; + ULONG SpecifierLength; + ULONG KeyValue; + + /* + * We must have a valid "specifier(key)" string, where 'specifier' + * cannot be the empty string, and is followed by '('. + */ + p = wcschr(p, L'('); + if (p == NULL) + return NULL; /* No '(' found */ + if (p == ArcPath) + return NULL; /* Path starts with '(' and is thus invalid */ + + SpecifierLength = (p - ArcPath) * sizeof(WCHAR); + + ++p; + + /* + * The strtoul function skips any leading whitespace. + * + * Note that if the token is "specifier()" then strtoul won't perform + * any conversion and return 0, therefore effectively making the token + * equivalent to "specifier(0)", as it should be. + */ + // KeyValue = _wtoi(p); + KeyValue = wcstoul(p, (PWSTR*)&p, 10); + ASSERT(p); + + /* Skip any trailing whitespace */ + while (*p && iswspace(*p)) ++p; + + /* The token must terminate with ')' */ + if (*p != L')') + return NULL; +#if 0 + p = wcschr(p, L')'); + if (p == NULL) + return NULL; +#endif + + /* We should have succeeded, copy the token specifier in the buffer */ + hr = StringCbCopyNW(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (FAILED(hr)) + return NULL; + + TokenSpecifier->Length = wcslen(TokenSpecifier->Buffer) * sizeof(WCHAR); + + /* We succeeded, return the token key value */ + *Key = KeyValue; + + /* Next token starts just after */ + return ++p; +} + + +ULONG +ArcMatchTokenA( + IN PCSTR CandidateToken, + IN const PCSTR* TokenTable) +{ + ULONG Index = 0; + + while (TokenTable[Index] && _stricmp(CandidateToken, TokenTable[Index]) != 0) + { + ++Index; + } + + return Index; +} + +ULONG +ArcMatchTokenU( + IN PCWSTR CandidateToken, + IN const PCWSTR* TokenTable) +{ + ULONG Index = 0; + + while (TokenTable[Index] && _wcsicmp(CandidateToken, TokenTable[Index]) != 0) + { + ++Index; + } + + return Index; +} + +ULONG +ArcMatchToken_UStr( + IN PCUNICODE_STRING CandidateToken, + IN const PCWSTR* TokenTable) +{ + ULONG Index = 0; +#if 0 + SIZE_T Length; +#else + UNICODE_STRING Token; +#endif + + while (TokenTable[Index]) + { +#if 0 + Length = wcslen(TokenTable[Index])*sizeof(WCHAR); + if (RtlCompareMemory(CandidateToken->Buffer, TokenTable[Index], Length) == Length) + break; +#else + RtlInitUnicodeString(&Token, TokenTable[Index]); + // if (RtlCompareUnicodeString(CandidateToken, &Token, TRUE) == 0) + if (RtlEqualUnicodeString(CandidateToken, &Token, TRUE)) + break; +#endif + + ++Index; + } + + return Index; +} + + +BOOLEAN +ArcPathNormalize( + OUT PUNICODE_STRING NormalizedArcPath, + IN PCWSTR ArcPath) +{ + HRESULT hr; + PCWSTR EndOfArcName; + PCWSTR p; + + if (NormalizedArcPath->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *NormalizedArcPath->Buffer = UNICODE_NULL; + NormalizedArcPath->Length = 0; + + EndOfArcName = wcschr(ArcPath, OBJ_NAME_PATH_SEPARATOR); + if (!EndOfArcName) + EndOfArcName = ArcPath + wcslen(ArcPath); + + while ((p = wcsstr(ArcPath, L"()")) && (p < EndOfArcName)) + { +#if 0 + hr = StringCbCopyNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); +#else + hr = StringCbCatNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); +#endif + if (FAILED(hr)) + return FALSE; + hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, L"(0)"); + if (FAILED(hr)) + return FALSE; +#if 0 + NormalizedArcPath->Buffer += wcslen(NormalizedArcPath->Buffer); +#endif + ArcPath = p + 2; + } + hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, ArcPath); + if (FAILED(hr)) + return FALSE; + + NormalizedArcPath->Length = wcslen(NormalizedArcPath->Buffer) * sizeof(WCHAR); + return TRUE; +} + + +/* + * ArcName: + * ARC name (counted string) to be resolved into a NT device name. + * The caller should have already delimited it from within an ARC path + * (usually by finding where the first path separator appears in the path). + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + */ +static NTSTATUS +ResolveArcNameNtSymLink( + OUT PUNICODE_STRING NtName, + IN PUNICODE_STRING ArcName) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DirectoryHandle, LinkHandle; + UNICODE_STRING ArcNameDir; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* Open the \ArcName object directory */ + RtlInitUnicodeString(&ArcNameDir, L"\\ArcName"); + InitializeObjectAttributes(&ObjectAttributes, + &ArcNameDir, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenDirectoryObject(&DirectoryHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenDirectoryObject(%wZ) failed, Status 0x%08lx\n", &ArcNameDir, Status); + return Status; + } + + /* Open the ARC name link */ + InitializeObjectAttributes(&ObjectAttributes, + ArcName, + OBJ_CASE_INSENSITIVE, + DirectoryHandle, + NULL); + Status = NtOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + + /* Close the \ArcName object directory handle */ + NtClose(DirectoryHandle); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + return Status; + } + + /* Reserve one WCHAR for the NULL-termination */ + NtName->MaximumLength -= sizeof(UNICODE_NULL); + + /* Resolve the link */ + Status = NtQuerySymbolicLinkObject(LinkHandle, NtName, NULL); + + /* Restore the NULL-termination */ + NtName->MaximumLength += sizeof(UNICODE_NULL); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed, don't touch NtName */ + DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + } + else + { + /* We succeeded, NULL-terminate NtName */ + NtName->Buffer[NtName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + NtClose(LinkHandle); + return Status; +} + +/* + * ArcNamePath: + * In input, pointer to an ARC path (NULL-terminated) starting by an ARC name + * to be resolved into a NT device name. + * In opposition to ResolveArcNameNtSymLink(), the caller does not have to + * delimit the ARC name from within an ARC path. The real ARC name is deduced + * after parsing the ARC path, and, in output, ArcNamePath points to the + * beginning of the path after the ARC name part. + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + * + * PartList: + * (Optional) partition list that helps in resolving the paths pointing + * to hard disks. + */ +static NTSTATUS +ResolveArcNameManually( + OUT PUNICODE_STRING NtName, + IN OUT PCWSTR* ArcNamePath, + IN PPARTLIST PartList OPTIONAL) +{ + HRESULT hr; + WCHAR TokenBuffer[50]; + UNICODE_STRING Token; + PCWSTR p, q; + ULONG AdapterKey; + ULONG ControllerKey; + ULONG PeripheralKey; + ULONG PartitionNumber; + ADAPTER_TYPE AdapterType; + CONTROLLER_TYPE ControllerType; + PERIPHERAL_TYPE PeripheralType; + BOOLEAN UseSignature = FALSE; + + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* + * The format of ArcName is: + * adapter(www)[controller(xxx)peripheral(yyy)[partition(zzz)][filepath]] , + * where the [filepath] part is not being parsed. + */ + + RtlInitEmptyUnicodeString(&Token, TokenBuffer, sizeof(TokenBuffer)); + + p = *ArcNamePath; + + /* Retrieve the adapter */ + p = ArcGetNextTokenU(p, &Token, &AdapterKey); + if (!p) + { + DPRINT1("No adapter specified!\n"); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Check for the 'signature()' pseudo-adapter, introduced in Windows 2000 */ + if (_wcsicmp(Token.Buffer, L"signature") == 0) + { + /* + * We've got a signature! Remember this for later, and set the adapter type to SCSI. + * We however check that the rest of the ARC path is valid by parsing the other tokens. + * AdapterKey stores the disk signature value (that holds in a ULONG). + */ + UseSignature = TRUE; + AdapterType = ScsiAdapter; + } + else + { + /* Check for regular adapters */ + AdapterType = (ADAPTER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, AdapterTypes_U); + if (AdapterType >= AdapterTypeMax) + { + DPRINT1("Invalid adapter type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Check for adapters that don't take any extra controller or peripheral nodes */ + if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) + { + // if (*p) + // return STATUS_OBJECT_PATH_SYNTAX_BAD; + + if (AdapterType == NetAdapter) + { + DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_NOT_SUPPORTED; + } + + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Ramdisk%lu", AdapterKey); + goto Quit; + } + } + + /* Here, we have either an 'eisa', a 'scsi/signature', or a 'multi' adapter */ + + /* Check for a valid controller */ + p = ArcGetNextTokenU(p, &Token, &ControllerKey); + if (!p) + { + DPRINT1("%S(%lu) adapter doesn't have a controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + ControllerType = (CONTROLLER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, ControllerTypes_U); + if (ControllerType >= ControllerTypeMax) + { + DPRINT1("Invalid controller type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Here the controller can only be either a disk or a CDROM */ + + /* + * Ignore the controller in case we have a 'multi' adapter. + * I guess a similar condition holds for the 'eisa' adapter too... + * + * For SignatureAdapter, as similar for ScsiAdapter, the controller key corresponds + * to the disk target ID. Note that actually, the implementation just ignores the + * target ID, as well as the LUN, and just loops over all the available disks and + * searches for the one having the correct signature. + */ + if ((AdapterType == MultiAdapter /* || AdapterType == EisaAdapter */) && ControllerKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + ControllerKey = 0; + } + + /* + * Only the 'scsi' adapter supports a direct 'cdrom' controller. + * For the others, we need a 'disk' controller to which a 'cdrom' peripheral can talk to. + */ + if ((AdapterType != ScsiAdapter) && (ControllerType == CdRomController)) + { + DPRINT1("%S(%lu) adapter cannot have a CDROM controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* Check for a valid peripheral */ + p = ArcGetNextTokenU(p, &Token, &PeripheralKey); + if (!p) + { + DPRINT1("%S(%lu)%S(%lu) adapter-controller doesn't have a peripheral!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + PeripheralType = (PERIPHERAL_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, PeripheralTypes_U); + if (PeripheralType >= PeripheralTypeMax) + { + DPRINT1("Invalid peripheral type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* + * If we had a 'cdrom' controller already, the corresponding peripheral can only be 'fdisk' + * (see for example the ARC syntax for SCSI CD-ROMs: scsi(x)cdrom(y)fdisk(z) where z == 0). + */ + if ((ControllerType == CdRomController) && (PeripheralType != FDiskPeripheral)) + { + DPRINT1("%S(%lu) controller cannot have a %S(%lu) peripheral! (note that we haven't check whether the adapter was SCSI or not)\n", + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* For a 'scsi' adapter, the possible peripherals are only 'rdisk' or 'fdisk' */ + if (AdapterType == ScsiAdapter && !(PeripheralType == RDiskPeripheral || PeripheralType == FDiskPeripheral)) + { + DPRINT1("%S(%lu)%S(%lu) SCSI adapter-controller has an invalid peripheral %S(%lu) !\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + +#if 0 + if (AdapterType == SignatureAdapter && PeripheralKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + PeripheralKey = 0; + } +#endif + + /* Check for the optional 'partition' specifier */ + q = ArcGetNextTokenU(p, &Token, &PartitionNumber); + if (q && _wcsicmp(Token.Buffer, L"partition") == 0) + { + /* We've got a partition! */ + p = q; + } + else + { + /* + * Either no other ARC token was found, or we've got something else + * (possibly invalid or not)... + */ + PartitionNumber = 0; + } + + + // TODO: Check the partition number in case of fdisks and cdroms?? + + + if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral + hr = StringCbPrintfW(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); + else + if (PeripheralType == FDiskPeripheral) + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Floppy%lu", PeripheralKey); + else + if (PeripheralType == RDiskPeripheral) + { + if (UseSignature) + { + /* The disk signature is stored in AdapterKey */ + DiskEntry = GetDiskBySignature(PartList, AdapterKey); + } + else + { + DiskEntry = GetDiskBySCSI(PartList, AdapterKey, + ControllerKey, PeripheralKey); + } + if (!DiskEntry) + return STATUS_OBJECT_PATH_NOT_FOUND; // STATUS_NOT_FOUND; + + if (PartitionNumber != 0) + { + PartEntry = GetPartition(DiskEntry, PartitionNumber); + if (!PartEntry) + return STATUS_OBJECT_PATH_NOT_FOUND; // STATUS_DEVICE_NOT_PARTITIONED; + ASSERT(PartEntry->DiskEntry == DiskEntry); + } + + hr = StringCbPrintfW(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); + } +#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; + } + + *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, + IN PCWSTR ArcPath, + IN PPARTLIST PartList OPTIONAL) +{ + NTSTATUS Status; + PCWSTR BeginOfPath; + UNICODE_STRING ArcName; + + /* TODO: We should "normalize" the path, i.e. expand all the xxx() into xxx(0) */ + + if (NtPath->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *NtPath->Buffer = UNICODE_NULL; + NtPath->Length = 0; + + /* + * - First, check whether the ARC path is already inside \\ArcName + * and if so, map it to the corresponding NT path. + * - Only then, if we haven't found any ArcName, try to build a + * NT path by deconstructing the ARC path, using its disk and + * partition numbers. We may use here our disk/partition list. + * + * See also freeldr/arcname.c + * + * Note that it would be nice to maintain a cache of these mappings. + */ + + /* + * Initialize the ARC name to resolve, by cutting the ARC path at the first + * NT path separator. The ARC name therefore ends where the NT path part starts. + */ + RtlInitUnicodeString(&ArcName, ArcPath); + BeginOfPath = wcschr(ArcName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (BeginOfPath) + ArcName.Length = (ULONG_PTR)BeginOfPath - (ULONG_PTR)ArcName.Buffer; + + /* Resolve the ARC name via NT SymLinks. Note that NtPath is returned NULL-terminated. */ + Status = ResolveArcNameNtSymLink(NtPath, &ArcName); + if (!NT_SUCCESS(Status)) + { + /* We failed, attempt a manual resolution */ + DPRINT1("ResolveArcNameNtSymLink(ArcName = '%wZ') for ArcPath = '%S' failed, Status 0x%08lx\n", &ArcName, ArcPath, Status); + + /* + * We failed at directly resolving the ARC path, and we cannot perform + * a manual resolution because we don't have any disk/partition list, + * we therefore fail here. + */ + if (!PartList) + { + DPRINT1("PartList == NULL, cannot perform a manual resolution\n"); + return FALSE; + } + + *NtPath->Buffer = UNICODE_NULL; + NtPath->Length = 0; + + BeginOfPath = ArcPath; + Status = ResolveArcNameManually(NtPath, &BeginOfPath, PartList); + if (!NT_SUCCESS(Status)) + { + /* We really failed this time, bail out */ + DPRINT1("ResolveArcNameManually(ArcPath = '%S') failed, Status 0x%08lx\n", ArcPath, Status); + return FALSE; + } + } + + /* + * We succeeded. Concatenate the rest of the system-specific path. We know the path is going + * to be inside the NT namespace, therefore we can use the path string concatenation function + * that uses '\\' as the path separator. + */ + if (BeginOfPath && *BeginOfPath) + { + HRESULT hr; + hr = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); + if (FAILED(hr)) + { + /* Buffer not large enough, or whatever...: just bail out */ + return FALSE; + } + } + NtPath->Length = wcslen(NtPath->Buffer) * sizeof(WCHAR); + return TRUE; +} + +#if 0 +PWSTR +NtPathToArcPath( + IN PWSTR NtPath) +{ + /* + * - First, check whether any of the ARC paths inside \\ArcName + * map to the corresponding NT path. If so, we are OK. + * - Only then, if we haven't found any ArcName, try to build an + * ARC path by deconstructing the NT path, using its disk and + * partition numbers. We may use here our disk/partition list. + * + * See also freeldr/arcname.c + * + * Note that it would be nice to maintain a cache of these mappings. + */ +} +#endif + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/arcname.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/lib/arcname.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.h (added) +++ branches/setup_improvements/base/setup/lib/arcname.h [iso-8859-1] Mon May 22 01:09:35 2017 @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: base/setup/lib/arcname.h + * PURPOSE: ARC path to-and-from NT path resolver. + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +BOOLEAN +ArcPathNormalize( + OUT PUNICODE_STRING NormalizedArcPath, + IN PCWSTR ArcPath); + +BOOLEAN +ArcPathToNtPath( + OUT PUNICODE_STRING NtPath, + IN PCWSTR ArcPath, + IN PPARTLIST PartList OPTIONAL); + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/arcname.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/lib/arcname_tests.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname_tests.c (added) +++ branches/setup_improvements/base/setup/lib/arcname_tests.c [iso-8859-1] Mon May 22 01:09:35 2017 @@ -0,0 +1,142 @@ +/* + * Tests for the arcname.c functions: + * - ArcPathNormalize(), + * - ArcPathToNtPath(). + * + * You should certainly fix the included headers before being able + * to compile this file (as I didn't bother to have it compilable + * under our (P/N)DK, but just under VS). + */ + +#include <stdio.h> +#include <tchar.h> +#include <conio.h> + +#define WIN32_NO_STATUS +#include <windows.h> +#include <winternl.h> +#undef WIN32_NO_STATUS + +#include <ntstatus.h> + +#include <strsafe.h> + +#include "arcname.h" + + +BOOLEAN +NTAPI +RtlEqualUnicodeString( + IN CONST UNICODE_STRING *s1, + IN CONST UNICODE_STRING *s2, + IN BOOLEAN CaseInsensitive); + +#define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') + + +int _tmain(int argc, _TCHAR* argv[]) +{ + WCHAR ArcPath[MAX_PATH] = L"multi(5)disk()rdisk(1)partition()\\ReactOS"; + WCHAR NormalizedArcPathBuffer[MAX_PATH]; + UNICODE_STRING NormalizedArcPath; + WCHAR NtPathBuffer[MAX_PATH]; + UNICODE_STRING NtPath; + + NormalizedArcPath.Buffer = NormalizedArcPathBuffer; + NormalizedArcPath.Length = 0; + NormalizedArcPath.MaximumLength = sizeof(NormalizedArcPathBuffer); + + ArcPathNormalize(&NormalizedArcPath, ArcPath); + wprintf(L"ArcPath = '%s' ; Normalized = '%wZ'\n", ArcPath, &NormalizedArcPath); + + NtPath.Buffer = NtPathBuffer; + NtPath.Length = 0; + NtPath.MaximumLength = sizeof(NtPathBuffer); + + ArcPathToNtPath(&NtPath, NormalizedArcPath.Buffer); + // wprintf(L"ArcPath = '%s' ; NtPath = '%wZ'\n", ArcPath, &NtPath); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)\\ReactOS\\system32\\ntoskrnl.exe"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)\\Foobar"); // OK but not supported + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)disk(1)\\Foobar"); // Bad + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)disk(1)rdisk(3)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)disk(1)fdisk(3)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)"); // Bad: missing fdisk + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)cdrom(0)"); // Bad: twice cdrom + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)fdisk(0)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)rdisk(0)"); // Bad; cdrom controller and rdisk peripheral + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)cdrom(1)fdisk(0)"); // Bad: multi adapter cannot have cdrom controller + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)rdisk(1)cdrom(1)fdisk(0)"); // Bad: rdisk is not a controller + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)cdrom(1)fdisk(0)"); // OK (disk(1) ignored) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)rdisk(1)fdisk(0)"); // Same (and also fdisk is not considered as part of ARC path) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)rdisk(1)partition(3)"); // OK (disk(1) ignored) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + + /* All these are OK */ + ArcPathToNtPath(&NtPath, L"scsi(0)disk(3)rdisk(0)partition(1)\\OS.DIR"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(1)disk(3)rdisk(3)partition(2)\\OS\\ARCOS\\LOADER"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + + /* All these are OK */ + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)cdrom(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + /* These are invalid storage ARC paths (but otherwise are valid ARC names) */ + ArcPathToNtPath(&NtPath, L"multi(0)video(0)monitor(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)key(0)keyboard(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + return 0; +} Propchange: branches/setup_improvements/base/setup/lib/arcname_tests.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Mon May 22 01:09:35 2017 @@ -29,8 +29,10 @@ #include "errorcode.h" #include "linklist.h" #include "ntverrsrc.h" +// #include "arcname.h" #include "fsutil.h" #include "genlist.h" #include "partlist.h" +#include "arcname.h" /* EOF */

7 years, 7 months

[hbelusca] 74620: [USETUP]: inicache module: From the existing IniCacheLoad() function, introduce a IniCacheLoadFromMemory() function that just does the same (initialize an INI file cache and parse...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:48:09 2017 New Revision: 74620 URL: http://svn.reactos.org/svn/reactos?rev=74620&view=rev Log: [USETUP]: inicache module: From the existing IniCacheLoad() function, introduce a IniCacheLoadFromMemory() function that just does the same (initialize an INI file cache and parse the INI file), but takes the input from a memory buffer. Then, rewrite the IniCacheLoad() function to just open the file given in input, and then fall back to calling IniCacheLoadFromMemory. The IniCacheLoadFromMemory() function will be used later. Modified: branches/setup_improvements/base/setup/usetup/inicache.c branches/setup_improvements/base/setup/usetup/inicache.h Modified: branches/setup_improvements/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inicache.c [iso-8859-1] Sun May 21 23:48:09 2017 @@ -467,6 +467,101 @@ /* PUBLIC FUNCTIONS *********************************************************/ NTSTATUS +IniCacheLoadFromMemory( + PINICACHE *Cache, + PCHAR FileBuffer, + ULONG FileLength, + BOOLEAN String) +{ + PCHAR Ptr; + + PINICACHESECTION Section; + PINICACHEKEY Key; + + PCHAR SectionName; + ULONG SectionNameSize; + + PCHAR KeyName; + ULONG KeyNameSize; + + PCHAR KeyValue; + ULONG KeyValueSize; + + /* Allocate inicache header */ + *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(INICACHE)); + if (*Cache == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Parse ini file */ + Section = NULL; + Ptr = FileBuffer; + while (Ptr != NULL && *Ptr != 0) + { + Ptr = IniCacheSkipWhitespace(Ptr); + if (Ptr == NULL) + continue; + + if (*Ptr == '[') + { + Section = NULL; + Ptr++; + + Ptr = IniCacheGetSectionName(Ptr, + &SectionName, + &SectionNameSize); + + DPRINT1("[%.*s]\n", SectionNameSize, SectionName); + + Section = IniCacheAddSection(*Cache, + SectionName, + SectionNameSize); + if (Section == NULL) + { + DPRINT("IniCacheAddSection() failed\n"); + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + } + else + { + if (Section == NULL) + { + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + + Ptr = IniCacheGetKeyName(Ptr, + &KeyName, + &KeyNameSize); + + Ptr = IniCacheGetKeyValue(Ptr, + &KeyValue, + &KeyValueSize, + String); + + DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); + + Key = IniCacheAddKey(Section, + KeyName, + KeyNameSize, + KeyValue, + KeyValueSize); + if (Key == NULL) + { + DPRINT("IniCacheAddKey() failed\n"); + } + } + } + + return STATUS_SUCCESS; +} + +NTSTATUS IniCacheLoad( PINICACHE *Cache, PWCHAR FileName, @@ -480,20 +575,7 @@ NTSTATUS Status; PCHAR FileBuffer; ULONG FileLength; - PCHAR Ptr; LARGE_INTEGER FileOffset; - - PINICACHESECTION Section; - PINICACHEKEY Key; - - PCHAR SectionName; - ULONG SectionNameSize; - - PCHAR KeyName; - ULONG KeyNameSize; - - PCHAR KeyValue; - ULONG KeyValueSize; *Cache = NULL; @@ -568,84 +650,18 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtReadFile() failed (Status %lx)\n", Status); - RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; - } - - /* Allocate inicache header */ - *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(INICACHE)); - if (*Cache == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Parse ini file */ - Section = NULL; - Ptr = FileBuffer; - while (Ptr != NULL && *Ptr != 0) - { - Ptr = IniCacheSkipWhitespace(Ptr); - if (Ptr == NULL) - continue; - - if (*Ptr == '[') - { - Section = NULL; - Ptr++; - - Ptr = IniCacheGetSectionName(Ptr, - &SectionName, - &SectionNameSize); - - DPRINT1("[%.*s]\n", SectionNameSize, SectionName); - - Section = IniCacheAddSection(*Cache, - SectionName, - SectionNameSize); - if (Section == NULL) - { - DPRINT("IniCacheAddSection() failed\n"); - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - } - else - { - if (Section == NULL) - { - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - - Ptr = IniCacheGetKeyName(Ptr, - &KeyName, - &KeyNameSize); - - Ptr = IniCacheGetKeyValue(Ptr, - &KeyValue, - &KeyValueSize, - String); - - DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); - - Key = IniCacheAddKey(Section, - KeyName, - KeyNameSize, - KeyValue, - KeyValueSize); - if (Key == NULL) - { - DPRINT("IniCacheAddKey() failed\n"); - } - } - } - - /* Free file buffer */ + goto Quit; + } + + Status = IniCacheLoadFromMemory(Cache, FileBuffer, FileLength, String); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IniCacheLoadFromMemory() failed (Status %lx)\n", Status); + } + +Quit: + /* Free the file buffer, and return */ RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; } Modified: branches/setup_improvements/base/setup/usetup/inicache.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inicache.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inicache.h [iso-8859-1] Sun May 21 23:48:09 2017 @@ -74,6 +74,13 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS +IniCacheLoadFromMemory( + PINICACHE *Cache, + PCHAR FileBuffer, + ULONG FileLength, + BOOLEAN String); + +NTSTATUS IniCacheLoad( PINICACHE *Cache, PWCHAR FileName,

7 years, 7 months

[hbelusca] 74619: [USETUP]: filesup module: - Add a NtPathToDiskPartComponents helper, that takes in input a fully qualified NT path to a file on hard disk, e.g.: \Device\Harddisk1\Partition2\foo\b...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:45:43 2017 New Revision: 74619 URL: http://svn.reactos.org/svn/reactos?rev=74619&view=rev Log: [USETUP]: filesup module: - Add a NtPathToDiskPartComponents helper, that takes in input a fully qualified NT path to a file on hard disk, e.g.: \Device\Harddisk1\Partition2\foo\bar, and returns in output the disk number ('1'), the partition number ('2'), and the the path component "\foo\bar" that is after the device-harddisk-partition stuff. - Make the OpenAndMapFile return the file size of the opened file. Both of these additions will be used soon. - Turn a 'isspace' into a 'iswspace'. Modified: branches/setup_improvements/base/setup/usetup/filesup.c branches/setup_improvements/base/setup/usetup/filesup.h Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Sun May 21 23:45:43 2017 @@ -428,7 +428,7 @@ /* Check for whitespaces */ for (i = 0; i < Length; i++) { - if (isspace(InstallDir[i])) + if (iswspace(InstallDir[i])) return FALSE; } @@ -547,6 +547,117 @@ 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) + { + DPRINT1("An error happened!\n"); + return FALSE; + } + else 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) + { + /* We fail here because wcstoul failed for whatever reason */ + DPRINT1("An error happened!\n"); + return FALSE; + } + else 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, @@ -554,7 +665,8 @@ IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress) + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -593,6 +705,31 @@ { 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 */ Modified: branches/setup_improvements/base/setup/usetup/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] Sun May 21 23:45:43 2017 @@ -64,6 +64,13 @@ 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, @@ -71,7 +78,8 @@ IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress); + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL); BOOLEAN UnMapFile(

7 years, 7 months

[hbelusca] 74618: [USETUP]: Move all the code that retrieves the version resources from PE executable, out of osdetect.c, and place it in its own module inside the setuplib. Remove also some commen...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:41:04 2017 New Revision: 74618 URL: http://svn.reactos.org/svn/reactos?rev=74618&view=rev Log: [USETUP]: Move all the code that retrieves the version resources from PE executable, out of osdetect.c, and place it in its own module inside the setuplib. Remove also some commented headers in precomp.h. Added: branches/setup_improvements/base/setup/lib/ntverrsrc.c (with props) branches/setup_improvements/base/setup/lib/ntverrsrc.h (with props) Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/precomp.h branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/osdetect.c Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Sun May 21 23:41:04 2017 @@ -2,6 +2,7 @@ list(APPEND SOURCE fsutil.c genlist.c + ntverrsrc.c partlist.c precomp.h) Added: branches/setup_improvements/base/setup/lib/ntverrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/ntverrsrc.c (added) +++ branches/setup_improvements/base/setup/lib/ntverrsrc.c [iso-8859-1] Sun May 21 23:41:04 2017 @@ -0,0 +1,194 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: base/setup/lib/ntverrsrc.c + * PURPOSE: NT Version Resource Management API + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE 1: Adapted from Wine-synced dll/win32/version DLL. + * NOTE 2: We only deal with 32-bit PE executables. + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include <ndk/ldrtypes.h> +#include <ndk/ldrfuncs.h> + +#include "ntverrsrc.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL) +{ +// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h +#define VS_VERSION_INFO 1 // See psdk/verrsrc.h +#define VS_FILE_INFO RT_VERSION + + NTSTATUS Status; + LDR_RESOURCE_INFO ResourceInfo; + PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; + PVOID Data = NULL; + ULONG Size = 0; + + /* Try to find the resource */ + ResourceInfo.Type = 16; // RT_VERSION; + ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); + ResourceInfo.Language = 0; // Don't care about the language + + Status = LdrFindResource_U(BaseAddress, + &ResourceInfo, + RESOURCE_DATA_LEVEL, + &ResourceDataEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); + return Status; + } + + /* Access the resource */ + Status = LdrAccessResource(BaseAddress, + ResourceDataEntry, + &Data, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); + return Status; + } + + *Resource = Data; + if (ResourceSize) *ResourceSize = Size; + + return STATUS_SUCCESS; +} + +/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ +typedef struct _VS_VERSION_INFO_STRUCT32 +{ + WORD wLength; + WORD wValueLength; + WORD wType; /* 1:Text, 0:Binary */ + WCHAR szKey[1]; +#if 0 /* variable length structure */ + /* DWORD aligned */ + BYTE Value[]; + /* DWORD aligned */ + VS_VERSION_INFO_STRUCT32 Children[]; +#endif +} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; +typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; + +#define DWORD_ALIGN( base, ptr ) \ + ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) + +#define VersionInfo32_Value( ver ) \ + DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) + +#define VersionInfo32_Children( ver ) \ + (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ + ( ( (ver)->wValueLength * \ + ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) + +#define VersionInfo32_Next( ver ) \ + (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) + +static PCVS_VERSION_INFO_STRUCT32 +VersionInfo32_FindChild( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR szKey, + IN UINT cbKey) +{ + PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); + + while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) + { + if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + return child; + + if (child->wLength == 0) return NULL; + child = VersionInfo32_Next(child); + } + + return NULL; +} + +static NTSTATUS +VersionInfo32_QueryValue( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen OPTIONAL, + OUT BOOL* pbText OPTIONAL) +{ + PCWSTR lpNextSlash; + + DPRINT("lpSubBlock : (%S)\n", lpSubBlock); + + while (*lpSubBlock) + { + /* Find next path component */ + for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) + { + if (*lpNextSlash == '\\') + break; + } + + /* Skip empty components */ + if (lpNextSlash == lpSubBlock) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); + if (!info) + { + if (puLen) *puLen = 0; + return STATUS_RESOURCE_TYPE_NOT_FOUND; + } + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = (PVOID)VersionInfo32_Value(info); + if (puLen) + *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; + + return STATUS_SUCCESS; +} + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen) +{ + PCVS_VERSION_INFO_STRUCT32 info = pBlock; + + DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); + + if (!pBlock) + return FALSE; + + if (!lpSubBlock || !*lpSubBlock) + lpSubBlock = L"\\"; + + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/ntverrsrc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/lib/ntverrsrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/ntverrsrc.h (added) +++ branches/setup_improvements/base/setup/lib/ntverrsrc.h [iso-8859-1] Sun May 21 23:41:04 2017 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: base/setup/lib/ntverrsrc.h + * PURPOSE: NT Version Resource Management API + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL); + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen); + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/ntverrsrc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/lib/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/precomp.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/precomp.h [iso-8859-1] Sun May 21 23:41:04 2017 @@ -33,11 +33,6 @@ /* Filesystem headers */ #include <reactos/rosioctl.h> // For extra partition IDs -/** For FileSystems **/ -// #include <fslib/vfatlib.h> -// #include <fslib/ext2lib.h> -// // #include <fslib/ntfslib.h> - // ///* Internal Headers */ //#include "interface/consup.h" Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Sun May 21 23:41:04 2017 @@ -28,6 +28,7 @@ #include "errorcode.h" #include "linklist.h" +#include "ntverrsrc.h" #include "fsutil.h" #include "genlist.h" #include "partlist.h" Modified: branches/setup_improvements/base/setup/usetup/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Sun May 21 23:41:04 2017 @@ -9,9 +9,6 @@ #include "usetup.h" -#include <ndk/ldrtypes.h> -#include <ndk/ldrfuncs.h> - #define NDEBUG #include <debug.h> @@ -22,183 +19,6 @@ /* Language-independent Vendor strings */ static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; - - -/* VERSION RESOURCE API ******************************************************/ - -/* - * NT-oriented version resource management, adapted from dll/win32/version. - * We only deal with 32-bit PE executables. - */ - -NTSTATUS -NtGetVersionResource( - IN PVOID BaseAddress, - OUT PVOID* Resource, - OUT PULONG ResourceSize OPTIONAL) -{ -// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h -#define VS_VERSION_INFO 1 // See psdk/verrsrc.h -#define VS_FILE_INFO RT_VERSION - - NTSTATUS Status; - LDR_RESOURCE_INFO ResourceInfo; - PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; - PVOID Data = NULL; - ULONG Size = 0; - - /* Try to find the resource */ - ResourceInfo.Type = 16; // RT_VERSION; - ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); - ResourceInfo.Language = 0; // Don't care about the language - - Status = LdrFindResource_U(BaseAddress, - &ResourceInfo, - RESOURCE_DATA_LEVEL, - &ResourceDataEntry); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); - return Status; - } - - /* Access the resource */ - Status = LdrAccessResource(BaseAddress, - ResourceDataEntry, - &Data, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); - return Status; - } - - *Resource = Data; - if (ResourceSize) *ResourceSize = Size; - - return STATUS_SUCCESS; -} - -/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ -typedef struct _VS_VERSION_INFO_STRUCT32 -{ - WORD wLength; - WORD wValueLength; - WORD wType; /* 1:Text, 0:Binary */ - WCHAR szKey[1]; -#if 0 /* variable length structure */ - /* DWORD aligned */ - BYTE Value[]; - /* DWORD aligned */ - VS_VERSION_INFO_STRUCT32 Children[]; -#endif -} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; -typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; - -#define DWORD_ALIGN( base, ptr ) \ - ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) - -#define VersionInfo32_Value( ver ) \ - DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) - -#define VersionInfo32_Children( ver ) \ - (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ - ( ( (ver)->wValueLength * \ - ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) - -#define VersionInfo32_Next( ver ) \ - (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) - -static PCVS_VERSION_INFO_STRUCT32 -VersionInfo32_FindChild( - IN PCVS_VERSION_INFO_STRUCT32 info, - IN PCWSTR szKey, - IN UINT cbKey) -{ - PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); - - while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) - { - if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) - return child; - - if (child->wLength == 0) return NULL; - child = VersionInfo32_Next(child); - } - - return NULL; -} - -static NTSTATUS -VersionInfo32_QueryValue( - IN PCVS_VERSION_INFO_STRUCT32 info, - IN PCWSTR lpSubBlock, - OUT PVOID* lplpBuffer, - OUT PUINT puLen OPTIONAL, - OUT BOOL* pbText OPTIONAL) -{ - PCWSTR lpNextSlash; - - DPRINT("lpSubBlock : (%S)\n", lpSubBlock); - - while (*lpSubBlock) - { - /* Find next path component */ - for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) - { - if (*lpNextSlash == '\\') - break; - } - - /* Skip empty components */ - if (lpNextSlash == lpSubBlock) - { - lpSubBlock++; - continue; - } - - /* We have a non-empty component: search info for key */ - info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); - if (!info) - { - if (puLen) *puLen = 0; - return STATUS_RESOURCE_TYPE_NOT_FOUND; - } - - /* Skip path component */ - lpSubBlock = lpNextSlash; - } - - /* Return value */ - *lplpBuffer = (PVOID)VersionInfo32_Value(info); - if (puLen) - *puLen = info->wValueLength; - if (pbText) - *pbText = info->wType; - - return STATUS_SUCCESS; -} - -NTSTATUS -NtVerQueryValue( - IN const VOID* pBlock, - IN PCWSTR lpSubBlock, - OUT PVOID* lplpBuffer, - OUT PUINT puLen) -{ - PCVS_VERSION_INFO_STRUCT32 info = pBlock; - - DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); - - if (!pBlock) - return FALSE; - - if (!lpSubBlock || !*lpSubBlock) - lpSubBlock = L"\\"; - - return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); -} - /* FUNCTIONS ****************************************************************/

7 years, 7 months

[hbelusca] 74617: [USETUP]: PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:36:13 2017 New Revision: 74617 URL: http://svn.reactos.org/svn/reactos?rev=74617&view=rev Log: [USETUP]: PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They will be used in the subsequent commits. Modified: branches/setup_improvements/base/setup/lib/partlist.c branches/setup_improvements/base/setup/lib/partlist.h Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Sun May 21 23:36:13 2017 @@ -1073,6 +1073,21 @@ DiskEntry->Id = ScsiAddress.TargetId; GetDriverName(DiskEntry); + /* + * Actually it would be more correct somehow to use: + * + * OBJECT_NAME_INFORMATION NameInfo; // ObjectNameInfo; + * ULONG ReturnedLength; + * + * Status = NtQueryObject(SomeHandleToTheDisk, + * ObjectNameInformation, + * &NameInfo, + * sizeof(NameInfo), + * &ReturnedLength); + * etc... + * + * See examples in https://git.reactos.org/?p=reactos.git;a=blob;f=reactos/ntoskrnl/io/iomgr/e… + */ InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); @@ -1333,8 +1348,204 @@ RtlFreeHeap(ProcessHeap, 0, List); } +PDISKENTRY +GetDiskByBiosNumber( + IN PPARTLIST List, + IN ULONG BiosDiskNumber) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->BiosDiskNumber == BiosDiskNumber) + { + /* Disk found */ + return DiskEntry; + } + } + + /* Disk not found, stop there */ + return NULL; +} + +PDISKENTRY +GetDiskByNumber( + IN PPARTLIST List, + IN ULONG DiskNumber) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->DiskNumber == DiskNumber) + { + /* Disk found */ + return DiskEntry; + } + } + + /* Disk not found, stop there */ + return NULL; +} + +PDISKENTRY +GetDiskBySCSI( + IN PPARTLIST List, + IN USHORT Port, + IN USHORT Bus, + IN USHORT Id) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->Port == Port && + DiskEntry->Bus == Bus && + DiskEntry->Id == Id) + { + /* Disk found */ + return DiskEntry; + } + } + + /* Disk not found, stop there */ + return NULL; +} + +PDISKENTRY +GetDiskBySignature( + IN PPARTLIST List, + IN ULONG Signature) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->LayoutBuffer->Signature == Signature) + { + /* Disk found */ + return DiskEntry; + } + } + + /* Disk not found, stop there */ + return NULL; +} + +PPARTENTRY +GetPartition( + // IN PPARTLIST List, + IN PDISKENTRY DiskEntry, + IN ULONG PartitionNumber) +{ + PPARTENTRY PartEntry; + PLIST_ENTRY Entry; + + /* Disk found, loop over the primary partitions first... */ + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + Entry = Entry->Flink; + + if (PartEntry->PartitionNumber == PartitionNumber) + { + /* Partition found */ + return PartEntry; + } + } + + /* ... then over the logical partitions if needed */ + Entry = DiskEntry->LogicalPartListHead.Flink; + while (Entry != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + Entry = Entry->Flink; + + if (PartEntry->PartitionNumber == PartitionNumber) + { + /* Partition found */ + return PartEntry; + } + } + + /* The partition was not found on the disk, stop there */ + return NULL; +} + +BOOLEAN +GetDiskOrPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber OPTIONAL, + OUT PDISKENTRY* pDiskEntry, + OUT PPARTENTRY* pPartEntry OPTIONAL) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + /* Find the disk */ + DiskEntry = GetDiskByNumber(List, DiskNumber); + if (!DiskEntry) + return FALSE; + + /* If we have a partition (PartitionNumber != 0), find it */ + if (PartitionNumber != 0) + { + PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); + if (!PartEntry) + return FALSE; + ASSERT(PartEntry->DiskEntry == DiskEntry); + } + + /* Return the disk (and optionally the partition) */ + *pDiskEntry = DiskEntry; + if (pPartEntry) *pPartEntry = PartEntry; + return TRUE; +} + // -// FIXME: This function is COMPLETELY BROKEN!!!! +// NOTE: Was introduced broken in r6258 by Casper // BOOLEAN SelectPartition( @@ -1344,42 +1555,22 @@ { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - PLIST_ENTRY Entry1, Entry2; - - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) + + DiskEntry = GetDiskByNumber(List, DiskNumber); + if (!DiskEntry) return FALSE; - /* Check for first usable entry on next disk */ - Entry1 = List->CurrentDisk->ListEntry.Flink; - while (Entry1 != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); - - if (DiskEntry->DiskNumber == DiskNumber) - { - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - - if (PartEntry->PartitionNumber == PartitionNumber) - { - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return TRUE; - } - - Entry2 = Entry2->Flink; - } - - return FALSE; - } - - Entry1 = Entry1->Flink; - } - - return FALSE; + PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); + if (!PartEntry) + return FALSE; + + ASSERT(PartEntry->DiskEntry == DiskEntry); + ASSERT(DiskEntry->DiskNumber == DiskNumber); + ASSERT(PartEntry->PartitionNumber == PartitionNumber); + + List->CurrentDisk = DiskEntry; + List->CurrentPartition = PartEntry; + return TRUE; } PPARTENTRY Modified: branches/setup_improvements/base/setup/lib/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] Sun May 21 23:36:13 2017 @@ -90,11 +90,12 @@ /* BIOS parameters */ BOOLEAN BiosFound; ULONG BiosDiskNumber; -// ULONG Signature; +// ULONG Signature; // Obtained from LayoutBuffer->Signature // ULONG Checksum; /* SCSI parameters */ ULONG DiskNumber; +// SCSI_ADDRESS; USHORT Port; USHORT Bus; USHORT Id; @@ -220,6 +221,42 @@ DestroyPartitionList( IN PPARTLIST List); +PDISKENTRY +GetDiskByBiosNumber( + IN PPARTLIST List, + IN ULONG BiosDiskNumber); + +PDISKENTRY +GetDiskByNumber( + IN PPARTLIST List, + IN ULONG DiskNumber); + +PDISKENTRY +GetDiskBySCSI( + IN PPARTLIST List, + IN USHORT Port, + IN USHORT Bus, + IN USHORT Id); + +PDISKENTRY +GetDiskBySignature( + IN PPARTLIST List, + IN ULONG Signature); + +PPARTENTRY +GetPartition( + // IN PPARTLIST List, + IN PDISKENTRY DiskEntry, + IN ULONG PartitionNumber); + +BOOLEAN +GetDiskOrPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber OPTIONAL, + OUT PDISKENTRY* pDiskEntry, + OUT PPARTENTRY* pPartEntry OPTIONAL); + BOOLEAN SelectPartition( IN PPARTLIST List,

7 years, 7 months

[hbelusca] 74616: [USETUP]: Use secure "StringCchPrintfW" function instead of swprintf.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:34:03 2017 New Revision: 74616 URL: http://svn.reactos.org/svn/reactos?rev=74616&view=rev Log: [USETUP]: Use secure "StringCchPrintfW" function instead of swprintf. Modified: branches/setup_improvements/base/setup/lib/fsutil.c branches/setup_improvements/base/setup/lib/partlist.c Modified: branches/setup_improvements/base/setup/lib/fsutil.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/fsutil.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/fsutil.c [iso-8859-1] Sun May 21 23:34:03 2017 @@ -119,11 +119,11 @@ 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); + StringCchPrintfW(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); Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Sun May 21 23:34:03 2017 @@ -109,15 +109,13 @@ WCHAR KeyName[32]; NTSTATUS Status; - RtlInitUnicodeString(&DiskEntry->DriverName, - NULL); - - swprintf(KeyName, - L"\\Scsi\\Scsi Port %hu", - DiskEntry->Port); - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); + RtlInitUnicodeString(&DiskEntry->DriverName, NULL); + + StringCchPrintfW(KeyName, ARRAYSIZE(KeyName), + L"\\Scsi\\Scsi Port %hu", + DiskEntry->Port); + + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); QueryTable[0].Name = L"Driver"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; @@ -366,9 +364,10 @@ } AdapterCount = 0; - while (1) - { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); + while (TRUE) + { + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -379,7 +378,8 @@ break; } - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -387,9 +387,10 @@ NULL); if (NT_SUCCESS(Status)) { - while (1) + while (TRUE) { - swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -401,7 +402,8 @@ return; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -415,7 +417,7 @@ QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; DiskCount = 0; - while (1) + while (TRUE) { BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); if (BiosDiskEntry == NULL) @@ -423,7 +425,8 @@ break; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, @@ -820,7 +823,7 @@ Buffer = (PUCHAR)&DiskEntry->LayoutBuffer->Signature; - while (1) + while (TRUE) { NtQuerySystemTime(&SystemTime); RtlTimeToTimeFields(&SystemTime, &TimeFields); @@ -976,7 +979,8 @@ } Checksum = ~Checksum + 1; - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); + StringCchPrintfW(Identifier, ARRAYSIZE(Identifier), + L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); DiskEntry = RtlAllocateHeap(ProcessHeap, @@ -1217,11 +1221,10 @@ for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) { - swprintf(Buffer, - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); - RtlInitUnicodeString(&Name, - Buffer); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%lu\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, Buffer); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -1238,7 +1241,6 @@ if (NT_SUCCESS(Status)) { AddDiskToList(FileHandle, DiskNumber, List); - NtClose(FileHandle); } } @@ -1313,7 +1315,6 @@ /* Release layout buffer */ if (DiskEntry->LayoutBuffer != NULL) RtlFreeHeap(ProcessHeap, 0, DiskEntry->LayoutBuffer); - /* Release disk entry */ RtlFreeHeap(ProcessHeap, 0, DiskEntry); @@ -1570,7 +1571,8 @@ return NULL; } -static +// static +FORCEINLINE BOOLEAN IsEmptyLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo) @@ -1582,7 +1584,8 @@ return FALSE; } -static +// static +FORCEINLINE BOOLEAN IsSamePrimaryLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo, @@ -2585,11 +2588,10 @@ DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); - swprintf(DstPath, - L"\\Device\\Harddisk%d\\Partition0", - DiskEntry->DiskNumber); - RtlInitUnicodeString(&Name, - DstPath); + StringCchPrintfW(DstPath, ARRAYSIZE(DstPath), + L"\\Device\\Harddisk%lu\\Partition0", + DiskEntry->DiskNumber); + RtlInitUnicodeString(&Name, DstPath); InitializeObjectAttributes(&ObjectAttributes, &Name, 0, @@ -2686,7 +2688,8 @@ NTSTATUS Status; HANDLE KeyHandle; - swprintf(ValueNameBuffer, L"\\DosDevices\\%C:", Letter); + StringCchPrintfW(ValueNameBuffer, ARRAYSIZE(ValueNameBuffer), + L"\\DosDevices\\%C:", Letter); RtlInitUnicodeString(&ValueName, ValueNameBuffer); InitializeObjectAttributes(&ObjectAttributes,

7 years, 7 months

[hbelusca] 74615: [USETUP]: Addendum to r74614: Code adaptations for the "STRING_HDDINFOUNKx" string labels renaming. The extra slot added to some of the strings is to indicate whether the disk is ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 21 23:30:45 2017 New Revision: 74615 URL: http://svn.reactos.org/svn/reactos?rev=74615&view=rev Log: [USETUP]: Addendum to r74614: Code adaptations for the "STRING_HDDINFOUNKx" string labels renaming. The extra slot added to some of the strings is to indicate whether the disk is MBR or GPT. As attentive readers will notice, the code that "determines" whether the disk is either MBR or GPT is of course wrong: it's just a temporary placeholder code that should currently just show "MBR". Having the NoMbr flag mostly signifies that the disk is uninitialized. A GPT disk also has a MBR but it's for "backcompatibility" / "protective" reasons (so that MBR-only tools would see the disk as just a big 1-partitioned only disk with which they could barely do anything). A real involved test for the nature of the disk should involve calling the correct IOCTLs in the disk detection code in partlist.c . This is for the future (and when ReactOS will better support GPT disks). Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/partlist.c Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun May 21 23:30:45 2017 @@ -2068,25 +2068,27 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2225,25 +2227,27 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2381,25 +2385,27 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2618,25 +2624,27 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDINFOPARTDELETE), + MUIGetString(STRING_HDINFOPARTDELETE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFOUNK3), + MUIGetString(STRING_HDINFOPARTDELETE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } while (TRUE) @@ -2841,14 +2849,15 @@ PartTypeString); #endif - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1), DiskEntry->DiskNumber, DiskSize, DiskUnit, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2901,14 +2910,15 @@ PartUnit); } - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS_1), DiskEntry->DiskNumber, DiskSize, DiskUnit, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); @@ -2923,8 +2933,6 @@ return QUIT_PAGE; } } - - DrawFileSystemList(FileSystemList); if (RepairUpdateFlag) { @@ -2948,6 +2956,8 @@ return CHECK_FILE_SYSTEM_PAGE; } + + DrawFileSystemList(FileSystemList); while (TRUE) { @@ -4451,15 +4461,12 @@ static PAGE_NUMBER BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { - UCHAR PartitionType; NTSTATUS Status; - - PartitionType = PartitionList->SystemPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, &DestinationArcPath, - PartitionType); + PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); @@ -4487,19 +4494,16 @@ static PAGE_NUMBER BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { - UCHAR PartitionType; NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; WCHAR SourceMbrPathBuffer[MAX_PATH]; WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ - PartitionType = PartitionList->SystemPartition->PartitionType; - Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, &DestinationArcPath, - PartitionType); + PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); @@ -4652,9 +4656,7 @@ MUIDisplayPage(SUCCESS_PAGE); if (IsUnattendedSetup) - { return FLUSH_PAGE; - } while (TRUE) { Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] Sun May 21 23:30:45 2017 @@ -458,25 +458,27 @@ if (DiskEntry->DriverName.Length > 0) { sprintf(LineBuffer, - MUIGetString(STRING_HDINFOPARTSELECT), + MUIGetString(STRING_HDINFOPARTSELECT_1), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DriverName.Buffer); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { sprintf(LineBuffer, - MUIGetString(STRING_HDDINFOUNK6), + MUIGetString(STRING_HDINFOPARTSELECT_2), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } if (ListUi->Line >= 0 && ListUi->Line <= Height)

7 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017