Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 22:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CSRSRV]: Fix scenario when a new thread is being created from within CSRSRV and it could not register itself due to the new server-to-server support. Fixes CTRL-C and using the "X" button in a console window to close it, which had regressed since the server-to-server commit.

Browse source 
svn path=/trunk/; revision=55700
This commit is contained in:
Alex Ionescu 2012-02-19 07:22:37 +00:00
parent 7d4a765fe0
commit 59ac9cae89
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/csr/csrsrv/api.c
View file

@ -1227,7 +1227,7 @@ CsrCallServerFromServer(PCSR_API_MESSAGE ReceiveMsg,
_SEH2_TRY _SEH2_TRY
{ {
/* Call the API and get the result */ /* Call the API and get the result */
Status = (ServerDll->DispatchTable[ApiId])(ReceiveMsg, &Reply); Status = ServerDll->DispatchTable[ApiId](ReceiveMsg, &Reply);
/* Return the result, no matter what it is */ /* Return the result, no matter what it is */
ReplyMsg->Status = Status; ReplyMsg->Status = Status;

1
reactos/subsystems/win32/csrss/csrsrv/api/process.c
View file

@ -173,6 +173,7 @@ CSR_API(CsrSrvCreateThread)
PCSR_PROCESS CsrProcess; PCSR_PROCESS CsrProcess;
CurrentThread = NtCurrentTeb()->CsrClientThread; CurrentThread = NtCurrentTeb()->CsrClientThread;
if (!CurrentThread) return STATUS_SUCCESS; // server-to-server
CsrProcess = CurrentThread->Process; CsrProcess = CurrentThread->Process;
if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess)