eersoy93/exectos
1
0
Fork 0
forked from xt-sys/exectos
Code Pull Requests Activity

Unify string API parameter types to PCSTR/PCWSTR

Browse Source
This commit is contained in:
Aiken Harris 2025-09-03 19:54:46 +02:00
parent 9577a39046
commit 602da0960c
Signed by: harraiken
GPG Key ID: C40F06CB7493C1F5
4 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
sdk/xtdk/rtlfuncs.h
View File

@ -83,26 +83,26 @@ RtlCompareMemory(IN PCVOID LeftBuffer,
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareString(IN CONST PCHAR String1, RtlCompareString(IN PCSTR String1,
IN CONST PCHAR String2, IN PCSTR String2,
IN SIZE_T Length); IN SIZE_T Length);
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareStringInsensitive(IN CONST PCHAR String1, RtlCompareStringInsensitive(IN PCSTR String1,
IN CONST PCHAR String2, IN PCSTR String2,
IN SIZE_T Length); IN SIZE_T Length);
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareWideString(IN CONST PWCHAR String1, RtlCompareWideString(IN PCWSTR String1,
IN CONST PWCHAR String2, IN PCWSTR String2,
IN SIZE_T Length); IN SIZE_T Length);
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareWideStringInsensitive(IN CONST PWCHAR String1, RtlCompareWideStringInsensitive(IN PCWSTR String1,
IN CONST PWCHAR String2, IN PCWSTR String2,
IN SIZE_T Length); IN SIZE_T Length);
XTAPI XTAPI
@ -134,13 +134,13 @@ RtlCopyMemory(OUT PVOID Destination,
XTAPI XTAPI
VOID VOID
RtlCopyString(IN PCHAR Destination, RtlCopyString(IN PCHAR Destination,
IN PCCHAR Source, IN PCSTR Source,
IN ULONG Length); IN ULONG Length);
XTAPI XTAPI
VOID VOID
RtlCopyWideString(IN PWCHAR Destination, RtlCopyWideString(IN PWCHAR Destination,
IN CONST PWCHAR Source, IN PCWSTR Source,
IN ULONG Length); IN ULONG Length);
XTAPI XTAPI
@ -162,24 +162,24 @@ RtlFindSetBits(IN PRTL_BITMAP BitMap,
IN ULONG_PTR Index); IN ULONG_PTR Index);
XTAPI XTAPI
PCHAR PCSTR
RtlFindString(IN PCHAR Source, RtlFindString(IN PCSTR Source,
IN PCHAR Search); IN PCSTR Search);
XTAPI XTAPI
PCHAR PCSTR
RtlFindStringInsensitive(IN PCHAR Source, RtlFindStringInsensitive(IN PCSTR Source,
IN PCHAR Search); IN PCSTR Search);
XTAPI XTAPI
PWCHAR PCWSTR
RtlFindWideString(IN PWCHAR Source, RtlFindWideString(IN PCWSTR Source,
IN PWCHAR Search); IN PCWSTR Search);
XTAPI XTAPI
PWCHAR PCWSTR
RtlFindWideStringInsensitive(IN PWCHAR Source, RtlFindWideStringInsensitive(IN PCWSTR Source,
IN PWCHAR Search); IN PCWSTR Search);
XTAPI XTAPI
XTSTATUS XTSTATUS
@ -249,13 +249,13 @@ RtlSetMemory(OUT PVOID Destination,
XTAPI XTAPI
SIZE_T SIZE_T
RtlStringLength(IN CONST PCHAR String, RtlStringLength(IN PCSTR String,
IN SIZE_T MaxLength); IN SIZE_T MaxLength);
XTAPI XTAPI
SIZE_T SIZE_T
RtlStringToWideString(OUT PWCHAR Destination, RtlStringToWideString(OUT PWCHAR Destination,
IN CONST PCHAR *Source, IN PCSTR *Source,
IN SIZE_T Length); IN SIZE_T Length);
XTAPI XTAPI
@ -266,13 +266,13 @@ RtlTestBit(IN PRTL_BITMAP BitMap,
XTAPI XTAPI
PCHAR PCHAR
RtlTokenizeString(IN PCHAR String, RtlTokenizeString(IN PCHAR String,
IN CONST PCHAR Delimiter, IN PCSTR Delimiter,
IN OUT PCHAR *SavePtr); IN OUT PCHAR *SavePtr);
XTAPI XTAPI
PWCHAR PWCHAR
RtlTokenizeWideString(IN PWCHAR String, RtlTokenizeWideString(IN PWCHAR String,
IN CONST PWCHAR Delimiter, IN PCWSTR Delimiter,
IN OUT PWCHAR *SavePtr); IN OUT PWCHAR *SavePtr);
XTAPI XTAPI
@ -293,31 +293,31 @@ RtlToUpperWideCharacter(IN WCHAR Character);
XTAPI XTAPI
PCHAR PCHAR
RtlTrimLeftString(IN CONST PCHAR String); RtlTrimLeftString(IN PCHAR String);
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimLeftWideString(IN CONST PWCHAR String); RtlTrimLeftWideString(IN PWCHAR String);
XTAPI XTAPI
PCHAR PCHAR
RtlTrimRightString(IN CONST PCHAR String); RtlTrimRightString(IN PCHAR String);
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimRightWideString(IN CONST PWCHAR String); RtlTrimRightWideString(IN PWCHAR String);
XTAPI XTAPI
PCHAR PCHAR
RtlTrimString(IN CONST PCHAR String); RtlTrimString(IN PCHAR String);
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimWideString(IN CONST PWCHAR String); RtlTrimWideString(IN PWCHAR String);
XTAPI XTAPI
SIZE_T SIZE_T
RtlWideStringLength(IN CONST PWCHAR String, RtlWideStringLength(IN PCWSTR String,
IN SIZE_T MaxLength); IN SIZE_T MaxLength);
XTAPI XTAPI

6
xtldr/config.c
View File

@ -681,7 +681,7 @@ BlpParseConfigFile(IN CONST PCHAR RawConfig,
/* Initialize new section and convert its name to wide string */ /* Initialize new section and convert its name to wide string */
RtlInitializeListHead(&Section->Options); RtlInitializeListHead(&Section->Options);
RtlStringToWideString(Section->SectionName, &SectionName, SectionLength); RtlStringToWideString(Section->SectionName, (PCSTR*)&SectionName, SectionLength);
/* Ensure string is NULL-terminated and add new section to the configuration list */ /* Ensure string is NULL-terminated and add new section to the configuration list */
Section->SectionName[SectionLength] = L'\0'; Section->SectionName[SectionLength] = L'\0';
@ -770,8 +770,8 @@ BlpParseConfigFile(IN CONST PCHAR RawConfig,
} }
/* Convert key and value to wide strings */ /* Convert key and value to wide strings */
RtlStringToWideString(Option->Name, &Key, RtlStringLength(Key, 0) + 1); RtlStringToWideString(Option->Name, (PCSTR*)&Key, RtlStringLength(Key, 0) + 1);
RtlStringToWideString(Option->Value, &Value, RtlStringLength(Value, 0) + 1); RtlStringToWideString(Option->Value, (PCSTR*)&Value, RtlStringLength(Value, 0) + 1);
/* Ensure strings are NULL-terminated and add new option to the list */ /* Ensure strings are NULL-terminated and add new option to the list */
Option->Name[KeyLength] = L'\0'; Option->Name[KeyLength] = L'\0';

44
xtoskrnl/rtl/string.c
View File

@ -27,8 +27,8 @@
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareString(IN CONST PCHAR String1, RtlCompareString(IN PCSTR String1,
IN CONST PCHAR String2, IN PCSTR String2,
IN SIZE_T Length) IN SIZE_T Length)
{ {
SIZE_T Index; SIZE_T Index;
@ -79,8 +79,8 @@ RtlCompareString(IN CONST PCHAR String1,
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareStringInsensitive(IN CONST PCHAR String1, RtlCompareStringInsensitive(IN PCSTR String1,
IN CONST PCHAR String2, IN PCSTR String2,
IN SIZE_T Length) IN SIZE_T Length)
{ {
CHAR Character1; CHAR Character1;
@ -206,7 +206,7 @@ RtlConcatenateString(OUT PCHAR Destination,
XTAPI XTAPI
VOID VOID
RtlCopyString(IN PCHAR Destination, RtlCopyString(IN PCHAR Destination,
IN PCCHAR Source, IN PCSTR Source,
IN ULONG Length) IN ULONG Length)
{ {
ULONG Index; ULONG Index;
@ -243,12 +243,12 @@ RtlCopyString(IN PCHAR Destination,
* @since XT 1.0 * @since XT 1.0
*/ */
XTAPI XTAPI
PCHAR PCSTR
RtlFindString(IN PCHAR Source, RtlFindString(IN PCSTR Source,
IN PCHAR Search) IN PCSTR Search)
{ {
PCHAR CurrentSource; PCSTR CurrentSource;
PCHAR CurrentSearch; PCSTR CurrentSearch;
/* Validate input parameters */ /* Validate input parameters */
if(!Source || !Search) if(!Source || !Search)
@ -305,12 +305,12 @@ RtlFindString(IN PCHAR Source,
* @since XT 1.0 * @since XT 1.0
*/ */
XTAPI XTAPI
PCHAR PCSTR
RtlFindStringInsensitive(IN PCHAR Source, RtlFindStringInsensitive(IN PCSTR Source,
IN PCHAR Search) IN PCSTR Search)
{ {
PCHAR CurrentSource; PCSTR CurrentSource;
PCHAR CurrentSearch; PCSTR CurrentSearch;
/* Validate input parameters */ /* Validate input parameters */
if(!Source || !Search) if(!Source || !Search)
@ -400,7 +400,7 @@ RtlReverseString(IN OUT PCHAR String,
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlStringLength(IN CONST PCHAR String, RtlStringLength(IN PCSTR String,
IN SIZE_T MaxLength) IN SIZE_T MaxLength)
{ {
SIZE_T Length; SIZE_T Length;
@ -446,10 +446,10 @@ RtlStringLength(IN CONST PCHAR String,
XTAPI XTAPI
SIZE_T SIZE_T
RtlStringToWideString(OUT PWCHAR Destination, RtlStringToWideString(OUT PWCHAR Destination,
IN CONST PCHAR *Source, IN PCSTR *Source,
IN SIZE_T Length) IN SIZE_T Length)
{ {
PCHAR LocalSource = *Source; PCSTR LocalSource = *Source;
SIZE_T Count = Length; SIZE_T Count = Length;
/* Check if NULL pointer passed */ /* Check if NULL pointer passed */
@ -506,7 +506,7 @@ RtlStringToWideString(OUT PWCHAR Destination,
XTAPI XTAPI
PCHAR PCHAR
RtlTokenizeString(IN PCHAR String, RtlTokenizeString(IN PCHAR String,
IN CONST PCHAR Delimiter, IN PCSTR Delimiter,
IN OUT PCHAR *SavePtr) IN OUT PCHAR *SavePtr)
{ {
PCHAR Span, Token; PCHAR Span, Token;
@ -623,7 +623,7 @@ RtlToUpperCharacter(IN CHAR Character)
*/ */
XTAPI XTAPI
PCHAR PCHAR
RtlTrimLeftString(IN CONST PCHAR String) RtlTrimLeftString(IN PCHAR String)
{ {
PCHAR Start; PCHAR Start;
@ -653,7 +653,7 @@ RtlTrimLeftString(IN CONST PCHAR String)
*/ */
XTAPI XTAPI
PCHAR PCHAR
RtlTrimRightString(IN CONST PCHAR String) RtlTrimRightString(IN PCHAR String)
{ {
PCHAR End; PCHAR End;
@ -686,7 +686,7 @@ RtlTrimRightString(IN CONST PCHAR String)
*/ */
XTAPI XTAPI
PCHAR PCHAR
RtlTrimString(IN CONST PCHAR String) RtlTrimString(IN PCHAR String)
{ {
return RtlTrimLeftString(RtlTrimRightString(String)); return RtlTrimLeftString(RtlTrimRightString(String));
} }

42
xtoskrnl/rtl/widestr.c
View File

@ -27,8 +27,8 @@
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareWideString(IN CONST PWCHAR String1, RtlCompareWideString(IN PCWSTR String1,
IN CONST PWCHAR String2, IN PCWSTR String2,
IN SIZE_T Length) IN SIZE_T Length)
{ {
SIZE_T Index; SIZE_T Index;
@ -79,8 +79,8 @@ RtlCompareWideString(IN CONST PWCHAR String1,
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlCompareWideStringInsensitive(IN CONST PWCHAR String1, RtlCompareWideStringInsensitive(IN PCWSTR String1,
IN CONST PWCHAR String2, IN PCWSTR String2,
IN SIZE_T Length) IN SIZE_T Length)
{ {
WCHAR Character1; WCHAR Character1;
@ -124,7 +124,7 @@ RtlCompareWideStringInsensitive(IN CONST PWCHAR String1,
Index++; Index++;
} }
/* Wide strings are equal */ /* Strings are equal */
return 0; return 0;
} }
@ -207,7 +207,7 @@ RtlConcatenateWideString(OUT PWCHAR Destination,
XTAPI XTAPI
VOID VOID
RtlCopyWideString(IN PWCHAR Destination, RtlCopyWideString(IN PWCHAR Destination,
IN CONST PWCHAR Source, IN PCWSTR Source,
IN ULONG Length) IN ULONG Length)
{ {
ULONG Index; ULONG Index;
@ -244,12 +244,12 @@ RtlCopyWideString(IN PWCHAR Destination,
* @since XT 1.0 * @since XT 1.0
*/ */
XTAPI XTAPI
PWCHAR PCWSTR
RtlFindWideString(IN PWCHAR Source, RtlFindWideString(IN PCWSTR Source,
IN PWCHAR Search) IN PCWSTR Search)
{ {
PWCHAR CurrentSource; PCWSTR CurrentSource;
PWCHAR CurrentSearch; PCWSTR CurrentSearch;
/* Validate input parameters */ /* Validate input parameters */
if(!Source || !Search) if(!Source || !Search)
@ -306,12 +306,12 @@ RtlFindWideString(IN PWCHAR Source,
* @since XT 1.0 * @since XT 1.0
*/ */
XTAPI XTAPI
PWCHAR PCWSTR
RtlFindWideStringInsensitive(IN PWCHAR Source, RtlFindWideStringInsensitive(IN PCWSTR Source,
IN PWCHAR Search) IN PCWSTR Search)
{ {
PWCHAR CurrentSource; PCWSTR CurrentSource;
PWCHAR CurrentSearch; PCWSTR CurrentSearch;
/* Validate input parameters */ /* Validate input parameters */
if(!Source || !Search) if(!Source || !Search)
@ -480,7 +480,7 @@ RtlReverseWideString(IN OUT PWCHAR String,
XTAPI XTAPI
PWCHAR PWCHAR
RtlTokenizeWideString(IN PWCHAR String, RtlTokenizeWideString(IN PWCHAR String,
IN CONST PWCHAR Delimiter, IN PCWSTR Delimiter,
IN OUT PWCHAR *SavePtr) IN OUT PWCHAR *SavePtr)
{ {
PWCHAR Span, Token; PWCHAR Span, Token;
@ -597,7 +597,7 @@ RtlToUpperWideCharacter(IN WCHAR Character)
*/ */
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimLeftWideString(IN CONST PWCHAR String) RtlTrimLeftWideString(IN PWCHAR String)
{ {
PWCHAR Start; PWCHAR Start;
@ -627,7 +627,7 @@ RtlTrimLeftWideString(IN CONST PWCHAR String)
*/ */
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimRightWideString(IN CONST PWCHAR String) RtlTrimRightWideString(IN PWCHAR String)
{ {
PWCHAR End; PWCHAR End;
@ -660,7 +660,7 @@ RtlTrimRightWideString(IN CONST PWCHAR String)
*/ */
XTAPI XTAPI
PWCHAR PWCHAR
RtlTrimWideString(IN CONST PWCHAR String) RtlTrimWideString(IN PWCHAR String)
{ {
return RtlTrimLeftWideString(RtlTrimRightWideString(String)); return RtlTrimLeftWideString(RtlTrimRightWideString(String));
} }
@ -680,7 +680,7 @@ RtlTrimWideString(IN CONST PWCHAR String)
*/ */
XTAPI XTAPI
SIZE_T SIZE_T
RtlWideStringLength(IN CONST PWCHAR String, RtlWideStringLength(IN PCWSTR String,
IN SIZE_T MaxLength) IN SIZE_T MaxLength)
{ {
SIZE_T Length; SIZE_T Length;