Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL]

Browse source 
- Code formatting.
- Fix CSR message length computation.

[CSR]
- Remove unneeded comments.
- Correct arguments names.

svn path=/branches/ros-csrss/; revision=57625
This commit is contained in:
Hermès Bélusca-Maïto 2012-10-27 19:05:10 +00:00
parent ec451b5d49
commit 5a3ba45059
5 changed files with 32 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/ntdll/csr/api.c
View file

@ -6,16 +6,16 @@
* PROGRAMMER: Alex Ionescu (alex@relsoft.net)
*/
/* INCLUDES *****************************************************************/
/* INCLUDES *******************************************************************/
#include <ntdll.h>
#define NDEBUG
#include <debug.h>
/* GLOBALS *******************************************************************/
/* GLOBALS ********************************************************************/
extern HANDLE CsrApiPort;
/* FUNCTIONS *****************************************************************/
/* FUNCTIONS ******************************************************************/
/*
* @implemented
@ -78,7 +78,7 @@ CsrIdentifyAlertableThread(VOID)
Status = CsrClientCallServer(&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpIdentifyAlertable),
sizeof(CSR_SET_PRIORITY_CLASS));
sizeof(CSR_IDENTIFY_ALTERTABLE_THREAD));
/* Return to caller */
return Status;

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

@ -6,16 +6,16 @@
* PROGRAMMER: Alex Ionescu (alex@relsoft.net)
*/
/* INCLUDES *****************************************************************/
/* INCLUDES *******************************************************************/
#include <ntdll.h>
#define NDEBUG
#include <debug.h>
/* GLOBALS *******************************************************************/
/* GLOBALS ********************************************************************/
extern HANDLE CsrPortHeap;
/* FUNCTIONS *****************************************************************/
/* FUNCTIONS ******************************************************************/
/*
* @implemented

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

@ -6,13 +6,13 @@
* PROGRAMMER: Alex Ionescu (alex@relsoft.net)
*/
/* INCLUDES *****************************************************************/
/* INCLUDES *******************************************************************/
#include <ntdll.h>
#define NDEBUG
#include <debug.h>
/* GLOBALS *******************************************************************/
/* GLOBALS ********************************************************************/
HANDLE CsrApiPort;
HANDLE CsrProcessId;
@ -28,7 +28,7 @@ PCSR_SERVER_API_ROUTINE CsrServerApiRoutine;
#define UNICODE_PATH_SEP L"\\"
/* FUNCTIONS *****************************************************************/
/* FUNCTIONS ******************************************************************/
/*
* @implemented
@ -45,10 +45,10 @@ CsrGetProcessId(VOID)
*/
NTSTATUS
NTAPI
CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL,
CSR_API_NUMBER ApiNumber,
ULONG RequestLength)
CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL,
IN CSR_API_NUMBER ApiNumber,
IN ULONG DataLength)
{
NTSTATUS Status;
ULONG PointerCount;
@ -58,8 +58,11 @@ CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
/* Fill out the Port Message Header */
ApiMessage->Header.u2.ZeroInit = 0;
ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE);
ApiMessage->Header.u1.s1.TotalLength = RequestLength;
ApiMessage->Header.u1.s1.TotalLength =
FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength;
/* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */
ApiMessage->Header.u1.s1.DataLength =
ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE);
/* Fill out the CSR Header */
ApiMessage->ApiNumber = ApiNumber;
@ -113,7 +116,7 @@ CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
/* Check if we got a a Capture Buffer */
if (CaptureBuffer)
{
/* We have to convert from the remote view to our remote view */
/* We have to convert back from the remote view to our local view */
DPRINT("Reconverting CaptureBuffer\n");
ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)
ApiMessage->CsrCaptureData -
@ -168,7 +171,7 @@ CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
NTSTATUS
NTAPI
CsrConnectToServer(IN PWSTR ObjectDirectory)
CsrpConnectToServer(IN PWSTR ObjectDirectory)
{
ULONG PortNameLength;
UNICODE_STRING PortName;
@ -318,11 +321,11 @@ CsrConnectToServer(IN PWSTR ObjectDirectory)
*/
NTSTATUS
NTAPI
CsrClientConnectToServer(PWSTR ObjectDirectory,
ULONG ServerId,
PVOID ConnectionInfo,
PULONG ConnectionInfoSize,
PBOOLEAN ServerToServerCall)
CsrClientConnectToServer(IN PWSTR ObjectDirectory,
IN ULONG ServerId,
IN PVOID ConnectionInfo,
IN OUT PULONG ConnectionInfoSize,
OUT PBOOLEAN ServerToServerCall)
{
NTSTATUS Status;
PIMAGE_NT_HEADERS NtHeader;
@ -397,7 +400,7 @@ CsrClientConnectToServer(PWSTR ObjectDirectory,
if (!CsrApiPort)
{
/* No, set it up now */
if (!NT_SUCCESS(Status = CsrConnectToServer(ObjectDirectory)))
if (!NT_SUCCESS(Status = CsrpConnectToServer(ObjectDirectory)))
{
/* Failed */
DPRINT1("Failure to connect to CSR\n");
@ -410,8 +413,7 @@ CsrClientConnectToServer(PWSTR ObjectDirectory,
ClientConnect->ConnectionInfoSize = *ConnectionInfoSize;
/* Setup a buffer for the connection info */
CaptureBuffer = CsrAllocateCaptureBuffer(1,
ClientConnect->ConnectionInfoSize);
CaptureBuffer = CsrAllocateCaptureBuffer(1, ClientConnect->ConnectionInfoSize);
if (CaptureBuffer == NULL)
{
return STATUS_INSUFFICIENT_RESOURCES;
@ -435,12 +437,6 @@ CsrClientConnectToServer(PWSTR ObjectDirectory,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpClientConnect),
sizeof(CSR_CLIENT_CONNECT));
/*
Status = CsrClientCallServer(&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CSR_NATIVE, CONNECT_PROCESS),
sizeof(CSR_API_MESSAGE));
*/
}
else
{

6
include/reactos/subsys/csr/csr.h
View file

@ -33,10 +33,10 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory,
NTSTATUS
NTAPI
CsrClientCallServer(IN OUT PCSR_API_MESSAGE Request,
CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL,
IN ULONG ApiNumber,
IN ULONG RequestLength);
IN CSR_API_NUMBER ApiNumber,
IN ULONG DataLength);
PVOID
NTAPI

4
include/reactos/subsys/csr/csrmsg.h
View file

@ -94,7 +94,7 @@ typedef struct _CSR_CAPTURE_BUFFER
struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer;
ULONG PointerCount;
ULONG_PTR BufferEnd;
ULONG_PTR PointerArray[1]; // MessagePointerOffsets // Offsets within CSR_API_MSG of pointers
ULONG_PTR PointerArray[1];
} CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER;
@ -122,8 +122,6 @@ typedef struct _CSR_API_MESSAGE
CSR_SET_PRIORITY_CLASS SetPriorityClass;
CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
// ULONG_PTR ApiMessageData[39]; //// what to do ????
/*** win32csr thingies to remove. ***/
#if 1
CSRSS_CREATE_DESKTOP CreateDesktopRequest;