Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 55715: [CSRSRV]: Implement support for exception messages now that these get sent.
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 18:05:49 2012 New Revision: 55715 URL: http://svn.reactos.org/svn/reactos?rev=55715&view=rev Log: [CSRSRV]: Implement support for exception messages now that these get sent. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.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 18:05:49 2012 @@ -1008,6 +1008,7 @@ PCSR_THREAD ServerThread; ULONG MessageType; HANDLE ReplyPort; + PDBGKM_MSG DebugMessage; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -1155,6 +1156,23 @@ DPRINT1("Message %d: process %d already terminated\n", Request->Type, Request->Header.ClientId.UniqueProcess); Reply = NULL; + ReplyPort = CsrApiPort; + continue; + } + + /* If this was an exception, handle it */ + if (MessageType == LPC_EXCEPTION) + { + /* Kill the process */ + NtTerminateProcess(ProcessData->ProcessHandle, STATUS_ABANDONED); + + /* Destroy it from CSR */ + CsrDestroyProcess(&Request->Header.ClientId, STATUS_ABANDONED); + + /* Return a Debug Message */ + DebugMessage = (PDBGKM_MSG)&Request; + DebugMessage->ReturnedStatus = DBG_CONTINUE; + Reply = Request; ReplyPort = CsrApiPort; continue; } 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 18:05:49 2012 @@ -498,6 +498,98 @@ } /*++ + * @name CsrDestroyProcess + * @implemented NT4 + * + * The CsrDestroyProcess routine destroys the CSR Process corresponding to + * a given Client ID. + * + * @param Cid + * Pointer to the Client ID Structure corresponding to the CSR + * Process which is about to be destroyed. + * + * @param ExitStatus + * Unused. + * + * @return STATUS_SUCCESS in case of success, STATUS_THREAD_IS_TERMINATING + * if the CSR Process is already terminating. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrDestroyProcess(IN PCLIENT_ID Cid, + IN NTSTATUS ExitStatus) +{ + PCSR_THREAD CsrThread; + PCSR_PROCESS CsrProcess; + CLIENT_ID ClientId = *Cid; + PLIST_ENTRY NextEntry; + + /* Acquire lock */ + CsrAcquireProcessLock(); + + /* Find the thread */ + CsrThread = CsrLocateThreadByClientId(&CsrProcess, &ClientId); + + /* Make sure we got one back, and that it's not already gone */ + if (!(CsrThread) || (CsrProcess->Flags & CsrProcessTerminating)) + { + /* Release the lock and return failure */ + CsrReleaseProcessLock(); + return STATUS_THREAD_IS_TERMINATING; + } + + /* Set the terminated flag */ + CsrProcess->Flags |= CsrProcessTerminating; + + /* Get the List Pointers */ + NextEntry = CsrProcess->ThreadList.Flink; + while (NextEntry != &CsrProcess->ThreadList) + { + /* Get the current thread entry */ + CsrThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Make sure the thread isn't already dead */ + if (CsrThread->Flags & CsrThreadTerminated) + { + NextEntry = NextEntry->Flink; + continue; + } + + /* Set the Terminated flag */ + CsrThread->Flags |= CsrThreadTerminated; + + /* Acquire the Wait Lock */ + CsrAcquireWaitLock(); + + /* Do we have an active wait block? */ + if (CsrThread->WaitBlock) + { + /* Notify waiters of termination */ + CsrNotifyWaitBlock(CsrThread->WaitBlock, + NULL, + NULL, + NULL, + CsrProcessTerminating, + TRUE); + } + + /* Release the Wait Lock */ + CsrReleaseWaitLock(); + + /* Dereference the thread */ + CsrLockedDereferenceThread(CsrThread); + NextEntry = CsrProcess->ThreadList.Flink; + } + + /* Release the Process Lock and return success */ + CsrReleaseProcessLock(); + return STATUS_SUCCESS; +} + +/*++ * @name CsrCreateProcess * @implemented NT4 * 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 18:05:49 2012 @@ -310,6 +310,37 @@ CsrDereferenceProcess(CsrProcess); } +/*++ + * @name CsrLockedDereferenceThread + * + * The CsrLockedDereferenceThread derefences a CSR Thread while the + * Process Lock is already being held. + * + * @param CsrThread + * Pointer to the CSR Thread to be dereferenced. + * + * @return None. + * + * @remarks This routine will return with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrLockedDereferenceThread(IN PCSR_THREAD CsrThread) +{ + LONG LockCount; + + /* Decrease reference count */ + LockCount = --CsrThread->ReferenceCount; + ASSERT(LockCount >= 0); + if (!LockCount) + { + /* Call the generic cleanup code */ + CsrThreadRefcountZero(CsrThread); + CsrAcquireProcessLock(); + } +} + NTSTATUS NTAPI CsrCreateThread(IN PCSR_PROCESS CsrProcess, 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 18:05:49 2012 @@ -415,6 +415,24 @@ IN OUT PULONG Reply ); +NTSTATUS +NTAPI +CsrDestroyProcess(IN PCLIENT_ID Cid, +IN NTSTATUS ExitStatus); + +VOID +NTAPI +CsrLockedDereferenceThread(IN PCSR_THREAD CsrThread); + +BOOLEAN +NTAPI +CsrNotifyWaitBlock(IN PCSR_WAIT_BLOCK WaitBlock, + IN PLIST_ENTRY WaitList, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags, + IN BOOLEAN DereferenceThread); + VOID NTAPI CsrReferenceNtSession(IN PCSR_NT_SESSION Session);

