Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55707: [CSRSRV]: Properly implement CsrSrvCreateThread now that the worker thread issue is fixed. CSR_THREAD's are now created for everyone, and CSRSS succesfully duplicates their thread hand...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 10:12:14 2012 New Revision: 55707 URL: http://svn.reactos.org/svn/reactos?rev=55707&view=rev Log: [CSRSRV]: Properly implement CsrSrvCreateThread now that the worker thread issue is fixed. CSR_THREAD's are now created for everyone, and CSRSS succesfully duplicates their thread handle! Also, while connections from unknown threads are still allowed (in case I missed something), we do warn on the console about these guys now. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Feb 19 10:12:14 2012 @@ -172,50 +172,46 @@ NTSTATUS Status; PCSR_PROCESS CsrProcess; + /* Get the current CSR thread */ CurrentThread = NtCurrentTeb()->CsrClientThread; if (!CurrentThread) return STATUS_SUCCESS; // server-to-server + + /* Get the CSR Process for this request */ CsrProcess = CurrentThread->Process; - - if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) - { + if (CsrProcess->ClientId.UniqueProcess != + Request->Data.CreateThreadRequest.ClientId.UniqueProcess) + { + /* This is a remote thread request -- is it within the server itself? */ if (Request->Data.CreateThreadRequest.ClientId.UniqueProcess == NtCurrentTeb()->ClientId.UniqueProcess) { + /* Accept this without any further work */ return STATUS_SUCCESS; } + /* Get the real CSR Process for the remote thread's process */ Status = CsrLockProcessByClientId(Request->Data.CreateThreadRequest.ClientId.UniqueProcess, &CsrProcess); if (!NT_SUCCESS(Status)) return Status; } - - Status = NtDuplicateObject(CsrProcess->ProcessHandle, + + /* Duplicate the thread handle so we can own it */ + Status = NtDuplicateObject(CurrentThread->Process->ProcessHandle, Request->Data.CreateThreadRequest.ThreadHandle, NtCurrentProcess(), &ThreadHandle, 0, 0, DUPLICATE_SAME_ACCESS); - if (!NT_SUCCESS(Status)) - { - Status = NtDuplicateObject(CurrentThread->Process->ProcessHandle, - Request->Data.CreateThreadRequest.ThreadHandle, - NtCurrentProcess(), - &ThreadHandle, - 0, - 0, - DUPLICATE_SAME_ACCESS); - } - - Status = STATUS_SUCCESS; // hack if (NT_SUCCESS(Status)) { + /* Call CSRSRV to tell it about the new thread */ Status = CsrCreateThread(CsrProcess, - ThreadHandle, - &Request->Data.CreateThreadRequest.ClientId); - } - - if (CsrProcess != CurrentThread->Process) CsrReleaseProcessLock(); - + ThreadHandle, + &Request->Data.CreateThreadRequest.ClientId); + } + + /* Unlock the process and return */ + if (CsrProcess != CurrentThread->Process) CsrUnlockProcess(CsrProcess); return Status; } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 10:12:14 2012 @@ -1183,7 +1183,7 @@ Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); if (!Thread) { - DPRINT("No thread found for request %lx and clientID %lx.%lx\n", + DPRINT1("No thread found for request %lx and clientID %lx.%lx\n", Request->Type & 0xFFFF, Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread);

12 years, 7 months

