Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: Create a Code of conduct to complete the Github community checklist (#431)

by Dheeraj Bhaskar

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce5d4fd3e14047402955e… commit ce5d4fd3e14047402955e14fe002f4cc37c64e12 Author: Dheeraj Bhaskar <dheerajthe1(a)gmail.com> AuthorDate: Fri Jun 1 02:56:33 2018 +0530 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Thu May 31 23:26:33 2018 +0200 Create a Code of conduct to complete the Github community checklist (#431) --- CODE_OF_CONDUCT.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..8109c09b77 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Code of Conduct + +Be respectful toward other members of the community. Don't initiate or engage in discussions that are designed to insult, inflame, attack, or incite hate/discrimination/bullying against others. Don't feed the trolls. If we detect any kind of behaviour we consider unacceptable, we reserve the right to ban, block, or remove the involved members from any or all of our communities.

6 years, 6 months

01/01: [MSPAINT] use __targv[1] instead of lpszArgument

by Benedikt Freisen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=313ded449ce3ecff1c1fb… commit 313ded449ce3ecff1c1fb2412a6fbd8732739fc7 Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Thu May 31 20:17:30 2018 +0200 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Thu May 31 20:17:30 2018 +0200 [MSPAINT] use __targv[1] instead of lpszArgument This should make Paint's handling of command line strings less brittle. CORE-13293 --- base/applications/mspaint/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 510688ea98..8b0bfe7bf8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -259,15 +259,15 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument RECT imageAreaPos = {3, 3, 3 + imageModel.GetWidth(), 3 + imageModel.GetHeight()}; imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); - if (lpszArgument[0] != 0) + if (__argc >= 2) { HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, lpszArgument, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { TCHAR *temp; imageModel.Insert(bmNew); - GetFullPathName(lpszArgument, SIZEOF(filepathname), filepathname, &temp); + GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, &temp); CPath pathFileName(filepathname); pathFileName.StripPath(); CString strTitle;

6 years, 6 months

01/01: [USETUP] Some fixes/improvements suggested by Thomas (2/2).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c434a5ab21780b3ca4229… commit c434a5ab21780b3ca42299da3dc6f5b46b978bc3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 17:55:16 2017 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 19:54:09 2018 +0200 [USETUP] Some fixes/improvements suggested by Thomas (2/2). - In the partlist.c disk getters: Remove useless "IsListEmpty(&List->DiskListHead)" checks, because this is actually the kind of check the while() loop does just after... - Fix few DPRINTs. svn path=/branches/setup_improvements/; revision=74629 --- base/setup/lib/partlist.c | 16 ---------------- base/setup/usetup/filesup.c | 21 +++++---------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index d2d3f36768..7b74cda8f0 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -1352,10 +1352,6 @@ GetDiskByBiosNumber( 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) @@ -1382,10 +1378,6 @@ GetDiskByNumber( 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) @@ -1414,10 +1406,6 @@ GetDiskBySCSI( 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) @@ -1446,10 +1434,6 @@ GetDiskBySignature( 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) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index b7fdf692f1..b466e4e38d 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -679,12 +679,7 @@ NtPathToDiskPartComponents( 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) + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) { DPRINT1("'%S' : expected a path separator!\n", Path); return FALSE; @@ -717,13 +712,7 @@ NtPathToDiskPartComponents( 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) + 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); @@ -788,7 +777,7 @@ OpenAndMapFile( FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); return Status; } @@ -810,7 +799,7 @@ OpenAndMapFile( } if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file %wZ is too large!\n", Name); + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); *FileSize = FileInfo.EndOfFile.LowPart; @@ -829,7 +818,7 @@ OpenAndMapFile( *FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a memory section for file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &Name, Status); NtClose(*FileHandle); *FileHandle = NULL; return Status;

6 years, 6 months