1 0

[janderwald] 55714: [USBCCGP] - Remove assert hit during install of hid devices
by janderwald＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: janderwald Date: Sun Feb 19 15:43:18 2012 New Revision: 55714 URL: http://svn.reactos.org/svn/reactos?rev=55714&view=rev Log: [USBCCGP] - Remove assert hit during install of hid devices Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sun Feb 19 15:43:18 2012 @@ -993,7 +993,6 @@ return PDO_HandleInternalDeviceControl(DeviceObject, Irp); default: DPRINT1("PDO_Dispatch Function %x not implemented\n", IoStack->MajorFunction); - ASSERT(FALSE); Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status;

1 0

[arty] 55713: [NEWCC] Add necessary NULL check. Add pageout case for a page that's only in segment page tables.
by arty＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: arty Date: Sun Feb 19 14:13:51 2012 New Revision: 55713 URL: http://svn.reactos.org/svn/reactos?rev=55713&view=rev Log: [NEWCC] Add necessary NULL check. Add pageout case for a page that's only in segment page tables. Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Sun Feb 19 14:13:51 2012 @@ -58,7 +58,15 @@ ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(Page); - while (RMAP_IS_SEGMENT(entry->Address)) + +#ifdef NEWCC + // Special case for NEWCC: we can have a page that's only in a segment + // page table + if (entry && RMAP_IS_SEGMENT(entry->Address) && entry->Next == NULL) + return MmpPageOutPhysicalAddress(Page); +#endif + + while (entry && RMAP_IS_SEGMENT(entry->Address)) entry = entry->Next; if (entry == NULL)

1 0

[arty] 55712: [NEWCC] Add a paging out case for cache sections, which had been lost at some point. Recognize the case where the first rmap entry is a segment rmap in pageout. Lock the segment when ...
by arty＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: arty Date: Sun Feb 19 13:15:33 2012 New Revision: 55712 URL: http://svn.reactos.org/svn/reactos?rev=55712&view=rev Log: [NEWCC] Add a paging out case for cache sections, which had been lost at some point. Recognize the case where the first rmap entry is a segment rmap in pageout. Lock the segment when modifying the segment page table in 1 place. Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Sun Feb 19 13:15:33 2012 @@ -58,11 +58,15 @@ ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(Page); + while (RMAP_IS_SEGMENT(entry->Address)) + entry = entry->Next; + if (entry == NULL) { ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } + Process = entry->Process; Address = entry->Address; @@ -140,6 +144,10 @@ */ Status = MmPageOutSectionView(AddressSpace, MemoryArea, Address, PageOp); + } + else if (Type == MEMORY_AREA_CACHE) + { + Status = MmpPageOutPhysicalAddress(Page); } else if (Type == MEMORY_AREA_VIRTUAL_MEMORY) { Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Sun Feb 19 13:15:33 2012 @@ -2242,8 +2242,13 @@ MmInsertRmap(Page, Process, Address); + // If we got here, the previous entry should have been a wait Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); + MmLockSectionSegment(Context.Segment); + LONG OldEntry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); + ASSERT(OldEntry == 0 || OldEntry == MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); + MmUnlockSectionSegment(Context.Segment); } MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL;

