ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix UNICODE_STRING's Buffer variable type issue

This commit is contained in:
RadWolfie 2023-12-17 20:49:10 -06:00
parent a2fb41856d
commit e5043dbc05
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/kernel/common/types.h
View File

@ -266,7 +266,7 @@ typedef struct _UNICODE_STRING
{
ushort_xt Length;
ushort_xt MaximumLength;
ushort_xt *Buffer;
wchar_xt *Buffer;
}
UNICODE_STRING, *PUNICODE_STRING;

12
src/core/kernel/exports/EmuKrnlRtl.cpp
View File

@ -114,7 +114,7 @@ XBSYSAPI EXPORTNUM(260) xbox::ntstatus_xt NTAPI xbox::RtlAnsiStringToUnicodeStri
DestinationString->Length = (USHORT)(total - sizeof(WCHAR));
if (AllocateDestinationString) {
DestinationString->MaximumLength = (USHORT)total;
if (!(DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag(total, 'grtS'))) {
if (!(DestinationString->Buffer = (wchar_xt*)ExAllocatePoolWithTag(total, 'grtS'))) {
RETURN(X_STATUS_NO_MEMORY);
}
}
@ -657,7 +657,7 @@ XBSYSAPI EXPORTNUM(274) xbox::boolean_xt NTAPI xbox::RtlCreateUnicodeString
BOOLEAN result = TRUE;
ULONG bufferSize = (std::u16string(SourceString).length() + 1) * sizeof(WCHAR);
DestinationString->Buffer = (USHORT *)ExAllocatePoolWithTag(bufferSize, 'grtS');
DestinationString->Buffer = (wchar_xt*)ExAllocatePoolWithTag(bufferSize, 'grtS');
if (!DestinationString->Buffer) {
result = FALSE;
}
@ -705,7 +705,7 @@ XBSYSAPI EXPORTNUM(276) xbox::ntstatus_xt NTAPI xbox::RtlDowncaseUnicodeString
if (AllocateDestinationString) {
DestinationString->MaximumLength = SourceString->Length;
DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS');
DestinationString->Buffer = (wchar_xt*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS');
if (DestinationString->Buffer == NULL) {
return X_STATUS_NO_MEMORY;
}
@ -1178,9 +1178,9 @@ XBSYSAPI EXPORTNUM(290) xbox::void_xt NTAPI xbox::RtlInitUnicodeString
LOG_FUNC_ARG(SourceString)
LOG_FUNC_END;
DestinationString->Buffer = (USHORT*)SourceString;
DestinationString->Buffer = (wchar_xt*)SourceString;
if (SourceString != NULL) {
DestinationString->Buffer = (USHORT*)SourceString;
DestinationString->Buffer = (wchar_xt*)SourceString;
DestinationString->Length = (USHORT)std::u16string(SourceString).length() * 2;
DestinationString->MaximumLength = DestinationString->Length + 2;
}
@ -2030,7 +2030,7 @@ XBSYSAPI EXPORTNUM(314) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeString
if (AllocateDestinationString) {
DestinationString->MaximumLength = SourceString->Length;
DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS');
DestinationString->Buffer = (wchar_xt*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS');
if (DestinationString->Buffer == NULL) {
return X_STATUS_NO_MEMORY;
}