[ion] 55706: [RTL/NTDLL/KERNEL32]: Rtl provides worker queue and timer queue functionality, which queues a worker thread associated with a caller-supplied callback. In Windows, Rtl by default calls...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 10:06:31 2012 New Revision: 55706 URL: http://svn.reactos.org/svn/reactos?rev=55706&view=rev Log: [RTL/NTDLL/KERNEL32]: Rtl provides worker queue and timer queue functionality, which queues a worker thread associated with a caller-supplied callback. In Windows, Rtl by default calls RtlCreateUserThread, but as soon as kernel32 loads, it's DllMain calls an exported function RtlSetThreadPoolStartFunc which changes that default to a special Base function that calls CreateRemoteThread instead. The net result is that Win32 processes using the Rtl functionality get their threads properly registered with CSRSS. In ReactOS, this did not happen, so when those threads called into CSRSS, CSRSS had no CSR_THREAD structure/state for them, which is why CsrCreateThread (and the API loop) are so badly hacked. This commit implements RtlSetThreadPoolStartFunc, implements the kernel32 base functions which wrap CreateRemoteThread, and implements the rtl functions which wrap RtlCreateUserThread. Services, Setup, and any ReactOS application using RPC now have the worker threads correctly registered. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/timerqueue.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -896,7 +896,7 @@ //@ stdcall RtlSetSecurityObjectEx //@ stdcall RtlSetThreadErrorMode @ stdcall RtlSetThreadIsCritical(long ptr long) -//@ stdcall RtlSetThreadPoolStartFunc +@ stdcall RtlSetThreadPoolStartFunc(ptr ptr) @ stdcall RtlSetTimeZoneInformation(ptr) //@ stdcall RtlSetTimer @ stdcall RtlSetUnhandledExceptionFilter(ptr) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -896,7 +896,7 @@ ;@ stdcall RtlSetSecurityObjectEx ;@ stdcall RtlSetThreadErrorMode @ stdcall RtlSetThreadIsCritical(long ptr long) -;@ stdcall RtlSetThreadPoolStartFunc +@ stdcall RtlSetThreadPoolStartFunc(ptr ptr) @ stdcall RtlSetTimeZoneInformation(ptr) ;@ stdcall RtlSetTimer @ stdcall RtlSetUnhandledExceptionFilter(ptr) Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -220,6 +220,46 @@ return TRUE; } +NTSTATUS +NTAPI +BaseCreateThreadPoolThread(IN PTHREAD_START_ROUTINE Function, + IN PVOID Parameter, + OUT PHANDLE ThreadHandle) +{ + NTSTATUS Status; + + /* Create a Win32 thread */ + *ThreadHandle = CreateRemoteThread(NtCurrentProcess(), + NULL, + 0, + Function, + Parameter, + CREATE_SUSPENDED, + NULL); + if (!(*ThreadHandle)) + { + /* Get the status value if we couldn't get a handle */ + Status = NtCurrentTeb()->LastStatusValue; + if (NT_SUCCESS(Status)) Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Set success code */ + Status = STATUS_SUCCESS; + } + + /* All done */ + return Status; +} + +NTSTATUS +NTAPI +BaseExitThreadPoolThread(IN NTSTATUS ExitStatus) +{ + /* Exit the thread */ + ExitThread(ExitStatus); +} + BOOL WINAPI DllMain(HANDLE hDll, @@ -246,6 +286,9 @@ /* Set no filter intially */ GlobalTopLevelExceptionFilter = RtlEncodePointer(NULL); + + /* Enable the Rtl thread pool and timer queue to use proper Win32 thread */ + RtlSetThreadPoolStartFunc(BaseCreateThreadPoolThread, BaseExitThreadPoolThread); /* Don't bother us for each thread */ LdrDisableThreadCalloutsForDll((PVOID)hDll); Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -544,7 +544,7 @@ sizeof(CSR_API_MESSAGE)); if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) { - DPRINT1("Failed to tell csrss about new thread\n"); + DPRINT1("Failed to tell csrss about new thread: %lx %lx\n", Status, CsrRequest.Status); return CsrRequest.Status; } Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -2410,6 +2410,14 @@ // // Thread Pool Functions // +// +NTSTATUS +NTAPI +RtlSetThreadPoolStartFunc( + IN PRTL_START_POOL_THREAD StartPoolThread, + IN PRTL_EXIT_POOL_THREAD ExitPoolThread +); + NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -520,6 +520,21 @@ (NTAPI *PRTL_BASE_PROCESS_START_ROUTINE)( PTHREAD_START_ROUTINE StartAddress, PVOID Parameter +); + +// +// Worker Start/Exit Function +// +typedef NTSTATUS +(NTAPI *PRTL_START_POOL_THREAD)( + IN PTHREAD_START_ROUTINE Function, + IN PVOID Parameter, + OUT PHANDLE ThreadHandle +); + +typedef NTSTATUS +(NTAPI *PRTL_EXIT_POOL_THREAD)( + IN NTSTATUS ExitStatus ); // Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=5… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -19,6 +19,8 @@ /* FUNCTIONS ***************************************************************/ +extern PRTL_START_POOL_THREAD RtlpStartThreadFunc; +extern PRTL_EXIT_POOL_THREAD RtlpExitThreadFunc; HANDLE TimerThreadHandle = NULL; NTSTATUS @@ -239,7 +241,7 @@ NtClose(q->event); RtlDeleteCriticalSection(&q->cs); RtlFreeHeap(RtlGetProcessHeap(), 0, q); - RtlExitUserThread(STATUS_SUCCESS); + RtlpExitThreadFunc(STATUS_SUCCESS); } static void queue_destroy_timer(struct queue_timer *t) @@ -285,8 +287,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, q); return status; } - status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, 0, 0, 0, - (PTHREAD_START_ROUTINE)timer_queue_thread_proc, q, &q->thread, NULL); + status = RtlpStartThreadFunc((PVOID)timer_queue_thread_proc, q, &q->thread); if (status != STATUS_SUCCESS) { NtClose(q->event); @@ -294,6 +295,7 @@ return status; } + NtResumeThread(q->thread, NULL); *NewTimerQueue = q; return STATUS_SUCCESS; } Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=557… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Sun Feb 19 10:06:31 2012 @@ -14,6 +14,36 @@ #include <debug.h> /* FUNCTIONS ***************************************************************/ + +NTSTATUS +NTAPI +RtlpStartThread(IN PTHREAD_START_ROUTINE Function, + IN PVOID Parameter, + OUT PHANDLE ThreadHandle) +{ + /* Create a native worker thread -- used for SMSS, CSRSS, etc... */ + return RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + Function, + Parameter, + ThreadHandle, + NULL); +} + +NTSTATUS +NTAPI +RtlpExitThread(IN NTSTATUS ExitStatus) +{ + /* Kill a native worker thread -- used for SMSS, CSRSS, etc... */ + return NtTerminateThread(NtCurrentThread(), ExitStatus); +} + +PRTL_START_POOL_THREAD RtlpStartThreadFunc = RtlpStartThread; +PRTL_EXIT_POOL_THREAD RtlpExitThreadFunc = RtlpExitThread; #define MAX_WORKERTHREADS 0x100 #define WORKERTHREAD_CREATION_THRESHOLD 0x5 @@ -141,19 +171,11 @@ Timeout.QuadPart = -10000LL; /* Wait for 100ms */ /* Start the thread */ - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - StartRoutine, - (PVOID)&WorkerInitialized, - &ThreadHandle, - NULL); - + Status = RtlpStartThreadFunc(StartRoutine, (PVOID)&WorkerInitialized, &ThreadHandle); if (NT_SUCCESS(Status)) { + NtResumeThread(ThreadHandle, NULL); + /* Poll until the thread got a chance to initialize */ while (WorkerInitialized == 0) { @@ -568,7 +590,7 @@ InterlockedExchange((PLONG)Parameter, 1); - RtlExitUserThread(Status); + RtlpExitThreadFunc(Status); return 0; } @@ -647,7 +669,7 @@ } NtClose(ThreadInfo.ThreadHandle); - RtlExitUserThread(Status); + RtlpExitThreadFunc(Status); return 0; } @@ -670,7 +692,7 @@ 1); /* Oops, too many worker threads... */ - RtlExitUserThread(Status); + RtlpExitThreadFunc(Status); return 0; } @@ -743,7 +765,7 @@ } } - RtlExitUserThread(Status); + RtlpExitThreadFunc(Status); return 0; } @@ -892,3 +914,16 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetThreadPoolStartFunc(IN PRTL_START_POOL_THREAD StartPoolThread, + IN PRTL_EXIT_POOL_THREAD ExitPoolThread) +{ + RtlpStartThreadFunc = StartPoolThread; + RtlpExitThreadFunc = ExitPoolThread; + return STATUS_SUCCESS; +}