07/07: [USETUP] Further improve the OS detection code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f88d029c9d3f58ce92afe… commit f88d029c9d3f58ce92afefe965bd0d800e6ae254 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 22:59:11 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:01:01 2018 +0200 [USETUP] Further improve the OS detection code. - Improve FindExistingNTOSInstall() so that we can find an existing installation either by system root ARC path or NT path. This is used during the enumeration of available installations from the boot.ini/freeldr.ini and during other existence & validity checks of NTOS installations. - Improve AddNTOSInstallation() so that we can save the system root ARC path and NT path of the installation, as well as its partition entry structure pointer, for caching & later retrieval purposes. - Remove some deprecated comments & todos, and implement other todos. - Improve the output of some DPRINTs. - Fix the return value of FindSubStrI. svn path=/branches/setup_improvements/; revision=74632 --- base/setup/usetup/osdetect.c | 314 ++++++++++++++++++++++++++----------------- base/setup/usetup/osdetect.h | 10 +- 2 files changed, 199 insertions(+), 125 deletions(-) diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 34c18e7b11..97cc6430ea 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -29,7 +29,7 @@ static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; BOOL IsWindowsOS(VOID) { - // TODO: + // TODO? : // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, // check the REG_SZ value "ProductName" and see whether it's "Windows" @@ -100,12 +100,22 @@ IsValidNTOSInstallation( IN HANDLE SystemRootDirectory OPTIONAL, IN PCWSTR SystemRoot OPTIONAL); +static PNTOS_INSTALLATION +FindExistingNTOSInstall( + IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ); + static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName); static NTSTATUS @@ -121,7 +131,15 @@ FreeLdrEnumerateInstallations( PINICACHEITERATOR Iterator; PINICACHESECTION IniSection, OsIniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -149,16 +167,16 @@ FreeLdrEnumerateInstallations( PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + RtlInitUnicodeString(&InstallName, KeyData); } - DPRINT1("Possible installation '%S' in OS section '%S'\n", InstallName, SectionName); + DPRINT1("Possible installation '%wZ' in OS section '%S'\n", &InstallName, SectionName); /* Search for an existing ReactOS entry */ OsIniSection = IniCacheGetSection(IniCache, SectionName); @@ -188,27 +206,25 @@ FreeLdrEnumerateInstallations( Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (!NT_SUCCESS(Status)) { - DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); + DPRINT1(" A Win2k3 install '%wZ' 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); + DPRINT1(" Found a candidate Win2k3 install '%wZ' 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: Normalize the ARC path. - // 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... + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, KeyData, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -218,18 +234,26 @@ FreeLdrEnumerateInstallations( RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", KeyData); - // FIXME: Do not continue! + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", KeyData); continue; } - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", KeyData, &SystemRootPath); + 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... + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*KeyData*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -245,18 +269,18 @@ FreeLdrEnumerateInstallations( FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", KeyData, &SystemRootPath); + 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)) @@ -276,20 +300,21 @@ FreeLdrEnumerateInstallations( if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, KeyData, InstallNameW); + AddNTOSInstallation(List, KeyData, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -313,7 +338,15 @@ NtLdrEnumerateInstallations( PINICACHEITERATOR Iterator; PINICACHESECTION IniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -341,40 +374,32 @@ NtLdrEnumerateInstallations( PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + RtlInitUnicodeString(&InstallName, KeyData); } - DPRINT1("Possible installation '%S' with ARC path '%S'\n", InstallName, SectionName); + DPRINT1("Possible installation '%wZ' 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 '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - 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]; + // TODO: Normalize the ARC 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... + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, SectionName, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -384,18 +409,26 @@ NtLdrEnumerateInstallations( RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", SectionName); - // FIXME: Do not continue! + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", SectionName); continue; } - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", SectionName, &SystemRootPath); + 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... + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*SectionName*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -411,18 +444,18 @@ NtLdrEnumerateInstallations( FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", SectionName, &SystemRootPath); + 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)) @@ -442,20 +475,21 @@ NtLdrEnumerateInstallations( if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, SectionName, InstallNameW); + AddNTOSInstallation(List, SectionName, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -471,18 +505,18 @@ Quit: * Searches for a sub-string 'strSearch' inside 'str', similarly to what * wcsstr(str, strSearch) does, but ignores the case during the comparisons. */ -PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) { - PWSTR cp = (PWSTR)str; - PWSTR s1, s2; + PCWSTR cp = str; + PCWSTR s1, s2; if (!*strSearch) - return (PWSTR)str; + return str; while (*cp) { s1 = cp; - s2 = (PWSTR)strSearch; + s2 = strSearch; while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) ++s1, ++s2; @@ -523,14 +557,14 @@ CheckForValidPEAndVendor( &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", FileName, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File %S does not seem to be a valid PE, bail out\n", FileName); + DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", FileName); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -542,7 +576,7 @@ CheckForValidPEAndVendor( Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", FileName, Status); goto UnmapFile; } @@ -568,7 +602,7 @@ CheckForValidPEAndVendor( if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - DPRINT1("Found version vendor: \"%S\" for file %S\n", pvData, FileName); + DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, FileName); StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); @@ -579,7 +613,7 @@ CheckForValidPEAndVendor( } if (!NT_SUCCESS(Status)) - DPRINT1("No version vendor found for file %S\n", FileName); + DPRINT1("No version vendor found for file '%S'\n", FileName); UnmapFile: /* Finally, unmap and close the file */ @@ -602,8 +636,8 @@ IsValidNTOSInstallation( { BOOLEAN Success = FALSE; USHORT i; - WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING VendorName; + WCHAR PathBuffer[MAX_PATH]; /* * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, @@ -623,7 +657,7 @@ IsValidNTOSInstallation( 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); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -631,7 +665,7 @@ IsValidNTOSInstallation( 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); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -639,7 +673,7 @@ IsValidNTOSInstallation( 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); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -650,12 +684,12 @@ IsValidNTOSInstallation( */ if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif @@ -723,9 +757,9 @@ DumpNTOSInstalls( NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot %S\n", + DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot '%wZ'\n", NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, - NtOsInstall->InstallationName, NtOsInstall->SystemRoot); + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); } DPRINT1("Done.\n"); @@ -734,12 +768,22 @@ DumpNTOSInstalls( static PNTOS_INSTALLATION FindExistingNTOSInstall( IN PGENERIC_LIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber, - IN PCWSTR SystemRoot) + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ) { PGENERIC_LIST_ENTRY Entry; PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemArcPath; + + /* + * We search either via ARC path or NT path. + * If both pointers are NULL then we fail straight away. + */ + if (!SystemRootArcPath && !SystemRootNtPath) + return NULL; + + RtlInitUnicodeString(&SystemArcPath, SystemRootArcPath); Entry = GetFirstListEntry(List); while (Entry) @@ -747,9 +791,17 @@ FindExistingNTOSInstall( NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - if (NtOsInstall->DiskNumber == DiskNumber && - NtOsInstall->PartitionNumber == PartitionNumber && - _wcsicmp(NtOsInstall->SystemRoot, SystemRoot) == 0) + /* + * Note that if both ARC paths are equal, then the corresponding + * NT paths must be the same. However, two ARC paths may be different + * but resolve into the same NT path. + */ + if ( (SystemRootArcPath && + RtlEqualUnicodeString(&NtOsInstall->SystemArcPath, + &SystemArcPath, TRUE)) || + (SystemRootNtPath && + RtlEqualUnicodeString(&NtOsInstall->SystemNtPath, + SystemRootNtPath, TRUE)) ) { /* Found it! */ return NtOsInstall; @@ -762,20 +814,24 @@ FindExistingNTOSInstall( static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName) { PNTOS_INSTALLATION NtOsInstall; + SIZE_T ArcPathLength, NtPathLength; CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ - NtOsInstall = FindExistingNTOSInstall(List, DiskNumber, PartitionNumber, SystemRoot); + NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); if (NtOsInstall) { - 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); + DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, &NtOsInstall->SystemNtPath); // // 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. @@ -783,14 +839,34 @@ AddNTOSInstallation( return NtOsInstall; } + ArcPathLength = (wcslen(SystemRootArcPath) + 1) * sizeof(WCHAR); + // NtPathLength = ROUND_UP(SystemRootNtPath->Length + sizeof(UNICODE_NULL), sizeof(WCHAR)); + NtPathLength = SystemRootNtPath->Length + sizeof(UNICODE_NULL); + /* None was found, so add a new one */ - NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*NtOsInstall)); + NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, + sizeof(*NtOsInstall) + + ArcPathLength + NtPathLength); if (!NtOsInstall) return NULL; NtOsInstall->DiskNumber = DiskNumber; NtOsInstall->PartitionNumber = PartitionNumber; - StringCchCopyW(NtOsInstall->SystemRoot, ARRAYSIZE(NtOsInstall->SystemRoot), SystemRoot); + NtOsInstall->PartEntry = PartEntry; + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemArcPath, + (PWCHAR)(NtOsInstall + 1), + ArcPathLength); + RtlCopyMemory(NtOsInstall->SystemArcPath.Buffer, SystemRootArcPath, ArcPathLength); + NtOsInstall->SystemArcPath.Length = ArcPathLength - sizeof(UNICODE_NULL); + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemNtPath, + (PWCHAR)((ULONG_PTR)(NtOsInstall + 1) + ArcPathLength), + NtPathLength); + RtlCopyUnicodeString(&NtOsInstall->SystemNtPath, SystemRootNtPath); + NtOsInstall->PathComponent = NtOsInstall->SystemNtPath.Buffer + + (PathComponent - SystemRootNtPath->Buffer); + StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... @@ -807,27 +883,25 @@ FindNTOSInstallations( IN PPARTENTRY PartEntry) { NTSTATUS Status; - UINT i; + ULONG DiskNumber = PartEntry->DiskEntry->DiskNumber; + ULONG PartitionNumber = PartEntry->PartitionNumber; HANDLE PartitionHandle, FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; + UINT i; HANDLE SectionHandle; // SIZE_T ViewSize; ULONG FileSize; PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; -PDISKENTRY DiskEntry = PartEntry->DiskEntry; -ULONG DiskNumber = DiskEntry->DiskNumber; -ULONG PartitionNumber = PartEntry->PartitionNumber; - /* Set PartitionRootPath */ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", DiskNumber, PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); + DPRINT1("FindNTOSInstallations: PartitionRootPath: '%wZ'\n", &PartitionRootPath); /* Open the partition */ InitializeObjectAttributes(&ObjectAttributes, @@ -843,7 +917,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionRootPath, Status); return; } @@ -854,7 +928,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) { /* The loader does not exist, continue with another one */ - DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); continue; } @@ -865,7 +939,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; { /* The loader does not exist, continue with another one */ // FIXME: Consider it might be optional?? - DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); continue; } diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h index bef666a172..5076784086 100644 --- a/base/setup/usetup/osdetect.h +++ b/base/setup/usetup/osdetect.h @@ -9,15 +9,15 @@ typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG PartitionNumber; - 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];/**/ + PCWSTR PathComponent; // Pointer inside SystemNtPath.Buffer + ULONG DiskNumber; + ULONG PartitionNumber; + PPARTENTRY PartEntry; + WCHAR InstallationName[MAX_PATH]; } NTOS_INSTALLATION, *PNTOS_INSTALLATION; // EnumerateNTOSInstallations

6 years, 6 months

06/07: [USETUP] Some fixes/improvements suggested by Thomas (1/2).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3074ad7159f830ed5184e… commit 3074ad7159f830ed5184e0a6627b3d8a5ab9b1a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 17:55:16 2017 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:01:00 2018 +0200 [USETUP] Some fixes/improvements suggested by Thomas (1/2). - isspace('\0') returns FALSE anyways so no need to separately test for a NULL character; - The (str/wcs)toul function cannot return a NULL pointer from its second paramter; - VersionInfo32_FindChild(): the third argument is indeed a number of characters (not bytes), so rename the parameter to make this fact clear. The function is however correctly used within this module. svn path=/branches/setup_improvements/; revision=74629 --- base/setup/lib/arcname.c | 5 ++--- base/setup/lib/ntverrsrc.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index d2ea9d927a..60af00dbb1 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -142,7 +142,7 @@ ArcGetNextTokenA( KeyValue = strtoul(p, (PSTR*)&p, 10); /* Skip any trailing whitespace */ - while (*p && isspace(*p)) ++p; + while (isspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != ')') @@ -202,10 +202,9 @@ ArcGetNextTokenU( */ // KeyValue = _wtoi(p); KeyValue = wcstoul(p, (PWSTR*)&p, 10); - ASSERT(p); /* Skip any trailing whitespace */ - while (*p && iswspace(*p)) ++p; + while (iswspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != L')') diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/ntverrsrc.c index e788e12b12..d8c1c64fc6 100644 --- a/base/setup/lib/ntverrsrc.c +++ b/base/setup/lib/ntverrsrc.c @@ -104,13 +104,13 @@ static PCVS_VERSION_INFO_STRUCT32 VersionInfo32_FindChild( IN PCVS_VERSION_INFO_STRUCT32 info, IN PCWSTR szKey, - IN UINT cbKey) + IN UINT cchKey) { 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]) + if (!_wcsnicmp(child->szKey, szKey, cchKey) && !child->szKey[cchKey]) return child; if (child->wLength == 0) return NULL;

6 years, 6 months

05/07: [USETUP] Improve the NTOS installations detector.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a6050902bd78e831d525… commit 5a6050902bd78e831d525fc56a1714f155bd86f3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 01:19:08 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:59 2018 +0200 [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. svn path=/branches/setup_improvements/; revision=74622 --- base/setup/usetup/osdetect.c | 589 +++++++++++++++++++++++++++++++++---------- base/setup/usetup/osdetect.h | 8 +- 2 files changed, 468 insertions(+), 129 deletions(-) diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 23f1dee7a9..34c18e7b11 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -94,28 +94,41 @@ NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = // {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) { @@ -123,69 +136,335 @@ EnumerateInstallationsFreeLdr() return STATUS_UNSUCCESSFUL; } - /* NOTE that we enumerate all the valid installations, not just the default one */ - while (TRUE) + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do { - Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + // 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; + { + DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); + continue; + } - // TODO some foobaring... + { + 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; + } - // TODO 2 : Remind the entry name so that we may display it as available installation... + 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; + } - /* Search for an existing ReactOS entry */ - OsIniSection = IniCacheGetSection(IniCache, SectionName2); - if (OsIniSection != NULL) + if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - BOOLEAN UseExistingEntry = TRUE; + 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); - /* Check for supported boot type "Windows2003" */ - Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); - if (NT_SUCCESS(Status)) + /* 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); + return STATUS_SUCCESS; } -#endif +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; +} /* * FindSubStrI(PCWSTR str, PCWSTR strSearch) : @@ -221,8 +500,8 @@ static BOOLEAN 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; @@ -234,18 +513,24 @@ CheckForValidPEAndVendor( 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; } @@ -257,7 +542,7 @@ CheckForValidPEAndVendor( 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; } @@ -266,7 +551,6 @@ CheckForValidPEAndVendor( { USHORT wCodePage = 0, wLangID = 0; WCHAR FileInfo[MAX_PATH]; - UNICODE_STRING Vendor; wCodePage = LOWORD(*(ULONG*)pvData); wLangID = HIWORD(*(ULONG*)pvData); @@ -276,22 +560,27 @@ CheckForValidPEAndVendor( 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: \"%S\" for file %S\n", pvData, FileName); - DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); + StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, + pvData, BufLen * sizeof(WCHAR)); + VendorName->Length = wcslen(VendorName->Buffer) * sizeof(WCHAR); - Success = !!FindSubStrI(pvData, VendorName); - } - else - { - DPRINT1("No version vendor found for file %wZ\n", &FileName); + Success = TRUE; } } + if (!NT_SUCCESS(Status)) + DPRINT1("No version vendor found for file %S\n", FileName); + UnmapFile: /* Finally, unmap and close the file */ UnMapFile(SectionHandle, ViewBase); @@ -300,36 +589,55 @@ UnmapFile: 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]; + UNICODE_STRING VendorName; - // DoesPathExist(PartitionHandle, SystemRoot, L"System32\\"); etc... + /* + * 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; @@ -340,38 +648,64 @@ IsValidNTOSInstallation( * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(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]); + RtlInitEmptyUnicodeString(&VendorName, PathBuffer, sizeof(PathBuffer)); - /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ + /* 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"); - /* Check for the existence of \SystemRoot\System32\ntdll.dll */ - Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntdll.dll", KnownVendors[i]); + /* 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; + } + } + } - /* We have found a correct vendor combination */ - if (Success) - 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; @@ -442,6 +776,10 @@ AddNTOSInstallation( { 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; } @@ -464,9 +802,9 @@ AddNTOSInstallation( 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; @@ -476,15 +814,18 @@ FindNTOSInstallations( 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); @@ -519,7 +860,7 @@ FindNTOSInstallations( /* 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 */ @@ -529,31 +870,21 @@ FindNTOSInstallations( } /* 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("Analyse the OS installations inside '%S' in disk #%d, partition #%d\n", + NtosBootLoaders[i].LoaderConfigurationFile, DiskNumber, PartitionNumber); + switch (NtosBootLoaders[i].Type) { - 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); - } + case FreeLdr: + Status = FreeLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); + break; - // 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); + 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 */ @@ -611,6 +942,8 @@ CreateNTOSInstallationsList( 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, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", @@ -621,7 +954,7 @@ CreateNTOSInstallationsList( 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) */ @@ -631,6 +964,8 @@ CreateNTOSInstallationsList( 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, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", @@ -641,12 +976,12 @@ CreateNTOSInstallationsList( 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; } diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h index 117681e47a..bef666a172 100644 --- a/base/setup/usetup/osdetect.h +++ b/base/setup/usetup/osdetect.h @@ -11,8 +11,12 @@ typedef struct _NTOS_INSTALLATION 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;

6 years, 6 months

04/07: [SETUPLIB] Add an ARC path to (and from) NT path resolver.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa44ab1fbceecc0ab9c69… commit aa44ab1fbceecc0ab9c69512ca5f04eba0a6bfcd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 01:09:35 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:59 2018 +0200 [SETUPLIB] Add an ARC path to (and from) NT path resolver. The NT path resolver 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()]. The code is in work-in-progress status. Some validation tests, that were used during the implementation of the resolver, have been added. svn path=/branches/setup_improvements/; revision=74621 svn path=/branches/setup_improvements/; revision=74631 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/arcname.c | 860 +++++++++++++++++++++++++++++++++++++++++ base/setup/lib/arcname.h | 21 + base/setup/lib/arcname_tests.c | 134 +++++++ base/setup/lib/setuplib.h | 2 + 5 files changed, 1018 insertions(+) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 258a14b03c..a37be9d1fb 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND SOURCE + arcname.c fsutil.c genlist.c ntverrsrc.c diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c new file mode 100644 index 0000000000..d2ea9d927a --- /dev/null +++ b/base/setup/lib/arcname.c @@ -0,0 +1,860 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ARC path to-and-from NT path resolver. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ +/* + * 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 */ diff --git a/base/setup/lib/arcname.h b/base/setup/lib/arcname.h new file mode 100644 index 0000000000..45d5b6b5c7 --- /dev/null +++ b/base/setup/lib/arcname.h @@ -0,0 +1,21 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ARC path to-and-from NT path resolver. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#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 */ diff --git a/base/setup/lib/arcname_tests.c b/base/setup/lib/arcname_tests.c new file mode 100644 index 0000000000..deba131552 --- /dev/null +++ b/base/setup/lib/arcname_tests.c @@ -0,0 +1,134 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for the arcname.c functions: + * ArcPathNormalize(), ArcPathToNtPath(). + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + * + * You may need to fix the included headers before being able to + * compile this file (this file has only been compiled 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" + +#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; +} diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 6a4452429b..055ed5eef7 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -28,8 +28,10 @@ extern HANDLE ProcessHeap; #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 */

6 years, 6 months

03/07: [USETUP][SETUPLIB] 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.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1741a07cfa267bda77f3… commit b1741a07cfa267bda77f32e5b019908b76187f94 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:41:04 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:58 2018 +0200 [USETUP][SETUPLIB] 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. svn path=/branches/setup_improvements/; revision=74618 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/ntverrsrc.c | 193 ++++++++++++++++++++++++++++++++++++++++++ base/setup/lib/ntverrsrc.h | 23 +++++ base/setup/lib/precomp.h | 5 -- base/setup/lib/setuplib.h | 1 + base/setup/usetup/osdetect.c | 180 --------------------------------------- 6 files changed, 218 insertions(+), 185 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index e44b2f71c7..258a14b03c 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE fsutil.c genlist.c + ntverrsrc.c partlist.c precomp.h) diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/ntverrsrc.c new file mode 100644 index 0000000000..e788e12b12 --- /dev/null +++ b/base/setup/lib/ntverrsrc.c @@ -0,0 +1,193 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Version Resource Management API + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + * + * 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 */ diff --git a/base/setup/lib/ntverrsrc.h b/base/setup/lib/ntverrsrc.h new file mode 100644 index 0000000000..9ef5b0065e --- /dev/null +++ b/base/setup/lib/ntverrsrc.h @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Version Resource Management API + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#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 */ diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index 1f84862e1b..ea82da4f39 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -32,11 +32,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" diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index f9ed75ebda..6a4452429b 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -27,6 +27,7 @@ extern HANDLE ProcessHeap; #include "errorcode.h" #include "linklist.h" +#include "ntverrsrc.h" #include "fsutil.h" #include "genlist.h" #include "partlist.h" diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 60fd7ef644..23f1dee7a9 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -8,9 +8,6 @@ #include "usetup.h" -#include <ndk/ldrtypes.h> -#include <ndk/ldrfuncs.h> - // HACK! #include <strsafe.h> @@ -26,183 +23,6 @@ extern PPARTLIST PartitionList; 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 ****************************************************************/ #if 0

6 years, 6 months

02/07: [USETUP] PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They will be used in the subsequent commits.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c76ce526c88811e35b8f… commit 2c76ce526c88811e35b8fbfc43a2c04f33b7e6bc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:36:13 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:58 2018 +0200 [USETUP] PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They will be used in the subsequent commits. svn path=/branches/setup_improvements/; revision=74617 --- base/setup/lib/partlist.c | 249 ++++++++++++++++++++++++++++++++++++++++------ base/setup/lib/partlist.h | 39 +++++++- 2 files changed, 258 insertions(+), 30 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 9861c241f8..d2d3f36768 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -1067,6 +1067,21 @@ AddDiskToList( 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); @@ -1329,53 +1344,229 @@ DestroyPartitionList( RtlFreeHeap(ProcessHeap, 0, List); } -// -// FIXME: This function is COMPLETELY BROKEN!!!! -// -BOOLEAN -SelectPartition( +PDISKENTRY +GetDiskByBiosNumber( IN PPARTLIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber) + IN ULONG BiosDiskNumber) { PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - PLIST_ENTRY Entry1, Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return FALSE; + return NULL; - /* Check for first usable entry on next disk */ - Entry1 = List->CurrentDisk->ListEntry.Flink; - while (Entry1 != &List->DiskListHead) + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) { - DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); + 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) { - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + /* Disk found */ + return DiskEntry; + } + } - if (PartEntry->PartitionNumber == PartitionNumber) - { - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return TRUE; - } + /* Disk not found, stop there */ + return NULL; +} - Entry2 = Entry2->Flink; - } +PDISKENTRY +GetDiskBySCSI( + IN PPARTLIST List, + IN USHORT Port, + IN USHORT Bus, + IN USHORT Id) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; - return FALSE; + /* 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; } + } - Entry1 = Entry1->Flink; + /* 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; + } } - return FALSE; + /* 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; +} + +// +// NOTE: Was introduced broken in r6258 by Casper +// +BOOLEAN +SelectPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + DiskEntry = GetDiskByNumber(List, DiskNumber); + if (!DiskEntry) + 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 diff --git a/base/setup/lib/partlist.h b/base/setup/lib/partlist.h index 5d2b62535f..d23642731b 100644 --- a/base/setup/lib/partlist.h +++ b/base/setup/lib/partlist.h @@ -87,11 +87,12 @@ typedef struct _DISKENTRY /* 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; @@ -217,6 +218,42 @@ VOID 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,

6 years, 6 months

01/07: [USETUP] Introduce an NT OS installation detector: a functionality that attempts to detect installations of NT 5.x operating systems (MS Windows <= 2k3, ReactOS).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b76fa3412122ade2b95f8… commit b76fa3412122ade2b95f8b05b7110f84db6d65bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 13 16:13:19 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:44 2018 +0200 [USETUP] Introduce an NT OS installation detector: a functionality that attempts to detect installations of NT 5.x operating systems (MS Windows <= 2k3, ReactOS). The aim is to use this detector to be able to detect and select an existing installation of ReactOS for upgrading. The user then could either select one, or skip this step and perform a regular ReactOS installation. What remains to be done, is to parse the NTOS loader configuration files (freeldr.ini in ReactOS' case, or boot.ini in Win2k3's case, etc...) to retrieve the actual installation paths. So far these are currently hardcoded for testing purposes only. The detector attempts to distinguish between ReactOS and Windows installations by checking at the company name vendor of the ntoskrnl.exe & ntdll.dll files, so that only ReactOS installations are allowed to be upgraded. svn path=/branches/setup_improvements/; revision=74527 svn path=/branches/setup_improvements/; revision=74550 --- base/setup/usetup/CMakeLists.txt | 1 + base/setup/usetup/osdetect.c | 834 +++++++++++++++++++++++++++++++++++++++ base/setup/usetup/osdetect.h | 22 ++ base/setup/usetup/usetup.h | 1 + 4 files changed, 858 insertions(+) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 69d1e6b4e3..714182e7e7 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE inicache.c keytrans.c mui.c + osdetect.c partlist.c progress.c registry.c diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c new file mode 100644 index 0000000000..60fd7ef644 --- /dev/null +++ b/base/setup/usetup/osdetect.c @@ -0,0 +1,834 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * operating systems detection code. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#include "usetup.h" + +#include <ndk/ldrtypes.h> +#include <ndk/ldrfuncs.h> + +// HACK! +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +extern PPARTLIST PartitionList; + +/* 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 ****************************************************************/ + +#if 0 + +BOOL IsWindowsOS(VOID) +{ + // TODO: + // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, + // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, + // check the REG_SZ value "ProductName" and see whether it's "Windows" + // or "ReactOS". One may also check the REG_SZ "CurrentVersion" value, + // the REG_SZ "SystemRoot" and "PathName" values (what are the differences??). + // + // Optionally, looking at the SYSTEM hive, CurrentControlSet\\Control, + // REG_SZ values "SystemBootDevice" (and "FirmwareBootDevice" ??)... + // + + /* ReactOS reports as Windows NT 5.2 */ + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + LONG ret; + DWORD dwType = 0, dwBufSize = 0; + + ret = RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, NULL, &dwBufSize); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + LPTSTR lpszProductName = (LPTSTR)MemAlloc(0, dwBufSize); + RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, (LPBYTE)lpszProductName, &dwBufSize); + + bIsWindowsOS = (FindSubStrI(lpszProductName, _T("Windows")) != NULL); + + MemFree(lpszProductName); + } + + RegCloseKey(hKey); + } + + return bIsWindowsOS; +} + +#endif + +typedef enum _NTOS_BOOT_LOADER_TYPE +{ + FreeLdr, // ReactOS' FreeLDR + NtLdr, // Windows <= 2k3 NTLDR +// BootMgr, // Vista+ BCD-oriented BOOTMGR +} NTOS_BOOT_LOADER_TYPE; + +typedef struct _NTOS_BOOT_LOADER_FILES +{ + NTOS_BOOT_LOADER_TYPE Type; + PCWSTR LoaderExecutable; + PCWSTR LoaderConfigurationFile; + // EnumerateInstallations; +} NTOS_BOOT_LOADER_FILES, *PNTOS_BOOT_LOADER_FILES; + +// Question 1: What if config file is optional? +// Question 2: What if many config files are possible? +NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = +{ + {FreeLdr, L"freeldr.sys", L"freeldr.ini"}, + {NtLdr , L"ntldr" , L"boot.ini"}, + {NtLdr , L"setupldr" , L"txtsetup.sif"}, +// {BootMgr, L"bootmgr" , ???} +}; + +#if 0 + +static VOID +EnumerateInstallationsFreeLdr() +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHESECTION IniSection; + PINICACHESECTION OsIniSection; + WCHAR SectionName[80]; + WCHAR OsName[80]; + WCHAR SystemPath[200]; + WCHAR SectionName2[200]; + PWCHAR KeyData; + ULONG i,j; + + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoad(&IniCache, IniPath, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* NOTE that we enumerate all the valid installations, not just the default one */ + while (TRUE) + { + Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + if (!NT_SUCCESS(Status)) + break; + + // TODO some foobaring... + + // TODO 2 : Remind the entry name so that we may display it as available installation... + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName2); + if (OsIniSection != NULL) + { + BOOLEAN UseExistingEntry = TRUE; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + + if (UseExistingEntry) + { + /* BootType is Windows2003. Now check SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); + if (NT_SUCCESS(Status)) + { + swprintf(SystemPath, L"\"%s\"", ArcPath); + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, ArcPath) != 0) && + (_wcsicmp(KeyData, SystemPath) != 0) )) + { + /* This entry is a ReactOS entry, but the SystemRoot + does not match the one we are looking for. */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + } + } + } + + IniCacheDestroy(IniCache); +} + +#endif + + +/* + * FindSubStrI(PCWSTR str, PCWSTR strSearch) : + * Searches for a sub-string 'strSearch' inside 'str', similarly to what + * wcsstr(str, strSearch) does, but ignores the case during the comparisons. + */ +PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +{ + PWSTR cp = (PWSTR)str; + PWSTR s1, s2; + + if (!*strSearch) + return (PWSTR)str; + + while (*cp) + { + s1 = cp; + s2 = (PWSTR)strSearch; + + while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) + ++s1, ++s2; + + if (!*s2) + return cp; + + ++cp; + } + + return NULL; +} + +static BOOLEAN +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 ? + ) +{ + BOOLEAN Success = FALSE; + NTSTATUS Status; + HANDLE FileHandle, SectionHandle; + // SIZE_T ViewSize; + PVOID ViewBase; + PVOID VersionBuffer = NULL; // Read-only + PVOID pvData = NULL; + UINT BufLen = 0; + + Status = OpenAndMapFile(RootDirectory, PathName, FileName, + &FileHandle, &SectionHandle, &ViewBase); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open and map file %wZ, 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); + Status = STATUS_INVALID_IMAGE_FORMAT; + goto UnmapFile; + } + + /* + * Search for a valid executable version and vendor. + * NOTE: The module is loaded as a data file, it should be marked as such. + */ + Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); + goto UnmapFile; + } + + Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); + if (NT_SUCCESS(Status)) + { + USHORT wCodePage = 0, wLangID = 0; + WCHAR FileInfo[MAX_PATH]; + UNICODE_STRING Vendor; + + wCodePage = LOWORD(*(ULONG*)pvData); + wLangID = HIWORD(*(ULONG*)pvData); + + StringCchPrintfW(FileInfo, ARRAYSIZE(FileInfo), + L"StringFileInfo\\%04X%04X\\CompanyName", + wCodePage, wLangID); + + Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); + if (NT_SUCCESS(Status) && pvData) + { + /* BufLen includes the NULL terminator count */ + RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); + Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); + + DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); + + Success = !!FindSubStrI(pvData, VendorName); + } + else + { + DPRINT1("No version vendor found for file %wZ\n", &FileName); + } + } + +UnmapFile: + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + + return Success; +} + +static BOOLEAN +IsValidNTOSInstallation( + IN HANDLE PartitionHandle, + IN PCWSTR SystemRoot) +{ + BOOLEAN Success = FALSE; + USHORT i; + WCHAR PathBuffer[MAX_PATH]; + + // DoesPathExist(PartitionHandle, 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)) + { + // 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)) + { + // 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)) + { + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + +#if 0 + /* + * 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")) + { + // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + if (!DoesFileExist(PartitionHandle, 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; + } + + return Success; +} + +static VOID +ListNTOSInstalls( + IN PGENERIC_LIST List) +{ + PGENERIC_LIST_ENTRY Entry; + PNTOS_INSTALLATION NtOsInstall; + ULONG NtOsInstallsCount = GetNumberOfListEntries(List); + + DPRINT1("There %s %d installation%s detected:\n", + NtOsInstallsCount >= 2 ? "are" : "is", + NtOsInstallsCount, + NtOsInstallsCount >= 2 ? "s" : ""); + + Entry = GetFirstListEntry(List); + while (Entry) + { + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); + Entry = GetNextListEntry(Entry); + + DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot %S\n", + NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, + NtOsInstall->InstallationName, NtOsInstall->SystemRoot); + } + + DPRINT1("Done.\n"); +} + +static PNTOS_INSTALLATION +FindExistingNTOSInstall( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot) +{ + PGENERIC_LIST_ENTRY Entry; + PNTOS_INSTALLATION NtOsInstall; + + Entry = GetFirstListEntry(List); + while (Entry) + { + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); + Entry = GetNextListEntry(Entry); + + if (NtOsInstall->DiskNumber == DiskNumber && + NtOsInstall->PartitionNumber == PartitionNumber && + _wcsicmp(NtOsInstall->SystemRoot, SystemRoot) == 0) + { + /* Found it! */ + return NtOsInstall; + } + } + + return NULL; +} + +static PNTOS_INSTALLATION +AddNTOSInstallation( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot, + IN PCWSTR InstallationName) +{ + PNTOS_INSTALLATION NtOsInstall; + CHAR InstallNameA[MAX_PATH]; + + /* Is there already any installation with these settings? */ + NtOsInstall = FindExistingNTOSInstall(List, DiskNumber, PartitionNumber, SystemRoot); + if (NtOsInstall) + { + 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); + return NtOsInstall; + } + + /* None was found, so add a new one */ + NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*NtOsInstall)); + if (!NtOsInstall) + return NULL; + + NtOsInstall->DiskNumber = DiskNumber; + NtOsInstall->PartitionNumber = PartitionNumber; + StringCchCopyW(NtOsInstall->SystemRoot, ARRAYSIZE(NtOsInstall->SystemRoot), SystemRoot); + StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); + + // Having the GENERIC_LIST storing the display item string plainly sucks... + StringCchPrintfA(InstallNameA, ARRAYSIZE(InstallNameA), "%S", InstallationName); + AppendGenericListEntry(List, InstallNameA, NtOsInstall, FALSE); + + return NtOsInstall; +} + +static VOID +FindNTOSInstallations( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber) +{ + NTSTATUS Status; + UINT i; + HANDLE PartitionHandle, FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PartitionRootPath; + HANDLE SectionHandle; + // SIZE_T ViewSize; + PVOID ViewBase; + WCHAR PathBuffer[MAX_PATH]; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + /* Set PartitionRootPath */ + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskNumber, PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Open the partition */ + InitializeObjectAttributes(&ObjectAttributes, + &PartitionRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + 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 partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + return; + } + + /* Try to see whether we recognize some NT boot loaders */ + for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) + { + /* Check whether the loader executable exists */ + if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) + { + /* The loader does not exist, continue with another one */ + DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + continue; + } + + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + continue; + } + + /* The loader configuration file exists, interpret it to find valid installations */ + // TODO!! + DPRINT1("TODO: Analyse the OS installations inside %S !\n", NtosBootLoaders[i].LoaderConfigurationFile); + + // 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); + } + + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + } + + /* Close the partition */ + NtClose(PartitionHandle); +} + +// static +FORCEINLINE BOOLEAN +ShouldICheckThisPartition( + IN PPARTENTRY PartEntry) +{ + if (!PartEntry) + return FALSE; + + return PartEntry->IsPartitioned && + !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ && + !PartEntry->New && + (PartEntry->FormatState == Preformatted /* || PartEntry->FormatState == Formatted */); +} + +// EnumerateNTOSInstallations +PGENERIC_LIST +CreateNTOSInstallationsList( + IN PPARTLIST PartList) +{ + PGENERIC_LIST List; + PLIST_ENTRY Entry, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + /* Loop each available disk ... */ + Entry = PartList->DiskListHead.Flink; + while (Entry != &PartList->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + DPRINT1("Disk #%d\n", DiskEntry->DiskNumber); + + /* ... and for each disk, loop each available partition */ + + /* First, the primary partitions */ + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + } + + /* Then, the logical partitions (present in the extended partition) */ + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + } + } + + /**** Debugging: List all the collected installations ****/ + ListNTOSInstalls(List); + + return List; +} + +/* EOF */ diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h new file mode 100644 index 0000000000..117681e47a --- /dev/null +++ b/base/setup/usetup/osdetect.h @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * operating systems detection code. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +typedef struct _NTOS_INSTALLATION +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG PartitionNumber; +// Vendor???? + WCHAR SystemRoot[MAX_PATH]; +/**/WCHAR InstallationName[MAX_PATH];/**/ +} NTOS_INSTALLATION, *PNTOS_INSTALLATION; + +// EnumerateNTOSInstallations +PGENERIC_LIST +CreateNTOSInstallationsList( + IN PPARTLIST List); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 4b7d7de339..aed5dcec4c 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -70,6 +70,7 @@ #include "cabinet.h" #include "filesup.h" #include "genlist.h" +#include "osdetect.h" #include "mui.h" extern HANDLE ProcessHeap;

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2018