Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 01/01: [DNSAPI_APITEST] Fix null-reference in case of failure

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf869e3444598624e8056… commit cf869e3444598624e805607d79c9dd78cfc9c9b8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 29 22:27:13 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Nov 4 21:13:42 2020 +0100 [DNSAPI_APITEST] Fix null-reference in case of failure --- modules/rostests/apitests/dnsapi/DnsQuery.c | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/rostests/apitests/dnsapi/DnsQuery.c b/modules/rostests/apitests/dnsapi/DnsQuery.c index c4873474a1f..3229ed9a3af 100644 --- a/modules/rostests/apitests/dnsapi/DnsQuery.c +++ b/modules/rostests/apitests/dnsapi/DnsQuery.c @@ -71,7 +71,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -84,7 +84,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -98,7 +98,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "LocalHost") == 0), "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -112,7 +112,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "Localhost") == 0), "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -126,7 +126,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -139,7 +139,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(strcmp(dp->pName, ".") == 0 || broken(strcmp(dp->pName, host_name) == 0), "DnsQuery_A returned wrong answer '%s' expected '%s' or '.'\n", dp->pName, host_name); @@ -165,7 +165,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_A("0.0.0.0", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "0.0.0.0") == 0, "DnsQuery_A returned wrong answer '%s' expected '%s'\n", dp->pName, "0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_A returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -284,7 +284,7 @@ void TestHostName(void) dp = InvalidPointer; dns_status = DnsQuery_UTF8(host_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -299,7 +299,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -315,7 +315,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "LocalHost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -331,7 +331,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is unchanged on XP is lowercased */ ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "Localhost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); @@ -347,7 +347,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -362,7 +362,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(strcmp(dp->pName, ".") == 0 || broken(strcmp(dp->pName, host_name) == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s' or '.'\n", dp->pName, host_name); @@ -392,7 +392,7 @@ void TestHostName(void) wcstombs(test_nameUTF8, test_nameW, 255); dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(strcmp(dp->pName, "0.0.0.0") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -534,7 +534,7 @@ void TestHostName(void) //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, host_nameW) == 0, "DnsQuery_w returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, host_nameW); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -546,7 +546,7 @@ void TestHostName(void) //127.0.0.1 dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"127.0.0.1") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"127.0.0.1"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -559,7 +559,7 @@ void TestHostName(void) //Localhost strings dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0 || broken(wcscmp((LPCWSTR)dp->pName, L"LocalHost") == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -571,7 +571,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0 || broken(wcscmp((LPCWSTR)dp->pName, L"Localhost") == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -583,7 +583,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"localhost") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"localhost"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); @@ -595,7 +595,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { /* On Windows 7 is the host on XP is dot ??? */ ok(wcscmp((LPCWSTR)dp->pName, L".") == 0 || broken(wcscmp((LPCWSTR)dp->pName, host_nameW) == 0), "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, host_nameW); @@ -620,7 +620,7 @@ void TestHostName(void) dns_status = DnsQuery_W(L"0.0.0.0", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - if (dp != InvalidPointer) + if (dp != InvalidPointer && dp) { ok(wcscmp((LPCWSTR)dp->pName, L"0.0.0.0") == 0, "DnsQuery_W returned wrong answer '%ls' expected '%ls'\n", (LPCWSTR)dp->pName, L"0.0.0.0"); ok(dp->wType == DNS_TYPE_A, "DnsQuery_W returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A);

4 years, 1 month

[reactos] 02/02: [FREELDR] Add the possibility to change the boot load options from TXTSETUP.SIF at runtime from the boot selection menu or from FREELDR.INI.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4792c007aafa9739c76ff… commit 4792c007aafa9739c76fff31cb3c19ffdc7a456d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 3 01:42:09 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 4 19:59:28 2020 +0100 [FREELDR] Add the possibility to change the boot load options from TXTSETUP.SIF at runtime from the boot selection menu or from FREELDR.INI. CORE-17350, CORE-9023 For a proper override of the options by new user options, specify the /SIFOPTIONSOVERRIDE switch in addition. Otherwise, user options are merged with those retrieved from TXTSETUP.SIF, with priority given to the former ones. - Update the documentation for the 'ReactOSSetup' OS type in the FREELDR.INI file template. - Use a different prompt in the custom boot options editor for the 'ReactOSSetup' OS type, with adequate explanation. - Get rid of the ReactOS-specific TXTSETUP.SIF 'DbgOsLoadOptions' value, and use instead the Windows-compatible 'SetupDebugOptions' value that is added to the other load options when debugging is to be enabled. --- boot/bootdata/txtsetup.sif | 6 +- boot/freeldr/FREELDR.INI | 24 +- boot/freeldr/freeldr/custom.c | 9 +- boot/freeldr/freeldr/ntldr/ntldropts.c | 80 ++++++ boot/freeldr/freeldr/ntldr/ntldropts.h | 7 + boot/freeldr/freeldr/ntldr/setupldr.c | 429 ++++++++++++++++++++++++++++++--- 6 files changed, 511 insertions(+), 44 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 2b7b04002e2..2ddb0512ed3 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -212,10 +212,10 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS +SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" +;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN" +;SetupDebugOptions = "/DEBUG /DEBUGPORT=BOCHS" OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" -;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" -;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" [NLS] AnsiCodepage = c_1252.nls diff --git a/boot/freeldr/FREELDR.INI b/boot/freeldr/FREELDR.INI index 0bd420d06dc..48561fc4475 100644 --- a/boot/freeldr/FREELDR.INI +++ b/boot/freeldr/FREELDR.INI @@ -115,14 +115,14 @@ ; will only be used to set the boot partition. ; Initrd - specifies the optional init ramdisk file name to be used. ; The same remarks about the path as for "Kernel" remain valid. -; CommandLine - specifies the command line options for the kernel. +; CommandLine - specifies the boot load options for the kernel. ; ["Windows(NT40|2003)" OSType] Section Commands: ; ; SystemPath - specifies the system root path (must be a valid ARC path): ; multi(0)disk(0)rdisk(0)partition(1)\reactos ; multi(0)disk(0)fdisk(0) -; Options - specifies the command line options for the kernel being booted. +; Options - specifies the boot load options for the kernel. ; Kernel - specifies the kernel file name (default: ntoskrnl.exe) ; Hal - specifies the HAL file name (default: hal.dll) ; @@ -133,8 +133,24 @@ ; ["ReactOSSetup" OSType] Section Commands: ; -; No options defined for the moment. This OS type is used to tell FreeLdr -; to start the SETUP portion of NT / ReactOS. +; This OS type is used to start the SETUP portion of NT / ReactOS. +; +; SystemPath - specifies the system root path (must be a valid ARC path): +; multi(0)disk(0)rdisk(0)partition(1)\reactos +; multi(0)disk(0)fdisk(0) +; Options - specifies extra boot load options for the kernel and the +; setup environment (see REMARK 2 below). +; +; REMARK: Contrary to the "Windows" type, this OS type does not support separate +; "Kernel" and "Hal" values. Instead, these values must be specified using the +; NT-compatible "/HAL=filename" and "/KERNEL=filename" option switches. +; +; REMARK 2: The SETUP portion retrieves the default boot load options from the +; TXTSETUP.SIF file present in the installation source (section "[SetupData]", +; values "OsLoadOptions" and "SetupDebugOptions"). Thus, any options specified +; using the "Options" value will supplement those already obtained from the +; TXTSETUP.SIF file, unless the "/SIFOPTIONSOVERRIDE" option switch is specified, +; in which case the "Options" value overrides those from TXTSETUP.SIF. [FREELOADER] diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 7cfd38c8d40..2422107d58e 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -36,7 +36,8 @@ const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; const CHAR ARCPathPrompt[] = "Enter the boot ARC path.\n\nExamples:\nmulti(0)disk(0)rdisk(0)partition(1)\nmulti(0)disk(0)fdisk(0)"; const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR ReactOSOptionsPrompt[] = "Enter the load options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR ReactOSSetupOptionsPrompt[] = "Enter additional load options you want passed to the ReactOS Setup.\nThese options will supplement those obtained from the TXTSETUP.SIF\nfile, unless you also specify the /SIFOPTIONSOVERRIDE option switch.\n\nExample:\n/NOGUIBOOT /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200"; const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; /* FUNCTIONS ******************************************************************/ @@ -659,7 +660,7 @@ EditCustomBootReactOS( return; } - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, sizeof(ReactOSOptions))) + if (!UiEditBox(IsSetup ? ReactOSSetupOptionsPrompt : ReactOSOptionsPrompt, ReactOSOptions, sizeof(ReactOSOptions))) return; /* Modify the settings values and return if we were in edit mode */ @@ -686,7 +687,9 @@ EditCustomBootReactOS( return; /* Construct the ReactOS ARC system path */ - ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); + ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, + DriveMapGetBiosDriveNumber(BootDriveString), + atoi(BootPartitionString)); /* Add the system path */ if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.c b/boot/freeldr/freeldr/ntldr/ntldropts.c index 2173924e224..ee3eb344cde 100644 --- a/boot/freeldr/freeldr/ntldr/ntldropts.c +++ b/boot/freeldr/freeldr/ntldr/ntldropts.c @@ -131,3 +131,83 @@ NtLdrGetOption( { return NtLdrGetOptionEx(Options, OptionName, NULL); } + +/* + * Appends or prepends new options to the ones originally contained + * in the buffer pointed by LoadOptions, of maximum size BufferSize. + */ +VOID +NtLdrAddOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR NewOptions OPTIONAL) +{ + ULONG OptionsLength; + ULONG NewOptsLength; + BOOLEAN AddSeparator; + + if (!LoadOptions || (BufferSize == 0)) + return; + // ASSERT(strlen(LoadOptions) + 1 <= BufferSize); + + if (!NewOptions || !*NewOptions) + return; + + if (Append) + { + OptionsLength = (ULONG)strlen(LoadOptions); + OptionsLength = min(OptionsLength, BufferSize-1); + + /* Add a whitespace separator if needed */ + if (OptionsLength != 0 && + (LoadOptions[OptionsLength-1] != ' ') && + (LoadOptions[OptionsLength-1] != '\t') && + (*NewOptions != '\0') && + (*NewOptions != ' ') && + (*NewOptions != '\t')) + { + RtlStringCbCatA(LoadOptions, BufferSize * sizeof(CHAR), " "); + } + + /* Append the options */ + RtlStringCbCatA(LoadOptions, BufferSize * sizeof(CHAR), NewOptions); + } + else + { + NewOptsLength = (ULONG)strlen(NewOptions); + NewOptsLength = min(NewOptsLength, BufferSize-1); + + /* Add a whitespace separator if needed */ + AddSeparator = FALSE; + if (NewOptsLength != 0 && + (NewOptions[NewOptsLength-1] != ' ') && + (NewOptions[NewOptsLength-1] != '\t') && + (*LoadOptions != '\0') && + (*LoadOptions != ' ') && + (*LoadOptions != '\t')) + { + AddSeparator = TRUE; + ++NewOptsLength; + } + + /* + * Move the original load options forward (possibly truncating them + * at the end if the buffer is not large enough) to make place for + * the options to prepend. + */ + OptionsLength = (ULONG)strlen(LoadOptions) + 1; + OptionsLength = min(OptionsLength, BufferSize - NewOptsLength); + RtlMoveMemory(LoadOptions + NewOptsLength, + LoadOptions, + OptionsLength * sizeof(CHAR)); + /* NULL-terminate */ + (LoadOptions + NewOptsLength)[OptionsLength-1] = '\0'; + + /* Restore the new options length back to its original value */ + if (AddSeparator) --NewOptsLength; + /* Prepend the options and add the whitespace separator if needed */ + strncpy(LoadOptions, NewOptions, NewOptsLength); + if (AddSeparator) LoadOptions[NewOptsLength] = ' '; + } +} diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.h b/boot/freeldr/freeldr/ntldr/ntldropts.h index aab539ce92d..9b92eac8e74 100644 --- a/boot/freeldr/freeldr/ntldr/ntldropts.h +++ b/boot/freeldr/freeldr/ntldr/ntldropts.h @@ -29,3 +29,10 @@ PCSTR NtLdrGetOption( IN PCSTR Options, IN PCSTR OptionName); + +VOID +NtLdrAddOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR NewOptions OPTIONAL); diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 548e4b7c21b..e80d15e03a6 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -15,8 +15,6 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); -#define TAG_BOOT_OPTIONS 'pOtB' - // TODO: Move to .h VOID AllocateAndInitLPB( @@ -175,6 +173,264 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, PCSTR Se /* SETUP STARTER **************************************************************/ +/* + * Update the options in the buffer pointed by LoadOptions, of maximum size + * BufferSize, by first removing any specified options, and then adding any + * other ones. + * + * OptionsToAdd is a NULL-terminated array of string buffer pointers that + * specify the options to be added into LoadOptions. Whether they are + * prepended or appended to LoadOptions is controlled via the Append + * parameter. The options are added in the order specified by the array. + * + * OptionsToRemove is a NULL-terminated array of string buffer pointers that + * specify the options to remove from LoadOptions. Specifying also there + * any options to add, has the effect of removing from LoadOptions any + * duplicates of the options to be added, before adding them later into + * LoadOptions. The options are removed in the order specified by the array. + * + * The options string buffers in the OptionsToRemove array have the format: + * "/option1 /option2[=] ..." + * + * An option in the OptionsToRemove list with a trailing '=' or ':' designates + * an option in LoadOptions with user-specific data appended after the sign. + * When such an option is being removed from LoadOptions, all the appended + * data is also removed until the next option. + */ +VOID +NtLdrUpdateLoadOptions( + IN OUT PSTR LoadOptions, + IN ULONG BufferSize, + IN BOOLEAN Append, + IN PCSTR OptionsToAdd[] OPTIONAL, + IN PCSTR OptionsToRemove[] OPTIONAL) +{ + PCSTR NextOptions, NextOpt; + PSTR Options, Option; + ULONG NextOptLength; + ULONG OptionLength; + + if (!LoadOptions || (BufferSize == 0)) + return; + // ASSERT(strlen(LoadOptions) + 1 <= BufferSize); + + /* Loop over the options to remove */ + for (; OptionsToRemove && *OptionsToRemove; ++OptionsToRemove) + { + NextOptions = *OptionsToRemove; + while ((NextOpt = NtLdrGetNextOption(&NextOptions, &NextOptLength))) + { + /* Scan the load options */ + Options = LoadOptions; + while ((Option = (PSTR)NtLdrGetNextOption((PCSTR*)&Options, &OptionLength))) + { + /* + * Check whether the option to find exactly matches the current + * load option, or is a prefix thereof if this is an option with + * appended data. + */ + if ((OptionLength >= NextOptLength) && + (_strnicmp(Option, NextOpt, NextOptLength) == 0)) + { + if ((OptionLength == NextOptLength) || + (NextOpt[NextOptLength-1] == '=') || + (NextOpt[NextOptLength-1] == ':')) + { + /* Eat any skipped option or whitespace separators */ + while ((Option > LoadOptions) && + (Option[-1] == '/' || + Option[-1] == ' ' || + Option[-1] == '\t')) + { + --Option; + } + + /* If the option was not preceded by a whitespace + * separator, insert one and advance the pointer. */ + if ((Option > LoadOptions) && + (Option[-1] != ' ') && + (Option[-1] != '\t') && + (*Options != '\0') /* && + ** Not necessary since NtLdrGetNextOption() ** + ** stripped any leading separators. ** + (*Options != ' ') && + (*Options != '\t') */) + { + *Option++ = ' '; + } + + /* Move the remaining options back, erasing the current one */ + ASSERT(Option <= Options); + RtlMoveMemory(Option, + Options, + (strlen(Options) + 1) * sizeof(CHAR)); + + /* Reset the iterator */ + Options = Option; + } + } + } + } + } + + /* Now loop over the options to add */ + for (; OptionsToAdd && *OptionsToAdd; ++OptionsToAdd) + { + NtLdrAddOptions(LoadOptions, + BufferSize, + Append, + *OptionsToAdd); + } +} + + +/* + * List of options and their corresponding higher priority ones, + * that are either checked before any other ones, or whose name + * includes another option name as a subset (e.g. NODEBUG vs. DEBUG). + * See also https://geoffchappell.com/notes/windows/boot/editoptions.htm + */ +static const struct +{ + PCSTR Options; + PCSTR ExtraOptions; + PCSTR HigherPriorOptions; +} HighPriorOptionsMap[] = +{ + /* NODEBUG has a higher precedence than DEBUG */ + {"/DEBUG/DEBUG=", NULL, "/NODEBUG"}, + + /* When using SCREEN debug port, we need boot video */ + {"/DEBUGPORT=SCREEN", NULL, "/NOGUIBOOT"}, + + /* DETECTHAL has a higher precedence than HAL= or KERNEL= */ + {"/HAL=/KERNEL=", NULL, "/DETECTHAL"}, + + /* NOPAE has a higher precedence than PAE */ + {"/PAE", NULL, "/NOPAE"}, + + /* NOEXECUTE(=) has a higher precedence than EXECUTE */ + {"/EXECUTE", "/NOEXECUTE=ALWAYSOFF", "/NOEXECUTE/NOEXECUTE="}, + /* NOEXECUTE(=) options are self-excluding and + * some have higher precedence than others. */ + {"/NOEXECUTE/NOEXECUTE=", NULL, "/NOEXECUTE/NOEXECUTE="}, + + /* SAFEBOOT(:) options are self-excluding */ + {"/SAFEBOOT/SAFEBOOT:", NULL, "/SAFEBOOT/SAFEBOOT:"}, +}; + +#define TAG_BOOT_OPTIONS 'pOtB' + +VOID +NtLdrGetHigherPriorityOptions( + IN PCSTR BootOptions, + OUT PSTR* ExtraOptions, + OUT PSTR* HigherPriorityOptions) +{ + ULONG i; + PCSTR NextOptions, NextOpt; + ULONG NextOptLength; + SIZE_T ExtraOptsSize = 0; + SIZE_T HighPriorOptsSize = 0; + + /* Masks specifying the presence (TRUE) or absence (FALSE) of the options */ + BOOLEAN Masks[RTL_NUMBER_OF(HighPriorOptionsMap)]; + + /* Just return if we cannot return anything */ + if (!ExtraOptions && !HigherPriorityOptions) + return; + + if (ExtraOptions) + *ExtraOptions = NULL; + if (HigherPriorityOptions) + *HigherPriorityOptions = NULL; + + /* Just return if no initial options were given */ + if (!BootOptions || !*BootOptions) + return; + + /* Determine the presence of the colliding options, and the + * maximum necessary sizes for the pointers to be allocated. */ + RtlZeroMemory(Masks, sizeof(Masks)); + for (i = 0; i < RTL_NUMBER_OF(HighPriorOptionsMap); ++i) + { + /* Loop over the given options to search for */ + NextOptions = HighPriorOptionsMap[i].Options; + while ((NextOpt = NtLdrGetNextOption(&NextOptions, &NextOptLength))) + { + /* If any of these options are present... */ + if (NtLdrGetOptionExN(BootOptions, NextOpt, NextOptLength, NULL)) + { + /* ... set the mask, retrieve the sizes and stop looking for these options */ + Masks[i] = TRUE; + if (ExtraOptions && HighPriorOptionsMap[i].ExtraOptions) + { + ExtraOptsSize += strlen(HighPriorOptionsMap[i].ExtraOptions) * sizeof(CHAR); + } + if (HigherPriorityOptions && HighPriorOptionsMap[i].HigherPriorOptions) + { + HighPriorOptsSize += strlen(HighPriorOptionsMap[i].HigherPriorOptions) * sizeof(CHAR); + } + break; + } + } + } + /* Count the NULL-terminator */ + if (ExtraOptions) + ExtraOptsSize += sizeof(ANSI_NULL); + if (HigherPriorityOptions) + HighPriorOptsSize += sizeof(ANSI_NULL); + + /* Allocate the string pointers */ + if (ExtraOptions) + { + *ExtraOptions = FrLdrHeapAlloc(ExtraOptsSize, TAG_BOOT_OPTIONS); + if (!*ExtraOptions) + return; + } + if (HigherPriorityOptions) + { + *HigherPriorityOptions = FrLdrHeapAlloc(HighPriorOptsSize, TAG_BOOT_OPTIONS); + if (!*HigherPriorityOptions) + { + if (ExtraOptions) + { + FrLdrHeapFree(*ExtraOptions, TAG_BOOT_OPTIONS); + *ExtraOptions = NULL; + } + return; + } + } + + /* Initialize the strings */ + if (ExtraOptions) + *(*ExtraOptions) = '\0'; + if (HigherPriorityOptions) + *(*HigherPriorityOptions) = '\0'; + + /* Go through the masks that determine the options to check */ + for (i = 0; i < RTL_NUMBER_OF(HighPriorOptionsMap); ++i) + { + if (Masks[i]) + { + /* Retrieve the strings */ + if (ExtraOptions && HighPriorOptionsMap[i].ExtraOptions) + { + RtlStringCbCatA(*ExtraOptions, + ExtraOptsSize, + HighPriorOptionsMap[i].ExtraOptions); + } + if (HigherPriorityOptions && HighPriorOptionsMap[i].HigherPriorOptions) + { + RtlStringCbCatA(*HigherPriorityOptions, + HighPriorOptsSize, + HighPriorOptionsMap[i].HigherPriorOptions); + } + } + } +} + + ARC_STATUS LoadReactOSSetup( IN ULONG Argc, @@ -196,9 +452,8 @@ LoadReactOSSetup( PSETUP_LOADER_BLOCK SetupBlock; CHAR BootPath[MAX_PATH]; CHAR FilePath[MAX_PATH]; - CHAR BootOptions2[256]; - PSTR BootOptions; - PCSTR LoadOptions; + CHAR UserBootOptions[256]; + PCSTR BootOptions; static PCSTR SourcePaths[] = { @@ -287,20 +542,22 @@ LoadReactOSSetup( TRACE("BootPath: '%s'\n", BootPath); - /* Retrieve the boot options */ - *BootOptions2 = ANSI_NULL; - ArgValue = GetArgumentValue(Argc, Argv, "Options"); - if (ArgValue && *ArgValue) - RtlStringCbCopyA(BootOptions2, sizeof(BootOptions2), ArgValue); + /* + * Retrieve the boot options. Any options present here will supplement or + * override those that will be specified in TXTSETUP.SIF's OsLoadOptions. + */ + BootOptions = GetArgumentValue(Argc, Argv, "Options"); + if (!BootOptions) + BootOptions = ""; - TRACE("BootOptions: '%s'\n", BootOptions2); + TRACE("BootOptions: '%s'\n", BootOptions); /* Check if a RAM disk file was given */ - FileName = (PSTR)NtLdrGetOptionEx(BootOptions2, "RDPATH=", &FileNameLength); + FileName = (PSTR)NtLdrGetOptionEx(BootOptions, "RDPATH=", &FileNameLength); if (FileName && (FileNameLength > 7)) { /* Load the RAM disk */ - Status = RamDiskInitialize(FALSE, BootOptions2, SystemPartition); + Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition); if (Status != ESUCCESS) { FileName += 7; FileNameLength -= 7; @@ -335,34 +592,138 @@ LoadReactOSSetup( TRACE("BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); - /* Get load options - debug and non-debug */ - if (!InfFindFirstLine(InfHandle, "SetupData", "OsLoadOptions", &InfContext)) - { - ERR("Failed to find 'SetupData/OsLoadOptions'\n"); - return EINVAL; - } + // UseLocalSif = NtLdrGetOption(BootOptions, "USELOCALSIF"); - if (!InfGetDataField(&InfContext, 1, &LoadOptions)) + if (NtLdrGetOption(BootOptions, "SIFOPTIONSOVERRIDE")) { - ERR("Failed to get load options\n"); - return EINVAL; - } + PCSTR OptionsToRemove[2] = {"SIFOPTIONSOVERRIDE", NULL}; -#if DBG - /* Get debug load options and use them */ - if (InfFindFirstLine(InfHandle, "SetupData", "DbgOsLoadOptions", &InfContext)) - { - PCSTR DbgLoadOptions; + /* Do not use any load options from TXTSETUP.SIF, but + * use instead those passed from the command line. */ + RtlStringCbCopyA(UserBootOptions, sizeof(UserBootOptions), BootOptions); - if (InfGetDataField(&InfContext, 1, &DbgLoadOptions)) - LoadOptions = DbgLoadOptions; + /* Remove the private switch from the options */ + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + NULL, + OptionsToRemove); + + BootOptions = UserBootOptions; } + else // if (!*BootOptions || NtLdrGetOption(BootOptions, "SIFOPTIONSADD")) + { + PCSTR LoadOptions = NULL; + PCSTR DbgLoadOptions = NULL; + PSTR ExtraOptions, HigherPriorityOptions; + PSTR OptionsToAdd[3]; + PSTR OptionsToRemove[4]; + + /* Load the options from TXTSETUP.SIF */ + if (InfFindFirstLine(InfHandle, "SetupData", "OsLoadOptions", &InfContext)) + { + if (!InfGetDataField(&InfContext, 1, &LoadOptions)) + WARN("Failed to get load options\n"); + } + +#if !DBG + /* Non-debug mode: get the debug load options only if /DEBUG was specified + * in the Argv command-line options (was e.g. added to the options when + * the user selected "Debugging Mode" in the advanced boot menu). */ + if (NtLdrGetOption(BootOptions, "DEBUG") || + NtLdrGetOption(BootOptions, "DEBUG=")) + { +#else + /* Debug mode: always get the debug load options */ #endif + if (InfFindFirstLine(InfHandle, "SetupData", "SetupDebugOptions", &InfContext)) + { + if (!InfGetDataField(&InfContext, 1, &DbgLoadOptions)) + WARN("Failed to get debug load options\n"); + } + /* If none was found, default to enabling debugging */ + if (!DbgLoadOptions) + DbgLoadOptions = "/DEBUG"; +#if !DBG + } +#endif + + /* Initialize the load options with those from TXTSETUP.SIF */ + *UserBootOptions = ANSI_NULL; + if (LoadOptions && *LoadOptions) + RtlStringCbCopyA(UserBootOptions, sizeof(UserBootOptions), LoadOptions); - /* Copy LoadOptions (original string will be freed) */ - BootOptions = FrLdrTempAlloc(strlen(LoadOptions) + 1, TAG_BOOT_OPTIONS); - ASSERT(BootOptions); - strcpy(BootOptions, LoadOptions); + /* Merge the debug load options if any */ + if (DbgLoadOptions) + { + RtlZeroMemory(OptionsToAdd, sizeof(OptionsToAdd)); + RtlZeroMemory(OptionsToRemove, sizeof(OptionsToRemove)); + + /* + * Retrieve any option patterns that we should remove from the + * SIF load options because they are of higher precedence than + * those specified in the debug load options to be added. + * Also always remove NODEBUG (even if the debug load options + * do not contain explicitly the DEBUG option), since we want + * to have debugging enabled if possible. + */ + OptionsToRemove[0] = "/NODEBUG"; + NtLdrGetHigherPriorityOptions(DbgLoadOptions, + &ExtraOptions, + &HigherPriorityOptions); + OptionsToAdd[1] = (ExtraOptions ? ExtraOptions : ""); + OptionsToRemove[1] = (HigherPriorityOptions ? HigherPriorityOptions : ""); + + /* + * Prepend the debug load options, so that in case it contains + * redundant options with respect to the SIF load options, the + * former can take precedence over the latter. + */ + OptionsToAdd[0] = (PSTR)DbgLoadOptions; + OptionsToRemove[2] = (PSTR)DbgLoadOptions; + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + (PCSTR*)OptionsToAdd, + (PCSTR*)OptionsToRemove); + + if (ExtraOptions) + FrLdrHeapFree(ExtraOptions, TAG_BOOT_OPTIONS); + if (HigherPriorityOptions) + FrLdrHeapFree(HigherPriorityOptions, TAG_BOOT_OPTIONS); + } + + RtlZeroMemory(OptionsToAdd, sizeof(OptionsToAdd)); + RtlZeroMemory(OptionsToRemove, sizeof(OptionsToRemove)); + + /* + * Retrieve any option patterns that we should remove from the + * SIF load options because they are of higher precedence than + * those specified in the options to be added. + */ + NtLdrGetHigherPriorityOptions(BootOptions, + &ExtraOptions, + &HigherPriorityOptions); + OptionsToAdd[1] = (ExtraOptions ? ExtraOptions : ""); + OptionsToRemove[0] = (HigherPriorityOptions ? HigherPriorityOptions : ""); + + /* Finally, prepend the user-specified options that + * take precedence over those from TXTSETUP.SIF. */ + OptionsToAdd[0] = (PSTR)BootOptions; + OptionsToRemove[1] = (PSTR)BootOptions; + NtLdrUpdateLoadOptions(UserBootOptions, + sizeof(UserBootOptions), + FALSE, + (PCSTR*)OptionsToAdd, + (PCSTR*)OptionsToRemove); + + if (ExtraOptions) + FrLdrHeapFree(ExtraOptions, TAG_BOOT_OPTIONS); + if (HigherPriorityOptions) + FrLdrHeapFree(HigherPriorityOptions, TAG_BOOT_OPTIONS); + + BootOptions = UserBootOptions; + } TRACE("BootOptions: '%s'\n", BootOptions);

4 years, 1 month

[reactos] 01/02: [FREELDR] Fix x64 compilation warning (addendum to commit d887308b).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d45b268127210b8dd894e… commit d45b268127210b8dd894e01a7b791deb5bd9b8ae Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 4 19:21:00 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 4 19:59:27 2020 +0100 [FREELDR] Fix x64 compilation warning (addendum to commit d887308b). --- boot/freeldr/freeldr/ntldr/ntldropts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.c b/boot/freeldr/freeldr/ntldr/ntldropts.c index fdd62938b59..2173924e224 100644 --- a/boot/freeldr/freeldr/ntldr/ntldropts.c +++ b/boot/freeldr/freeldr/ntldr/ntldropts.c @@ -119,7 +119,9 @@ NtLdrGetOptionEx( IN PCSTR OptionName, OUT PULONG OptionLength OPTIONAL) { - return NtLdrGetOptionExN(Options, OptionName, strlen(OptionName), OptionLength); + return NtLdrGetOptionExN(Options, OptionName, + (ULONG)strlen(OptionName), + OptionLength); } PCSTR

4 years, 1 month

[reactos] 01/01: [WDF] Enable Resource and Interrupt APIs

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c734db034ac93a85fa35… commit 7c734db034ac93a85fa352ca948efcdd001e5171 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Nov 4 19:34:14 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Nov 4 19:34:14 2020 +0300 [WDF] Enable Resource and Interrupt APIs --- sdk/lib/drivers/wdf/CMakeLists.txt | 4 +- sdk/lib/drivers/wdf/kmdf/inc/private/fxdynamics.h | 234 +++++++-------------- .../wdf/shared/irphandlers/pnp/fxinterruptapi.cpp | 16 ++ .../drivers/wdf/shared/support/fxresourceapi.cpp | 22 ++ 4 files changed, 116 insertions(+), 160 deletions(-) diff --git a/sdk/lib/drivers/wdf/CMakeLists.txt b/sdk/lib/drivers/wdf/CMakeLists.txt index 8b4efe8c3b5..cfb47188138 100644 --- a/sdk/lib/drivers/wdf/CMakeLists.txt +++ b/sdk/lib/drivers/wdf/CMakeLists.txt @@ -50,7 +50,7 @@ list(APPEND SOURCE_SHARED # shared/irphandlers/pnp/devicepwrreqstatemachine.cpp shared/irphandlers/pnp/eventqueue.cpp shared/irphandlers/pnp/fdopower.cpp - # shared/irphandlers/pnp/fxinterruptapi.cpp + shared/irphandlers/pnp/fxinterruptapi.cpp shared/irphandlers/pnp/fxpkgfdo.cpp shared/irphandlers/pnp/fxpkgpdo.cpp shared/irphandlers/pnp/fxpkgpnp.cpp @@ -85,7 +85,7 @@ list(APPEND SOURCE_SHARED shared/support/fxregistryapi.cpp shared/support/fxregkey.cpp shared/support/fxrequestbuffer.cpp - # shared/support/fxresourceapi.cpp + shared/support/fxresourceapi.cpp shared/support/fxresourcecollection.cpp shared/support/fxspinlock.cpp shared/support/fxspinlockapi.cpp diff --git a/sdk/lib/drivers/wdf/kmdf/inc/private/fxdynamics.h b/sdk/lib/drivers/wdf/kmdf/inc/private/fxdynamics.h index fcf73d3722b..9d2c75def55 100644 --- a/sdk/lib/drivers/wdf/kmdf/inc/private/fxdynamics.h +++ b/sdk/lib/drivers/wdf/kmdf/inc/private/fxdynamics.h @@ -189,29 +189,17 @@ typedef struct _WDFFUNCTIONS { PFN_WDFFILEOBJECTGETFLAGS pfnWdfFileObjectGetFlags; PFN_WDFFILEOBJECTGETDEVICE pfnWdfFileObjectGetDevice; PFN_WDFFILEOBJECTWDMGETFILEOBJECT pfnWdfFileObjectWdmGetFileObject; - // PFN_WDFINTERRUPTCREATE pfnWdfInterruptCreate; - // PFN_WDFINTERRUPTQUEUEDPCFORISR pfnWdfInterruptQueueDpcForIsr; - // PFN_WDFINTERRUPTSYNCHRONIZE pfnWdfInterruptSynchronize; - // PFN_WDFINTERRUPTACQUIRELOCK pfnWdfInterruptAcquireLock; - // PFN_WDFINTERRUPTRELEASELOCK pfnWdfInterruptReleaseLock; - // PFN_WDFINTERRUPTENABLE pfnWdfInterruptEnable; - // PFN_WDFINTERRUPTDISABLE pfnWdfInterruptDisable; - // PFN_WDFINTERRUPTWDMGETINTERRUPT pfnWdfInterruptWdmGetInterrupt; - // PFN_WDFINTERRUPTGETINFO pfnWdfInterruptGetInfo; - // PFN_WDFINTERRUPTSETPOLICY pfnWdfInterruptSetPolicy; - // PFN_WDFINTERRUPTGETDEVICE pfnWdfInterruptGetDevice; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptCreate; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptQueueDpcForIsr; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptSynchronize; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptAcquireLock; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptReleaseLock; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptEnable; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptDisable; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptWdmGetInterrupt; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptGetInfo; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptSetPolicy; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptGetDevice; - + PFN_WDFINTERRUPTCREATE pfnWdfInterruptCreate; + PFN_WDFINTERRUPTQUEUEDPCFORISR pfnWdfInterruptQueueDpcForIsr; + PFN_WDFINTERRUPTSYNCHRONIZE pfnWdfInterruptSynchronize; + PFN_WDFINTERRUPTACQUIRELOCK pfnWdfInterruptAcquireLock; + PFN_WDFINTERRUPTRELEASELOCK pfnWdfInterruptReleaseLock; + PFN_WDFINTERRUPTENABLE pfnWdfInterruptEnable; + PFN_WDFINTERRUPTDISABLE pfnWdfInterruptDisable; + PFN_WDFINTERRUPTWDMGETINTERRUPT pfnWdfInterruptWdmGetInterrupt; + PFN_WDFINTERRUPTGETINFO pfnWdfInterruptGetInfo; + PFN_WDFINTERRUPTSETPOLICY pfnWdfInterruptSetPolicy; + PFN_WDFINTERRUPTGETDEVICE pfnWdfInterruptGetDevice; PFN_WDFIOQUEUECREATE pfnWdfIoQueueCreate; PFN_WDFIOQUEUEGETSTATE pfnWdfIoQueueGetState; PFN_WDFIOQUEUESTART pfnWdfIoQueueStart; @@ -346,51 +334,28 @@ typedef struct _WDFFUNCTIONS { PFN_WDFREQUESTREQUEUE pfnWdfRequestRequeue; PFN_WDFREQUESTSTOPACKNOWLEDGE pfnWdfRequestStopAcknowledge; PFN_WDFREQUESTWDMGETIRP pfnWdfRequestWdmGetIrp; - // PFN_WDFIORESOURCEREQUIREMENTSLISTSETSLOTNUMBER pfnWdfIoResourceRequirementsListSetSlotNumber; - // PFN_WDFIORESOURCEREQUIREMENTSLISTSETINTERFACETYPE pfnWdfIoResourceRequirementsListSetInterfaceType; - // PFN_WDFIORESOURCEREQUIREMENTSLISTAPPENDIORESLIST pfnWdfIoResourceRequirementsListAppendIoResList; - // PFN_WDFIORESOURCEREQUIREMENTSLISTINSERTIORESLIST pfnWdfIoResourceRequirementsListInsertIoResList; - // PFN_WDFIORESOURCEREQUIREMENTSLISTGETCOUNT pfnWdfIoResourceRequirementsListGetCount; - // PFN_WDFIORESOURCEREQUIREMENTSLISTGETIORESLIST pfnWdfIoResourceRequirementsListGetIoResList; - // PFN_WDFIORESOURCEREQUIREMENTSLISTREMOVE pfnWdfIoResourceRequirementsListRemove; - // PFN_WDFIORESOURCEREQUIREMENTSLISTREMOVEBYIORESLIST pfnWdfIoResourceRequirementsListRemoveByIoResList; - // PFN_WDFIORESOURCELISTCREATE pfnWdfIoResourceListCreate; - // PFN_WDFIORESOURCELISTAPPENDDESCRIPTOR pfnWdfIoResourceListAppendDescriptor; - // PFN_WDFIORESOURCELISTINSERTDESCRIPTOR pfnWdfIoResourceListInsertDescriptor; - // PFN_WDFIORESOURCELISTUPDATEDESCRIPTOR pfnWdfIoResourceListUpdateDescriptor; - // PFN_WDFIORESOURCELISTGETCOUNT pfnWdfIoResourceListGetCount; - // PFN_WDFIORESOURCELISTGETDESCRIPTOR pfnWdfIoResourceListGetDescriptor; - // PFN_WDFIORESOURCELISTREMOVE pfnWdfIoResourceListRemove; - // PFN_WDFIORESOURCELISTREMOVEBYDESCRIPTOR pfnWdfIoResourceListRemoveByDescriptor; - // PFN_WDFCMRESOURCELISTAPPENDDESCRIPTOR pfnWdfCmResourceListAppendDescriptor; - // PFN_WDFCMRESOURCELISTINSERTDESCRIPTOR pfnWdfCmResourceListInsertDescriptor; - // PFN_WDFCMRESOURCELISTGETCOUNT pfnWdfCmResourceListGetCount; - // PFN_WDFCMRESOURCELISTGETDESCRIPTOR pfnWdfCmResourceListGetDescriptor; - // PFN_WDFCMRESOURCELISTREMOVE pfnWdfCmResourceListRemove; - // PFN_WDFCMRESOURCELISTREMOVEBYDESCRIPTOR pfnWdfCmResourceListRemoveByDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListSetSlotNumber; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListSetInterfaceType; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListAppendIoResList; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListInsertIoResList; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListGetCount; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListGetIoResList; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListRemove; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceRequirementsListRemoveByIoResList; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListCreate; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListAppendDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListInsertDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListUpdateDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListGetCount; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListGetDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListRemove; - PFN_ROSWDFUNIMPLEMENTED pfnWdfIoResourceListRemoveByDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListAppendDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListInsertDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListGetCount; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListGetDescriptor; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListRemove; - PFN_ROSWDFUNIMPLEMENTED pfnWdfCmResourceListRemoveByDescriptor; - + PFN_WDFIORESOURCEREQUIREMENTSLISTSETSLOTNUMBER pfnWdfIoResourceRequirementsListSetSlotNumber; + PFN_WDFIORESOURCEREQUIREMENTSLISTSETINTERFACETYPE pfnWdfIoResourceRequirementsListSetInterfaceType; + PFN_WDFIORESOURCEREQUIREMENTSLISTAPPENDIORESLIST pfnWdfIoResourceRequirementsListAppendIoResList; + PFN_WDFIORESOURCEREQUIREMENTSLISTINSERTIORESLIST pfnWdfIoResourceRequirementsListInsertIoResList; + PFN_WDFIORESOURCEREQUIREMENTSLISTGETCOUNT pfnWdfIoResourceRequirementsListGetCount; + PFN_WDFIORESOURCEREQUIREMENTSLISTGETIORESLIST pfnWdfIoResourceRequirementsListGetIoResList; + PFN_WDFIORESOURCEREQUIREMENTSLISTREMOVE pfnWdfIoResourceRequirementsListRemove; + PFN_WDFIORESOURCEREQUIREMENTSLISTREMOVEBYIORESLIST pfnWdfIoResourceRequirementsListRemoveByIoResList; + PFN_WDFIORESOURCELISTCREATE pfnWdfIoResourceListCreate; + PFN_WDFIORESOURCELISTAPPENDDESCRIPTOR pfnWdfIoResourceListAppendDescriptor; + PFN_WDFIORESOURCELISTINSERTDESCRIPTOR pfnWdfIoResourceListInsertDescriptor; + PFN_WDFIORESOURCELISTUPDATEDESCRIPTOR pfnWdfIoResourceListUpdateDescriptor; + PFN_WDFIORESOURCELISTGETCOUNT pfnWdfIoResourceListGetCount; + PFN_WDFIORESOURCELISTGETDESCRIPTOR pfnWdfIoResourceListGetDescriptor; + PFN_WDFIORESOURCELISTREMOVE pfnWdfIoResourceListRemove; + PFN_WDFIORESOURCELISTREMOVEBYDESCRIPTOR pfnWdfIoResourceListRemoveByDescriptor; + PFN_WDFCMRESOURCELISTAPPENDDESCRIPTOR pfnWdfCmResourceListAppendDescriptor; + PFN_WDFCMRESOURCELISTINSERTDESCRIPTOR pfnWdfCmResourceListInsertDescriptor; + PFN_WDFCMRESOURCELISTGETCOUNT pfnWdfCmResourceListGetCount; + PFN_WDFCMRESOURCELISTGETDESCRIPTOR pfnWdfCmResourceListGetDescriptor; + PFN_WDFCMRESOURCELISTREMOVE pfnWdfCmResourceListRemove; + PFN_WDFCMRESOURCELISTREMOVEBYDESCRIPTOR pfnWdfCmResourceListRemoveByDescriptor; PFN_WDFSTRINGCREATE pfnWdfStringCreate; PFN_WDFSTRINGGETUNICODESTRING pfnWdfStringGetUnicodeString; PFN_WDFOBJECTACQUIRELOCK pfnWdfObjectAcquireLock; @@ -535,9 +500,7 @@ typedef struct _WDFFUNCTIONS { PFN_WDFDEVICEREMOVEDEPENDENTUSAGEDEVICEOBJECT pfnWdfDeviceRemoveDependentUsageDeviceObject; PFN_WDFDEVICEGETSYSTEMPOWERACTION pfnWdfDeviceGetSystemPowerAction; - // PFN_WDFINTERRUPTSETEXTENDEDPOLICY pfnWdfInterruptSetExtendedPolicy; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptSetExtendedPolicy; - + PFN_WDFINTERRUPTSETEXTENDEDPOLICY pfnWdfInterruptSetExtendedPolicy; PFN_WDFIOQUEUEASSIGNFORWARDPROGRESSPOLICY pfnWdfIoQueueAssignForwardProgressPolicy; PFN_WDFPDOINITASSIGNCONTAINERID pfnWdfPdoInitAssignContainerID; PFN_WDFPDOINITALLOWFORWARDINGREQUESTTOPARENT pfnWdfPdoInitAllowForwardingRequestToParent; @@ -570,8 +533,6 @@ typedef struct _WDFFUNCTIONS { // PFN_WDFDMATRANSACTIONFREERESOURCES pfnWdfDmaTransactionFreeResources; // PFN_WDFDMATRANSACTIONCANCEL pfnWdfDmaTransactionCancel; // PFN_WDFDMATRANSACTIONWDMGETTRANSFERCONTEXT pfnWdfDmaTransactionWdmGetTransferContext; - // PFN_WDFINTERRUPTQUEUEWORKITEMFORISR pfnWdfInterruptQueueWorkItemForIsr; - // PFN_WDFINTERRUPTTRYTOACQUIRELOCK pfnWdfInterruptTryToAcquireLock; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaEnablerConfigureSystemProfile; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionInitializeUsingOffset; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionGetTransferInfo; @@ -583,9 +544,9 @@ typedef struct _WDFFUNCTIONS { PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionFreeResources; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionCancel; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionWdmGetTransferContext; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptQueueWorkItemForIsr; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptTryToAcquireLock; + PFN_WDFINTERRUPTQUEUEWORKITEMFORISR pfnWdfInterruptQueueWorkItemForIsr; + PFN_WDFINTERRUPTTRYTOACQUIRELOCK pfnWdfInterruptTryToAcquireLock; PFN_WDFIOQUEUESTOPANDPURGE pfnWdfIoQueueStopAndPurge; PFN_WDFIOQUEUESTOPANDPURGESYNCHRONOUSLY pfnWdfIoQueueStopAndPurgeSynchronously; PFN_WDFIOTARGETPURGE pfnWdfIoTargetPurge; @@ -601,13 +562,11 @@ typedef struct _WDFFUNCTIONS { PFN_WDFDEVICEWDMASSIGNPOWERFRAMEWORKSETTINGS pfnWdfDeviceWdmAssignPowerFrameworkSettings; // PFN_WDFDMATRANSACTIONSTOPSYSTEMTRANSFER pfnWdfDmaTransactionStopSystemTransfer; // PFN_WDFCXVERIFIERKEBUGCHECK pfnWdfCxVerifierKeBugCheck; - // PFN_WDFINTERRUPTREPORTACTIVE pfnWdfInterruptReportActive; - // PFN_WDFINTERRUPTREPORTINACTIVE pfnWdfInterruptReportInactive; PFN_ROSWDFUNIMPLEMENTED pfnWdfDmaTransactionStopSystemTransfer; PFN_ROSWDFUNIMPLEMENTED pfnWdfCxVerifierKeBugCheck; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptReportActive; - PFN_ROSWDFUNIMPLEMENTED pfnWdfInterruptReportInactive; + PFN_WDFINTERRUPTREPORTACTIVE pfnWdfInterruptReportActive; + PFN_WDFINTERRUPTREPORTINACTIVE pfnWdfInterruptReportInactive; PFN_WDFDEVICEINITSETRELEASEHARDWAREORDERONFAILURE pfnWdfDeviceInitSetReleaseHardwareOrderOnFailure; // PFN_WDFGETTRIAGEINFO pfnWdfGetTriageInfo; PFN_ROSWDFUNIMPLEMENTED pfnWdfGetTriageInfo; @@ -7259,29 +7218,17 @@ WDFVERSION WdfVersion = { WDFEXPORT(WdfFileObjectGetFlags), WDFEXPORT(WdfFileObjectGetDevice), WDFEXPORT(WdfFileObjectWdmGetFileObject), - // WDFEXPORT(WdfInterruptCreate), - // WDFEXPORT(WdfInterruptQueueDpcForIsr), - // WDFEXPORT(WdfInterruptSynchronize), - // WDFEXPORT(WdfInterruptAcquireLock), - // WDFEXPORT(WdfInterruptReleaseLock), - // WDFEXPORT(WdfInterruptEnable), - // WDFEXPORT(WdfInterruptDisable), - // WDFEXPORT(WdfInterruptWdmGetInterrupt), - // WDFEXPORT(WdfInterruptGetInfo), - // WDFEXPORT(WdfInterruptSetPolicy), - // WDFEXPORT(WdfInterruptGetDevice), - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - + WDFEXPORT(WdfInterruptCreate), + WDFEXPORT(WdfInterruptQueueDpcForIsr), + WDFEXPORT(WdfInterruptSynchronize), + WDFEXPORT(WdfInterruptAcquireLock), + WDFEXPORT(WdfInterruptReleaseLock), + WDFEXPORT(WdfInterruptEnable), + WDFEXPORT(WdfInterruptDisable), + WDFEXPORT(WdfInterruptWdmGetInterrupt), + WDFEXPORT(WdfInterruptGetInfo), + WDFEXPORT(WdfInterruptSetPolicy), + WDFEXPORT(WdfInterruptGetDevice), WDFEXPORT(WdfIoQueueCreate), WDFEXPORT(WdfIoQueueGetState), WDFEXPORT(WdfIoQueueStart), @@ -7416,51 +7363,28 @@ WDFVERSION WdfVersion = { WDFEXPORT(WdfRequestRequeue), WDFEXPORT(WdfRequestStopAcknowledge), WDFEXPORT(WdfRequestWdmGetIrp), - // WDFEXPORT(WdfIoResourceRequirementsListSetSlotNumber), - // WDFEXPORT(WdfIoResourceRequirementsListSetInterfaceType), - // WDFEXPORT(WdfIoResourceRequirementsListAppendIoResList), - // WDFEXPORT(WdfIoResourceRequirementsListInsertIoResList), - // WDFEXPORT(WdfIoResourceRequirementsListGetCount), - // WDFEXPORT(WdfIoResourceRequirementsListGetIoResList), - // WDFEXPORT(WdfIoResourceRequirementsListRemove), - // WDFEXPORT(WdfIoResourceRequirementsListRemoveByIoResList), - // WDFEXPORT(WdfIoResourceListCreate), - // WDFEXPORT(WdfIoResourceListAppendDescriptor), - // WDFEXPORT(WdfIoResourceListInsertDescriptor), - // WDFEXPORT(WdfIoResourceListUpdateDescriptor), - // WDFEXPORT(WdfIoResourceListGetCount), - // WDFEXPORT(WdfIoResourceListGetDescriptor), - // WDFEXPORT(WdfIoResourceListRemove), - // WDFEXPORT(WdfIoResourceListRemoveByDescriptor), - // WDFEXPORT(WdfCmResourceListAppendDescriptor), - // WDFEXPORT(WdfCmResourceListInsertDescriptor), - // WDFEXPORT(WdfCmResourceListGetCount), - // WDFEXPORT(WdfCmResourceListGetDescriptor), - // WDFEXPORT(WdfCmResourceListRemove), - // WDFEXPORT(WdfCmResourceListRemoveByDescriptor), - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - WdfApiNotImplemented, - + WDFEXPORT(WdfIoResourceRequirementsListSetSlotNumber), + WDFEXPORT(WdfIoResourceRequirementsListSetInterfaceType), + WDFEXPORT(WdfIoResourceRequirementsListAppendIoResList), + WDFEXPORT(WdfIoResourceRequirementsListInsertIoResList), + WDFEXPORT(WdfIoResourceRequirementsListGetCount), + WDFEXPORT(WdfIoResourceRequirementsListGetIoResList), + WDFEXPORT(WdfIoResourceRequirementsListRemove), + WDFEXPORT(WdfIoResourceRequirementsListRemoveByIoResList), + WDFEXPORT(WdfIoResourceListCreate), + WDFEXPORT(WdfIoResourceListAppendDescriptor), + WDFEXPORT(WdfIoResourceListInsertDescriptor), + WDFEXPORT(WdfIoResourceListUpdateDescriptor), + WDFEXPORT(WdfIoResourceListGetCount), + WDFEXPORT(WdfIoResourceListGetDescriptor), + WDFEXPORT(WdfIoResourceListRemove), + WDFEXPORT(WdfIoResourceListRemoveByDescriptor), + WDFEXPORT(WdfCmResourceListAppendDescriptor), + WDFEXPORT(WdfCmResourceListInsertDescriptor), + WDFEXPORT(WdfCmResourceListGetCount), + WDFEXPORT(WdfCmResourceListGetDescriptor), + WDFEXPORT(WdfCmResourceListRemove), + WDFEXPORT(WdfCmResourceListRemoveByDescriptor), WDFEXPORT(WdfStringCreate), WDFEXPORT(WdfStringGetUnicodeString), WDFEXPORT(WdfObjectAcquireLock), @@ -7605,9 +7529,7 @@ WDFVERSION WdfVersion = { WDFEXPORT(WdfDeviceRemoveDependentUsageDeviceObject), WDFEXPORT(WdfDeviceGetSystemPowerAction), - // WDFEXPORT(WdfInterruptSetExtendedPolicy), - WdfApiNotImplemented, - + WDFEXPORT(WdfInterruptSetExtendedPolicy), WDFEXPORT(WdfIoQueueAssignForwardProgressPolicy), WDFEXPORT(WdfPdoInitAssignContainerID), WDFEXPORT(WdfPdoInitAllowForwardingRequestToParent), @@ -7640,10 +7562,6 @@ WDFVERSION WdfVersion = { // WDFEXPORT(WdfDmaTransactionFreeResources), // WDFEXPORT(WdfDmaTransactionCancel), // WDFEXPORT(WdfDmaTransactionWdmGetTransferContext), - // WDFEXPORT(WdfInterruptQueueWorkItemForIsr), - // WDFEXPORT(WdfInterruptTryToAcquireLock), - WdfApiNotImplemented, - WdfApiNotImplemented, WdfApiNotImplemented, WdfApiNotImplemented, WdfApiNotImplemented, @@ -7656,6 +7574,8 @@ WDFVERSION WdfVersion = { WdfApiNotImplemented, WdfApiNotImplemented, + WDFEXPORT(WdfInterruptQueueWorkItemForIsr), + WDFEXPORT(WdfInterruptTryToAcquireLock), WDFEXPORT(WdfIoQueueStopAndPurge), WDFEXPORT(WdfIoQueueStopAndPurgeSynchronously), WDFEXPORT(WdfIoTargetPurge), @@ -7671,13 +7591,11 @@ WDFVERSION WdfVersion = { WDFEXPORT(WdfDeviceWdmAssignPowerFrameworkSettings), // WDFEXPORT(WdfDmaTransactionStopSystemTransfer), // WDFEXPORT(WdfCxVerifierKeBugCheck), - // WDFEXPORT(WdfInterruptReportActive), - // WDFEXPORT(WdfInterruptReportInactive), - WdfApiNotImplemented, - WdfApiNotImplemented, WdfApiNotImplemented, WdfApiNotImplemented, + WDFEXPORT(WdfInterruptReportActive), + WDFEXPORT(WdfInterruptReportInactive), WDFEXPORT(WdfDeviceInitSetReleaseHardwareOrderOnFailure), // WDFEXPORT(WdfGetTriageInfo), WdfApiNotImplemented, diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxinterruptapi.cpp b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxinterruptapi.cpp index efdbc17c4e3..839bc9418d6 100644 --- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxinterruptapi.cpp +++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxinterruptapi.cpp @@ -190,6 +190,7 @@ extern "C" { _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfInterruptCreate)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -618,6 +619,7 @@ Returns: } BOOLEAN +STDCALL WDFEXPORT(WdfInterruptQueueDpcForIsr)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -657,6 +659,7 @@ Returns: } BOOLEAN +STDCALL WDFEXPORT(WdfInterruptQueueWorkItemForIsr)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -698,6 +701,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) BOOLEAN +STDCALL WDFEXPORT(WdfInterruptSynchronize)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -755,6 +759,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptAcquireLock)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -802,6 +807,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL + 1) VOID +STDCALL WDFEXPORT(WdfInterruptReleaseLock)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -849,6 +855,7 @@ Returns: __drv_maxIRQL(PASSIVE_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptEnable)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -895,6 +902,7 @@ Returns: __drv_maxIRQL(PASSIVE_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptDisable)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -941,6 +949,7 @@ Returns: _Must_inspect_result_ struct _KINTERRUPT* +STDCALL WDFEXPORT(WdfInterruptWdmGetInterrupt)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -977,6 +986,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptGetInfo)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1037,6 +1047,7 @@ Returns: } WDFDEVICE +STDCALL WDFEXPORT(WdfInterruptGetDevice)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1075,6 +1086,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptSetPolicy)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1144,6 +1156,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptSetExtendedPolicy)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1236,6 +1249,7 @@ _Must_inspect_result_ _IRQL_requires_max_(PASSIVE_LEVEL) _Post_satisfies_(return == 1 || return == 0) BOOLEAN +STDCALL WDFEXPORT(WdfInterruptTryToAcquireLock)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1297,6 +1311,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptReportActive)( _In_ PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1342,6 +1357,7 @@ Returns: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfInterruptReportInactive)( _In_ PWDF_DRIVER_GLOBALS DriverGlobals, diff --git a/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp b/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp index 6d966d0855d..50f18af9e17 100644 --- a/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp +++ b/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp @@ -35,6 +35,7 @@ extern "C" { __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceRequirementsListSetSlotNumber)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -73,6 +74,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceRequirementsListSetInterfaceType)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -177,6 +179,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfIoResourceRequirementsListInsertIoResList)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -213,6 +216,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfIoResourceRequirementsListAppendIoResList)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -246,6 +250,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) ULONG +STDCALL WDFEXPORT(WdfIoResourceRequirementsListGetCount)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -285,6 +290,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) WDFIORESLIST +STDCALL WDFEXPORT(WdfIoResourceRequirementsListGetIoResList)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -331,6 +337,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceRequirementsListRemove)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -376,6 +383,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceRequirementsListRemoveByIoResList)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -456,6 +464,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfIoResourceListCreate)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -604,6 +613,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfIoResourceListInsertDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -640,6 +650,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfIoResourceListAppendDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -671,6 +682,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceListUpdateDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -746,6 +758,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) ULONG +STDCALL WDFEXPORT(WdfIoResourceListGetCount)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -784,6 +797,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) PIO_RESOURCE_DESCRIPTOR +STDCALL WDFEXPORT(WdfIoResourceListGetDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -838,6 +852,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceListRemove)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -892,6 +907,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfIoResourceListRemoveByDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1041,6 +1057,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfCmResourceListInsertDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1079,6 +1096,7 @@ Return Value: _Must_inspect_result_ __drv_maxIRQL(DISPATCH_LEVEL) NTSTATUS +STDCALL WDFEXPORT(WdfCmResourceListAppendDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1112,6 +1130,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) ULONG +STDCALL WDFEXPORT(WdfCmResourceListGetCount)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1144,6 +1163,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) PCM_PARTIAL_RESOURCE_DESCRIPTOR +STDCALL WDFEXPORT(WdfCmResourceListGetDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1181,6 +1201,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfCmResourceListRemove)( __in PWDF_DRIVER_GLOBALS DriverGlobals, @@ -1227,6 +1248,7 @@ Return Value: __drv_maxIRQL(DISPATCH_LEVEL) VOID +STDCALL WDFEXPORT(WdfCmResourceListRemoveByDescriptor)( __in PWDF_DRIVER_GLOBALS DriverGlobals,

4 years, 1 month

[reactos] 01/01: [UNIATA] Add an inf file for UniATA Management Port

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae72f18b55a2bc1a4ce11… commit ae72f18b55a2bc1a4ce1191a503a3856bc384333 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Nov 3 23:23:35 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Nov 3 23:23:35 2020 +0300 [UNIATA] Add an inf file for UniATA Management Port --- drivers/storage/ide/uniata/CMakeLists.txt | 1 + drivers/storage/ide/uniata/uniata_comm.inf | 91 ++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index f8f952a5a79..0df8e748a6c 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -35,3 +35,4 @@ set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(uniata_reg.inf) +add_driver_inf(uniata uniata_comm.inf) diff --git a/drivers/storage/ide/uniata/uniata_comm.inf b/drivers/storage/ide/uniata/uniata_comm.inf new file mode 100644 index 00000000000..12ea786cbf5 --- /dev/null +++ b/drivers/storage/ide/uniata/uniata_comm.inf @@ -0,0 +1,91 @@ +; Copyright (c) 2002-2012 UniATA group + +[Version] +Signature="$Windows NT$" +Provider=%ALTERWARE% +ClassGUID={4D36E97D-E325-11CE-BFC1-08002BE10318} +Class=System +;CatalogFile=uniata.cat +DriverVer=08/25/2012,0.43.4.2 + + +[DestinationDirs] +DefaultDestDir = 11 ; DIRID_DRIVERS + +[ControlFlags] +ExcludeFromSelect = * + +; +; Driver information +; + +[Manufacturer] +%ALTERWARE%=UNIATA_COMM + +[UNIATA_COMM] +;Well-known adapters +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, SCSI\NetUNIATA__MANAGEMENT_PORT +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, IDE\NetUNIATA__MANAGEMENT_PORT +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, SCSI\NetUNIATA__MANAGEMENT_PORT_ +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, IDE\NetUNIATA__MANAGEMENT_PORT_ +; For Win 2003 +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, SCSI\NetUNIATA__Management_Port*_* +%UNIATA__MANAGEMENT_PORT.DeviceDesc%=uniata_Inst, IDE\NetUNIATA__Management_Port*_* +; +; General installation section +; + +[uniata_Inst] +AddReg = uniata_Inst.AddReg +CopyFiles = + +[uniata_Inst.AddReg] + +; +; File sections +; + +[uniata_Inst.Miniport] +uniata.sys + + +; +; Service Installation +; + +[uniata_Inst.Services] +AddService = + +; +; Source file information +; + +[SourceDisksNames.x86] +1 = %DiskId1%,,,"" + +[SourceDisksFiles] +; Files for disk UniATA Installation Disk #1 (SCSIAdapter) +uniata.sys = 1,, + + +[Strings] +;Well-known adapters +UNIATA__MANAGEMENT_PORT.DeviceDesc="UniATA virtual communication device" +UniATA_Name = "Universal ATA Driver (Win XP)" +ALTERWARE = "AlterWare" + +;******************************************* +; +; Non-Localizable Strings +; + +REG_SZ = 0x00000000 +REG_MULTI_SZ = 0x00010000 +REG_EXPAND_SZ = 0x00020000 +REG_BINARY = 0x00000001 +REG_DWORD = 0x00010001 +SERVICEROOT = "System\CurrentControlSet\Services" + +IOLOGMSGDLL = "\IoLogMsg.dll" + +DiskId1 = "UniATA Installation disk"

4 years, 1 month

[reactos] 01/01: [HDAUDBUS] Add a timeout into HDA_SendVerbs This function may stuck during device installation if there are issues with interrupts (or with a device itself).

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48b3c61b5d6cddc20f322… commit 48b3c61b5d6cddc20f322c40ddcc987f2a75ff1d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Nov 3 23:18:14 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Nov 3 23:18:14 2020 +0300 [HDAUDBUS] Add a timeout into HDA_SendVerbs This function may stuck during device installation if there are issues with interrupts (or with a device itself). This fixes the boot on my testing ThinkPad x60s --- drivers/wdm/audio/hdaudbus/fdo.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index a600c64c7d8..2cb977eba29 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -176,11 +176,20 @@ HDA_SendVerbs( while (Queued--) { - KeWaitForSingleObject(&Codec->ResponseSemaphore, - Executive, - KernelMode, - FALSE, - NULL); + LARGE_INTEGER Timeout; + Timeout.QuadPart = -1000LL * 10000; // 1 sec + + NTSTATUS waitStatus = KeWaitForSingleObject(&Codec->ResponseSemaphore, + Executive, + KernelMode, + FALSE, + &Timeout); + + if (waitStatus == STATUS_TIMEOUT) + { + DPRINT1("HDA_SendVerbs: timeout! Queued: %u\n", Queued); + break; + } } if (Responses != NULL) {

4 years, 1 month

[reactos] 01/01: [STORPROP][CDROM_NEW][DISK_NEW] Improve disk and cdrom device installation

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da4ee18cc96a0cf0d3a7b… commit da4ee18cc96a0cf0d3a7b5b1ae6dffcc55f90ad8 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Nov 3 23:12:40 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Nov 3 23:12:40 2020 +0300 [STORPROP][CDROM_NEW][DISK_NEW] Improve disk and cdrom device installation - Take a proper inf file for disk.sys - Add class information into cdrom.inf - Make a correct stub for storprop!DvdClassInstaller --- dll/win32/storprop/storprop.c | 12 ++ dll/win32/storprop/storprop.spec | 2 +- drivers/storage/class/cdrom_new/cdrom.inf | 40 +++-- drivers/storage/class/disk_new/disk.inf | 259 ++++++++++++++++++------------ 4 files changed, 201 insertions(+), 112 deletions(-) diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c index 09149c8d795..ba37599da96 100644 --- a/dll/win32/storprop/storprop.c +++ b/dll/win32/storprop/storprop.c @@ -32,6 +32,18 @@ DiskClassInstaller( return ERROR_DI_DO_DEFAULT; } +DWORD +WINAPI +DvdClassInstaller( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + DPRINT("DvdClassInstaller(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + return ERROR_DI_DO_DEFAULT; +} BOOL WINAPI diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec index f04a9ac8020..d096e6b78e8 100644 --- a/dll/win32/storprop/storprop.spec +++ b/dll/win32/storprop/storprop.spec @@ -3,7 +3,7 @@ @ stub CdromIsDigitalPlaybackEnabled @ stdcall DiskClassInstaller(long ptr ptr) @ stdcall DllMain(ptr long ptr) -@ stub DvdClassInstaller +@ stdcall DvdClassInstaller(long ptr ptr) @ stub DvdLauncher @ stub DvdPropPageProvider @ stub IdePropPageProvider diff --git a/drivers/storage/class/cdrom_new/cdrom.inf b/drivers/storage/class/cdrom_new/cdrom.inf index 89220976529..5a33abd5049 100644 --- a/drivers/storage/class/cdrom_new/cdrom.inf +++ b/drivers/storage/class/cdrom_new/cdrom.inf @@ -3,13 +3,13 @@ ; [Version] -Signature = "$WINDOWS NT$" +Signature = "$WINDOWS NT$" LayoutFile = layout.inf -Class = CDROM -ClassGuid = {4D36E965-E325-11CE-BFC1-08002BE10318} -Provider = %MSFT% +Class = CDROM +ClassGUID = {4D36E965-E325-11CE-BFC1-08002BE10318} +Provider = %MSFT% ; Git commit 96eb96d @ https://github.com/microsoft/Windows-driver-samples -DriverVer = 08/11/2016, 1.0 +DriverVer = 08/11/2016, 1.0 ;[SourceDisksNames] ;3426=windows cd @@ -19,6 +19,18 @@ DriverVer = 08/11/2016, 1.0 [DestinationDirs] cdrom_copyfiles = 12 +storprop_CopyFiles.NT = 11 + +[ClassInstall32.NT] +AddReg = CDROMClass.NT.AddReg +Copyfiles = storprop_CopyFiles.NT + +[CDROMClass.NT.AddReg] +HKR, , , 0, %CDROMClassName% +HKR, , Icon, 0, "-51" +HKR, , Installer32, 0, "storprop.dll,DvdClassInstaller" +HKR, , NoInstallClass, 0, 1 +HKR, , SilentInstall, 0, 1 [cdrom_copyfiles] cdrom.sys,,,0x100 @@ -27,8 +39,10 @@ cdrom.sys,,,0x100 BasicDriverOk=* [Manufacturer] -%MITSUMI% = mitsumi_cdrom,NT$ARCH$ -%GenManufacturer% = cdrom_device,NT$ARCH$ +%MITSUMI% = mitsumi_cdrom,NT +%GenManufacturer% = cdrom_device,NT +;%MITSUMI% = mitsumi_cdrom,NT$ARCH$ +;%GenManufacturer% = cdrom_device,NT$ARCH$ ;[mitsumi_cdrom.NT$ARCH$] [mitsumi_cdrom.NT] @@ -135,13 +149,17 @@ AddReg=autorun_addreg [cdrom_EventLog_InstallSection] ;AddReg=cdrom_EventLog_AddReg -;[cdrom_EventLog_AddReg] -;HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll" -;HKR,,TypesSupported,0x00010001,7 +[cdrom_EventLog_AddReg] +HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll" +HKR,,TypesSupported,0x00010001,7 + +[storprop_CopyFiles.NT] +storprop.dll [Strings] -MSFT = "Microsoft" +MSFT = "Microsoft" +CDROMClassName = "DVD/CD-ROM drives" ;; Manufacturer specific strings MITSUMI = "Mitsumi" diff --git a/drivers/storage/class/disk_new/disk.inf b/drivers/storage/class/disk_new/disk.inf index 810f95e5793..421c2a5660e 100644 --- a/drivers/storage/class/disk_new/disk.inf +++ b/drivers/storage/class/disk_new/disk.inf @@ -1,10 +1,9 @@ -; DISK.INF - -; Installation of DISK DRIVESs +; +; Copyright (c) Microsoft Corporation. All rights reserved. +; [Version] -Signature = "$Windows NT$" -;Signature = "$ReactOS$" +Signature = "$WINDOWS NT$" LayoutFile = layout.inf Class = DiskDrive ClassGUID = {4D36E967-E325-11CE-BFC1-08002BE10318} @@ -12,8 +11,27 @@ Provider = %MSFT% ; Git commit 3428c5f @ https://github.com/microsoft/Windows-driver-samples DriverVer = 08/29/2018, 1.0 +;[SourceDisksNames] +;3426=windows cd + +;[SourceDisksFiles] +;disk.sys = 3426 + +;; +;; The AutoRunAlwaysDisable key is only for use when the hardware cannot +;; accepts TEST_UNIT_READY commands. Disabling 'AutoRun' or including +;; devices in this list will prevent removable media services from being +;; able to properly handle these devices. +;; + +[autorun_addreg] +HKLM,"System\CurrentControlSet\Services\disk","AutoRunAlwaysDisable", 0x00010008, "Brother RemovableDisk(U)" + +[disk_copyfiles] +disk.sys,,,0x100 + [DestinationDirs] -disk_CopyFiles.NT = 12 +disk_copyfiles=12 storprop_CopyFiles.NT = 11 [ClassInstall32.NT] @@ -22,108 +40,149 @@ Copyfiles = storprop_CopyFiles.NT [DiskClass.NT.AddReg] HKR, , , 0, %DiskClassName% -HKR, , Installer32, 0, "storprop.dll,DiskClassInstaller" HKR, , Icon, 0, "-53" +HKR, , Installer32, 0, "storprop.dll,DiskClassInstaller" HKR, , NoInstallClass, 0, 1 HKR, , SilentInstall, 0, 1 -[Manufacturer] -%GenericMfg% = GenericMfg - -[GenericMfg] -%Disk.DeviceDesc% = disk_Inst,GenDisk -%OpticalDisk.DeviceDesc% = disk_Inst,GenOptical +[ControlFlags] +BasicDriverOk=* -;----------------------------- DISK DRIVER ----------------------------- - -[disk_Inst.NT] -CopyFiles = disk_CopyFiles.NT - -[disk_Inst.NT.Services] -AddService = disk, 2, disk_Service_Inst - -[disk_Service_Inst] -DisplayName = %Disk.ServiceDesc% -ServiceType = 1 -StartType = 0 -ErrorControl = 1 -ServiceBinary = %12%\disk.sys - -[disk_CopyFiles.NT] -disk.sys - -;---------------------------- DISK INSTALLER ---------------------------- +[Manufacturer] +%GenManufacturer%=disk_device,NT +%Compaq%=compaq,NT +%Mylex%=mylex,NT +;%GenManufacturer%=disk_device,NT$ARCH$ +;%Compaq%=compaq,NT$ARCH$ +;%Mylex%=mylex,NT$ARCH$ + +;[disk_device.NT$ARCH$] +[disk_device.NT] +%disk_devdesc% = disk_install, GenDisk +%opticaldisk_devdesc% = disk_install, GenOptical +%disk_devdesc% = disk_install, USBSTOR\DiskSony____MSC-U01_________ +%disk_devdesc% = disk_install, USBSTOR\DiskSony____MSC-U01N________ +%disk_devdesc% = media_unlockable_disk_install, IDE\DiskIOMEGA_ZIP_100__________________________ +%disk_devdesc% = media_unlockable_disk_install, SCSI\DiskIOMEGA__ZIP_100_________ +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\FUJITSU&DynaMO-FE_OPTICAL_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\&SYM13FW500-DISK_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\&WDxxxA001RTL-Disk_Drive&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\MAC_TECHNOLOGIESINC.&MAC_THIN_FIREWIRE_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\VST_TECHNOLOGIESINC.&VST_THIN_FIREWIRE_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\Sony&PCVA-HD04&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\LSI_Logic&SYM13FW500-DISK_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\MELCO_INC&1394MEL-HD_DRIVE_&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\MELCO_INC&1394MEL-HD_DRIVE&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\MELCO_INC&1394MEL-MO_DRIVE_&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\LOGITEC&LMO-PFU&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\LOGITEC&LMO-AF&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\OXFW900_&LHD-SF__&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\LOGITEC&LHD-PFU&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\LOGITEC&LHD_AF&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\I-O_DATA_DEVICE_INC.&1394_Converter__&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\API-903-95__&1394_Storage_+_Repeater_&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_orderly_removal_disk_install, SBP2\Sony&PCVA-HD08A&CmdSetId104d8&GenDisk +%disk_devdesc% = expect_surprise_removal_disk_install, LEXARUSB\GenDisk +%disk_devdesc% = expect_surprise_removal_disk_install, SCSI\DiskToshiba_SD_Mem_Driver___ +%disk_devdesc% = disk_install_VHD_drive, SCSI\DiskMsft____Virtual_Disk____ + +;[compaq.NT$ARCH$] +[compaq.NT] +%compaq_array.DeviceDesc% = disk_install, SCSI\DiskCompaq__Disk_Array______ + +;[mylex.NT$ARCH$] +[mylex.NT] +%mylex_array.DeviceDesc% = disk_install, SCSI\DiskMYLEX___ + +[media_unlockable_disk_install.NT] +CopyFiles=disk_copyfiles + +[media_unlockable_disk_install.NT.Services] +AddService=disk,2,disk_ServiceInstallSection,disk_EventLog_InstallSection + +[media_unlockable_disk_install.NT.HW] +AddReg=media_unlockable_disk_install_HW.AddReg + +[media_unlockable_disk_install_HW.AddReg] +HKR,"Classpnp","HackMask",0x00010001,0x1 ; Device cannot lock media + +[expect_orderly_removal_disk_install.NT] +CopyFiles=disk_copyfiles + +[expect_orderly_removal_disk_install.NT.Services] +AddService=disk,2,disk_ServiceInstallSection,disk_EventLog_InstallSection + +[expect_orderly_removal_disk_install.NT.HW] +AddReg=expect_orderly_removal_disk_install_HW.AddReg + +[expect_orderly_removal_disk_install_HW.AddReg] +HKR,,"RemovalPolicy",0x00010001,0x2 ; ExpectOrderlyRemoval + +[expect_surprise_removal_disk_install.NT] +CopyFiles=disk_copyfiles + +[expect_surprise_removal_disk_install.NT.Services] +AddService=disk,2,disk_ServiceInstallSection,disk_EventLog_InstallSection + +[expect_surprise_removal_disk_install.NT.HW] +AddReg=expect_surprise_removal_disk_install_HW.AddReg + +[expect_surprise_removal_disk_install_HW.AddReg] +HKR,,"RemovalPolicy",0x00010001,0x3 ; ExpectSurpriseRemoval + +[disk_install_VHD_drive.NT] +CopyFiles=disk_copyfiles + +[disk_install_VHD_drive.NT.Services] +AddService=disk,2,disk_ServiceInstallSection,disk_EventLog_InstallSection + +[disk_install_VHD_drive.NT.HW] +AddReg=disk_install_VHD_drive.AddReg + +[disk_install_VHD_drive.AddReg] +HKR,,"FriendlyName",,%VHD_Generic_FriendlyName% ; Give VHD drives a more friendly name + +[disk_install.NT] +CopyFiles=disk_copyfiles +ExcludeId=GenSFloppy,SCSI\DiskMATSHITALS-120_COSM___04,SCSI\DiskCOMPAQ__LS-120_VER5___AB +ExcludeId=SCSI\DiskCOMPAQ__LS-120_HIMA___01,SCSI\DiskMATSHITALS-120_VER5___00 +ExcludeId=SCSI\DiskMATSHITALS-120/240____00 +DiskCiPrivateData=4 + +[disk_install.NT.Services] +AddService=disk,2,disk_ServiceInstallSection,disk_EventLog_InstallSection + +[disk_ServiceInstallSection] +DisplayName=%disk_ServiceDesc% +ServiceType=1 +StartType=0 +ErrorControl=1 +ServiceBinary = %12%\disk.sys +AddReg=autorun_addreg + +[disk_EventLog_InstallSection] +;AddReg=disk_EventLog_AddReg + +[disk_EventLog_AddReg] +HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll" +HKR,,TypesSupported,0x00010001,7 [storprop_CopyFiles.NT] storprop.dll -;-------------------------------- STRINGS ------------------------------- [Strings] -ReactOS = "ReactOS Team" -GenericMfg = "(Generic Disk Drives)" -DiskClassName = "Disk Drives" -Disk.DeviceDesc = "Disk Drive" -OpticalDisk.DeviceDesc = "Optical Disk Drive" -Disk.ServiceDesc = "Disk Driver" - -[Strings.0405] -GenericMfg = "(Obecné diskové jednotky)" -DiskClassName = "Diskové jednotky" -Disk.DeviceDesc = "Disková jednotka" -OpticalDisk.DeviceDesc = "Optická disková jednotka" -Disk.ServiceDesc = "Ovladač disku" - -[Strings.0a] -ReactOS = "Equipo de ReactOS" -GenericMfg = "(Unidades de disco genéricas)" -DiskClassName = "Unidades de disco" -Disk.DeviceDesc = "Unidad de disco" -OpticalDisk.DeviceDesc = "Unidad de disco óptico" -Disk.ServiceDesc = "Controlador de disco" - -[Strings.0415] -ReactOS = "Zespół ReactOS" -GenericMfg = "(Standardowy dysk twardy)" -DiskClassName = "Dyski twarde" -Disk.DeviceDesc = "Dysk twardy" -OpticalDisk.DeviceDesc = "Dysk optyczny" -Disk.ServiceDesc = "Sterownik dysku" - -[Strings.0418] -ReactOS = "Echipa ReactOS" -GenericMfg = "(dispozitiv disc generic)" -DiskClassName = "Dispozitive disc" -Disk.DeviceDesc = "Dispozitiv disc" -OpticalDisk.DeviceDesc = "Dispozitiv disc optic" -Disk.ServiceDesc = "Modúl-pilot de disc" - -[Strings.0419] -ReactOS = "Команда ReactOS" -GenericMfg = "(Стандартные дисковые накопители)" -DiskClassName = "Дисковые устройства" -Disk.DeviceDesc = "Дисковое устройство" -OpticalDisk.DeviceDesc = "Оптическое дисковое устройство" -Disk.ServiceDesc = "Драйвер диска" - -[Strings.041f] -ReactOS = "ReactOS Takımı" -GenericMfg = "(Umûmî Disk Sürücüleri)" -DiskClassName = "Disk Sürücüleri" -Disk.DeviceDesc = "Disk Sürücüsü" -OpticalDisk.DeviceDesc = "Optik Disk Sürücüsü" -Disk.ServiceDesc = "Disk Sürücüsü" - -[Strings.0422] -ReactOS = "Команда ReactOS" -GenericMfg = "(Стандартні приводи дисків)" -DiskClassName = "Дискові приводи" -Disk.DeviceDesc = "Дисковий привід" -OpticalDisk.DeviceDesc = "Оптичний привід дисків" -Disk.ServiceDesc = "Драйвер диску" - -[Strings.0804] -GenericMfg = "(通用磁盘驱动器)" -Disk.DeviceDesc = "磁盘驱动器" -OpticalDisk.DeviceDesc = "光盘驱动器" -Disk.ServiceDesc = "磁盘驱动器" +MSFT="Microsoft" +DiskClassName="Disk drives" +GenManufacturer="(Standard disk drives)" +Compaq="Compaq" +Mylex="Mylex" + +disk_devdesc="Disk drive" +opticaldisk_devdesc="Optical disk drive" + +disk_ServiceDesc="Disk Driver" +compaq_array.DeviceDesc = "Compaq SCSI Drive Array" +mylex_array.DeviceDesc = "Mylex RAID Disk Device" + +VHD_Generic_FriendlyName = "Microsoft Virtual Disk"

4 years, 1 month

[reactos] 06/06: [FREELDR] Parse NT kernel load options in a consistent manner.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d887308b2f604ae020887… commit d887308b2f604ae020887b5a403be8a3eabd52a0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 3 01:16:14 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 3 01:52:47 2020 +0100 [FREELDR] Parse NT kernel load options in a consistent manner. - Introduce a set of NtLdrGet(Next)Option(Ex) helpers that allow retrieving respectively, the "next" option in an options string, and retrieving a given named option in such an options string, by correctly parsing that string. Valid syntaxes: /OPTION1 /OPTION2/OPTION3 OPTION4 /OPTION5(=...) ... Options separators are slashes, or whitespace (space, tab), mandatory if no slash is used, and otherwise optional. - Use these functions wherever NT load options are being parsed. - Simplify the parsing of /DEBUGPORT=... using these functions. - When parsing the /HAL=... or /KERNEL=... options, only the first encountered one is taken into account, any other ones are discarded. - When parsing the other load options, only their first occurrences are taken into account, any other repetitions are discarded. * The NOPAE option overrides any previous PAE option. * Any NOEXECUTE(=) option should override any previous NOEXECUTE=ALWAYSOFF (or equivalently, EXECUTE) option. --- boot/freeldr/freeldr/CMakeLists.txt | 1 + boot/freeldr/freeldr/disk/ramdisk.c | 22 +-- boot/freeldr/freeldr/ntldr/ntldropts.c | 131 ++++++++++++++++ boot/freeldr/freeldr/ntldr/ntldropts.h | 31 ++++ boot/freeldr/freeldr/ntldr/setupldr.c | 13 +- boot/freeldr/freeldr/ntldr/winldr.c | 264 +++++++++++++-------------------- 6 files changed, 285 insertions(+), 177 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index a401a5b1a66..87116af5978 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -251,6 +251,7 @@ list(APPEND FREELDR_BASE_SOURCE ## otherwise we get linking errors with Rtl**Bitmap** APIs. ## Do not happen on MSVC builds however... ntldr/inffile.c + ntldr/ntldropts.c lib/rtl/libsupp.c) if(ARCH STREQUAL "i386") diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 78503649a49..9f623baf506 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -10,6 +10,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> +#include "../ntldr/ntldropts.h" /* GLOBALS ********************************************************************/ @@ -241,30 +242,31 @@ RamDiskInitialize( /* If we don't have any load options, initialize an empty Ramdisk */ if (LoadOptions) { - PCHAR Option; + PCSTR Option; + ULONG FileNameLength; /* Ramdisk image file name */ - Option = strstr(LoadOptions, "/RDPATH="); - if (Option) + Option = NtLdrGetOptionEx(LoadOptions, "RDPATH=", &FileNameLength); + if (Option && (FileNameLength > 7)) { - /* Copy the file name - everything until the next separator */ - Option += 8; + /* Copy the file name */ + Option += 7; FileNameLength -= 7; RtlStringCbCopyNA(FileName, sizeof(FileName), - Option, strcspn(Option, " \t") * sizeof(CHAR)); + Option, FileNameLength * sizeof(CHAR)); } /* Ramdisk image length */ - Option = strstr(LoadOptions, "/RDIMAGELENGTH="); + Option = NtLdrGetOption(LoadOptions, "RDIMAGELENGTH="); if (Option) { - RamDiskImageLength = _atoi64(Option + 15); + RamDiskImageLength = _atoi64(Option + 14); } /* Ramdisk image offset */ - Option = strstr(LoadOptions, "/RDIMAGEOFFSET="); + Option = NtLdrGetOption(LoadOptions, "RDIMAGEOFFSET="); if (Option) { - RamDiskImageOffset = atol(Option + 15); + RamDiskImageOffset = atol(Option + 14); } } diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.c b/boot/freeldr/freeldr/ntldr/ntldropts.c new file mode 100644 index 00000000000..fdd62938b59 --- /dev/null +++ b/boot/freeldr/freeldr/ntldr/ntldropts.c @@ -0,0 +1,131 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Kernel Load Options Support Functions + * COPYRIGHT: Copyright 2020 Hermes Belusca-Maito + */ + +/* INCLUDES ******************************************************************/ + +#include <freeldr.h> +#include "ntldropts.h" + +/* FUNCTIONS *****************************************************************/ + +PCSTR +NtLdrGetNextOption( + IN OUT PCSTR* Options, + OUT PULONG OptionLength OPTIONAL) +{ + PCSTR NextOption; + PCSTR Option = NULL; + ULONG Length = 0; + + if (OptionLength) + *OptionLength = 0; + + if (!Options || !*Options) + return NULL; + + /* Loop over each option */ + NextOption = *Options; + while (*NextOption) + { + /* Skip possible initial whitespace */ + NextOption += strspn(NextOption, " \t"); + + /* Stop now if we have already found an option. + * NextOption points to the next following option. */ + if (Option) + break; + + /* + * Check whether a new option starts. Options are delimited + * with an option separator '/' or with whitespace. + */ + if (*NextOption == '/') + ++NextOption; + + /* Get the actual length of the option until + * the next whitespace or option separator. */ + Length = (ULONG)strcspn(NextOption, " \t/"); + + /* Retrieve the option if present and go to the beginning of the next one */ + if (Length != 0) + Option = NextOption; + + /* Restart after the end of the option */ + NextOption += Length; + } + + *Options = NextOption; + if (Option && OptionLength) + *OptionLength = Length; + return Option; +} + +/* + * OptionName specifies the option name, without any leading + * option separator '/', to search for within the Options. + * The search is made case-insensitive. + */ +PCSTR +NtLdrGetOptionExN( + IN PCSTR Options, + IN PCCH OptionName, + IN ULONG OptNameLength, + OUT PULONG OptionLength OPTIONAL) +{ + PCSTR NextOptions; + PCSTR Option = NULL; + ULONG OptLength = 0; + + if (OptionLength) + *OptionLength = 0; + + if (!Options || !*Options) + return NULL; + if (!OptionName || (OptNameLength == 0) || !*OptionName) + return NULL; + + NextOptions = Options; + while ((Option = NtLdrGetNextOption(&NextOptions, &OptLength))) + { + /* + * Check whether the option to find exactly matches the current + * load option, or is a prefix thereof if this is an option with + * appended data. + */ + if ((OptLength >= OptNameLength) && + (_strnicmp(Option, OptionName, OptNameLength) == 0)) + { + if ((OptLength == OptNameLength) || + (OptionName[OptNameLength-1] == '=') || + (OptionName[OptNameLength-1] == ':')) + { + break; + } + } + } + + if (Option && OptionLength) + *OptionLength = OptLength; + return Option; +} + +PCSTR +NtLdrGetOptionEx( + IN PCSTR Options, + IN PCSTR OptionName, + OUT PULONG OptionLength OPTIONAL) +{ + return NtLdrGetOptionExN(Options, OptionName, strlen(OptionName), OptionLength); +} + +PCSTR +NtLdrGetOption( + IN PCSTR Options, + IN PCSTR OptionName) +{ + return NtLdrGetOptionEx(Options, OptionName, NULL); +} diff --git a/boot/freeldr/freeldr/ntldr/ntldropts.h b/boot/freeldr/freeldr/ntldr/ntldropts.h new file mode 100644 index 00000000000..aab539ce92d --- /dev/null +++ b/boot/freeldr/freeldr/ntldr/ntldropts.h @@ -0,0 +1,31 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Kernel Load Options Support Functions + * COPYRIGHT: Copyright 2020 Hermes Belusca-Maito + */ + +#pragma once + +PCSTR +NtLdrGetNextOption( + IN OUT PCSTR* Options, + OUT PULONG OptionLength OPTIONAL); + +PCSTR +NtLdrGetOptionExN( + IN PCSTR Options, + IN PCCH OptionName, + IN ULONG OptNameLength, + OUT PULONG OptionLength OPTIONAL); + +PCSTR +NtLdrGetOptionEx( + IN PCSTR Options, + IN PCSTR OptionName, + OUT PULONG OptionLength OPTIONAL); + +PCSTR +NtLdrGetOption( + IN PCSTR Options, + IN PCSTR OptionName); diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index ec1aafe0f7b..548e4b7c21b 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -10,6 +10,7 @@ #include <arc/setupblk.h> #include "winldr.h" #include "inffile.h" +#include "ntldropts.h" #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); @@ -185,6 +186,7 @@ LoadReactOSSetup( PCSTR SystemPartition; PCSTR SystemPath; PSTR FileName; + ULONG FileNameLength; BOOLEAN BootFromFloppy; BOOLEAN Success; HINF InfHandle; @@ -294,16 +296,16 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions2); /* Check if a RAM disk file was given */ - FileName = strstr(BootOptions2, "/RDPATH="); - if (FileName) + FileName = (PSTR)NtLdrGetOptionEx(BootOptions2, "RDPATH=", &FileNameLength); + if (FileName && (FileNameLength > 7)) { /* Load the RAM disk */ Status = RamDiskInitialize(FALSE, BootOptions2, SystemPartition); if (Status != ESUCCESS) { - FileName += 8; + FileName += 7; FileNameLength -= 7; UiMessageBox("Failed to load RAM disk file '%.*s'", - strcspn(FileName, " \t"), FileName); + FileNameLength, FileName); return Status; } } @@ -321,7 +323,8 @@ LoadReactOSSetup( UiMessageBox("Failed to open txtsetup.sif"); return ENOENT; } - RtlStringCbCopyA(FileName, sizeof(BootPath) - (FileName - BootPath)*sizeof(CHAR), SystemPath); + FileNameLength = (ULONG)(sizeof(BootPath) - (FileName - BootPath)*sizeof(CHAR)); + RtlStringCbCopyA(FileName, FileNameLength, SystemPath); RtlStringCbCopyA(FilePath, sizeof(FilePath), BootPath); RtlStringCbCatA(FilePath, sizeof(FilePath), "txtsetup.sif"); if (InfOpenFile(&InfHandle, FilePath, &ErrorLine)) diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index a7554dc7309..e57c3826114 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -8,6 +8,7 @@ #include <freeldr.h> #include <ndk/ldrtypes.h> #include "winldr.h" +#include "ntldropts.h" #include "registry.h" #include <debug.h> @@ -497,12 +498,13 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) { BOOLEAN Success; - PCSTR Options; + PCSTR Option; + ULONG OptionLength; + PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; CHAR DirPath[MAX_PATH]; CHAR HalFileName[MAX_PATH]; CHAR KernelFileName[MAX_PATH]; CHAR KdTransportDllName[MAX_PATH]; - PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; if (!KernelDTE) return FALSE; @@ -520,45 +522,24 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, RtlStringCbCopyA(HalFileName , sizeof(HalFileName) , "hal.dll"); RtlStringCbCopyA(KernelFileName, sizeof(KernelFileName), "ntoskrnl.exe"); - /* Find any "/HAL=" or "/KERNEL=" switch in the boot options */ - Options = BootOptions; - while (Options) - { - /* Skip possible initial whitespace */ - Options += strspn(Options, " \t"); + /* Check for any "/HAL=" or "/KERNEL=" override option */ - /* Check whether a new option starts and it is either HAL or KERNEL */ - if (*Options != '/' || (++Options, - !(_strnicmp(Options, "HAL=", 4) == 0 || - _strnicmp(Options, "KERNEL=", 7) == 0)) ) - { - /* Search for another whitespace */ - Options = strpbrk(Options, " \t"); - continue; - } - else - { - size_t i = strcspn(Options, " \t"); /* Skip whitespace */ - if (i == 0) - { - /* Use the default values */ - break; - } + Option = NtLdrGetOptionEx(BootOptions, "HAL=", &OptionLength); + if (Option && (OptionLength > 4)) + { + /* Retrieve the HAL file name */ + Option += 4; OptionLength -= 4; + RtlStringCbCopyNA(HalFileName, sizeof(HalFileName), Option, OptionLength); + _strupr(HalFileName); + } - /* We have found either HAL or KERNEL options */ - if (_strnicmp(Options, "HAL=", 4) == 0) - { - Options += 4; i -= 4; - RtlStringCbCopyNA(HalFileName, sizeof(HalFileName), Options, i); - _strupr(HalFileName); - } - else if (_strnicmp(Options, "KERNEL=", 7) == 0) - { - Options += 7; i -= 7; - RtlStringCbCopyNA(KernelFileName, sizeof(KernelFileName), Options, i); - _strupr(KernelFileName); - } - } + Option = NtLdrGetOptionEx(BootOptions, "KERNEL=", &OptionLength); + if (Option && (OptionLength > 7)) + { + /* Retrieve the KERNEL file name */ + Option += 7; OptionLength -= 7; + RtlStringCbCopyNA(KernelFileName, sizeof(KernelFileName), Option, OptionLength); + _strupr(KernelFileName); } TRACE("HAL file = '%s' ; Kernel file = '%s'\n", HalFileName, KernelFileName); @@ -583,65 +564,36 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, * the name "kdcom.dll". [...]" */ - /* - * This loop replaces a dumb call to strstr(..., "DEBUGPORT="). - * Indeed I want it to be case-insensitive to allow "debugport=" - * or "DeBuGpOrT=" or... , and I don't want it to match malformed - * command-line options, such as: - * - * "...foo DEBUGPORT=xxx bar..." - * "...foo/DEBUGPORT=xxx bar..." - * "...foo/DEBUGPORT=bar..." - * - * i.e. the "DEBUGPORT=" switch must start with a slash and be separated - * from the rest by whitespace, unless it begins the command-line, e.g.: - * - * "/DEBUGPORT=COM1 foo...bar..." - * "...foo /DEBUGPORT=USB bar..." - * or: - * "...foo /DEBUGPORT= bar..." - * (in that case, we default the port to COM). - */ - Options = BootOptions; - while (Options) + /* Check whether there is a DEBUGPORT option */ + Option = NtLdrGetOptionEx(BootOptions, "DEBUGPORT=", &OptionLength); + if (Option && (OptionLength > 10)) { - /* Skip possible initial whitespace */ - Options += strspn(Options, " \t"); + /* Move to the debug port name */ + Option += 10; OptionLength -= 10; + ASSERT(OptionLength > 0); - /* Check whether a new option starts and it is the DEBUGPORT one */ - if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) - { - /* Search for another whitespace */ - Options = strpbrk(Options, " \t"); - continue; - } - else - { - /* We found the DEBUGPORT option. Move to the port name. */ - Options += 10; - break; - } - } - - if (Options) - { /* - * We have found the DEBUGPORT option. Parse the port name. - * Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO - * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". + * Parse the port name. + * Format: /DEBUGPORT=COM[1-9] + * or: /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log + * or: /DEBUGPORT=FOO + * If we only have /DEBUGPORT= (i.e. without any port name), + * defaults it to "COM". */ RtlStringCbCopyA(KdTransportDllName, sizeof(KdTransportDllName), "KD"); - if (_strnicmp(Options, "COM", 3) == 0 && '0' <= Options[3] && Options[3] <= '9') + if (_strnicmp(Option, "COM", 3) == 0 && '0' <= Option[3] && Option[3] <= '9') { - RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Options, 3); + RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Option, 3); } else { - size_t i = strcspn(Options, " \t:"); /* Skip valid separators: whitespace or colon */ - if (i == 0) + /* Get the actual length of the debug port + * until the next whitespace or colon. */ + OptionLength = (ULONG)strcspn(Option, " \t:"); + if (OptionLength == 0) RtlStringCbCatA(KdTransportDllName, sizeof(KdTransportDllName), "COM"); else - RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Options, i); + RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Option, OptionLength); } RtlStringCbCatA(KdTransportDllName, sizeof(KdTransportDllName), ".DLL"); _strupr(KdTransportDllName); @@ -655,86 +607,73 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, } /* Parse the boot options */ - Options = BootOptions; TRACE("LoadWindowsCore: BootOptions '%s'\n", BootOptions); - while (Options) + + if (NtLdrGetOption(BootOptions, "3GB")) + { + /* We found the 3GB option. */ + FIXME("LoadWindowsCore: 3GB - TRUE (not implemented)\n"); + VirtualBias = TRUE; + } + if (NtLdrGetOption(BootOptions, "SOS")) { - /* Skip possible initial whitespace */ - Options += strspn(Options, " \t"); + /* We found the SOS option. */ + FIXME("LoadWindowsCore: SOS - TRUE (not implemented)\n"); + SosEnabled = TRUE; + } - /* Check whether a new option starts */ - if (*Options == '/') + if (OperatingSystemVersion > _WIN32_WINNT_NT4) + { + if (NtLdrGetOption(BootOptions, "SAFEBOOT")) + { + /* We found the SAFEBOOT option. */ + FIXME("LoadWindowsCore: SAFEBOOT - TRUE (not implemented)\n"); + SafeBoot = TRUE; + } + if (NtLdrGetOption(BootOptions, "PAE")) { - Options++; + /* We found the PAE option. */ + FIXME("LoadWindowsCore: PAE - TRUE (not implemented)\n"); + PaeEnabled = TRUE; + } + } - if (_strnicmp(Options, "3GB", 3) == 0) - { - /* We found the 3GB option. */ - FIXME("LoadWindowsCore: 3GB - TRUE (not implemented)\n"); - VirtualBias = TRUE; - } - if (_strnicmp(Options, "SOS", 3) == 0) + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) + { + if (NtLdrGetOption(BootOptions, "NOPAE")) + { + /* We found the NOPAE option. */ + FIXME("LoadWindowsCore: NOPAE - TRUE (not implemented)\n"); + PaeDisabled = TRUE; + } + if (NtLdrGetOption(BootOptions, "BOOTLOGO")) + { + /* We found the BOOTLOGO option. */ + FIXME("LoadWindowsCore: BOOTLOGO - TRUE (not implemented)\n"); + BootLogo = TRUE; + } + + if (!LoaderBlock->SetupLdrBlock) + { + if (NtLdrGetOption(BootOptions, "EXECUTE")) { - /* We found the SOS option. */ - FIXME("LoadWindowsCore: SOS - TRUE (not implemented)\n"); - SosEnabled = TRUE; + /* We found the EXECUTE option. */ + FIXME("LoadWindowsCore: EXECUTE - TRUE (not implemented)\n"); + NoexecuteDisabled = TRUE; } - if (OperatingSystemVersion > _WIN32_WINNT_NT4) + if (NtLdrGetOption(BootOptions, "NOEXECUTE=ALWAYSOFF")) { - if (_strnicmp(Options, "SAFEBOOT", 8) == 0) - { - /* We found the SAFEBOOT option. */ - FIXME("LoadWindowsCore: SAFEBOOT - TRUE (not implemented)\n"); - SafeBoot = TRUE; - } - if (_strnicmp(Options, "PAE", 3) == 0) - { - /* We found the PAE option. */ - FIXME("LoadWindowsCore: PAE - TRUE (not implemented)\n"); - PaeEnabled = TRUE; - } + /* We found the NOEXECUTE=ALWAYSOFF option. */ + FIXME("LoadWindowsCore: NOEXECUTE=ALWAYSOFF - TRUE (not implemented)\n"); + NoexecuteDisabled = TRUE; } - if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) + if (NtLdrGetOption(BootOptions, "NOEXECUTE")) { - if (_strnicmp(Options, "NOPAE", 5) == 0) - { - /* We found the NOPAE option. */ - FIXME("LoadWindowsCore: NOPAE - TRUE (not implemented)\n"); - PaeDisabled = TRUE; - } - if (_strnicmp(Options, "BOOTLOGO", 8) == 0) - { - /* We found the BOOTLOGO option. */ - FIXME("LoadWindowsCore: BOOTLOGO - TRUE (not implemented)\n"); - BootLogo = TRUE; - } - if (!LoaderBlock->SetupLdrBlock) - { - if (_strnicmp(Options, "NOEXECUTE=ALWAYSOFF", 19) == 0) - { - /* We found the NOEXECUTE=ALWAYSOFF option. */ - FIXME("LoadWindowsCore: NOEXECUTE=ALWAYSOFF - TRUE (not implemented)\n"); - NoexecuteDisabled = TRUE; - } - else if (_strnicmp(Options, "NOEXECUTE", 9) == 0) - { - /* We found the NOEXECUTE option. */ - FIXME("LoadWindowsCore: NOEXECUTE - TRUE (not implemented)\n"); - NoexecuteEnabled = TRUE; - } - - if (_strnicmp(Options, "EXECUTE", 7) == 0) - { - /* We found the EXECUTE option. */ - FIXME("LoadWindowsCore: EXECUTE - TRUE (not implemented)\n"); - NoexecuteDisabled = TRUE; - } - } + /* We found the NOEXECUTE option. */ + FIXME("LoadWindowsCore: NOEXECUTE - TRUE (not implemented)\n"); + NoexecuteEnabled = TRUE; } } - - /* Search for another whitespace */ - Options = strpbrk(Options, " \t"); } if (SafeBoot) @@ -826,6 +765,7 @@ LoadAndBootWindows( PCSTR ArgValue; PCSTR SystemPartition; PCSTR FileName; + ULONG FileNameLength; BOOLEAN Success; USHORT OperatingSystemVersion; PLOADER_PARAMETER_BLOCK LoaderBlock; @@ -912,12 +852,12 @@ LoadAndBootWindows( AppendBootTimeOptions(BootOptions); /* - * Set "/HAL=" and "/KERNEL=" options if needed. + * Set the "/HAL=" and "/KERNEL=" options if needed. * If already present on the standard "Options=" option line, they take * precedence over those passed via the separate "Hal=" and "Kernel=" * options. */ - if (strstr(BootOptions, "/HAL=") != 0) + if (!NtLdrGetOption(BootOptions, "HAL=")) { /* * Not found in the options, try to retrieve the @@ -930,7 +870,7 @@ LoadAndBootWindows( RtlStringCbCatA(BootOptions, sizeof(BootOptions), ArgValue); } } - if (strstr(BootOptions, "/KERNEL=") != 0) + if (!NtLdrGetOption(BootOptions, "KERNEL=")) { /* * Not found in the options, try to retrieve the @@ -947,16 +887,16 @@ LoadAndBootWindows( TRACE("BootOptions: '%s'\n", BootOptions); /* Check if a RAM disk file was given */ - FileName = strstr(BootOptions, "/RDPATH="); - if (FileName) + FileName = NtLdrGetOptionEx(BootOptions, "RDPATH=", &FileNameLength); + if (FileName && (FileNameLength > 7)) { /* Load the RAM disk */ Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition); if (Status != ESUCCESS) { - FileName += 8; + FileName += 7; FileNameLength -= 7; UiMessageBox("Failed to load RAM disk file '%.*s'", - strcspn(FileName, " \t"), FileName); + FileNameLength, FileName); return Status; } }

4 years, 1 month

[reactos] 05/06: [FREELDR] In LoadReactOSSetup(), verify that our BootType is really ReactOSSetup.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8547a8f20aa795c59c71… commit d8547a8f20aa795c59c710ff5704d40e029753f2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 3 01:28:14 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 3 01:52:47 2020 +0100 [FREELDR] In LoadReactOSSetup(), verify that our BootType is really ReactOSSetup. --- boot/freeldr/freeldr/ntldr/setupldr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 1443a7dd635..ec1aafe0f7b 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -212,6 +212,19 @@ LoadReactOSSetup( NULL }; + /* Retrieve the (mandatory) boot type */ + ArgValue = GetArgumentValue(Argc, Argv, "BootType"); + if (!ArgValue || !*ArgValue) + { + ERR("No 'BootType' value, aborting!\n"); + return EINVAL; + } + if (_stricmp(ArgValue, "ReactOSSetup") != 0) + { + ERR("Unknown 'BootType' value '%s', aborting!\n", ArgValue); + return EINVAL; + } + /* Retrieve the (mandatory) system partition */ SystemPartition = GetArgumentValue(Argc, Argv, "SystemPartition"); if (!SystemPartition || !*SystemPartition)

4 years, 1 month

[reactos] 04/06: [FREELDR] Minor code formatting / renaming some variables.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3033580c1a4377cac9f38… commit 3033580c1a4377cac9f382fea9bf9a56970b664f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 3 00:46:02 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 3 01:52:46 2020 +0100 [FREELDR] Minor code formatting / renaming some variables. --- boot/freeldr/freeldr/ntldr/setupldr.c | 56 +++++++++++++++++------------------ boot/freeldr/freeldr/ntldr/winldr.c | 22 +++++++------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index b6da7c7a95c..1443a7dd635 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -183,20 +183,20 @@ LoadReactOSSetup( ARC_STATUS Status; PCSTR ArgValue; PCSTR SystemPartition; - PCHAR File; - CHAR FileName[MAX_PATH]; - CHAR BootPath[MAX_PATH]; - CHAR BootOptions2[256]; - PCSTR LoadOptions; - PSTR BootOptions; + PCSTR SystemPath; + PSTR FileName; BOOLEAN BootFromFloppy; BOOLEAN Success; - ULONG i, ErrorLine; HINF InfHandle; INFCONTEXT InfContext; + ULONG i, ErrorLine; PLOADER_PARAMETER_BLOCK LoaderBlock; PSETUP_LOADER_BLOCK SetupBlock; - PCSTR SystemPath; + CHAR BootPath[MAX_PATH]; + CHAR FilePath[MAX_PATH]; + CHAR BootOptions2[256]; + PSTR BootOptions; + PCSTR LoadOptions; static PCSTR SourcePaths[] = { @@ -253,17 +253,17 @@ LoadReactOSSetup( if (strrchr(BootPath, ')') == NULL) { /* Temporarily save the boot path */ - RtlStringCbCopyA(FileName, sizeof(FileName), BootPath); + RtlStringCbCopyA(FilePath, sizeof(FilePath), BootPath); /* This is not a full path: prepend the SystemPartition */ RtlStringCbCopyA(BootPath, sizeof(BootPath), SystemPartition); /* Append a path separator if needed */ - if (*FileName != '\\' && *FileName != '/') + if (*FilePath != '\\' && *FilePath != '/') RtlStringCbCatA(BootPath, sizeof(BootPath), "\\"); /* Append the remaining path */ - RtlStringCbCatA(BootPath, sizeof(BootPath), FileName); + RtlStringCbCatA(BootPath, sizeof(BootPath), FilePath); } /* Append a path separator if needed */ @@ -280,17 +280,17 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions2); - /* Check if a ramdisk file was given */ - File = strstr(BootOptions2, "/RDPATH="); - if (File) + /* Check if a RAM disk file was given */ + FileName = strstr(BootOptions2, "/RDPATH="); + if (FileName) { - /* Load the ramdisk */ + /* Load the RAM disk */ Status = RamDiskInitialize(FALSE, BootOptions2, SystemPartition); if (Status != ESUCCESS) { - File += 8; + FileName += 8; UiMessageBox("Failed to load RAM disk file '%.*s'", - strcspn(File, " \t"), File); + strcspn(FileName, " \t"), FileName); return Status; } } @@ -298,8 +298,8 @@ LoadReactOSSetup( /* Check if we booted from floppy */ BootFromFloppy = strstr(BootPath, "fdisk") != NULL; - /* Open 'txtsetup.sif' from any of source paths */ - File = BootPath + strlen(BootPath); + /* Open 'txtsetup.sif' from any of the source paths */ + FileName = BootPath + strlen(BootPath); for (i = BootFromFloppy ? 0 : 1; ; i++) { SystemPath = SourcePaths[i]; @@ -308,10 +308,10 @@ LoadReactOSSetup( UiMessageBox("Failed to open txtsetup.sif"); return ENOENT; } - RtlStringCbCopyA(File, sizeof(BootPath) - (File - BootPath)*sizeof(CHAR), SystemPath); - RtlStringCbCopyA(FileName, sizeof(FileName), BootPath); - RtlStringCbCatA(FileName, sizeof(FileName), "txtsetup.sif"); - if (InfOpenFile(&InfHandle, FileName, &ErrorLine)) + RtlStringCbCopyA(FileName, sizeof(BootPath) - (FileName - BootPath)*sizeof(CHAR), SystemPath); + RtlStringCbCopyA(FilePath, sizeof(FilePath), BootPath); + RtlStringCbCatA(FilePath, sizeof(FilePath), "txtsetup.sif"); + if (InfOpenFile(&InfHandle, FilePath, &ErrorLine)) { break; } @@ -353,14 +353,14 @@ LoadReactOSSetup( /* Allocate and minimally-initialize the Loader Parameter Block */ AllocateAndInitLPB(_WIN32_WINNT_WS03, &LoaderBlock); - /* Allocate and initialize setup loader block */ + /* Allocate and initialize the setup loader block */ SetupBlock = &WinLdrSystemBlock->SetupBlock; LoaderBlock->SetupLdrBlock = SetupBlock; /* Set textmode setup flag */ SetupBlock->Flags = SETUPLDR_TEXT_MODE; - /* Load the system hive "setupreg.hiv" for setup */ + /* Load the "setupreg.hiv" setup system hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading setup system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath, TRUE); @@ -370,9 +370,9 @@ LoadReactOSSetup( return ENOEXEC; /* Load NLS data, they are in the System32 directory of the installation medium */ - RtlStringCbCopyA(FileName, sizeof(FileName), BootPath); - RtlStringCbCatA(FileName, sizeof(FileName), "system32\\"); - SetupLdrLoadNlsData(LoaderBlock, InfHandle, FileName); + RtlStringCbCopyA(FilePath, sizeof(FilePath), BootPath); + RtlStringCbCatA(FilePath, sizeof(FilePath), "system32\\"); + SetupLdrLoadNlsData(LoaderBlock, InfHandle, FilePath); /* Load the Firmware Errata file from the installation medium */ Success = SetupLdrInitErrataInf(LoaderBlock, InfHandle, BootPath); diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index d5ee1213e3e..a7554dc7309 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -825,12 +825,12 @@ LoadAndBootWindows( ARC_STATUS Status; PCSTR ArgValue; PCSTR SystemPartition; - PCHAR File; + PCSTR FileName; BOOLEAN Success; USHORT OperatingSystemVersion; PLOADER_PARAMETER_BLOCK LoaderBlock; CHAR BootPath[MAX_PATH]; - CHAR FileName[MAX_PATH]; + CHAR FilePath[MAX_PATH]; CHAR BootOptions[256]; /* Retrieve the (mandatory) boot type */ @@ -883,17 +883,17 @@ LoadAndBootWindows( if (strrchr(BootPath, ')') == NULL) { /* Temporarily save the boot path */ - RtlStringCbCopyA(FileName, sizeof(FileName), BootPath); + RtlStringCbCopyA(FilePath, sizeof(FilePath), BootPath); /* This is not a full path: prepend the SystemPartition */ RtlStringCbCopyA(BootPath, sizeof(BootPath), SystemPartition); /* Append a path separator if needed */ - if (*FileName != '\\' && *FileName != '/') + if (*FilePath != '\\' && *FilePath != '/') RtlStringCbCatA(BootPath, sizeof(BootPath), "\\"); /* Append the remaining path */ - RtlStringCbCatA(BootPath, sizeof(BootPath), FileName); + RtlStringCbCatA(BootPath, sizeof(BootPath), FilePath); } /* Append a path separator if needed */ @@ -946,17 +946,17 @@ LoadAndBootWindows( TRACE("BootOptions: '%s'\n", BootOptions); - /* Check if a ramdisk file was given */ - File = strstr(BootOptions, "/RDPATH="); - if (File) + /* Check if a RAM disk file was given */ + FileName = strstr(BootOptions, "/RDPATH="); + if (FileName) { - /* Load the ramdisk */ + /* Load the RAM disk */ Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition); if (Status != ESUCCESS) { - File += 8; + FileName += 8; UiMessageBox("Failed to load RAM disk file '%.*s'", - strcspn(File, " \t"), File); + strcspn(FileName, " \t"), FileName); return Status; } }

4 years, 1 month

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 November 2020