12 years, 7 months

[ion] 55705: [CSRSRV]: Take a refernece to the client thread since we are dereffing it...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 10:00:47 2012 New Revision: 55705 URL: http://svn.reactos.org/svn/reactos?rev=55705&view=rev Log: [CSRSRV]: Take a refernece to the client thread since we are dereffing it... Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 10:00:47 2012 @@ -1189,6 +1189,7 @@ Request->Header.ClientId.UniqueThread); } //DPRINT1("Thread found: %p %p\n", Thread, Process); + if (Thread) CsrLockedReferenceThread(Thread); if (Thread) NtCurrentTeb()->CsrClientThread = Thread;

12 years, 7 months

[ion] 55704: [CSRSRV]: Port CsrLockedReferenceThread from CSRSRV2.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 09:57:00 2012 New Revision: 55704 URL: http://svn.reactos.org/svn/reactos?rev=55704&view=rev Log: [CSRSRV]: Port CsrLockedReferenceThread from CSRSRV2. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Sun Feb 19 09:57:00 2012 @@ -122,6 +122,28 @@ return CsrThread; } +/*++ + * @name CsrLockedReferenceThread + * + * The CsrLockedReferenceThread refences a CSR Thread while the + * Process Lock is already being held. + * + * @param CsrThread + * Pointer to the CSR Thread to be referenced. + * + * @return None. + * + * @remarks This routine will return with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrLockedReferenceThread(IN PCSR_THREAD CsrThread) +{ + /* Increment the reference count */ + ++CsrThread->ReferenceCount; +} + PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sun Feb 19 09:57:00 2012 @@ -328,6 +328,10 @@ CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread); +VOID +NTAPI +CsrLockedReferenceThread(IN PCSR_THREAD CsrThread); + /* api/process.c */ typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSR_PROCESS ProcessData, PVOID Context);

12 years, 7 months