1 0

[ion] 55711: [CSRSRV/KERNEL32]: Do the Windows thing and send a unified LPC message when a new process is created, which includes the thread information as well, instead of sending two LPC messages...
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 11:39:07 2012 New Revision: 55711 URL: http://svn.reactos.org/svn/reactos?rev=55711&view=rev Log: [CSRSRV/KERNEL32]: Do the Windows thing and send a unified LPC message when a new process is created, which includes the thread information as well, instead of sending two LPC messages per process. Perf++. [CSRSRV/kERNEL32]: Switch to using the Windows CSRSS message structure for a new process, minus the bInheritHandles field which we still support for ReactOS compatibility. [CSRSRV]: Port CsrCreateProcess from CSRSRV2, rewrite CsrSrvCreateProcess to use this API, and add required ReactOS compatibility hacks. A lot of stuff is still not supported, but the minimum (ie: previous ReactOS functionality) has been maintained during the transition. Processes are now tracked correctly, but there are still refcount leaks (known, to be fixed later). Will let this breathe for a bit now to catch regressions. Work can now continue back on the kernel32 side while that happens. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/include/reactos/subsys/csrss/csrss.h 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/include/api.h 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 11:39:07 2012 @@ -485,26 +485,21 @@ ExitProcess(uExitCode); } -/* - * Tells CSR that a new process was created - */ NTSTATUS WINAPI -BasepNotifyCsrOfCreation(ULONG dwCreationFlags, - IN HANDLE ProcessId, - IN BOOL InheritHandles) -{ - ULONG Request = CREATE_PROCESS; +BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, + IN PCLIENT_ID ClientId) +{ + ULONG Request = CREATE_THREAD; CSR_API_MESSAGE CsrRequest; NTSTATUS Status; - DPRINT("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n", - ProcessId, dwCreationFlags); + DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", + ClientId->UniqueThread, ThreadHandle); /* Fill out the request */ - CsrRequest.Data.CreateProcessRequest.NewProcessId = ProcessId; - CsrRequest.Data.CreateProcessRequest.Flags = dwCreationFlags; - CsrRequest.Data.CreateProcessRequest.bInheritHandles = InheritHandles; + CsrRequest.Data.CreateThreadRequest.ClientId = *ClientId; + CsrRequest.Data.CreateThreadRequest.ThreadHandle = ThreadHandle; /* Call CSR */ Status = CsrClientCallServer(&CsrRequest, @@ -513,37 +508,6 @@ sizeof(CSR_API_MESSAGE)); if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) { - DPRINT1("Failed to tell csrss about new process: %lx %lx\n", Status, CsrRequest.Status); - return CsrRequest.Status; - } - - /* Return Success */ - return STATUS_SUCCESS; -} - -NTSTATUS -WINAPI -BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, - IN PCLIENT_ID ClientId) -{ - ULONG Request = CREATE_THREAD; - CSR_API_MESSAGE CsrRequest; - NTSTATUS Status; - - DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", - ClientId->UniqueThread, ThreadHandle); - - /* Fill out the request */ - CsrRequest.Data.CreateThreadRequest.ClientId = *ClientId; - CsrRequest.Data.CreateThreadRequest.ThreadHandle = ThreadHandle; - - /* Call CSR */ - Status = CsrClientCallServer(&CsrRequest, - NULL, - MAKE_CSR_API(Request, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { DPRINT1("Failed to tell csrss about new thread: %lx %lx\n", Status, CsrRequest.Status); return CsrRequest.Status; } @@ -560,7 +524,9 @@ BasepCreateFirstThread(HANDLE ProcessHandle, LPSECURITY_ATTRIBUTES lpThreadAttributes, PSECTION_IMAGE_INFORMATION SectionImageInfo, - PCLIENT_ID ClientId) + PCLIENT_ID ClientId, + BOOLEAN InheritHandles, + DWORD dwCreationFlags) { OBJECT_ATTRIBUTES LocalObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; @@ -568,7 +534,8 @@ INITIAL_TEB InitialTeb; NTSTATUS Status; HANDLE hThread; - + ULONG Request = CREATE_PROCESS; + CSR_API_MESSAGE CsrRequest; DPRINT("BasepCreateFirstThread. hProcess: %lx\n", ProcessHandle); /* Create the Thread's Stack */ @@ -603,10 +570,22 @@ return NULL; } - Status = BasepNotifyCsrOfThread(hThread, ClientId); - if (!NT_SUCCESS(Status)) - { - ASSERT(FALSE); + /* Fill out the request to notify CSRSS */ + CsrRequest.Data.CreateProcessRequest.ClientId = *ClientId; + CsrRequest.Data.CreateProcessRequest.ProcessHandle = ProcessHandle; + CsrRequest.Data.CreateProcessRequest.ThreadHandle = hThread; + CsrRequest.Data.CreateProcessRequest.CreationFlags = dwCreationFlags; + CsrRequest.Data.CreateProcessRequest.bInheritHandles = InheritHandles; + + /* Call CSR */ + Status = CsrClientCallServer(&CsrRequest, + NULL, + MAKE_CSR_API(Request, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + { + DPRINT1("Failed to tell csrss about new process: %lx %lx\n", Status, CsrRequest.Status); + return NULL; } /* Success */ @@ -3240,25 +3219,15 @@ &RemoteParameters->StandardError); } - /* Notify CSRSS */ - Status = BasepNotifyCsrOfCreation(dwCreationFlags, - (HANDLE)ProcessBasicInfo.UniqueProcessId, - bInheritHandles); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR Notification Failed\n"); - BaseSetLastNTError(Status); - goto Cleanup; - } - /* Create the first thread */ DPRINT("Creating thread for process (EntryPoint = 0x%p)\n", SectionImageInfo.TransferAddress); hThread = BasepCreateFirstThread(hProcess, lpThreadAttributes, &SectionImageInfo, - &ClientId); + &ClientId, + bInheritHandles, + dwCreationFlags); if (hThread == NULL) { Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Feb 19 11:39:07 2012 @@ -69,8 +69,6 @@ // // ReactOS Data // - HANDLE NewProcessId; - ULONG Flags; BOOL bInheritHandles; } CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; 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 11:39:07 2012 @@ -31,58 +31,6 @@ return CsrProcess; } -PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId) -{ - PCSR_PROCESS pProcessData; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId; - NTSTATUS Status; - - LOCK; - - pProcessData = CsrAllocateProcess(); - ASSERT(pProcessData != NULL); - - pProcessData->ClientId.UniqueProcess = ProcessId; - - ClientId.UniqueThread = NULL; - ClientId.UniqueProcess = pProcessData->ClientId.UniqueProcess; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ - Status = NtOpenProcess(&pProcessData->ProcessHandle, - PROCESS_ALL_ACCESS, - &ObjectAttributes, - &ClientId); - DPRINT("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->ProcessHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed\n"); - CsrDeallocateProcess(pProcessData); - CsrReleaseProcessLock(); - return NULL; - } - else - { - RtlInitializeCriticalSection(&pProcessData->HandleTableLock); - } - - /* Set default shutdown parameters */ - pProcessData->ShutdownLevel = 0x280; - pProcessData->ShutdownFlags = 0; - - /* Insert the Process */ - CsrInsertProcess(NULL, NULL, pProcessData); - - /* Release lock and return */ - CsrReleaseProcessLock(); - return pProcessData; -} - NTSTATUS WINAPI CsrFreeProcessData(HANDLE Pid) { PCSR_PROCESS pProcessData; @@ -135,34 +83,114 @@ * CSRSS API *********************************************************************/ -CSR_API(CsrCreateProcess) -{ - PCSR_PROCESS NewProcessData; - - NewProcessData = CsrCreateProcessData(Request->Data.CreateProcessRequest.NewProcessId); - if (NewProcessData == NULL) +CSR_API(CsrSrvCreateProcess) +{ + NTSTATUS Status; + HANDLE ProcessHandle, ThreadHandle; + PCSR_THREAD CsrThread; + PCSR_PROCESS NewProcessData; + ULONG Flags, VdmPower = 0, DebugFlags = 0; + + /* Get the current client thread */ + CsrThread = NtCurrentTeb()->CsrClientThread; + ASSERT(CsrThread != NULL); + + /* Extract the flags out of the process handle */ + Flags = (ULONG_PTR)Request->Data.CreateProcessRequest.ProcessHandle & 3; + Request->Data.CreateProcessRequest.ProcessHandle = (HANDLE)((ULONG_PTR)Request->Data.CreateProcessRequest.ProcessHandle & ~3); + + /* Duplicate the process handle */ + Status = NtDuplicateObject(CsrThread->Process->ProcessHandle, + Request->Data.CreateProcessRequest.ProcessHandle, + NtCurrentProcess(), + &ProcessHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) { - return(STATUS_NO_MEMORY); + DPRINT1("Failed to duplicate process handle\n"); + return Status; } - if (!(Request->Data.CreateProcessRequest.Flags & (CREATE_NEW_CONSOLE|DETACHED_PROCESS))) - { - NewProcessData->ParentConsole = ProcessData->Console; - NewProcessData->bInheritHandles = Request->Data.CreateProcessRequest.bInheritHandles; - } - - CallProcessCreated(ProcessData, NewProcessData); - - if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) - { - NewProcessData->ProcessGroupId = (DWORD)(ULONG_PTR)NewProcessData->ClientId.UniqueProcess; - } - else - { - NewProcessData->ProcessGroupId = ProcessData->ProcessGroupId; - } - - return(STATUS_SUCCESS); + /* Duplicate the thread handle */ + Status = NtDuplicateObject(CsrThread->Process->ProcessHandle, + Request->Data.CreateProcessRequest.ThreadHandle, + NtCurrentProcess(), + &ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to duplicate process handle\n"); + NtClose(ProcessHandle); + return Status; + } + + /* See if this is a VDM process */ + if (VdmPower) + { + /* Request VDM powers */ + Status = NtSetInformationProcess(ProcessHandle, + ProcessWx86Information, + &VdmPower, + sizeof(VdmPower)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get VDM powers\n"); + NtClose(ProcessHandle); + NtClose(ThreadHandle); + return Status; + } + } + + /* Convert some flags. FIXME: More need conversion */ + if (Request->Data.CreateProcessRequest.CreationFlags & CREATE_NEW_PROCESS_GROUP) + { + DebugFlags |= CsrProcessCreateNewGroup; + } + + /* FIXME: SxS Stuff */ + + /* Call CSRSRV to create the CSR_PROCESS structure and the first CSR_THREAD */ + Status = CsrCreateProcess(ProcessHandle, + ThreadHandle, + &Request->Data.CreateProcessRequest.ClientId, + CsrThread->Process->NtSession, + DebugFlags, + NULL); + if (Status == STATUS_THREAD_IS_TERMINATING) + { + DPRINT1("Thread already dead\n"); + return Status; + } + + /* Check for other failures */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create process/thread structures: %lx\n", Status); + return Status; + } + + /* FIXME: Should notify user32 */ + + /* FIXME: VDM vodoo */ + + /* ReactOS Compatibility */ + Status = CsrLockProcessByClientId(Request->Data.CreateProcessRequest.ClientId.UniqueProcess, &NewProcessData); + ASSERT(Status == STATUS_SUCCESS); + if (!(Request->Data.CreateProcessRequest.CreationFlags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS))) + { + NewProcessData->ParentConsole = ProcessData->Console; + NewProcessData->bInheritHandles = Request->Data.CreateProcessRequest.bInheritHandles; + } + RtlInitializeCriticalSection(&NewProcessData->HandleTableLock); + CallProcessCreated(ProcessData, NewProcessData); + CsrUnlockProcess(NewProcessData); + + /* Return the result of this operation */ + return Status; } CSR_API(CsrSrvCreateThread) 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 11:39:07 2012 @@ -86,7 +86,7 @@ CSRSS_API_DEFINITION NativeDefinitions[] = { - CSRSS_DEFINE_API(CREATE_PROCESS, CsrCreateProcess), + CSRSS_DEFINE_API(CREATE_PROCESS, CsrSrvCreateProcess), CSRSS_DEFINE_API(CREATE_THREAD, CsrSrvCreateThread), CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), 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 11:39:07 2012 @@ -498,6 +498,219 @@ } /*++ + * @name CsrCreateProcess + * @implemented NT4 + * + * Do nothing for 500ms. + * + * @param ArgumentCount + * Description of the parameter. Wrapped to more lines on ~70th + * column. + * + * @param Arguments + * Description of the parameter. Wrapped to more lines on ~70th + * column. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrCreateProcess(IN HANDLE hProcess, + IN HANDLE hThread, + IN PCLIENT_ID ClientId, + IN PCSR_NT_SESSION NtSession, + IN ULONG Flags, + IN PCLIENT_ID DebugCid) +{ + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + CLIENT_ID CurrentCid; + PCSR_PROCESS CurrentProcess; +// PVOID ProcessData; +// ULONG i; + PCSR_PROCESS CsrProcess; + NTSTATUS Status; + PCSR_THREAD CsrThread; + KERNEL_USER_TIMES KernelTimes; + + /* Get the current CID and lock Processes */ + CurrentCid = CurrentThread->ClientId; + CsrAcquireProcessLock(); + + /* Get the current CSR Thread */ + CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, &CurrentCid); + if (!CurrentThread) + { + /* We've failed to locate the thread */ + CsrReleaseProcessLock(); + return STATUS_THREAD_IS_TERMINATING; + } + + /* Allocate a new Process Object */ + CsrProcess = CsrAllocateProcess(); + if (!CsrProcess) + { + /* Couldn't allocate Process */ + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + +#if 0 + /* Inherit the Process Data */ + CurrentProcess = CurrentThread->Process; + ProcessData = &CurrentProcess->ServerData[CSR_SERVER_DLL_MAX]; + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Check if the DLL is Loaded and has Per Process Data */ + if ((CsrLoadedServerDll[i]) && (CsrLoadedServerDll[i]->SizeOfProcessData)) + { + /* Set the pointer */ + CsrProcess->ServerData[i] = ProcessData; + + /* Copy the Data */ + RtlMoveMemory(ProcessData, + CurrentProcess->ServerData[i], + CsrLoadedServerDll[i]->SizeOfProcessData); + + /* Update next data pointer */ + ProcessData = (PVOID)((ULONG_PTR)ProcessData + + CsrLoadedServerDll[i]->SizeOfProcessData); + } + else + { + /* No data for this Server */ + CsrProcess->ServerData[i] = NULL; + } + } +#endif + + /* Set the Exception port to us */ + Status = NtSetInformationProcess(hProcess, + ProcessExceptionPort, + &CsrApiPort, + sizeof(HANDLE)); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + + /* If Check if CreateProcess got CREATE_NEW_PROCESS_GROUP */ + if (!(Flags & CsrProcessCreateNewGroup)) + { + /* Create new data */ + CsrProcess->ProcessGroupId = HandleToUlong(ClientId->UniqueProcess); + CsrProcess->ProcessGroupSequence = CsrProcess->SequenceNumber; + } + else + { + /* Copy it from the current process */ + CsrProcess->ProcessGroupId = CurrentProcess->ProcessGroupId; + CsrProcess->ProcessGroupSequence = CurrentProcess->ProcessGroupSequence; + } + + /* Check if this is a console process */ + if (Flags & CsrProcessIsConsoleApp) CsrProcess->Flags |= CsrProcessIsConsoleApp; + + /* Mask out non-debug flags */ + Flags &= ~(CsrProcessIsConsoleApp | CsrProcessCreateNewGroup | CsrProcessPriorityFlags); + + /* Check if every process will be debugged */ + if (!(Flags) && (CurrentProcess->DebugFlags & CsrDebugProcessChildren)) + { + /* Pass it on to the current process */ + CsrProcess->DebugFlags = CsrDebugProcessChildren; + CsrProcess->DebugCid = CurrentProcess->DebugCid; + } + + /* Check if Debugging was used on this process */ + if ((Flags & (CsrDebugOnlyThisProcess | CsrDebugProcessChildren)) && (DebugCid)) + { + /* Save the debug flag used */ + CsrProcess->DebugFlags = Flags; + + /* Save the CID */ + CsrProcess->DebugCid = *DebugCid; + } + + /* Check if we debugging is enabled */ + if (CsrProcess->DebugFlags) + { + /* Set the Debug Port to us */ + Status = NtSetInformationProcess(hProcess, + ProcessDebugPort, + &CsrApiPort, + sizeof(HANDLE)); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + } + + /* Get the Thread Create Time */ + Status = NtQueryInformationThread(hThread, + ThreadTimes, + (PVOID)&KernelTimes, + sizeof(KernelTimes), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + + /* Allocate a CSR Thread Structure */ + CsrThread = CsrAllocateThread(CsrProcess); + if (!CsrThread) + { + /* Failed */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + + /* Save the data we have */ + CsrThread->CreateTime = KernelTimes.CreateTime; + CsrThread->ClientId = *ClientId; + CsrThread->ThreadHandle = hThread; + ProtectHandle(hThread); + CsrThread->Flags = 0; + + /* Insert the Thread into the Process */ + CsrInsertThread(CsrProcess, CsrThread); + + /* Reference the session */ + CsrReferenceNtSession(NtSession); + CsrProcess->NtSession = NtSession; + + /* Setup Process Data */ + CsrProcess->ClientId = *ClientId; + CsrProcess->ProcessHandle = hProcess; + CsrProcess->ShutdownLevel = 0x280; + + /* Set the Priority to Background */ + CsrSetBackgroundPriority(CsrProcess); + + /* Insert the Process */ + CsrInsertProcess(NULL, CurrentProcess, CsrProcess); + + /* Release lock and return */ + CsrReleaseProcessLock(); + return Status; +} + +/*++ * @name CsrUnlockProcess * @implemented NT4 * 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 11:39:07 2012 @@ -56,15 +56,30 @@ CsrShutdownOther = 8 } CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; +typedef enum _CSR_DEBUG_FLAGS +{ + CsrDebugOnlyThisProcess = 1, + CsrDebugProcessChildren = 2 +} CSR_PROCESS_DEBUG_FLAGS, *PCSR_PROCESS_DEBUG_FLAGS; + typedef enum _CSR_PROCESS_FLAGS { CsrProcessTerminating = 0x1, CsrProcessSkipShutdown = 0x2, + CsrProcessNormalPriority = 0x10, + CsrProcessIdlePriority = 0x20, + CsrProcessHighPriority = 0x40, + CsrProcessRealtimePriority = 0x80, CsrProcessCreateNewGroup = 0x100, CsrProcessTerminated = 0x200, CsrProcessLastThreadTerminated = 0x400, CsrProcessIsConsoleApp = 0x800 } CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; + +#define CsrProcessPriorityFlags (CsrProcessNormalPriority | \ + CsrProcessIdlePriority | \ + CsrProcessHighPriority | \ + CsrProcessRealtimePriority) typedef struct _CSRSS_CON_PROCESS_DATA { @@ -251,7 +266,7 @@ /* api/process.c */ CSR_API(CsrConnectProcess); -CSR_API(CsrCreateProcess); +CSR_API(CsrSrvCreateProcess); CSR_API(CsrTerminateProcess); CSR_API(CsrSrvCreateThread); CSR_API(CsrGetShutdownParameters); @@ -319,6 +334,15 @@ NTAPI CsrApiPortInitialize(VOID); +NTSTATUS +NTAPI +CsrCreateProcess(IN HANDLE hProcess, + IN HANDLE hThread, + IN PCLIENT_ID ClientId, + IN PCSR_NT_SESSION NtSession, + IN ULONG Flags, + IN PCLIENT_ID DebugCid); + BOOLEAN NTAPI ProtectHandle(IN HANDLE ObjectHandle); @@ -391,6 +415,10 @@ IN OUT PULONG Reply ); +VOID +NTAPI +CsrReferenceNtSession(IN PCSR_NT_SESSION Session); + LONG NTAPI CsrUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo);

