Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 04/04: [FREELDR:NTLDR] Expose and use the CurrentControlSetKey handle.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f10437b1e2d3daffaa831… commit f10437b1e2d3daffaa831d006b5dcb2701024081 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 23:07:50 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 7 03:19:11 2022 +0200 [FREELDR:NTLDR] Expose and use the CurrentControlSetKey handle. This allows: (i) to shorten dramatically the lengths of the static registry path strings being used (and thus, allow for reduced binary file size), and (ii) to prepare future support for selecting different control sets (and related Last-Known-Good configurations). --- boot/freeldr/freeldr/ntldr/registry.c | 2 +- boot/freeldr/freeldr/ntldr/registry.h | 2 ++ boot/freeldr/freeldr/ntldr/winldr.c | 12 +++--------- boot/freeldr/freeldr/ntldr/wlregistry.c | 25 +++++++++---------------- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 3db27582935..ea68cc340dc 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -27,7 +27,7 @@ DBG_DEFAULT_CHANNEL(REGISTRY); static PCMHIVE CmHive; static PCM_KEY_NODE RootKeyNode; -static HKEY CurrentControlSetKey; +HKEY CurrentControlSetKey; PVOID NTAPI diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index 8368749339d..0743be4866e 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -32,6 +32,8 @@ LONG RegInitCurrentControlSet( _In_ BOOLEAN LastKnownGood); +extern HKEY CurrentControlSetKey; + /* * LONG * RegCloseKey( diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index c923330d6be..5427b14fe22 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -473,9 +473,7 @@ WinLdrDetectVersion(VOID) LONG rc; HKEY hKey; - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server", - &hKey); + rc = RegOpenKey(CurrentControlSetKey, L"Control\\Terminal Server", &hKey); if (rc != ERROR_SUCCESS) { /* Key doesn't exist; assume NT 4.0 */ @@ -905,15 +903,11 @@ WinLdrInitErrataInf( /* Open either the 'BiosInfo' (Windows <= 2003) or the 'Errata' (Vista+) key */ if (OperatingSystemVersion >= _WIN32_WINNT_VISTA) { - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Errata", - &hKey); + rc = RegOpenKey(CurrentControlSetKey, L"Control\\Errata", &hKey); } else // (OperatingSystemVersion <= _WIN32_WINNT_WS03) { - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\BiosInfo", - &hKey); + rc = RegOpenKey(CurrentControlSetKey, L"Control\\BiosInfo", &hKey); } if (rc != ERROR_SUCCESS) { diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 92bf593743c..cc139b77111 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -20,6 +20,7 @@ ULONG TotalNLSSize = 0; static BOOLEAN WinLdrGetNLSNames( + _In_ HKEY ControlSet, _Inout_ PUNICODE_STRING AnsiFileName, _Inout_ PUNICODE_STRING OemFileName, _Inout_ PUNICODE_STRING LangFileName, // CaseTable @@ -186,7 +187,8 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, SystemRoot); /* Get names of NLS files */ - Success = WinLdrGetNLSNames(&AnsiFileName, + Success = WinLdrGetNLSNames(CurrentControlSetKey, + &AnsiFileName, &OemFileName, &LangFileName, &OemHalFileName); @@ -219,6 +221,7 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, // Queries registry for those three file names static BOOLEAN WinLdrGetNLSNames( + _In_ HKEY ControlSet, _Inout_ PUNICODE_STRING AnsiFileName, _Inout_ PUNICODE_STRING OemFileName, _Inout_ PUNICODE_STRING LangFileName, // CaseTable @@ -230,9 +233,7 @@ WinLdrGetNLSNames( WCHAR szIdBuffer[80]; /* Open the CodePage key */ - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", - &hKey); + rc = RegOpenKey(ControlSet, L"Control\\NLS\\CodePage", &hKey); if (rc != ERROR_SUCCESS) { //TRACE("Couldn't open CodePage registry key"); @@ -305,9 +306,7 @@ WinLdrGetNLSNames( RegCloseKey(hKey); /* Open the Language key */ - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", - &hKey); + rc = RegOpenKey(ControlSet, L"Control\\NLS\\Language", &hKey); if (rc != ERROR_SUCCESS) { //TRACE("Couldn't open Language registry key"); @@ -545,9 +544,7 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, BOOLEAN Success; /* Get 'group order list' key */ - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", - &hOrderKey); + rc = RegOpenKey(CurrentControlSetKey, L"Control\\GroupOrderList", &hOrderKey); if (rc != ERROR_SUCCESS) { TRACE_CH(REACTOS, "Failed to open the 'GroupOrderList' key (rc %d)\n", (int)rc); @@ -555,9 +552,7 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, } /* Get 'services' key */ - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services", - &hServiceKey); + rc = RegOpenKey(CurrentControlSetKey, L"Services", &hServiceKey); if (rc != ERROR_SUCCESS) { TRACE_CH(REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc); @@ -566,9 +561,7 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, } /* Get 'service group order' key */ - rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder", - &hGroupKey); + rc = RegOpenKey(CurrentControlSetKey, L"Control\\ServiceGroupOrder", &hGroupKey); if (rc != ERROR_SUCCESS) { TRACE_CH(REACTOS, "Failed to open the 'ServiceGroupOrder' key (rc %d)\n", (int)rc);

2 years, 8 months

[reactos] 03/04: [FREELDR:NTLDR] Improve NLS data loading.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57b9c6b2f209b0e48aa04… commit 57b9c6b2f209b0e48aa04b74427ab142e6522733 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 23:01:22 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 7 03:19:10 2022 +0200 [FREELDR:NTLDR] Improve NLS data loading. - Use UNICODE_STRINGs wherever possible. - Retrieve the OEMHAL font file name. TODO: Load it! - In WinLdrLoadNLSData(), don't open/close each file twice (and showing we are loading them twice). Instead, open all files at once (and keep them that way), retrieve their sizes and do the calculations, then load their respective contents one by one -- giving loading feedback only at that point -- and finally close all of them at once. --- boot/freeldr/freeldr/ntldr/setupldr.c | 86 +++++---- boot/freeldr/freeldr/ntldr/winldr.h | 14 +- boot/freeldr/freeldr/ntldr/wlregistry.c | 309 +++++++++++++++++--------------- 3 files changed, 219 insertions(+), 190 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index f7a330be2fd..b300be50813 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -22,60 +22,74 @@ AllocateAndInitLPB( OUT PLOADER_PARAMETER_BLOCK* OutLoaderBlock); static VOID -SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, PCSTR SearchPath) +SetupLdrLoadNlsData( + _Inout_ PLOADER_PARAMETER_BLOCK LoaderBlock, + _In_ HINF InfHandle, + _In_ PCSTR SearchPath) { + BOOLEAN Success; INFCONTEXT InfContext; - PCSTR AnsiName, OemName, LangName; + PCSTR AnsiData; + UNICODE_STRING AnsiFileName = {0}; + UNICODE_STRING OemFileName = {0}; + UNICODE_STRING LangFileName = {0}; // CaseTable + UNICODE_STRING OemHalFileName = {0}; /* Get ANSI codepage file */ - if (!InfFindFirstLine(InfHandle, "NLS", "AnsiCodepage", &InfContext)) - { - ERR("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &AnsiName)) + if (!InfFindFirstLine(InfHandle, "NLS", "AnsiCodepage", &InfContext) || + !InfGetDataField(&InfContext, 1, &AnsiData) || + !RtlCreateUnicodeStringFromAsciiz(&AnsiFileName, AnsiData)) { - ERR("Failed to get load options\n"); + ERR("Failed to find or get 'NLS/AnsiCodepage'\n"); return; } /* Get OEM codepage file */ - if (!InfFindFirstLine(InfHandle, "NLS", "OemCodepage", &InfContext)) + if (!InfFindFirstLine(InfHandle, "NLS", "OemCodepage", &InfContext) || + !InfGetDataField(&InfContext, 1, &AnsiData) || + !RtlCreateUnicodeStringFromAsciiz(&OemFileName, AnsiData)) { - ERR("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &OemName)) - { - ERR("Failed to get load options\n"); - return; + ERR("Failed to find or get 'NLS/OemCodepage'\n"); + goto Quit; } - if (!InfFindFirstLine(InfHandle, "NLS", "UnicodeCasetable", &InfContext)) + /* Get the Unicode case table file */ + if (!InfFindFirstLine(InfHandle, "NLS", "UnicodeCasetable", &InfContext) || + !InfGetDataField(&InfContext, 1, &AnsiData) || + !RtlCreateUnicodeStringFromAsciiz(&LangFileName, AnsiData)) { - ERR("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &LangName)) - { - ERR("Failed to get load options\n"); - return; + ERR("Failed to find or get 'NLS/UnicodeCasetable'\n"); + goto Quit; } - TRACE("NLS data '%s' '%s' '%s'\n", AnsiName, OemName, LangName); - -#if DBG + /* Get OEM HAL font file */ + if (!InfFindFirstLine(InfHandle, "NLS", "OemHalFont", &InfContext) || + !InfGetData(&InfContext, NULL, &AnsiData) || + !RtlCreateUnicodeStringFromAsciiz(&OemHalFileName, AnsiData)) { - BOOLEAN Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); - (VOID)Success; - TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); + WARN("Failed to find or get 'NLS/OemHalFont'\n"); + /* Ignore, this is an optional file */ + RtlInitEmptyUnicodeString(&OemHalFileName, NULL, 0); } -#else - WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); -#endif - /* TODO: Load OEM HAL font */ - // Value "OemHalFont" + TRACE("NLS data: '%wZ' '%wZ' '%wZ' '%wZ'\n", + &AnsiFileName, &OemFileName, &LangFileName, &OemHalFileName); + + /* Load NLS data */ + Success = WinLdrLoadNLSData(LoaderBlock, + SearchPath, + &AnsiFileName, + &OemFileName, + &LangFileName, + &OemHalFileName); + TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); + (VOID)Success; + +Quit: + RtlFreeUnicodeString(&OemHalFileName); + RtlFreeUnicodeString(&LangFileName); + RtlFreeUnicodeString(&OemFileName); + RtlFreeUnicodeString(&AnsiFileName); } static diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index ee7c1fede7d..ab06855f14f 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -124,12 +124,16 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCSTR SystemPath, PCSTR BootPath, USHORT VersionToBoot); + BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PCSTR DirectoryPath, - IN PCSTR AnsiFileName, - IN PCSTR OemFileName, - IN PCSTR LanguageFileName); +WinLdrLoadNLSData( + _Inout_ PLOADER_PARAMETER_BLOCK LoaderBlock, + _In_ PCSTR DirectoryPath, + _In_ PCUNICODE_STRING AnsiFileName, + _In_ PCUNICODE_STRING OemFileName, + _In_ PCUNICODE_STRING LangFileName, // CaseTable + _In_ PCUNICODE_STRING OemHalFileName); + BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, PWSTR RegistryPath, diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 56702e26703..92bf593743c 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -20,12 +20,10 @@ ULONG TotalNLSSize = 0; static BOOLEAN WinLdrGetNLSNames( - _Out_z_bytecap_(AnsiNameSize) PSTR AnsiName, - _In_ SIZE_T AnsiNameSize, - _Out_z_bytecap_(OemNameSize) PSTR OemName, - _In_ SIZE_T OemNameSize, - _Out_z_bytecap_(LangNameSize) PSTR LangName, - _In_ SIZE_T LangNameSize); + _Inout_ PUNICODE_STRING AnsiFileName, + _Inout_ PUNICODE_STRING OemFileName, + _Inout_ PUNICODE_STRING LangFileName, // CaseTable + _Inout_ PUNICODE_STRING OemHalFileName); static VOID WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, @@ -178,34 +176,40 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR SystemRoot) { BOOLEAN Success; + DECLARE_UNICODE_STRING_SIZE(AnsiFileName, MAX_PATH); + DECLARE_UNICODE_STRING_SIZE(OemFileName, MAX_PATH); + DECLARE_UNICODE_STRING_SIZE(LangFileName, MAX_PATH); // CaseTable + DECLARE_UNICODE_STRING_SIZE(OemHalFileName, MAX_PATH); CHAR SearchPath[1024]; - CHAR AnsiName[256], OemName[256], LangName[256]; /* Scan registry and prepare boot drivers list */ WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, SystemRoot); /* Get names of NLS files */ - Success = WinLdrGetNLSNames(AnsiName, sizeof(AnsiName), - OemName, sizeof(OemName), - LangName, sizeof(LangName)); + Success = WinLdrGetNLSNames(&AnsiFileName, + &OemFileName, + &LangFileName, + &OemHalFileName); if (!Success) { UiMessageBox("Getting NLS names from registry failed!"); return FALSE; } - TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); + TRACE("NLS data: '%wZ' '%wZ' '%wZ' '%wZ'\n", + &AnsiFileName, &OemFileName, &LangFileName, &OemHalFileName); /* Load NLS data */ RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); RtlStringCbCatA(SearchPath, sizeof(SearchPath), "system32\\"); - Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + Success = WinLdrLoadNLSData(LoaderBlock, + SearchPath, + &AnsiFileName, + &OemFileName, + &LangFileName, + &OemHalFileName); TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); - /* TODO: Load OEM HAL font */ - // In HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage, - // REG_SZ value "OEMHAL" - return TRUE; } @@ -213,21 +217,17 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, /* PRIVATE FUNCTIONS ******************************************************/ // Queries registry for those three file names -_Use_decl_annotations_ static BOOLEAN WinLdrGetNLSNames( - _Out_ PSTR AnsiName, - _In_ SIZE_T AnsiNameSize, - _Out_ PSTR OemName, - _In_ SIZE_T OemNameSize, - _Out_ PSTR LangName, - _In_ SIZE_T LangNameSize) + _Inout_ PUNICODE_STRING AnsiFileName, + _Inout_ PUNICODE_STRING OemFileName, + _Inout_ PUNICODE_STRING LangFileName, // CaseTable + _Inout_ PUNICODE_STRING OemHalFileName) { - LONG rc = ERROR_SUCCESS; + LONG rc; HKEY hKey; ULONG BufferSize; WCHAR szIdBuffer[80]; - WCHAR NameBuffer[80]; /* Open the CodePage key */ rc = RegOpenKey(NULL, @@ -239,47 +239,68 @@ WinLdrGetNLSNames( return FALSE; } - /* Get ANSI codepage */ + /* Get ANSI codepage file */ BufferSize = sizeof(szIdBuffer); rc = RegQueryValue(hKey, L"ACP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("Couldn't get ACP NLS setting"); - RegCloseKey(hKey); - return FALSE; + goto Quit; } - BufferSize = sizeof(NameBuffer); - rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); + BufferSize = AnsiFileName->MaximumLength; + rc = RegQueryValue(hKey, szIdBuffer, NULL, + (PUCHAR)AnsiFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("ACP NLS Setting exists, but isn't readable"); - //RegCloseKey(hKey); - //return FALSE; - wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 + //goto Quit; + AnsiFileName->Length = 0; + RtlAppendUnicodeToString(AnsiFileName, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 + } + else + { + AnsiFileName->Length = (USHORT)BufferSize - sizeof(UNICODE_NULL); } - RtlStringCbPrintfA(AnsiName, AnsiNameSize, "%S", NameBuffer); - /* Get OEM codepage */ + /* Get OEM codepage file */ BufferSize = sizeof(szIdBuffer); rc = RegQueryValue(hKey, L"OEMCP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("Couldn't get OEMCP NLS setting"); - RegCloseKey(hKey); - return FALSE; + goto Quit; } - BufferSize = sizeof(NameBuffer); - rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); + BufferSize = OemFileName->MaximumLength; + rc = RegQueryValue(hKey, szIdBuffer, NULL, + (PUCHAR)OemFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("OEMCP NLS setting exists, but isn't readable"); - //RegCloseKey(hKey); - //return FALSE; - wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 + //goto Quit; + OemFileName->Length = 0; + RtlAppendUnicodeToString(OemFileName, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 + } + else + { + OemFileName->Length = (USHORT)BufferSize - sizeof(UNICODE_NULL); + } + + /* Get OEM HAL font file */ + BufferSize = OemHalFileName->MaximumLength; + rc = RegQueryValue(hKey, L"OEMHAL", NULL, + (PUCHAR)OemHalFileName->Buffer, &BufferSize); + if (rc != ERROR_SUCCESS) + { + //TRACE("Couldn't get OEMHAL NLS setting"); + //goto Quit; + RtlInitEmptyUnicodeString(OemHalFileName, NULL, 0); + } + else + { + OemHalFileName->Length = (USHORT)BufferSize - sizeof(UNICODE_NULL); } - RtlStringCbPrintfA(OemName, OemNameSize, "%S", NameBuffer); RegCloseKey(hKey); @@ -293,68 +314,71 @@ WinLdrGetNLSNames( return FALSE; } - /* Get the Unicode case table */ + /* Get the Unicode case table file */ BufferSize = sizeof(szIdBuffer); rc = RegQueryValue(hKey, L"Default", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("Couldn't get Language Default setting"); - RegCloseKey(hKey); - return FALSE; + goto Quit; } - BufferSize = sizeof(NameBuffer); - rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); + BufferSize = LangFileName->MaximumLength; + rc = RegQueryValue(hKey, szIdBuffer, NULL, + (PUCHAR)LangFileName->Buffer, &BufferSize); if (rc != ERROR_SUCCESS) { //TRACE("Language Default setting exists, but isn't readable"); - RegCloseKey(hKey); - return FALSE; + //goto Quit; + LangFileName->Length = 0; + RtlAppendUnicodeToString(LangFileName, L"l_intl.nls"); + } + else + { + LangFileName->Length = (USHORT)BufferSize - sizeof(UNICODE_NULL); } - RtlStringCbPrintfA(LangName, LangNameSize, "%S", NameBuffer); +Quit: RegCloseKey(hKey); - return TRUE; + return (rc == ERROR_SUCCESS); } BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PCSTR DirectoryPath, - IN PCSTR AnsiFileName, - IN PCSTR OemFileName, - IN PCSTR LanguageFileName) +WinLdrLoadNLSData( + _Inout_ PLOADER_PARAMETER_BLOCK LoaderBlock, + _In_ PCSTR DirectoryPath, + _In_ PCUNICODE_STRING AnsiFileName, + _In_ PCUNICODE_STRING OemFileName, + _In_ PCUNICODE_STRING LangFileName, // CaseTable + _In_ PCUNICODE_STRING OemHalFileName) { - CHAR FileName[255]; - ULONG FileId; - ULONG AnsiFileSize, OemFileSize, LanguageFileSize; - ULONG TotalSize; - PVOID NlsDataBase; - PVOID NlsVirtual; - BOOLEAN AnsiEqualsOem = FALSE; + ARC_STATUS Status; FILEINFORMATION FileInfo; + ULONG AnsiFileId = -1, OemFileId = -1, LangFileId = -1; + ULONG AnsiFileSize, OemFileSize, LangFileSize; + ULONG TotalSize; ULONG BytesRead; - ARC_STATUS Status; + PVOID NlsDataBase, NlsVirtual; + BOOLEAN AnsiEqualsOem = FALSE; + CHAR FileName[MAX_PATH]; - /* There may be a case, when OEM and ANSI page coincide */ - if (!strcmp(AnsiFileName, OemFileName)) + /* There may be a case, where OEM and ANSI pages coincide */ + if (RtlCompareUnicodeString(AnsiFileName, OemFileName, TRUE) == 0) AnsiEqualsOem = TRUE; /* Open file with ANSI and store its size */ - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); - - NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, AnsiFileName); + Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } - Status = ArcGetFileInformation(FileId, &FileInfo); - ArcClose(FileId); + Status = ArcGetFileInformation(AnsiFileId, &FileInfo); if (Status != ESUCCESS) - goto Failure; + goto Quit; AnsiFileSize = FileInfo.EndingAddress.LowPart; TRACE("AnsiFileSize: %d\n", AnsiFileSize); @@ -365,146 +389,133 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, } else { - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); - - NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, OemFileName); + Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } - Status = ArcGetFileInformation(FileId, &FileInfo); - ArcClose(FileId); + Status = ArcGetFileInformation(OemFileId, &FileInfo); if (Status != ESUCCESS) - goto Failure; + goto Quit; OemFileSize = FileInfo.EndingAddress.LowPart; } TRACE("OemFileSize: %d\n", OemFileSize); - /* And finally open the language codepage file and store its length */ - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); - - NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); + /* Finally open the language codepage file and store its length */ + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, LangFileName); + Status = ArcOpen(FileName, OpenReadOnly, &LangFileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } - Status = ArcGetFileInformation(FileId, &FileInfo); - ArcClose(FileId); + Status = ArcGetFileInformation(LangFileId, &FileInfo); if (Status != ESUCCESS) - goto Failure; - LanguageFileSize = FileInfo.EndingAddress.LowPart; - TRACE("LanguageFileSize: %d\n", LanguageFileSize); + goto Quit; + LangFileSize = FileInfo.EndingAddress.LowPart; + TRACE("LangFileSize: %d\n", LangFileSize); + + // + // TODO: The OEMHAL file. + // /* Sum up all three length, having in mind that every one of them must start at a page boundary => thus round up each file to a page */ TotalSize = MM_SIZE_TO_PAGES(AnsiFileSize) + MM_SIZE_TO_PAGES(OemFileSize) + - MM_SIZE_TO_PAGES(LanguageFileSize); + MM_SIZE_TO_PAGES(LangFileSize); /* Store it for later marking the pages as NlsData type */ TotalNLSSize = TotalSize; NlsDataBase = MmAllocateMemoryWithType(TotalSize*MM_PAGE_SIZE, LoaderNlsData); if (NlsDataBase == NULL) - goto Failure; + goto Quit; NlsVirtual = PaToVa(NlsDataBase); LoaderBlock->NlsData->AnsiCodePageData = NlsVirtual; - LoaderBlock->NlsData->OemCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + + + LoaderBlock->NlsData->OemCodePageData = + (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT)); - LoaderBlock->NlsData->UnicodeCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + + + LoaderBlock->NlsData->UnicodeCodePageData = + (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT) + (MM_SIZE_TO_PAGES(OemFileSize) << MM_PAGE_SHIFT)); - /* Ansi and OEM data are the same - just set pointers to the same area */ + /* ANSI and OEM data are the same - just set pointers to the same area */ if (AnsiEqualsOem) LoaderBlock->NlsData->OemCodePageData = LoaderBlock->NlsData->AnsiCodePageData; - /* Now actually read the data into memory, starting with Ansi file */ - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); - + /* Now actually read the data into memory, starting with the ANSI file */ + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, AnsiFileName); NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) - { - WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; - } - - Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); - ArcClose(FileId); + Status = ArcRead(AnsiFileId, + VaToPa(LoaderBlock->NlsData->AnsiCodePageData), + AnsiFileSize, &BytesRead); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } - /* OEM now, if it doesn't equal Ansi of course */ + /* OEM now, if it isn't the same as the ANSI one */ if (!AnsiEqualsOem) { - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); - + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, OemFileName); NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) - { - WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; - } - - Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); - ArcClose(FileId); + Status = ArcRead(OemFileId, + VaToPa(LoaderBlock->NlsData->OemCodePageData), + OemFileSize, &BytesRead); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } } /* Finally the language file */ - RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); - RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); - + RtlStringCbPrintfA(FileName, sizeof(FileName), "%s%wZ", + DirectoryPath, LangFileName); NtLdrOutputLoadMsg(FileName, NULL); - Status = ArcOpen(FileName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) - { - WARN("Error while opening '%s', Status: %u\n", FileName, Status); - goto Failure; - } - - Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); - ArcClose(FileId); + Status = ArcRead(LangFileId, + VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), + LangFileSize, &BytesRead); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); - goto Failure; + goto Quit; } // - // THIS IS HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACK - // Should go to WinLdrLoadOemHalFont(), when it will be implemented + // THIS IS a HACK and should be replaced by actually loading the OEMHAL file! // LoaderBlock->OemFontFile = VaToPa(LoaderBlock->NlsData->UnicodeCodePageData); /* Convert NlsTables address to VA */ LoaderBlock->NlsData = PaToVa(LoaderBlock->NlsData); - return TRUE; +Quit: + if (LangFileId != -1) + ArcClose(LangFileId); + if (OemFileId != -1) + ArcClose(OemFileId); + if (AnsiFileId != -1) + ArcClose(AnsiFileId); + + if (Status != ESUCCESS) + UiMessageBox("Error reading NLS file %s", FileName); -Failure: - UiMessageBox("Error reading NLS file %s", FileName); - return FALSE; + return (Status == ESUCCESS); } static VOID

2 years, 8 months

[reactos] 02/04: [BOOT][SDK:RTL] Compile a reduced RTL library for FreeLdr / NT bootloader...

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24cb57fdead78f88236d2… commit 24cb57fdead78f88236d2e92e4293c4fc6c9c48f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 21:06:52 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 7 03:19:09 2022 +0200 [BOOT][SDK:RTL] Compile a reduced RTL library for FreeLdr / NT bootloader... ... as it should have always been done (and must be done for NTDLL and NTOS kernel as well). This allows using the RTL with the correct definitions and the reduced functionality available at boot-time. + Make the RTL main header compatible. In addition, this will permit re-using existing code that already uses the RTL (mostly string conversions). See commits 427c90af3 (r36761) and b46e8cc18 (r36980) for some background. --- boot/CMakeLists.txt | 1 + boot/environ/CMakeLists.txt | 4 +- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/rtl/CMakeLists.txt | 2 + boot/rtl/blrtl.cmake | 58 +++++++ boot/rtl/nlsboot.c | 317 ++++++++++++++++++++++++++++++++++++ sdk/lib/rtl/rtl.h | 12 +- sdk/lib/rtl/rtlp.h | 37 ++++- 8 files changed, 420 insertions(+), 13 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 8ce56ed64fb..f6275e7f25d 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -4,3 +4,4 @@ include(boot_images.cmake) add_subdirectory(bootdata) # add_subdirectory(environ) add_subdirectory(freeldr) +add_subdirectory(rtl) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index 46d29015499..3874ed3f031 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -101,7 +101,7 @@ endif() set_entrypoint(bootmgfw EfiEntry) -target_link_libraries(bootmgfw bootlib cportlib cmlib rtl libcntpr) +target_link_libraries(bootmgfw bootlib cportlib cmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) @@ -149,7 +149,7 @@ else() set_entrypoint(rosload OslMain) endif() -target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr) +target_link_libraries(rosload bootlib cportlib cmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 0827186d090..592f0af85c1 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -292,7 +292,7 @@ if(ARCH STREQUAL "i386") target_link_libraries(freeldr_pe mini_hal) endif() -target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) +target_link_libraries(freeldr_pe freeldr_common cportlib cmlib blrtl libcntpr) # dynamic analysis switches if(STACK_PROTECTOR) diff --git a/boot/rtl/CMakeLists.txt b/boot/rtl/CMakeLists.txt new file mode 100644 index 00000000000..4ed56cd3d6e --- /dev/null +++ b/boot/rtl/CMakeLists.txt @@ -0,0 +1,2 @@ + +include(blrtl.cmake) diff --git a/boot/rtl/blrtl.cmake b/boot/rtl/blrtl.cmake new file mode 100644 index 00000000000..3a51ecb8bc7 --- /dev/null +++ b/boot/rtl/blrtl.cmake @@ -0,0 +1,58 @@ + +add_definitions( + -DNO_RTL_INLINES + -D_BLDR_ + -D_NTSYSTEM_) + +set(NTOS_RTL_SOURCE_DIR "${REACTOS_SOURCE_DIR}/sdk/lib/rtl") +include_directories(${NTOS_RTL_SOURCE_DIR}) + +if (GCC) + # Enable this again. CORE-17637 + add_compile_options(-Wunused-result) +endif() + +list(APPEND SOURCE + # ${NTOS_RTL_SOURCE_DIR}/assert.c ## Requires a local implementation. + ${NTOS_RTL_SOURCE_DIR}/bitmap.c + # ${NTOS_RTL_SOURCE_DIR}/bootdata.c ## Requires a local implementation. + ${NTOS_RTL_SOURCE_DIR}/compress.c + ${NTOS_RTL_SOURCE_DIR}/crc32.c + # ${NTOS_RTL_SOURCE_DIR}/debug.c ## Requires a local implementation. + ${NTOS_RTL_SOURCE_DIR}/image.c + ${NTOS_RTL_SOURCE_DIR}/largeint.c + ## message.c + # ${NTOS_RTL_SOURCE_DIR}/nls.c ## Requires a local implementation. + nlsboot.c + ${NTOS_RTL_SOURCE_DIR}/random.c + ## res.c ## Optional? Needs SEH + # ${NTOS_RTL_SOURCE_DIR}/time.c ## Optional + ${NTOS_RTL_SOURCE_DIR}/unicode.c + ${NTOS_RTL_SOURCE_DIR}/rtl.h) + +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + ${NTOS_RTL_SOURCE_DIR}/i386/debug_asm.S + ${NTOS_RTL_SOURCE_DIR}/i386/rtlmem.s + ${NTOS_RTL_SOURCE_DIR}/i386/rtlswap.S + ## ${NTOS_RTL_SOURCE_DIR}/i386/res_asm.s + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND ASM_SOURCE + ${NTOS_RTL_SOURCE_DIR}/amd64/debug_asm.S + ${NTOS_RTL_SOURCE_DIR}/amd64/rtlmem.S) + list(APPEND SOURCE + ${NTOS_RTL_SOURCE_DIR}/bitmap64.c + ${NTOS_RTL_SOURCE_DIR}/byteswap.c + ${NTOS_RTL_SOURCE_DIR}/mem.c) +elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE arm/debug_asm.S) + list(APPEND SOURCE + ${NTOS_RTL_SOURCE_DIR}/byteswap.c + ${NTOS_RTL_SOURCE_DIR}/mem.c) +endif() + +add_asm_files(blrtl_asm ${ASM_SOURCE}) +add_library(blrtl ${SOURCE} ${blrtl_asm}) +add_pch(blrtl ${NTOS_RTL_SOURCE_DIR}/rtl.h SOURCE) +add_dependencies(blrtl psdk asm) diff --git a/boot/rtl/nlsboot.c b/boot/rtl/nlsboot.c new file mode 100644 index 00000000000..917a5922a77 --- /dev/null +++ b/boot/rtl/nlsboot.c @@ -0,0 +1,317 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: "Poor-man" boot-time National Language Support (NLS) functions. + * COPYRIGHT: Copyright 2022 Hermès Bélusca-Maïto + * + * NOTE: This code is used at boot-time when no NLS tables are loaded. + * Adapted from lib/rtl/nls.c + */ + +/* INCLUDES ******************************************************************/ + +#include <rtl.h> + +/* GLOBALS *******************************************************************/ + +BOOLEAN NlsMbCodePageTag = FALSE; + +BOOLEAN NlsMbOemCodePageTag = FALSE; +PUSHORT NlsOemToUnicodeTable = NULL; +PCHAR NlsUnicodeToOemTable = NULL; +PUSHORT NlsUnicodeToMbOemTable = NULL; +PUSHORT NlsOemLeadByteInfo = NULL; + +USHORT NlsOemDefaultChar = '\0'; +USHORT NlsUnicodeDefaultChar = 0; + +/* FUNCTIONS *****************************************************************/ + +WCHAR +NTAPI +RtlpDowncaseUnicodeChar( + _In_ WCHAR Source) +{ + USHORT Offset = 0; + + if (Source < L'A') + return Source; + + if (Source <= L'Z') + return Source + (L'a' - L'A'); + +#if 0 + if (Source < 0x80) + return Source; +#endif + + return Source + (SHORT)Offset; +} + +WCHAR +NTAPI +RtlDowncaseUnicodeChar( + _In_ WCHAR Source) +{ + return RtlpDowncaseUnicodeChar(Source); +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlMultiByteToUnicodeN( + _Out_ PWCH UnicodeString, + _In_ ULONG UnicodeSize, + _Out_opt_ PULONG ResultSize, + _In_ PCCH MbString, + _In_ ULONG MbSize) +{ + ULONG Size = 0; + ULONG i; + + /* single-byte code page */ + if (MbSize > (UnicodeSize / sizeof(WCHAR))) + Size = UnicodeSize / sizeof(WCHAR); + else + Size = MbSize; + + if (ResultSize) + *ResultSize = Size * sizeof(WCHAR); + + for (i = 0; i < Size; i++) + { + /* Trivially zero-extend */ + UnicodeString[i] = (WCHAR)MbString[i]; + } + + return STATUS_SUCCESS; +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlMultiByteToUnicodeSize( + _Out_ PULONG UnicodeSize, + _In_ PCCH MbString, + _In_ ULONG MbSize) +{ + /* single-byte code page */ + *UnicodeSize = MbSize * sizeof(WCHAR); + + return STATUS_SUCCESS; +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlUnicodeToMultiByteN( + _Out_ PCHAR MbString, + _In_ ULONG MbSize, + _Out_opt_ PULONG ResultSize, + _In_ PCWCH UnicodeString, + _In_ ULONG UnicodeSize) +{ + ULONG Size = 0; + ULONG i; + + /* single-byte code page */ + Size = (UnicodeSize > (MbSize * sizeof(WCHAR))) + ? MbSize : (UnicodeSize / sizeof(WCHAR)); + + if (ResultSize) + *ResultSize = Size; + + for (i = 0; i < Size; i++) + { + /* Check for characters that cannot be trivially demoted to ANSI */ + if (*((PCHAR)UnicodeString + 1) == 0) + { + *MbString++ = (CHAR)*UnicodeString++; + } + else + { + /* Invalid character, use default */ + *MbString++ = NlsOemDefaultChar; + UnicodeString++; + } + } + + return STATUS_SUCCESS; +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlUnicodeToMultiByteSize( + _Out_ PULONG MbSize, + _In_ PCWCH UnicodeString, + _In_ ULONG UnicodeSize) +{ + ULONG UnicodeLength = UnicodeSize / sizeof(WCHAR); + + /* single-byte code page */ + *MbSize = UnicodeLength; + + return STATUS_SUCCESS; +} + +WCHAR +NTAPI +RtlpUpcaseUnicodeChar( + _In_ WCHAR Source) +{ + USHORT Offset = 0; + + if (Source < 'a') + return Source; + + if (Source <= 'z') + return (Source - ('a' - 'A')); + + return Source + (SHORT)Offset; +} + +WCHAR +NTAPI +RtlUpcaseUnicodeChar( + _In_ WCHAR Source) +{ + return RtlpUpcaseUnicodeChar(Source); +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlUpcaseUnicodeToMultiByteN( + _Out_ PCHAR MbString, + _In_ ULONG MbSize, + _Out_opt_ PULONG ResultSize, + _In_ PCWCH UnicodeString, + _In_ ULONG UnicodeSize) +{ + WCHAR UpcaseChar; + ULONG Size = 0; + ULONG i; + + /* single-byte code page */ + if (UnicodeSize > (MbSize * sizeof(WCHAR))) + Size = MbSize; + else + Size = UnicodeSize / sizeof(WCHAR); + + if (ResultSize) + *ResultSize = Size; + + for (i = 0; i < Size; i++) + { + UpcaseChar = RtlpUpcaseUnicodeChar(*UnicodeString); + + /* Check for characters that cannot be trivially demoted to ANSI */ + if (*((PCHAR)&UpcaseChar + 1) == 0) + { + *MbString = (CHAR)UpcaseChar; + } + else + { + /* Invalid character, use default */ + *MbString = NlsOemDefaultChar; + } + + MbString++; + UnicodeString++; + } + + return STATUS_SUCCESS; +} + +CHAR +NTAPI +RtlUpperChar( + _In_ CHAR Source) +{ + /* Check for simple ANSI case */ + if (Source <= 'z') + { + /* Check for simple downcase a-z case */ + if (Source >= 'a') + { + /* Just XOR with the difference */ + return Source ^ ('a' - 'A'); + } + else + { + /* Otherwise return the same char, it's already upcase */ + return Source; + } + } + else + { + /* single-byte code page */ + return (CHAR)RtlpUpcaseUnicodeChar((WCHAR)Source); + } +} + + +/** + * Stubbed OEM helpers that should not be used in the OS boot loader, + * but are necessary for linking with the rest of the RTL unicode.c. + **/ + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlUnicodeToOemN( + _Out_ PCHAR OemString, + _In_ ULONG OemSize, + _Out_opt_ PULONG ResultSize, + _In_ PCWCH UnicodeString, + _In_ ULONG UnicodeSize) +{ + if (OemSize) + *OemString = ANSI_NULL; + + if (ResultSize) + *ResultSize = 0; + + return STATUS_NOT_IMPLEMENTED; +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlOemToUnicodeN( + _Out_ PWCHAR UnicodeString, + _In_ ULONG UnicodeSize, + _Out_opt_ PULONG ResultSize, + _In_ PCCH OemString, + _In_ ULONG OemSize) +{ + if (UnicodeString) + *UnicodeString = UNICODE_NULL; + + if (ResultSize) + *ResultSize = 0; + + return STATUS_NOT_IMPLEMENTED; +} + +_Use_decl_annotations_ +NTSTATUS +NTAPI +RtlUpcaseUnicodeToOemN( + _Out_ PCHAR OemString, + _In_ ULONG OemSize, + _Out_opt_ PULONG ResultSize, + _In_ PCWCH UnicodeString, + _In_ ULONG UnicodeSize) +{ + if (OemSize) + *OemString = ANSI_NULL; + + if (ResultSize) + *ResultSize = 0; + + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ diff --git a/sdk/lib/rtl/rtl.h b/sdk/lib/rtl/rtl.h index 7f49ab8de4e..037b2ee2c9b 100644 --- a/sdk/lib/rtl/rtl.h +++ b/sdk/lib/rtl/rtl.h @@ -9,13 +9,15 @@ #ifndef RTL_H #define RTL_H -/* We're a core NT DLL, we don't import syscalls */ +/* We are a core NT DLL, we don't import syscalls */ #define _INC_SWPRINTF_INL_ #undef __MSVCRT__ /* C Headers */ -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> + +#ifndef _BLDR_ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS @@ -43,6 +45,12 @@ /* SEH support with PSEH */ #include <pseh/pseh2.h> +#else + +#include <ndk/rtlfuncs.h> + +#endif /* _BLDR_ */ + /* Internal RTL header */ #include "rtlp.h" diff --git a/sdk/lib/rtl/rtlp.h b/sdk/lib/rtl/rtlp.h index be1c7372e96..df2fdf1e0de 100644 --- a/sdk/lib/rtl/rtlp.h +++ b/sdk/lib/rtl/rtlp.h @@ -43,23 +43,31 @@ RtlpSafeCopyMemory( _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, _In_ SIZE_T Length); +#ifndef _BLDR_ + VOID NTAPI RtlpGetStackLimits(PULONG_PTR LowLimit, PULONG_PTR HighLimit); +#ifdef _M_IX86 + PEXCEPTION_REGISTRATION_RECORD NTAPI RtlpGetExceptionList(VOID); VOID NTAPI -RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters); +RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); + +#endif /* _M_IX86 */ +/* For heap.c */ VOID NTAPI -RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters); +/* For vectoreh.c */ BOOLEAN NTAPI RtlCallVectoredExceptionHandlers( @@ -81,6 +89,8 @@ typedef struct _DISPATCHER_CONTEXT } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; #endif +#endif /* !_BLDR_ */ + /* These provide support for sharing code between User and Kernel RTL */ PVOID NTAPI @@ -94,6 +104,8 @@ RtlpFreeMemory( PVOID Mem, ULONG Tag); +#ifndef _BLDR_ + KPROCESSOR_MODE NTAPI RtlpGetMode(VOID); @@ -106,6 +118,7 @@ RtlpCaptureStackLimits( IN ULONG_PTR *StackEnd ); +/* For heap.c and heappage.c */ NTSTATUS NTAPI RtlDeleteHeapLock(IN OUT PHEAP_LOCK Lock); @@ -137,9 +150,13 @@ RtlpHandleDpcStackException(IN PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, IN OUT PULONG_PTR StackLow, IN OUT PULONG_PTR StackHigh); +#endif /* !_BLDR_ */ + #define RtlpAllocateStringMemory RtlpAllocateMemory #define RtlpFreeStringMemory RtlpFreeMemory +#ifndef _BLDR_ + ULONG NTAPI RtlGetTickCount(VOID); @@ -209,18 +226,14 @@ DebugService2( IN ULONG Service ); -/* Tags for the String Allocators */ -#define TAG_USTR 'RTSU' -#define TAG_ASTR 'RTSA' -#define TAG_OSTR 'RTSO' - /* Timer Queue */ - extern HANDLE TimerThreadHandle; NTSTATUS RtlpInitializeTimerThread(VOID); +#endif /* !_BLDR_ */ + /* bitmap64.c */ typedef struct _RTL_BITMAP64 { @@ -234,6 +247,11 @@ typedef struct _RTL_BITMAP_RUN64 ULONG64 NumberOfBits; } RTL_BITMAP_RUN64, *PRTL_BITMAP_RUN64; +/* Tags for the String Allocators */ +#define TAG_USTR 'RTSU' +#define TAG_ASTR 'RTSA' +#define TAG_OSTR 'RTSO' + /* nls.c */ WCHAR NTAPI @@ -243,6 +261,8 @@ WCHAR NTAPI RtlpDowncaseUnicodeChar(IN WCHAR Source); +#ifndef _BLDR_ + /* ReactOS only */ VOID NTAPI @@ -253,5 +273,6 @@ NTAPI RtlpDebugBufferCommit(_Inout_ PRTL_DEBUG_INFORMATION Buffer, _In_ SIZE_T Size); +#endif /* !_BLDR_ */ /* EOF */

2 years, 8 months

[reactos] 01/04: [SDK:RTL] Minimal formatting for NLS functions + Remove inadequate assert in RtlUpcaseUnicodeToOemN().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ac49f0824ccbb814eeab… commit 2ac49f0824ccbb814eeabb83cf9b3724a8ce7214 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 21:06:07 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 7 03:19:06 2022 +0200 [SDK:RTL] Minimal formatting for NLS functions + Remove inadequate assert in RtlUpcaseUnicodeToOemN(). --- sdk/lib/rtl/nls.c | 10 +++++----- sdk/lib/rtl/unicode.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/lib/rtl/nls.c b/sdk/lib/rtl/nls.c index a875379ca15..35f19c6a77c 100644 --- a/sdk/lib/rtl/nls.c +++ b/sdk/lib/rtl/nls.c @@ -251,7 +251,9 @@ RtlMultiByteToUnicodeN(OUT PWCHAR UnicodeString, *ResultSize = Size * sizeof(WCHAR); for (i = 0; i < Size; i++) + { UnicodeString[i] = NlsAnsiToUnicodeTable[(UCHAR)MbString[i]]; + } } else { @@ -331,7 +333,7 @@ RtlMultiByteToUnicodeSize(OUT PULONG UnicodeSize, if (!NlsMbCodePageTag) { /* single-byte code page */ - *UnicodeSize = MbSize * sizeof (WCHAR); + *UnicodeSize = MbSize * sizeof(WCHAR); } else { @@ -535,8 +537,8 @@ RtlUnicodeToMultiByteN(OUT PCHAR MbString, if (!NlsMbCodePageTag) { /* single-byte code page */ - Size = (UnicodeSize > (MbSize * sizeof (WCHAR))) - ? MbSize : (UnicodeSize / sizeof (WCHAR)); + Size = (UnicodeSize > (MbSize * sizeof(WCHAR))) + ? MbSize : (UnicodeSize / sizeof(WCHAR)); if (ResultSize) *ResultSize = Size; @@ -830,8 +832,6 @@ RtlUpcaseUnicodeToOemN(OUT PCHAR OemString, PAGED_CODE_RTL(); - ASSERT(NlsUnicodeToOemTable != NULL); - if (!NlsMbOemCodePageTag) { /* single-byte code page */ diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c index c7e85948f98..8c7248db155 100644 --- a/sdk/lib/rtl/unicode.c +++ b/sdk/lib/rtl/unicode.c @@ -101,7 +101,7 @@ RtlAnsiStringToUnicodeString( if (NlsMbCodePageTag == FALSE) { - Length = AnsiSource->Length * 2 + sizeof(WCHAR); + Length = (AnsiSource->Length + 1) * sizeof(WCHAR); } else { @@ -2236,7 +2236,7 @@ RtlCopyString( PCHAR p1, p2; /* Check if there was no source given */ - if(!SourceString) + if (!SourceString) { /* Simply return an empty string */ DestinationString->Length = 0; @@ -2275,7 +2275,7 @@ RtlCopyUnicodeString( { ULONG SourceLength; - if(SourceString == NULL) + if (!SourceString) { DestinationString->Length = 0; } @@ -2431,7 +2431,7 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, Destination->Length += Length; /* append terminating '\0' if enough space */ - if(Destination->MaximumLength > Destination->Length) + if (Destination->MaximumLength > Destination->Length) { DestBuffer[Length / sizeof(WCHAR)] = UNICODE_NULL; }

2 years, 8 months

[reactos] 01/01: [SDK:NTOS_VISTA] Fix GCC AMD64 build. Addendum to commit 6f559e9c5. (#4426)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7416328523209c8d4442b… commit 7416328523209c8d4442b6e13c8ebf97b03f1333 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 4 22:00:42 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 7 01:52:33 2022 +0200 [SDK:NTOS_VISTA] Fix GCC AMD64 build. Addendum to commit 6f559e9c5. (#4426) Instead of adding the rtl_vista library to the target, manually add the related source files to compilation. That's not the best, but this should definitively fix the linking problem. --- sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 9cb2838f2a0..934b4bc2054 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -3,15 +3,18 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/rtl) + list(APPEND SOURCE etw.c fsrtl.c io.c po.c - ke.c) + ke.c + ${REACTOS_SOURCE_DIR}/sdk/lib/rtl/utf8.c) add_library(ntoskrnl_vista ${SOURCE}) -target_link_libraries(ntoskrnl_vista PRIVATE rtl_vista) +target_link_libraries(ntoskrnl_vista PRIVATE pseh) # rtl_vista) add_dependencies(ntoskrnl_vista bugcodes xdk) target_compile_definitions(ntoskrnl_vista PUBLIC NTKRNLVISTA)

2 years, 8 months

[reactos] 01/01: [WINHTTP] Fix 1 MSVC x86 warning LNK4199 (#4414) CORE-18104

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f7dc168f29c0693203cc… commit 2f7dc168f29c0693203cc10901cb6dc4bb23ea75 Author: Joachim Henze <33393466+JoachimHenze(a)users.noreply.github.com> AuthorDate: Thu Apr 7 00:36:52 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 7 00:36:52 2022 +0200 [WINHTTP] Fix 1 MSVC x86 warning LNK4199 (#4414) CORE-18104 Fixes Creating library dll\win32\winhttp\winhttp.lib and object dll\win32\winhttp\winhttp.exp LINK : warning LNK4199: /DELAYLOAD:ole32.dll ignored; no imports found from ole32.dll which I could observe all the way from releases/0.4.7 up to releases/0.4.14 with MSVC 2010SP1 (16.0.40219.1) x86 target in dbg configuration --- dll/win32/winhttp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt index f0dca0805ed..184ca8604e6 100644 --- a/dll/win32/winhttp/CMakeLists.txt +++ b/dll/win32/winhttp/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(winhttp MODULE set_module_type(winhttp win32dll) target_link_libraries(winhttp uuid wine) -add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32) +add_delay_importlibs(winhttp oleaut32 crypt32 secur32) add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy kernel32_vista msvcrt kernel32 ntdll) add_dependencies(winhttp stdole2) add_pch(winhttp precomp.h SOURCE)

2 years, 8 months

[reactos] 01/01: [IMM32] Renaming: s/Imm32InitInstance/ImmInitializeGlobals/ (#4428)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a40f55bf6dec9f876f527… commit a40f55bf6dec9f876f527567ad513bdb3f28f508 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 6 15:44:27 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 6 15:44:27 2022 +0900 [IMM32] Renaming: s/Imm32InitInstance/ImmInitializeGlobals/ (#4428) - Rename Imm32InitInstance as ImmInitializeGlobals. - Add Win: comments. CORE-11700 --- dll/win32/imm32/imm.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index ec939a72dda..e3a71f8ba8d 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -6,7 +6,7 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2020-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" @@ -18,7 +18,8 @@ PSERVERINFO gpsi = NULL; SHAREDINFO gSharedInfo = { NULL }; BYTE g_bClientRegd = FALSE; -static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) +// Win: ImmInitializeGlobals +static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) { NTSTATUS status; @@ -44,7 +45,7 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) { gSharedInfo = *ptr; gpsi = gSharedInfo.psi; - return Imm32InitInstance(hMod); + return ImmInitializeGlobals(hMod); } /*********************************************************************** @@ -629,6 +630,7 @@ static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC) } } +// Win: DestroyInputContext BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) { PIMEDPI pImeDpi; @@ -792,6 +794,7 @@ Fail: return FALSE; } +// Win: InternalImmLockIMC LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect) { HANDLE hIC; @@ -960,6 +963,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc) ImmLocalFree(pClientImc); } +// Win: ImmGetSaveContext static HIMC APIENTRY ImmGetSaveContext(HWND hWnd, DWORD dwContextFlags) { HIMC hIMC; @@ -1256,9 +1260,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - if (!Imm32InitInstance(hinstDLL)) + if (!ImmInitializeGlobals(hinstDLL)) { - ERR("Imm32InitInstance failed\n"); + ERR("ImmInitializeGlobals failed\n"); return FALSE; } if (!User32InitializeImmEntryTable(IMM_INIT_MAGIC))

2 years, 8 months

[reactos] 01/01: [NTUSER] Add 'Win:' comments to ime.c and window.c (#4427)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f7775c60428c0a1141fa… commit 2f7775c60428c0a1141faa862eacc461bacf960f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 6 13:11:57 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 6 13:11:57 2022 +0900 [NTUSER] Add 'Win:' comments to ime.c and window.c (#4427) - Add 'Win:' comments to clarify the Windows-side function names. CORE-11700 --- win32ss/user/ntuser/ime.c | 10 ++++++++++ win32ss/user/ntuser/window.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 124e5667c88..c6f5473d8d9 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -134,6 +134,7 @@ static LANGID FASTCALL IntGetImeHotKeyLangId(DWORD dwHotKeyId) return LANGID_NEUTRAL; } +// Win: AddImeHotKey static VOID FASTCALL IntAddImeHotKey(PIMEHOTKEY *ppList, PIMEHOTKEY pHotKey) { PIMEHOTKEY pNode; @@ -279,6 +280,7 @@ IntGetImeHotKeyByKey(PIMEHOTKEY pList, UINT uModKeys, UINT uLeftRight, UINT uVir return ret; } +// Win: CheckImeHotKey PIMEHOTKEY IntCheckImeHotKey(PUSER_MESSAGE_QUEUE MessageQueue, UINT uVirtualKey, LPARAM lParam) { PIMEHOTKEY pHotKey; @@ -329,6 +331,7 @@ PIMEHOTKEY IntCheckImeHotKey(PUSER_MESSAGE_QUEUE MessageQueue, UINT uVirtualKey, return NULL; } +// Win: FreeImeHotKeys VOID FASTCALL IntFreeImeHotKeys(VOID) { PIMEHOTKEY pNode, pNext; @@ -340,6 +343,7 @@ VOID FASTCALL IntFreeImeHotKeys(VOID) gpImeHotKeyList = NULL; } +// Win: SetImeHotKey static BOOL APIENTRY IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DWORD dwAction) { @@ -493,6 +497,7 @@ PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) return pwnd; } +// Win: AssociateInputContext HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc) { HIMC hOldImc = pWnd->hImc; @@ -528,6 +533,7 @@ Quit: return 0; } +// Win: BuildHimcList DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) { PIMC pIMC; @@ -938,6 +944,7 @@ Quit: return ret; } +// Win: GetImeInfoEx BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLASS SearchType) { PKL pkl, pklHead; @@ -1064,6 +1071,7 @@ Quit: return ret; } +// Win: SetImeInfoEx BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx) { PKL pklHead, pkl; @@ -1310,6 +1318,7 @@ Quit: return ret; } +// Win: CreateInputContext PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) { PIMC pIMC; @@ -1381,6 +1390,7 @@ Quit: return ret; } +// Win: AssociateInputContextEx DWORD FASTCALL IntAssociateInputContextEx(PWND pWnd, PIMC pIMC, DWORD dwFlags) { DWORD ret = 0; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index cba571b9196..3cf1fd22a99 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1390,6 +1390,7 @@ PWINDOWLIST FASTCALL IntPopulateHwndList(PWINDOWLIST pwl, PWND pwnd, DWORD dwFla return pwl; } +// Win: BuildHwndList PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti) { PWINDOWLIST pwl; @@ -1435,6 +1436,7 @@ PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti) return pwl; } +// Win: FreeHwndList VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget) { PWINDOWLIST pwl, *ppwl;

2 years, 8 months

[reactos] 01/01: [WIN32K:NTUSER] Remove broken assert in NtUserCreateWindowEx. CORE-18123

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f5cde9cbeab658b6530b… commit 9f5cde9cbeab658b6530b018cd166a63ed3e321f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 3 23:43:29 2022 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 3 23:44:09 2022 -0400 [WIN32K:NTUSER] Remove broken assert in NtUserCreateWindowEx. CORE-18123 --- win32ss/user/ntuser/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index f3aeab5d344..cba571b9196 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2617,8 +2617,6 @@ NtUserCreateWindowEx( lstrClassName.Buffer = NULL; lstrClsVersion.Buffer = NULL; - ASSERT(plstrWindowName); - if ( (dwStyle & (WS_POPUP|WS_CHILD)) != WS_CHILD) { /* check hMenu is valid handle */

2 years, 8 months

[reactos] 01/01: [NTOS:EX] Only set WakeTimer-related status if timer handle is valid. CORE-18133

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d1a497619f4001db59e5… commit 7d1a497619f4001db59e552ddb69406bea4dae70 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 3 20:10:37 2022 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 3 20:13:09 2022 -0400 [NTOS:EX] Only set WakeTimer-related status if timer handle is valid. CORE-18133 Since STATUS_TIMER_RESUME_IGNORED is a success status, we would otherwise go into the success case with a NULL Timer object pointer. --- ntoskrnl/ex/timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/timer.c b/ntoskrnl/ex/timer.c index 0ce7af03156..0c33675333c 100644 --- a/ntoskrnl/ex/timer.c +++ b/ntoskrnl/ex/timer.c @@ -640,7 +640,10 @@ NtSetTimer(IN HANDLE TimerHandle, * functionality required to support them, make this check dependent * on the actual PM capabilities */ - if (WakeTimer) Status = STATUS_TIMER_RESUME_IGNORED; + if (NT_SUCCESS(Status) && WakeTimer) + { + Status = STATUS_TIMER_RESUME_IGNORED; + } /* Check status */ if (NT_SUCCESS(Status))

2 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2022