[ion] 55703: [CSRSRV2]: Bugfix, don't dereference the thread instead of referencing it!

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 09:54:41 2012 New Revision: 55703 URL: http://svn.reactos.org/svn/reactos?rev=55703&view=rev Log: [CSRSRV2]: Bugfix, don't dereference the thread instead of referencing it! Modified: trunk/reactos/subsystems/csr/csrsrv/api.c Modified: trunk/reactos/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] Sun Feb 19 09:54:41 2012 @@ -720,7 +720,7 @@ } /* We got an API Request */ - CsrDereferenceThread(CsrThread); + CsrLockedReferenceThread(CsrThread); CsrReleaseProcessLock(); /* This is an API call, get the Server ID */

12 years, 7 months

[janderwald] 55702: [USBSTOR] - Fix bugs introduced in rev 55695

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 19 09:45:54 2012 New Revision: 55702 URL: http://svn.reactos.org/svn/reactos?rev=55702&view=rev Log: [USBSTOR] - Fix bugs introduced in rev 55695 Modified: trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Feb 19 09:45:54 2012 @@ -1115,7 +1115,7 @@ // // let's allocate an irp // - Status = USBSTOR_AllocateIrp(PDODeviceObject, sizeof(UFI_INQUIRY_RESPONSE), SCSIOP_INQUIRY, &Event, &Request, &Irp); + Status = USBSTOR_AllocateIrp(PDODeviceObject, DataTransferLength, OpCode, &Event, &Request, &Irp); if (!NT_SUCCESS(Status)) { //

12 years, 7 months

[tfaber] 55701: [NTOSKRNL] - Make Trap debugging usable again. Suggested by Stefan.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 19 08:38:09 2012 New Revision: 55701 URL: http://svn.reactos.org/svn/reactos?rev=55701&view=rev Log: [NTOSKRNL] - Make Trap debugging usable again. Suggested by Stefan. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sun Feb 19 08:38:09 2012 @@ -98,7 +98,7 @@ VOID FORCEINLINE KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame, - IN KTRAP_EXIT_SKIP_BITS SkipBits) + IN BOOLEAN SkipPreviousMode) { /* Make sure interrupts are disabled */ if (__readeflags() & EFLAGS_INTERRUPT_MASK) @@ -137,7 +137,7 @@ } /* If we're ignoring previous mode, make sure caller doesn't actually want it */ - if ((SkipBits.SkipPreviousMode) && (TrapFrame->PreviousPreviousMode != -1)) + if (SkipPreviousMode && (TrapFrame->PreviousPreviousMode != -1)) { DbgPrint("Exiting a trap witout restoring previous mode, yet previous mode seems valid: %lx\n", TrapFrame->PreviousPreviousMode); __debugbreak(); Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Feb 19 08:38:09 2012 @@ -82,7 +82,7 @@ VOID FORCEINLINE -KiCommonExit(IN PKTRAP_FRAME TrapFrame, const ULONG Flags) +KiCommonExit(IN PKTRAP_FRAME TrapFrame, BOOLEAN SkipPreviousMode) { /* Disable interrupts until we return */ _disable(); @@ -91,7 +91,7 @@ KiCheckForApcDelivery(TrapFrame); /* Debugging checks */ - KiExitTrapDebugChecks(TrapFrame, Flags); + KiExitTrapDebugChecks(TrapFrame, SkipPreviousMode); /* Restore the SEH handler chain */ KeGetPcr()->NtTib.ExceptionList = TrapFrame->ExceptionList; @@ -112,7 +112,7 @@ KiEoiHelper(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ - KiCommonExit(TrapFrame, 0); + KiCommonExit(TrapFrame, TRUE); /* Check if this was a V8086 trap */ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); @@ -140,7 +140,7 @@ TrapFrame->Eax = Status; /* Common trap exit code */ - KiCommonExit(TrapFrame, 0); + KiCommonExit(TrapFrame, FALSE); /* Restore previous mode */ KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; @@ -171,7 +171,7 @@ KiServiceExit2(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ - KiCommonExit(TrapFrame, 0); + KiCommonExit(TrapFrame, FALSE); /* Restore previous mode */ KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Sun Feb 19 08:38:09 2012 @@ -526,8 +526,10 @@ TrapFrame->HardwareEsp = 0x11FFE; TrapFrame->ExceptionList = EXCEPTION_CHAIN_END; TrapFrame->Dr7 = 0; - //TrapFrame->DbgArgMark = 0xBADB0D00; +#ifdef TRAP_DEBUG + TrapFrame->DbgArgMark = 0xBADB0D00; TrapFrame->PreviousPreviousMode = -1; +#endif /* Disable interrupts */ _disable();

12 years, 7 months