1 0

[ion] 55710: [CSRSRV]: It seems safe to now enable the #if0'ed out functionality of CsrCreateThread, as all thread/processes are tracked properly now.
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 11:34:45 2012 New Revision: 55710 URL: http://svn.reactos.org/svn/reactos?rev=55710&view=rev Log: [CSRSRV]: It seems safe to now enable the #if0'ed out functionality of CsrCreateThread, as all thread/processes are tracked properly now. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c 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 11:34:45 2012 @@ -317,20 +317,17 @@ IN PCLIENT_ID ClientId) { PCSR_THREAD CsrThread; - //PCSR_PROCESS CurrentProcess; - //PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; - //CLIENT_ID CurrentCid; + PCSR_PROCESS CurrentProcess; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + CLIENT_ID CurrentCid; KERNEL_USER_TIMES KernelTimes; -// DPRINT1("CSRSRV: %s called\n", __FUNCTION__); - /* Get the current thread and CID */ - //CurrentCid = CurrentThread->ClientId; -// DPRINT1("CALLER PID/TID: %lx/%lx\n", CurrentCid.UniqueProcess, CurrentCid.UniqueThread); + CurrentCid = CurrentThread->ClientId; /* Acquire the Process Lock */ CsrAcquireProcessLock(); -#if 0 + /* Get the current Process and make sure the Thread is valid with this CID */ CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, &CurrentCid); @@ -342,7 +339,7 @@ CsrReleaseProcessLock(); return STATUS_THREAD_IS_TERMINATING; } -#endif + /* Get the Thread Create Time */ NtQueryInformationThread(hThread, ThreadTimes,

