/* GLOBALS *******************************************************************/
+extern HANDLE hApiPort;
+
HANDLE CsrssApiHeap = (HANDLE) 0;
static unsigned ApiDefinitionsCount = 0;
PCSRSS_API_DEFINITION Scan;
PCSRSS_API_DEFINITION New;
- DPRINT("CSR: %s called", __FUNCTION__);
+ DPRINT("CSR: %s called\n", __FUNCTION__);
NewCount = 0;
for (Scan = NewDefinitions; 0 != Scan->Handler; Scan++)
return STATUS_SUCCESS;
}
-VOID
+VOID
FASTCALL
CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData,
PCSR_API_MESSAGE Request)
{
- BOOL Found = FALSE;
unsigned DefIndex;
ULONG Type;
-
+
DPRINT("CSR: Calling handler for type: %x.\n", Request->Type);
Type = Request->Type & 0xFFFF; /* FIXME: USE MACRO */
DPRINT("CSR: API Number: %x ServerID: %x\n",Type, Request->Type >> 16);
/* FIXME: Extract DefIndex instead of looping */
- for (DefIndex = 0; ! Found && DefIndex < ApiDefinitionsCount; DefIndex++)
+ for (DefIndex = 0; DefIndex < ApiDefinitionsCount; DefIndex++)
{
if (ApiDefinitions[DefIndex].Type == Type)
{
}
else
{
- (ApiDefinitions[DefIndex].Handler)(ProcessData, Request);
- Found = TRUE;
+ Request->Status = (ApiDefinitions[DefIndex].Handler)(ProcessData, Request);
}
+ return;
}
}
- if (! Found)
- {
- DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type);
- Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
- Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
- Request->Status = STATUS_INVALID_SYSTEM_SERVICE;
- }
+ DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type);
+ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
+ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
+ Request->Status = STATUS_INVALID_SYSTEM_SERVICE;
}
-BOOL FASTCALL CallHardError(void);
+BOOL
+CallHardError(IN PCSRSS_PROCESS_DATA ProcessData,
+ IN PHARDERROR_MSG HardErrorMessage);
static
VOID
DPRINT1("CSR: received hard error %lx\n", Message->Status);
/* Call the hard error handler in win32csr */
- CallHardError();
+ (VOID)CallHardError(ProcessData, Message);
}
-NTSTATUS STDCALL
+NTSTATUS WINAPI
CsrpHandleConnectionRequest (PPORT_MESSAGE Request,
IN HANDLE hApiListenPort)
{
DPRINT("CSR: %s: Handling: %p\n", __FUNCTION__, Request);
Status = NtAcceptConnectPort(&ServerPort,
-#ifdef NTLPC
NULL,
Request,
-#else
- hApiListenPort,
- NULL,
-#endif
TRUE,
0,
& LpcRead);
return Status;
}
- ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess);
+ ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess);
if (ProcessData == NULL)
{
- DPRINT1("Unable to allocate or find data for process 0x%x\n",
- Request->ClientId.UniqueProcess);
- Status = STATUS_UNSUCCESSFUL;
- return Status;
+ ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess);
+ if (ProcessData == NULL)
+ {
+ DPRINT1("Unable to allocate or find data for process 0x%x\n",
+ Request->ClientId.UniqueProcess);
+ Status = STATUS_UNSUCCESSFUL;
+ return Status;
+ }
}
ProcessData->CsrSectionViewBase = LpcRead.ViewBase;
ProcessData->CsrSectionViewSize = LpcRead.ViewSize;
+ ProcessData->ServerCommunicationPort = ServerPort;
Status = NtCompleteConnectPort(ServerPort);
if (!NT_SUCCESS(Status))
return Status;
}
-#if !defined(NTLPC) /* ReactOS LPC */
HANDLE ServerThread = (HANDLE) 0;
Status = RtlCreateUserThread(NtCurrentProcess(),
NULL,
}
NtClose(ServerThread);
-#endif
Status = STATUS_SUCCESS;
DPRINT("CSR: %s done\n", __FUNCTION__);
}
VOID
-STDCALL
+WINAPI
ClientConnectionThread(HANDLE ServerPort)
{
NTSTATUS Status;
PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest;
PCSR_API_MESSAGE Reply;
PCSRSS_PROCESS_DATA ProcessData;
-
- DPRINT("CSR: %s called", __FUNCTION__);
+
+ DPRINT("CSR: %s called\n", __FUNCTION__);
/* Reply must be NULL at the first call to NtReplyWaitReceivePort */
- Reply = NULL;
+ Reply = NULL;
/* Loop and reply/wait for a new message */
for (;;)
{
/* Send the reply and wait for a new request */
- Status = NtReplyWaitReceivePort(ServerPort,
+ Status = NtReplyWaitReceivePort(hApiPort,
0,
&Reply->Header,
&Request->Header);
+ /* Client died, continue */
+ if (Status == STATUS_INVALID_CID)
+ {
+ Reply = NULL;
+ continue;
+ }
+
if (!NT_SUCCESS(Status))
{
DPRINT1("NtReplyWaitReceivePort failed: %lx\n", Status);
{
DPRINT("Port died, oh well\n");
CsrFreeProcessData( Request->Header.ClientId.UniqueProcess );
- //NtClose()
- Reply = NULL;
- continue;
- //break;
+ break;
}
if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST)
if (Request->Header.u2.s2.Type == LPC_CLIENT_DIED)
{
- DPRINT("Clietn died, oh well\n");
+ DPRINT("Client died, oh well\n");
Reply = NULL;
continue;
}
- DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n",
+ if ((Request->Header.u2.s2.Type != LPC_ERROR_EVENT) &&
+ (Request->Header.u2.s2.Type != LPC_REQUEST))
+ {
+ DPRINT1("CSR: received message %d\n", Request->Header.u2.s2.Type);
+ Reply = NULL;
+ continue;
+ }
+
+ DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n",
Request->Type,
Request->Header.ClientId.UniqueThread);
}
if (ProcessData->Terminated)
{
- DPRINT1("Message %d: process %d already terminated\n",
- Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess);
+ DPRINT1("Message %d: process %p already terminated\n",
+ Request->Type, Request->Header.ClientId.UniqueProcess);
continue;
}
}
/* Close the port and exit the thread */
- NtClose(ServerPort);
- RtlExitUserThread(STATUS_SUCCESS);
-}
+ // NtClose(ServerPort);
-/**********************************************************************
- * NAME
- * ServerApiPortThread/1
- *
- * DESCRIPTION
- * Handle connection requests from clients to the port
- * "\Windows\ApiPort".
- */
-DWORD STDCALL
-ServerApiPortThread (HANDLE hApiListenPort)
-{
- NTSTATUS Status = STATUS_SUCCESS;
- BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)];
- PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest;
-
- DPRINT("CSR: %s called", __FUNCTION__);
-
- for (;;)
- {
- REMOTE_PORT_VIEW LpcRead;
- LpcRead.Length = sizeof(LpcRead);
-
- Status = NtListenPort (hApiListenPort, Request);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status);
- break;
- }
-
- Status = CsrpHandleConnectionRequest(Request, hApiListenPort);
- if(!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- break;
- }
- }
-
- NtClose(hApiListenPort);
- NtTerminateThread(NtCurrentThread(), Status);
- return 0;
+ DPRINT("CSR: %s done\n", __FUNCTION__);
+ RtlExitUserThread(STATUS_SUCCESS);
}
/**********************************************************************
* "\Windows\SbApiPort". We will accept only one
* connection request (from the SM).
*/
-DWORD STDCALL
+DWORD WINAPI
ServerSbApiPortThread (HANDLE hSbApiPortListen)
{
- HANDLE hConnectedPort = (HANDLE) 0;
- PORT_MESSAGE Request;
- PVOID Context = NULL;
- NTSTATUS Status = STATUS_SUCCESS;
+ HANDLE hConnectedPort = (HANDLE) 0;
+ PORT_MESSAGE Request;
+ PVOID Context = NULL;
+ NTSTATUS Status = STATUS_SUCCESS;
PPORT_MESSAGE Reply = NULL;
- DPRINT("CSR: %s called\n", __FUNCTION__);
+ DPRINT("CSR: %s called\n", __FUNCTION__);
RtlZeroMemory(&Request, sizeof(PORT_MESSAGE));
- Status = NtListenPort (hSbApiPortListen, & Request);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: NtListenPort(SB) failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- } else {
-DPRINT("-- 1\n");
- Status = NtAcceptConnectPort (& hConnectedPort,
-#ifdef NTLPC
- NULL,
- &Request,
-#else
- hSbApiPortListen,
- NULL,
-#endif
- TRUE,
- NULL,
- NULL);
- if(!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- } else {
-DPRINT("-- 2\n");
- Status = NtCompleteConnectPort (hConnectedPort);
- if(!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- } else {
-DPRINT("-- 3\n");
-
- /*
- * Tell the init thread the SM gave the
- * green light for boostrapping.
- */
- Status = NtSetEvent (hBootstrapOk, NULL);
- if(!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: NtSetEvent failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- }
- /* Wait for messages from the SM */
-DPRINT("-- 4\n");
- while (TRUE)
- {
- Status = NtReplyWaitReceivePort(hConnectedPort,
- Context,
- Reply,
- & Request);
- if(!NT_SUCCESS(Status))
- {
- DPRINT1("CSR: %s: NtReplyWaitReceivePort failed (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- break;
- }
- switch (Request.u2.s2.Type)//fix .h PORT_MESSAGE_TYPE(Request))
- {
- /* TODO */
- default:
- DPRINT1("CSR: %s received message (type=%d)\n",
- __FUNCTION__, Request.u2.s2.Type);
- }
-DPRINT("-- 5\n");
- }
- }
- }
- }
- DPRINT("CSR: %s: terminating!\n", __FUNCTION__);
- if(hConnectedPort) NtClose (hConnectedPort);
- NtClose (hSbApiPortListen);
- NtTerminateThread (NtCurrentThread(), Status);
- return 0;
+ Status = NtListenPort (hSbApiPortListen, & Request);
+
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("CSR: %s: NtListenPort(SB) failed (Status=0x%08lx)\n",
+ __FUNCTION__, Status);
+ } else {
+ DPRINT("-- 1\n");
+ Status = NtAcceptConnectPort(&hConnectedPort,
+ NULL,
+ &Request,
+ TRUE,
+ NULL,
+ NULL);
+ if(!NT_SUCCESS(Status))
+ {
+ DPRINT1("CSR: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n",
+ __FUNCTION__, Status);
+ } else {
+ DPRINT("-- 2\n");
+ Status = NtCompleteConnectPort (hConnectedPort);
+ if(!NT_SUCCESS(Status))
+ {
+ DPRINT1("CSR: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n",
+ __FUNCTION__, Status);
+ } else {
+ DPRINT("-- 3\n");
+ /*
+ * Tell the init thread the SM gave the
+ * green light for boostrapping.
+ */
+ Status = NtSetEvent (hBootstrapOk, NULL);
+ if(!NT_SUCCESS(Status))
+ {
+ DPRINT1("CSR: %s: NtSetEvent failed (Status=0x%08lx)\n",
+ __FUNCTION__, Status);
+ }
+ /* Wait for messages from the SM */
+ DPRINT("-- 4\n");
+ while (TRUE)
+ {
+ Status = NtReplyWaitReceivePort(hConnectedPort,
+ Context,
+ Reply,
+ &Request);
+ if(!NT_SUCCESS(Status))
+ {
+ DPRINT1("CSR: %s: NtReplyWaitReceivePort failed (Status=0x%08lx)\n",
+ __FUNCTION__, Status);
+ break;
+ }
+
+ switch (Request.u2.s2.Type) //fix .h PORT_MESSAGE_TYPE(Request))
+ {
+ /* TODO */
+ default:
+ DPRINT1("CSR: %s received message (type=%d)\n",
+ __FUNCTION__, Request.u2.s2.Type);
+ }
+ DPRINT("-- 5\n");
+ }
+ }
+ }
+ }
+
+ DPRINT("CSR: %s: terminating!\n", __FUNCTION__);
+ if(hConnectedPort) NtClose (hConnectedPort);
+ NtClose (hSbApiPortListen);
+ NtTerminateThread (NtCurrentThread(), Status);
+ return 0;
}
/* EOF */
projects / reactos.git / blobdiff