[ion] 55700: [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" bu...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 07:22:37 2012 New Revision: 55700 URL: http://svn.reactos.org/svn/reactos?rev=55700&view=rev Log: [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. Modified: trunk/reactos/subsystems/csr/csrsrv/api.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c Modified: trunk/reactos/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] Sun Feb 19 07:22:37 2012 @@ -1227,7 +1227,7 @@ _SEH2_TRY { /* 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 */ ReplyMsg->Status = Status; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Feb 19 07:22:37 2012 @@ -173,6 +173,7 @@ PCSR_PROCESS CsrProcess; CurrentThread = NtCurrentTeb()->CsrClientThread; + if (!CurrentThread) return STATUS_SUCCESS; // server-to-server CsrProcess = CurrentThread->Process; if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess)

12 years, 7 months

[ion] 55699: [CSRSRV]: I confused ShutdownCallback with DisconnectCallback. What win32csr needs is actually the later. Fixed that. Also removed CallProcessDeleted since we already call the Disconne...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 06:44:09 2012 New Revision: 55699 URL: http://svn.reactos.org/svn/reactos?rev=55699&view=rev Log: [CSRSRV]: I confused ShutdownCallback with DisconnectCallback. What win32csr needs is actually the later. Fixed that. Also removed CallProcessDeleted since we already call the Disconnectcallback from CsrRemoveProcess, which we do call in CSRSRV. Enabled the code that was disabled. Modified: trunk/reactos/subsystems/csr/csrsrv/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -345,10 +345,10 @@ ServerDll = CsrLoadedServerDll[i]; /* Check if it's valid and if it has a Disconnect Callback */ - if (ServerDll && ServerDll->DisconnectCallback) + if ((ServerDll) && (ServerDll->DisconnectCallback)) { /* Call it */ - (ServerDll->DisconnectCallback)(CsrProcess); + ServerDll->DisconnectCallback(CsrProcess); } } } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -14,7 +14,6 @@ #include <debug.h> extern NTSTATUS CallProcessCreated(PCSR_PROCESS, PCSR_PROCESS); -extern NTSTATUS CallProcessDeleted(PCSR_PROCESS); /* GLOBALS *******************************************************************/ @@ -97,7 +96,6 @@ LOCK; Process = pProcessData->ProcessHandle; - CallProcessDeleted(pProcessData); /* Dereference all process threads */ NextEntry = pProcessData->ThreadList.Flink; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -82,31 +82,6 @@ } return Status; -} - -NTSTATUS -CallProcessDeleted(IN PCSR_PROCESS ProcessData) -{ - ULONG Result = 0; - unsigned i; - PCSR_SERVER_DLL ServerDll; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - /* Notify the Server DLLs */ - for (i = 0; i < CSR_SERVER_DLL_MAX; i++) - { - /* Get the current Server DLL */ - ServerDll = CsrLoadedServerDll[i]; - - /* Make sure it's valid and that it has callback */ - if ((ServerDll) && (ServerDll->ShutdownProcessCallback)) - { - Result = ServerDll->ShutdownProcessCallback(ProcessData, 0, FALSE); - } - } - - return Result; } CSRSS_API_DEFINITION NativeDefinitions[] = Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -701,66 +701,63 @@ NTAPI CsrRemoveProcess(IN PCSR_PROCESS CsrProcess) { + PCSR_SERVER_DLL ServerDll; + ULONG i; + ASSERT(ProcessStructureListLocked()); + + /* Remove us from the Process List */ + RemoveEntryList(&CsrProcess->ListLink); + + /* Release the lock */ + CsrReleaseProcessLock(); + + /* Loop every Server DLL */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Check if it's valid and if it has a Disconnect Callback */ + if ((ServerDll) && (ServerDll->DisconnectCallback)) + { + /* Call it */ + ServerDll->DisconnectCallback(CsrProcess); + } + } +} + +/*++ + * @name CsrInsertProcess + * + * The CsrInsertProcess routine inserts a CSR Process into the Process List + * and notifies Server DLLs of the creation of a new CSR Process. + * + * @param Parent + * Optional pointer to the CSR Process creating this CSR Process. + * + * @param CurrentProcess + * Optional pointer to the current CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process which is to be inserted. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, + IN PCSR_PROCESS CurrentProcess OPTIONAL, + IN PCSR_PROCESS CsrProcess) +{ #if 0 PCSR_SERVER_DLL ServerDll; ULONG i; #endif ASSERT(ProcessStructureListLocked()); - /* Remove us from the Process List */ - RemoveEntryList(&CsrProcess->ListLink); - - /* Release the lock */ - CsrReleaseProcessLock(); -#if 0 - /* Loop every Server DLL */ - for (i = 0; i < CSR_SERVER_DLL_MAX; i++) - { - /* Get the Server DLL */ - ServerDll = CsrLoadedServerDll[i]; - - /* Check if it's valid and if it has a Disconnect Callback */ - if (ServerDll && ServerDll->DisconnectCallback) - { - /* Call it */ - (ServerDll->DisconnectCallback)(CsrProcess); - } - } -#endif -} - -/*++ - * @name CsrInsertProcess - * - * The CsrInsertProcess routine inserts a CSR Process into the Process List - * and notifies Server DLLs of the creation of a new CSR Process. - * - * @param Parent - * Optional pointer to the CSR Process creating this CSR Process. - * - * @param CurrentProcess - * Optional pointer to the current CSR Process. - * - * @param CsrProcess - * Pointer to the CSR Process which is to be inserted. - * - * @return None. - * - * @remarks None. - * - *--*/ -VOID -NTAPI -CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, - IN PCSR_PROCESS CurrentProcess OPTIONAL, - IN PCSR_PROCESS CsrProcess) -{ -#if 0 - PCSR_SERVER_DLL ServerDll; - ULONG i; -#endif - ASSERT(ProcessStructureListLocked()); - /* Set the parent */ CsrProcess->Parent = Parent; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -313,7 +313,8 @@ CSR_API(CsrFreeConsole) { - return Win32CsrReleaseConsole(ProcessData, 0, 0); + Win32CsrReleaseConsole(ProcessData); + return STATUS_SUCCESS; } VOID WINAPI Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -353,7 +353,7 @@ ServerDll->HardErrorCallback = Win32CsrHardError; ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; - ServerDll->ShutdownProcessCallback = Win32CsrReleaseConsole; + ServerDll->DisconnectCallback = Win32CsrReleaseConsole; #else *ApiDefinitions = Win32CsrApiDefinitions; ServerProcs->HardErrorProc = Win32CsrHardError; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -132,10 +132,10 @@ ConioDeleteConsole(&Console->Header); } -ULONG +VOID WINAPI Win32CsrReleaseConsole( - PCSR_PROCESS ProcessData, ULONG Flags, BOOLEAN First) + PCSR_PROCESS ProcessData) { PCSRSS_CONSOLE Console; ULONG i; @@ -161,10 +161,8 @@ //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return 0; - } - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return -1; + } + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); } NTSTATUS Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] Sun Feb 19 06:44:09 2012 @@ -54,7 +54,7 @@ VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSR_PROCESS ProcessData, HANDLE Object); -ULONG WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData, ULONG Flags, BOOLEAN First); +VOID WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData); NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSR_PROCESS SourceProcessData, PCSR_PROCESS TargetProcessData); CSR_API(CsrGetHandle);

12 years, 7 months

[ion] 55698: [CSRSRV]: Switch to the CSRSRV2 model of having a dynamic amount of threads handling CSRSS requests depending on how many are deadlocked, instead of creating a thread for every single ...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 06:32:17 2012 New Revision: 55698 URL: http://svn.reactos.org/svn/reactos?rev=55698&view=rev Log: [CSRSRV]: Switch to the CSRSRV2 model of having a dynamic amount of threads handling CSRSS requests depending on how many are deadlocked, instead of creating a thread for every single client. CSRSRV now has about 2 API threads instead of 16. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/session.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 06:32:17 2012 @@ -20,6 +20,9 @@ static unsigned ApiDefinitionsCount = 0; static PCSRSS_API_DEFINITION ApiDefinitions = NULL; UNICODE_STRING CsrApiPortName; +volatile LONG CsrpStaticThreadCount; +volatile LONG CsrpDynamicThreadTotal; +ULONG CsrMaxApiRequestThreads; /* FUNCTIONS *****************************************************************/ @@ -290,7 +293,7 @@ NULL /* FIXME*/); /* Create the Port Object */ - Status = NtCreatePort(&hApiPort, //&CsrApiPort, + Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, LPC_MAX_DATA_LENGTH, // hack LPC_MAX_MESSAGE_LENGTH, // hack @@ -741,10 +744,10 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request) { NTSTATUS Status; - HANDLE ServerPort = NULL, ServerThread = NULL; + HANDLE ServerPort = NULL;//, ServerThread = NULL; PCSR_PROCESS ProcessData = NULL; REMOTE_PORT_VIEW RemotePortView; - CLIENT_ID ClientId; +// CLIENT_ID ClientId; BOOLEAN AllowConnection = FALSE; PCSR_CONNECTION_INFO ConnectInfo; ServerPort = NULL; @@ -836,7 +839,7 @@ Request->ClientId.UniqueProcess, Request->ClientId.UniqueThread); } - +#if 0 if (!NT_SUCCESS(Status)) return Status; Status = RtlCreateUserThread(NtCurrentProcess(), @@ -863,6 +866,7 @@ Status = STATUS_SUCCESS; DPRINT("CSR: %s done\n", __FUNCTION__); +#endif return Status; } @@ -911,6 +915,83 @@ /* Return it */ return CsrThread; +} + +/*++ + * @name CsrpCheckRequestThreads + * + * The CsrpCheckRequestThreads routine checks if there are no more threads + * to handle CSR API Requests, and creates a new thread if possible, to + * avoid starvation. + * + * @param None. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * if a new thread couldn't be created. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrpCheckRequestThreads(VOID) +{ + HANDLE hThread; + CLIENT_ID ClientId; + NTSTATUS Status; + + /* Decrease the count, and see if we're out */ + if (!(_InterlockedDecrement(&CsrpStaticThreadCount))) + { + /* Check if we've still got space for a Dynamic Thread */ + if (CsrpDynamicThreadTotal < CsrMaxApiRequestThreads) + { + /* Create a new dynamic thread */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + (PVOID)ClientConnectionThread,//CsrApiRequestThread, + NULL, + &hThread, + &ClientId); + /* Check success */ + if (NT_SUCCESS(Status)) + { + /* Increase the thread counts */ + _InterlockedIncrement(&CsrpStaticThreadCount); + _InterlockedIncrement(&CsrpDynamicThreadTotal); + + /* Add a new server thread */ + if (CsrAddStaticServerThread(hThread, + &ClientId, + CsrThreadIsServerThread)) + { + /* Activate it */ + NtResumeThread(hThread, NULL); + } + else + { + /* Failed to create a new static thread */ + _InterlockedDecrement(&CsrpStaticThreadCount); + _InterlockedDecrement(&CsrpDynamicThreadTotal); + + /* Terminate it */ + DPRINT1("Failing\n"); + NtTerminateThread(hThread, 0); + NtClose(hThread); + + /* Return */ + return STATUS_UNSUCCESSFUL; + } + } + } + } + + /* Success */ + return STATUS_SUCCESS; } VOID @@ -926,12 +1007,13 @@ PCSR_PROCESS ProcessData; PCSR_THREAD ServerThread; ULONG MessageType; + HANDLE ReplyPort; DPRINT("CSR: %s called\n", __FUNCTION__); /* Setup LPC loop port and message */ Reply = NULL; -// ReplyPort = CsrApiPort; + ReplyPort = CsrApiPort; /* Connect to user32 */ while (!CsrConnectToUser()) @@ -955,8 +1037,8 @@ ASSERT(NT_SUCCESS(Status)); /* Increase the Thread Counts */ - //_InterlockedIncrement(&CsrpStaticThreadCount); - //_InterlockedIncrement(&CsrpDynamicThreadTotal); + _InterlockedIncrement(&CsrpStaticThreadCount); + _InterlockedIncrement(&CsrpDynamicThreadTotal); } /* Now start the loop */ @@ -976,7 +1058,8 @@ } /* Send the reply and wait for a new request */ - Status = NtReplyWaitReceivePort(hApiPort, + DPRINT("Replying to: %lx (%lx)\n", ReplyPort, CsrApiPort); + Status = NtReplyWaitReceivePort(ReplyPort, 0, &Reply->Header, &Request->Header); @@ -988,17 +1071,18 @@ { /* Check for specific status cases */ if ((Status != STATUS_INVALID_CID) && - (Status != STATUS_UNSUCCESSFUL))// && -// ((Status == STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) + (Status != STATUS_UNSUCCESSFUL) && + ((Status == STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) { /* Notify the debugger */ DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); - //DPRINT1("CSRSS: ReplyPortHandle %lx CsrApiPort %lx\n", ReplyPort, CsrApiPort); + DPRINT1("CSRSS: ReplyPortHandle %lx CsrApiPort %lx\n", ReplyPort, CsrApiPort); } /* We failed big time, so start out fresh */ Reply = NULL; - //ReplyPort = CsrApiPort; + ReplyPort = CsrApiPort; + DPRINT1("failed: %lx\n", Status); continue; } else @@ -1020,13 +1104,17 @@ { DPRINT("Port died, oh well\n"); CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); - break; + Reply = NULL; + ReplyPort = CsrApiPort; + continue; } if (MessageType == LPC_CONNECTION_REQUEST) { + DPRINT("Accepting new connection\n"); CsrpHandleConnectionRequest((PPORT_MESSAGE)Request); Reply = NULL; + ReplyPort = CsrApiPort; continue; } @@ -1034,6 +1122,7 @@ { DPRINT("Client died, oh well\n"); Reply = NULL; + ReplyPort = CsrApiPort; continue; } @@ -1042,6 +1131,7 @@ { DPRINT1("CSR: received message %d\n", Request->Header.u2.s2.Type); Reply = NULL; + ReplyPort = CsrApiPort; continue; } @@ -1056,12 +1146,16 @@ DPRINT1("Message %d: Unable to find data for process 0x%x\n", MessageType, Request->Header.ClientId.UniqueProcess); - break; + Reply = NULL; + ReplyPort = CsrApiPort; + continue; } if (ProcessData->Flags & CsrProcessTerminated) { DPRINT1("Message %d: process %d already terminated\n", Request->Type, Request->Header.ClientId.UniqueProcess); + Reply = NULL; + ReplyPort = CsrApiPort; continue; } @@ -1072,20 +1166,61 @@ PCSR_THREAD Thread; Thread = CsrLocateThreadByClientId(NULL, &Request->Header.ClientId); CsrHandleHardError(Thread, (PHARDERROR_MSG)Request); + ReplyPort = CsrApiPort; } else { PCSR_THREAD Thread; PCSR_PROCESS Process = NULL; - //DPRINT1("locate thread %lx/%lx\n", Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); - Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); - //DPRINT1("Thread found: %p %p\n", Thread, Process); - - /* Call the Handler */ - if (Thread) NtCurrentTeb()->CsrClientThread = Thread; - CsrApiCallHandler(ProcessData, Request); - if (Thread) NtCurrentTeb()->CsrClientThread = ServerThread; + /* Validation complete, start SEH */ + _SEH2_TRY + { + /* Make sure we have enough threads */ + CsrpCheckRequestThreads(); + + //DPRINT1("locate thread %lx/%lx\n", Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); + Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); + if (!Thread) + { + DPRINT("No thread found for request %lx and clientID %lx.%lx\n", + Request->Type & 0xFFFF, + Request->Header.ClientId.UniqueProcess, + Request->Header.ClientId.UniqueThread); + } + //DPRINT1("Thread found: %p %p\n", Thread, Process); + + if (Thread) NtCurrentTeb()->CsrClientThread = Thread; + + /* Now we reply to a particular client */ + if (Thread) + { + ReplyPort = Thread->Process->ClientPort; + ASSERT(Thread->Process == ProcessData); + } + else + { + ReplyPort = ProcessData->ClientPort; + } + + /* Call the Handler */ + CsrApiCallHandler(ProcessData, Request); + + /* Increase the static thread count */ + _InterlockedIncrement(&CsrpStaticThreadCount); + + if (Thread) + { + NtCurrentTeb()->CsrClientThread = ServerThread; + CsrDereferenceThread(Thread); + } + } + _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) + { + Reply = NULL; + ReplyPort = CsrApiPort; + } + _SEH2_END; } /* Send back the reply */ @@ -1095,7 +1230,7 @@ /* Close the port and exit the thread */ // NtClose(ServerPort); - DPRINT("CSR: %s done\n", __FUNCTION__); + DPRINT1("CSR: %s done\n", __FUNCTION__); /* We're out of the loop for some reason, terminate! */ NtTerminateThread(NtCurrentThread(), Status); //return Status; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sun Feb 19 06:32:17 2012 @@ -22,7 +22,7 @@ PCSR_THREAD CsrSbApiRequestThreadPtr; HANDLE CsrSmApiPort; HANDLE hSbApiPort = (HANDLE) 0; -HANDLE hApiPort = (HANDLE) 0; +HANDLE CsrApiPort = (HANDLE) 0; ULONG CsrDebug = 0xFFFFFFFF; ULONG CsrMaxApiRequestThreads; ULONG CsrTotalPerProcessDataLength; @@ -1098,7 +1098,7 @@ NtClose(CsrInitializationEvent); /* Have us handle Hard Errors */ - Status = NtSetDefaultHardErrorPort(hApiPort); + Status = NtSetDefaultHardErrorPort(CsrApiPort); if (!NT_SUCCESS(Status)) { DPRINT1("CSRSRV:%s: NtSetDefaultHardErrorPort failed (Status=%08lx)\n", Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Sun Feb 19 06:32:17 2012 @@ -231,7 +231,7 @@ /* Set the exception port */ Status = NtSetInformationProcess(hProcess, ProcessExceptionPort, - &hApiPort,//&CsrApiPort, + &CsrApiPort, sizeof(HANDLE)); /* Check for success */ Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sun Feb 19 06:32:17 2012 @@ -299,7 +299,7 @@ NTAPI CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); -extern HANDLE hApiPort; +extern HANDLE CsrApiPort; extern HANDLE CsrSmApiPort; extern HANDLE CsrSbApiPort; extern LIST_ENTRY CsrThreadHashTable[256]; @@ -313,6 +313,7 @@ extern PVOID *CsrSrvSharedStaticServerData; extern HANDLE CsrInitializationEvent; extern PCSR_SERVER_DLL CsrLoadedServerDll[CSR_SERVER_DLL_MAX]; +extern ULONG CsrMaxApiRequestThreads; NTSTATUS NTAPI @@ -386,6 +387,10 @@ IN OUT PULONG Reply ); +LONG +NTAPI +CsrUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo); + VOID NTAPI CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess);

12 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012