1 0

[sginsberg] 55709: [NTOSKRNL] - Fix KiEnterV86Mode's check for TRAP_DEBUG to #if instead of #ifdef, it is either defined to 1 or 0, like DBG.
by sginsberg＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: sginsberg Date: Sun Feb 19 10:38:38 2012 New Revision: 55709 URL: http://svn.reactos.org/svn/reactos?rev=55709&view=rev Log: [NTOSKRNL] - Fix KiEnterV86Mode's check for TRAP_DEBUG to #if instead of #ifdef, it is either defined to 1 or 0, like DBG. Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c 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 10:38:38 2012 @@ -526,7 +526,9 @@ TrapFrame->HardwareEsp = 0x11FFE; TrapFrame->ExceptionList = EXCEPTION_CHAIN_END; TrapFrame->Dr7 = 0; -#ifdef TRAP_DEBUG + + /* Set some debug fields if trap debugging is enabled */ +#if TRAP_DEBUG TrapFrame->DbgArgMark = 0xBADB0D00; TrapFrame->PreviousPreviousMode = -1; #endif

1 0

[ion] 55708: [CSRSRV]: Let's see if touching the CSR header file kills CSRSRV again. Re-enable the #if'0ed code that merely added a few fields to the create process structure. I think we no longer ...
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 10:19:16 2012 New Revision: 55708 URL: http://svn.reactos.org/svn/reactos?rev=55708&view=rev Log: [CSRSRV]: Let's see if touching the CSR header file kills CSRSRV again. Re-enable the #if'0ed code that merely added a few fields to the create process structure. I think we no longer have weird fucked up dependencies on exact structure byte sizes. I hope. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Feb 19 10:19:16 2012 @@ -51,7 +51,6 @@ typedef struct { -#if 0 // // NT-type structure (BASE_CREATEPROCESS_MSG) // @@ -66,7 +65,7 @@ PVOID PebAddressNative; ULONG PebAddressWow64; USHORT ProcessorArchitecture; -#endif + // // ReactOS Data //

1 0

[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 19 Feb '12

19 Feb '12

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);

1 0

[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 19 Feb '12

19 Feb '12

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; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs