Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 09:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL:CSR] Don't hardcode types in sizeofs; move local variables into code blocks where they are used.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2022-10-23 01:48:20 +02:00
parent cb8c8693e0
commit e774423689
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/ntdll/csr/capture.c
View file

@ -261,7 +261,7 @@ CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer,
/* Null-terminate the string if we don't take up the whole space */
if (CapturedString->Length < CapturedString->MaximumLength)
CapturedString->Buffer[CapturedString->Length] = '\0';
CapturedString->Buffer[CapturedString->Length] = ANSI_NULL;
}
static VOID
@ -277,11 +277,9 @@ CsrCaptureMessageUnicodeStringInPlace(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer,
String->MaximumLength,
(PSTRING)String);
/* Null-terminate the string */
if (String->MaximumLength >= String->Length + sizeof(WCHAR))
{
String->Buffer[String->Length / sizeof(WCHAR)] = L'\0';
}
/* Null-terminate the string if we don't take up the whole space */
if (String->Length + sizeof(WCHAR) <= String->MaximumLength)
String->Buffer[String->Length / sizeof(WCHAR)] = UNICODE_NULL;
}
/*

35
dll/ntdll/csr/connect.c
View file

@ -49,7 +49,7 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory)
SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
PSID SystemSid = NULL;
CSR_API_CONNECTINFO ConnectionInfo;
ULONG ConnectionInfoLength = sizeof(CSR_API_CONNECTINFO);
ULONG ConnectionInfoLength = sizeof(ConnectionInfo);
DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory);
@ -100,13 +100,13 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory)
}
/* Set up the port view structures to match them with the section */
LpcWrite.Length = sizeof(PORT_VIEW);
LpcWrite.Length = sizeof(LpcWrite);
LpcWrite.SectionHandle = CsrSectionHandle;
LpcWrite.SectionOffset = 0;
LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart;
LpcWrite.ViewBase = 0;
LpcWrite.ViewRemoteBase = 0;
LpcRead.Length = sizeof(REMOTE_PORT_VIEW);
LpcRead.Length = sizeof(LpcRead);
LpcRead.ViewSize = 0;
LpcRead.ViewBase = 0;
@ -202,12 +202,6 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory,
{
NTSTATUS Status;
PIMAGE_NT_HEADERS NtHeader;
UNICODE_STRING CsrSrvName;
HANDLE hCsrSrv;
ANSI_STRING CsrServerRoutineName;
CSR_API_MESSAGE ApiMessage;
PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.Data.CsrClientConnect;
PCSR_CAPTURE_BUFFER CaptureBuffer;
DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo);
@ -241,8 +235,11 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory,
/* Now we can check if we are inside or not */
if (InsideCsrProcess)
{
UNICODE_STRING CsrSrvName;
HANDLE hCsrSrv;
ANSI_STRING CsrServerRoutineName;
/* We're inside, so let's find csrsrv */
DPRINT("Next-GEN CSRSS support\n");
RtlInitUnicodeString(&CsrSrvName, L"csrsrv");
Status = LdrGetDllHandle(NULL,
NULL,
@ -267,6 +264,10 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory,
/* Now check if connection info is given */
if (ConnectionInfo)
{
CSR_API_MESSAGE ApiMessage;
PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.Data.CsrClientConnect;
PCSR_CAPTURE_BUFFER CaptureBuffer;
/* Well, we're definitely in a client now */
InsideCsrProcess = FALSE;
@ -307,7 +308,7 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory,
Status = CsrClientCallServer(&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpClientConnect),
sizeof(CSR_CLIENT_CONNECT));
sizeof(*ClientConnect));
/* Copy the updated connection info data back into the user buffer */
RtlMoveMemory(ConnectionInfo,
@ -368,8 +369,6 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
IN ULONG DataLength)
{
NTSTATUS Status;
ULONG PointerCount;
PULONG_PTR OffsetPointer;
/* Make sure the length is valid */
if (DataLength > (MAXSHORT - sizeof(CSR_API_MESSAGE)))
@ -397,6 +396,9 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
/* Check if we are already inside a CSR Server */
if (!InsideCsrProcess)
{
ULONG PointerCount;
PULONG_PTR OffsetPointer;
/* Check if we got a Capture Buffer */
if (CaptureBuffer)
{
@ -471,12 +473,13 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
}
else
{
/* This is a server-to-server call. Save our CID and do a direct call. */
DPRINT("Next gen server-to-server call\n");
/* This is a server-to-server call */
DPRINT("Server-to-server call\n");
/* We check this equality inside CsrValidateMessageBuffer */
/* Save our CID; we check this equality inside CsrValidateMessageBuffer */
ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId;
/* Do a direct call */
Status = CsrServerApiRoutine(&ApiMessage->Header,
&ApiMessage->Header);