Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24576: - Fix kernel symbol loading.
by ion＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: ion Date: Fri Oct 20 09:41:01 2006 New Revision: 24576 URL: http://svn.reactos.org/svn/reactos?rev=24576&view=rev Log: - Fix kernel symbol loading. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Fri Oct 20 09:41:01 2006 @@ -595,13 +595,13 @@ BOOLEAN IsRaw; PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; + PUNICODE_STRING ModuleName = FileName; UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); UNICODE_STRING NtosName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); - DPRINT("KdbSymProcessBootSymbols(%wZ)\n", FileName); if (RtlEqualUnicodeString(FileName, &NtosSymName, TRUE)) { - FileName = &NtosName; + ModuleName = &NtosName; IsRaw = TRUE; } else @@ -609,7 +609,7 @@ IsRaw = FALSE; } - ModuleObject = LdrGetModuleObject(FileName); + ModuleObject = LdrGetModuleObject(ModuleName); if (ModuleObject != NULL) { @@ -647,6 +647,7 @@ if (IsRaw) { + DPRINT1("Data: %p %p %wZ\n", LdrEntry->DllBase, LdrEntry->SizeOfImage, &LdrEntry->FullDllName); if (! RosSymCreateFromRaw(LdrEntry->DllBase, LdrEntry->SizeOfImage, (PROSSYM_INFO*)&ModuleObject->PatchInformation))

1 0

[ion] 24575: - Define DBGKM_APINUMBER - Implement DbgkpSendApiMessageLpc, DbgkpSendApiMessage, DbgkCopyProcessDebugPort, DbgkForwardException, DbgkFreeDebugEvent, DbgpWakeTarget. - Close original handle in DbgkOpenHandles.
by ion＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: ion Date: Fri Oct 20 09:16:04 2006 New Revision: 24575 URL: http://svn.reactos.org/svn/reactos?rev=24575&view=rev Log: - Define DBGKM_APINUMBER - Implement DbgkpSendApiMessageLpc, DbgkpSendApiMessage, DbgkCopyProcessDebugPort, DbgkForwardException, DbgkFreeDebugEvent, DbgpWakeTarget. - Close original handle in DbgkOpenHandles. Modified: trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h (original) +++ trunk/reactos/include/ndk/dbgktypes.h Fri Oct 20 09:16:04 2006 @@ -41,6 +41,22 @@ DebugObjectUnusedInformation, DebugObjectKillProcessOnExitInformation } DEBUGOBJECTINFOCLASS, *PDEBUGOBJECTINFOCLASS; + +// +// Debug Message API Number +// +typedef enum _DBGKM_APINUMBER +{ + DbgKmExceptionApi = 0, + DbgKmCreateThreadApi = 1, + DbgKmCreateProcessApi = 2, + DbgKmExitThreadApi = 3, + DbgKmExitProcessApi = 4, + DbgKmLoadDllApi = 5, + DbgKmUnloadDllApi = 6, + DbgKmErrorReportApi = 7, + DbgKmMaxApiNumber = 8, +} DBGKM_APINUMBER; // // Debug Object Information Structures @@ -173,7 +189,7 @@ typedef struct _DBGKM_MSG { PORT_MESSAGE h; - ULONG ApiNumber; + DBGKM_APINUMBER ApiNumber; ULONG ReturnedStatus; union { Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Fri Oct 20 09:16:04 2006 @@ -68,4 +68,18 @@ /* FIXME */ } +VOID +NTAPI +DbgkpSuspendProcess(VOID) +{ + +} + +VOID +NTAPI +DbgkpResumeProcess(VOID) +{ + +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Oct 20 09:16:04 2006 @@ -26,12 +26,127 @@ /* PRIVATE FUNCTIONS *********************************************************/ +NTSTATUS +NTAPI +DbgkpQueueMessage(IN PEPROCESS Process, + IN PETHREAD Thread, + IN PDBGKM_MSG Message, + IN ULONG Flags, + IN PDEBUG_OBJECT TargetObject OPTIONAL) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkpSendApiMessageLpc(IN OUT PDBGKM_MSG Message, + IN PVOID Port, + IN BOOLEAN SuspendProcess) +{ + NTSTATUS Status; + UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; + PAGED_CODE(); + + /* Suspend process if required */ + if (SuspendProcess) DbgkpSuspendProcess(); + + /* Set return status */ + Message->ReturnedStatus = STATUS_PENDING; + + /* Set create process reported state */ + PsGetCurrentProcess()->CreateReported = TRUE; + + /* Send the LPC command */ +#if 0 + Status = LpcRequestWaitReplyPort(Port, + (PPORT_MESSAGE)Message, + (PPORT_MESSAGE)&Buffer[0]); +#else + Status = STATUS_UNSUCCESSFUL; +#endif + + /* Flush the instruction cache */ + ZwFlushInstructionCache(NtCurrentProcess(), NULL, 0); + + /* Copy the buffer back */ + if (NT_SUCCESS(Status)) RtlMoveMemory(Message, Buffer, sizeof(DBGKM_MSG)); + + /* Resume the process if it was suspended */ + if (SuspendProcess) DbgkpResumeProcess(); + return Status; +} + +NTSTATUS +NTAPI +DbgkpSendApiMessage(IN OUT PDBGKM_MSG ApiMsg, + IN ULONG Flags) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Suspend process if required */ + if (Flags) DbgkpSuspendProcess(); + + /* Set return status */ + ApiMsg->ReturnedStatus = STATUS_PENDING; + + /* Set create process reported state */ + PsGetCurrentProcess()->CreateReported = TRUE; + + /* Send the LPC command */ + Status = DbgkpQueueMessage(PsGetCurrentProcess(), + PsGetCurrentThread(), + ApiMsg, + 0, + NULL); + + /* Flush the instruction cache */ + ZwFlushInstructionCache(NtCurrentProcess(), NULL, 0); + + /* Resume the process if it was suspended */ + if (Flags) DbgkpResumeProcess(); + return Status; +} + VOID NTAPI DbgkCopyProcessDebugPort(IN PEPROCESS Process, IN PEPROCESS Parent) { - /* FIXME: Implement */ + PDEBUG_OBJECT DebugObject; + PAGED_CODE(); + + /* Clear this process's port */ + Process->DebugPort = NULL; + + /* Check if the parent has one */ + if (!Parent->DebugPort) return; + + /* It does, acquire the mutex */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Make sure it still has one, and that we should inherit */ + DebugObject = Parent->DebugPort; + if ((DebugObject) && !(Process->NoDebugInherit)) + { + /* Acquire the debug object's lock */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Make sure the debugger is active */ + if (!DebugObject->DebuggerInactive) + { + /* Reference the object and set it */ + ObReferenceObject(DebugObject); + Process->DebugPort = DebugObject; + } + + /* Release the debug object */ + ExReleaseFastMutex(&DebugObject->Mutex); + } + + /* Release the port mutex */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); } BOOLEAN @@ -40,16 +155,131 @@ IN BOOLEAN DebugPort, IN BOOLEAN SecondChance) { - /* FIXME: Implement */ - return FALSE; + DBGKM_MSG ApiMessage; + PDBGKM_EXCEPTION DbgKmException = &ApiMessage.Exception; + NTSTATUS Status; + PEPROCESS Process = PsGetCurrentProcess(); + PVOID Port; + BOOLEAN UseLpc = FALSE; + PAGED_CODE(); + + /* Setup the API Message */ + ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | + (8 + sizeof(DBGKM_EXCEPTION)); + ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.ApiNumber = DbgKmExceptionApi; + + /* Check if this is to be sent on the debug port */ + if (DebugPort) + { + /* Use the debug port, onless the thread is being hidden */ + Port = PsGetCurrentThread()->HideFromDebugger ? + NULL : Process->DebugPort; + } + else + { + /* Otherwise, use the exception port */ + Port = Process->ExceptionPort; + ApiMessage.h.u2.ZeroInit = LPC_EXCEPTION; + UseLpc = TRUE; + } + + /* Break out if there's no port */ + if (!Port) return FALSE; + + /* Fill out the exception information */ + DbgKmException->ExceptionRecord = *ExceptionRecord; + DbgKmException->FirstChance = !SecondChance; + + /* Check if we should use LPC */ + if (UseLpc) + { + /* Send the message on the LPC Port */ + Status = DbgkpSendApiMessageLpc(&ApiMessage, Port, DebugPort); + } + else + { + /* Use native debug object */ + Status = DbgkpSendApiMessage(&ApiMessage, DebugPort); + } + + /* Check if we failed, and for a debug port, also check the return status */ + if (!(NT_SUCCESS(Status)) || + ((DebugPort) && + (!(NT_SUCCESS(ApiMessage.ReturnedStatus)) || + (ApiMessage.ReturnedStatus == DBG_EXCEPTION_NOT_HANDLED)))) + { + /* Fail */ + return FALSE; + } + + /* Otherwise, we're ok */ + return TRUE; } VOID NTAPI +DbgkpFreeDebugEvent(IN PDEBUG_EVENT DebugEvent) +{ + PHANDLE Handle = NULL; + PAGED_CODE(); + + /* Check if this event had a file handle */ + switch (DebugEvent->ApiMsg.ApiNumber) + { + /* Create process has a handle */ + case DbgKmCreateProcessApi: + + /* Get the pointer */ + Handle = &DebugEvent->ApiMsg.CreateProcess.FileHandle; + + /* As does DLL load */ + case DbgKmLoadDllApi: + + /* Get the pointer */ + Handle = &DebugEvent->ApiMsg.LoadDll.FileHandle; + + default: + break; + } + + /* Close the handle if it exsts */ + if ((Handle) && (*Handle)) ObCloseHandle(*Handle, KernelMode); + + /* Dereference process and thread and free the event */ + ObDereferenceObject(DebugEvent->Process); + ObDereferenceObject(DebugEvent->Thread); + ExFreePool(DebugEvent); +} + +VOID +NTAPI DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent) { - /* FIXME: TODO */ - return; + PETHREAD Thread = DebugEvent->Thread; + PAGED_CODE(); + + /* Check if we have to wake the thread */ + if (DebugEvent->Flags & 20) PsResumeThread(Thread, NULL); + + /* Check if we had locked the thread */ + if (DebugEvent->Flags & 8) + { + /* Unlock it */ + ExReleaseRundownProtection(&Thread->RundownProtect); + } + + /* Check if we have to wake up the event */ + if (DebugEvent->Flags & 2) + { + /* Signal the continue event */ + KeSetEvent(&DebugEvent->ContinueEvent, IO_NO_INCREMENT, FALSE); + } + else + { + /* Otherwise, free the debug event */ + DbgkpFreeDebugEvent(DebugEvent); + } } NTSTATUS @@ -87,6 +317,14 @@ NTAPI DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +VOID +NTAPI +DbgkpMarkProcessPeb(IN PEPROCESS Process) { /* FIXME: TODO */ return; @@ -187,6 +425,10 @@ 0, DUPLICATE_SAME_ACCESS, KernelMode); + if (NT_SUCCESS(Status)) *DupHandle = NULL; + + /* Close the original handle */ + ObCloseHandle(Handle, KernelMode); } } @@ -199,14 +441,6 @@ /* Sanity check */ ASSERT(IsListEmpty(&DebugObject->EventList)); -} - -VOID -NTAPI -DbgkpMarkProcessPeb(IN PEPROCESS Process) -{ - /* FIXME: TODO */ - return; } VOID Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Fri Oct 20 09:16:04 2006 @@ -17,6 +17,18 @@ NTAPI DbgkExitThread( IN NTSTATUS ExitStatus +); + +VOID +NTAPI +DbgkpSuspendProcess( + VOID +); + +VOID +NTAPI +DbgkpResumeProcess( + VOID ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri Oct 20 09:16:04 2006 @@ -330,6 +330,16 @@ NTAPI PspDeleteJob( IN PVOID ObjectBody +); + +// +// State routines +// +NTSTATUS +NTAPI +PsResumeThread( + IN PETHREAD Thread, + OUT PULONG PreviousCount OPTIONAL ); //

1 0

[ion] 24574: - Fixup DEBUG_OBJECT definition. - Implement DbgkpCloseObject. - Implement DbgkpOpenHandles. - Fix various bugs in the code and flag usage. - Enable calling DbgkClearProcessDebugObject when terminating a process.
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Fri Oct 20 00:08:52 2006 New Revision: 24574 URL: http://svn.reactos.org/svn/reactos?rev=24574&view=rev Log: - Fixup DEBUG_OBJECT definition. - Implement DbgkpCloseObject. - Implement DbgkpOpenHandles. - Fix various bugs in the code and flag usage. - Enable calling DbgkClearProcessDebugObject when terminating a process. Modified: trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h (original) +++ trunk/reactos/include/ndk/dbgktypes.h Fri Oct 20 00:08:52 2006 @@ -55,11 +55,11 @@ // // Debug Object // -typedef struct _DBGK_DEBUG_OBJECT -{ - KEVENT Event; +typedef struct _DEBUG_OBJECT +{ + KEVENT EventsPresent; FAST_MUTEX Mutex; - LIST_ENTRY StateEventListEntry; + LIST_ENTRY EventList; union { ULONG Flags; @@ -69,7 +69,7 @@ UCHAR KillProcessOnExit:1; }; }; -} DBGK_DEBUG_OBJECT, *PDBGK_DEBUG_OBJECT; +} DEBUG_OBJECT, *PDEBUG_OBJECT; #endif Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Oct 20 00:08:52 2006 @@ -14,7 +14,7 @@ #include <internal/debug.h> POBJECT_TYPE DbgkDebugObjectType; -KGUARDED_MUTEX DbgkpProcessDebugPortMutex; +FAST_MUTEX DbgkpProcessDebugPortMutex; GENERIC_MAPPING DbgkDebugObjectMapping = { @@ -28,25 +28,272 @@ VOID NTAPI +DbgkCopyProcessDebugPort(IN PEPROCESS Process, + IN PEPROCESS Parent) +{ + /* FIXME: Implement */ +} + +BOOLEAN +NTAPI +DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord, + IN BOOLEAN DebugPort, + IN BOOLEAN SecondChance) +{ + /* FIXME: Implement */ + return FALSE; +} + +VOID +NTAPI +DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +NTSTATUS +NTAPI +DbgkpPostFakeProcessCreateMessages(IN PEPROCESS Process, + IN PDEBUG_OBJECT DebugObject, + IN PETHREAD *LastThread) +{ + /* FIXME: Implement */ + *LastThread = NULL; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkpSetProcessDebugObject(IN PEPROCESS Process, + IN PDEBUG_OBJECT DebugObject, + IN NTSTATUS MsgStatus, + IN PETHREAD LastThread) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkClearProcessDebugObject(IN PEPROCESS Process, + IN PDEBUG_OBJECT SourceDebugObject) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +VOID +NTAPI +DbgkpOpenHandles(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PEPROCESS Process, + IN PETHREAD Thread) +{ + NTSTATUS Status; + HANDLE Handle; + PHANDLE DupHandle; + PAGED_CODE(); + + /* Check which state this is */ + switch (WaitStateChange->NewState) + { + /* New thread */ + case DbgCreateThreadStateChange: + + /* Get handle to thread */ + Status = ObOpenObjectByPointer(Thread, + 0, + NULL, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode, + &Handle); + if (NT_SUCCESS(Status)) + { + /* Save the thread handle */ + WaitStateChange-> + StateInfo.CreateThread.HandleToThread = Handle; + } + return; + + /* New process */ + case DbgCreateProcessStateChange: + + /* Get handle to thread */ + Status = ObOpenObjectByPointer(Thread, + 0, + NULL, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode, + &Handle); + if (NT_SUCCESS(Status)) + { + /* Save the thread handle */ + WaitStateChange-> + StateInfo.CreateProcessInfo.HandleToThread = Handle; + } + + /* Get handle to process */ + Status = ObOpenObjectByPointer(Process, + 0, + NULL, + PROCESS_ALL_ACCESS, + PsProcessType, + KernelMode, + &Handle); + if (NT_SUCCESS(Status)) + { + /* Save the process handle */ + WaitStateChange-> + StateInfo.CreateProcessInfo.HandleToProcess = Handle; + } + + /* Fall through to duplicate file handle */ + DupHandle = &WaitStateChange-> + StateInfo.CreateProcessInfo.NewProcess.FileHandle; + break; + + /* DLL Load */ + case DbgLoadDllStateChange: + + /* Fall through to duplicate file handle */ + DupHandle = &WaitStateChange->StateInfo.LoadDll.FileHandle; + + /* Anything else has no handles */ + default: + return; + } + + /* If we got here, then we have to duplicate a handle, possibly */ + Handle = *DupHandle; + if (Handle) + { + /* Duplicate it */ + Status = ObDuplicateObject(PsGetCurrentProcess(), + Handle, + PsGetCurrentProcess(), + DupHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS, + KernelMode); + } +} + +VOID +NTAPI DbgkpDeleteObject(IN PVOID Object) { - PDBGK_DEBUG_OBJECT DebugObject = Object; + PDEBUG_OBJECT DebugObject = Object; PAGED_CODE(); /* Sanity check */ - ASSERT(IsListEmpty(&DebugObject->StateEventListEntry)); + ASSERT(IsListEmpty(&DebugObject->EventList)); } VOID NTAPI -DbgkpCloseObject(IN PEPROCESS Process OPTIONAL, +DbgkpMarkProcessPeb(IN PEPROCESS Process) +{ + /* FIXME: TODO */ + return; +} + +VOID +NTAPI +DbgkpCloseObject(IN PEPROCESS OwnerProcess OPTIONAL, IN PVOID ObjectBody, IN ACCESS_MASK GrantedAccess, IN ULONG HandleCount, IN ULONG SystemHandleCount) { - /* FIXME: Implement */ - ASSERT(FALSE); + PDEBUG_OBJECT DebugObject = ObjectBody; + PEPROCESS Process = NULL; + BOOLEAN DebugPortCleared = FALSE; + PLIST_ENTRY DebugEventList; + PDEBUG_EVENT DebugEvent; + + /* If this isn't the last handle, do nothing */ + if (HandleCount > 1) return; + + /* Otherwise, lock the debug object */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Set it as inactive */ + DebugObject->DebuggerInactive = TRUE; + + /* Remove it from the debug event list */ + DebugEventList = DebugObject->EventList.Flink; + InitializeListHead(&DebugObject->EventList); + + /* Release the lock */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Signal the wait event */ + KeSetEvent(&DebugObject->EventsPresent, IO_NO_INCREMENT, FALSE); + + /* Start looping each process */ + while ((Process = PsGetNextProcess(Process))) + { + /* Check if the process has us as their debug port */ + if (Process->DebugPort == DebugObject) + { + /* Acquire the process debug port lock */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Check if it's still us */ + if (Process->DebugPort == DebugObject) + { + /* Clear it and remember */ + Process->DebugPort = NULL; + DebugPortCleared = TRUE; + } + + /* Release the port lock */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + + /* Check if we cleared the debug port */ + if (DebugPortCleared) + { + /* Mark this in the PEB */ + DbgkpMarkProcessPeb(OwnerProcess); + + /* Check if we terminate on exit */ + if (DebugObject->KillProcessOnExit) + { + /* Terminate the process */ + PsTerminateProcess(OwnerProcess, STATUS_DEBUGGER_INACTIVE); + } + + /* Dereference the debug object */ + ObDereferenceObject(DebugObject); + } + } + } + + /* Loop debug events */ + while (DebugEventList != &DebugObject->EventList) + { + /* Get the debug event */ + DebugEvent = CONTAINING_RECORD(DebugEventList, DEBUG_EVENT, EventList); + + /* Go to the next entry */ + DebugEventList = DebugEventList->Flink; + + /* Wake it up */ + DebugEvent->Status = STATUS_DEBUGGER_INACTIVE; + DbgkpWakeTarget(DebugEvent); + } } VOID @@ -59,13 +306,13 @@ PAGED_CODE(); /* Initialize the process debug port mutex */ - KeInitializeGuardedMutex(&DbgkpProcessDebugPortMutex); - - /* Create the Event Pair Object Type */ + ExInitializeFastMutex(&DbgkpProcessDebugPortMutex); + + /* Create the Debug Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"DebugObject"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DBGK_DEBUG_OBJECT); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEBUG_OBJECT); ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_WAIT_STATE_CHANGE; @@ -78,83 +325,6 @@ &DbgkDebugObjectType); } -VOID -NTAPI -DbgkCopyProcessDebugPort(IN PEPROCESS Process, - IN PEPROCESS Parent) -{ - /* FIXME: Implement */ -} - -BOOLEAN -NTAPI -DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord, - IN BOOLEAN DebugPort, - IN BOOLEAN SecondChance) -{ - /* FIXME: Implement */ - return FALSE; -} - -VOID -NTAPI -DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent) -{ - /* FIXME: TODO */ - return; -} - -NTSTATUS -NTAPI -DbgkpPostFakeProcessCreateMessages(IN PEPROCESS Process, - IN PDBGK_DEBUG_OBJECT DebugObject, - IN PETHREAD *LastThread) -{ - /* FIXME: Implement */ - *LastThread = NULL; - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -DbgkpSetProcessDebugObject(IN PEPROCESS Process, - IN PDBGK_DEBUG_OBJECT DebugObject, - IN NTSTATUS MsgStatus, - IN PETHREAD LastThread) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -DbgkClearProcessDebugObject(IN PEPROCESS Process, - IN PDBGK_DEBUG_OBJECT SourceDebugObject) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; -} - -VOID -NTAPI -DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, - IN PDEBUG_EVENT DebugEvent) -{ - /* FIXME: TODO */ - return; -} - -VOID -NTAPI -DbgkpOpenHandles(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, - IN PEPROCESS Process, - IN PETHREAD Thread) -{ - /* FIXME: TODO */ - return; -} - - /* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS @@ -165,7 +335,7 @@ IN BOOLEAN KillProcessOnExit) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; HANDLE hDebug; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -193,7 +363,7 @@ ObjectAttributes, PreviousMode, NULL, - sizeof(PDBGK_DEBUG_OBJECT), + sizeof(PDEBUG_OBJECT), 0, 0, (PVOID*)&DebugObject); @@ -203,10 +373,10 @@ ExInitializeFastMutex(&DebugObject->Mutex); /* Initialize the State Event List */ - InitializeListHead(&DebugObject->StateEventListEntry); + InitializeListHead(&DebugObject->EventList); /* Initialize the Debug Object's Wait Event */ - KeInitializeEvent(&DebugObject->Event, NotificationEvent, 0); + KeInitializeEvent(&DebugObject->EventsPresent, NotificationEvent, 0); /* Set the Flags */ DebugObject->KillProcessOnExit = KillProcessOnExit; @@ -245,7 +415,7 @@ IN NTSTATUS ContinueStatus) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; NTSTATUS Status = STATUS_SUCCESS; PDEBUG_EVENT DebugEvent = NULL, DebugEventToWake = NULL; PLIST_ENTRY ListHead, NextEntry; @@ -296,7 +466,7 @@ ExAcquireFastMutex(&DebugObject->Mutex); /* Loop the state list */ - ListHead = &DebugObject->StateEventListEntry; + ListHead = &DebugObject->EventList; NextEntry = ListHead->Flink; while (ListHead != NextEntry) { @@ -371,7 +541,7 @@ IN HANDLE DebugHandle) { PEPROCESS Process; - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD LastThread; NTSTATUS Status; @@ -435,7 +605,7 @@ IN HANDLE DebugHandle) { PEPROCESS Process; - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; @@ -487,7 +657,7 @@ IN ULONG DebugInformationLength, OUT PULONG ReturnLength OPTIONAL) { - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION DebugInfo = DebugInformation; @@ -522,12 +692,12 @@ if (DebugInfo->KillProcessOnExit) { /* Enable killing the process */ - DebugObject->Flags |= 2; + DebugObject->KillProcessOnExit = TRUE; } else { /* Disable */ - DebugObject->Flags &= ~2; + DebugObject->KillProcessOnExit = FALSE; } /* Release the mutex */ @@ -555,7 +725,7 @@ PETHREAD Thread; BOOLEAN GotEvent; LARGE_INTEGER NewTime; - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; DBGUI_WAIT_STATE_CHANGE WaitStateChange; NTSTATUS Status = STATUS_SUCCESS; PDEBUG_EVENT DebugEvent, DebugEvent2; @@ -628,7 +798,7 @@ ExAcquireFastMutex(&DebugObject->Mutex); /* Check if a debugger is connected */ - if (DebugObject->Flags & 1) + if (DebugObject->DebuggerInactive) { /* Not connected */ Status = STATUS_DEBUGGER_INACTIVE; @@ -636,7 +806,7 @@ else { /* Loop the events */ - ListHead = &DebugObject->StateEventListEntry; + ListHead = &DebugObject->EventList; NextEntry = ListHead->Flink; while (ListHead != NextEntry) { @@ -702,7 +872,7 @@ else { /* Unsignal the event */ - DebugObject->Event.Header.SignalState = 0; + DebugObject->EventsPresent.Header.SignalState = 0; Status = STATUS_SUCCESS; } } Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Fri Oct 20 00:08:52 2006 @@ -3,15 +3,21 @@ VOID NTAPI -DbgkCreateThread(PVOID StartAddress); +DbgkCreateThread( + IN PVOID StartAddress +); VOID NTAPI -DbgkExitProcess(IN NTSTATUS ExitStatus); +DbgkExitProcess( + IN NTSTATUS ExitStatus +); VOID NTAPI -DbgkExitThread(IN NTSTATUS ExitStatus); +DbgkExitThread( + IN NTSTATUS ExitStatus +); VOID NTAPI @@ -28,6 +34,13 @@ IN BOOLEAN SecondChance ); +NTSTATUS +NTAPI +DbgkClearProcessDebugObject( + IN PEPROCESS Process, + IN PDEBUG_OBJECT SourceDebugObject +); + extern POBJECT_TYPE DbgkDebugObjectType; #endif Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Oct 20 00:08:52 2006 @@ -57,15 +57,15 @@ // #define KeEnterCriticalRegion() \ { \ - PKTHREAD Thread = KeGetCurrentThread(); \ + PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ - ASSERT(Thread == KeGetCurrentThread()); \ - ASSERT((Thread->KernelApcDisable <= 0) && \ - (Thread->KernelApcDisable != -32768)); \ + ASSERT(_Thread == KeGetCurrentThread()); \ + ASSERT((_Thread->KernelApcDisable <= 0) && \ + (_Thread->KernelApcDisable != -32768)); \ \ /* Disable Kernel APCs */ \ - Thread->KernelApcDisable--; \ + _Thread->KernelApcDisable--; \ } // @@ -73,21 +73,21 @@ // #define KeLeaveCriticalRegion() \ { \ - PKTHREAD Thread = KeGetCurrentThread(); \ + PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ - ASSERT(Thread == KeGetCurrentThread()); \ - ASSERT(Thread->KernelApcDisable < 0); \ + ASSERT(_Thread == KeGetCurrentThread()); \ + ASSERT(_Thread->KernelApcDisable < 0); \ \ /* Enable Kernel APCs */ \ - Thread->KernelApcDisable++; \ + _Thread->KernelApcDisable++; \ \ /* Check if Kernel APCs are now enabled */ \ - if (!(Thread->KernelApcDisable)) \ + if (!(_Thread->KernelApcDisable)) \ { \ /* Check if we need to request an APC Delivery */ \ - if (!(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) && \ - !(Thread->KernelApcDisable)) \ + if (!(IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode])) && \ + !(_Thread->KernelApcDisable)) \ { \ /* Check for the right environment */ \ KiCheckForKernelApcDelivery(); \ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Fri Oct 20 00:08:52 2006 @@ -238,6 +238,19 @@ IN PEPROCESS Process ); +NTSTATUS +NTAPI +ObDuplicateObject( + IN PEPROCESS SourceProcess, + IN HANDLE SourceHandle, + IN PEPROCESS TargetProcess OPTIONAL, + IN PHANDLE TargetHandle OPTIONAL, + IN ACCESS_MASK DesiredAccess, + IN ULONG HandleAttributes, + IN ULONG Options, + IN KPROCESSOR_MODE PreviousMode +); + // // DOS Devices Functions // Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri Oct 20 00:08:52 2006 @@ -235,6 +235,13 @@ PspExitProcess( IN BOOLEAN LastThread, IN PEPROCESS Process +); + +NTSTATUS +NTAPI +PsTerminateProcess( + IN PEPROCESS Process, + IN NTSTATUS ExitStatus ); VOID Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Fri Oct 20 00:08:52 2006 @@ -116,6 +116,15 @@ /* Return success*/ PSREFTRACE(Process); return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PsTerminateProcess(IN PEPROCESS Process, + IN NTSTATUS ExitStatus) +{ + /* Call the internal API */ + return PspTerminateProcess(Process, ExitStatus); } VOID @@ -1116,7 +1125,8 @@ /* Check for the DBG_TERMINATE_PROCESS exit code */ if (ExitStatus == DBG_TERMINATE_PROCESS) { - /* FIXME: Disable debugging on this process */ + /* Disable debugging on this process */ + DbgkClearProcessDebugObject(Process, NULL); } } /* Make sure that we got a handle */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Fri Oct 20 00:08:52 2006 @@ -362,7 +362,7 @@ HANDLE hProcess; PEPROCESS Process, Parent; PEPORT ExceptionPortObject; - PDBGK_DEBUG_OBJECT DebugObject; + PDEBUG_OBJECT DebugObject; PSECTION_OBJECT SectionObject; NTSTATUS Status, AccessStatus; PHYSICAL_ADDRESS DirectoryTableBase = {{0}};

1 0

[gedmurphy] 24573: - test app to display both the system and device image lists. - this app confirms the overlay icons in the device image list are part of the list.
by gedmurphy＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: gedmurphy Date: Thu Oct 19 20:55:11 2006 New Revision: 24573 URL: http://svn.reactos.org/svn/reactos?rev=24573&view=rev Log: - test app to display both the system and device image lists. - this app confirms the overlay icons in the device image list are part of the list. Added: trunk/rosapps/tests/Imagelistviewer/ trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild trunk/rosapps/tests/Imagelistviewer/main.c trunk/rosapps/tests/Imagelistviewer/res.rc trunk/rosapps/tests/Imagelistviewer/resource.h Modified: trunk/rosapps/tests/directory.rbuild Added: trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/imag… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild (added) +++ trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild Thu Oct 19 20:55:11 2006 @@ -1,0 +1,12 @@ +<module name="imagelistviewer" type="win32gui" installbase="bin" installname="imagelistviewer.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <include base="imagelistviewer">.</include> + <library>kernel32</library> + <library>user32</library> + <library>setupapi</library> + <library>comctl32</library> + <file>main.c</file> + <file>res.rc</file> +</module> Added: trunk/rosapps/tests/Imagelistviewer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/main… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/main.c (added) +++ trunk/rosapps/tests/Imagelistviewer/main.c Thu Oct 19 20:55:11 2006 @@ -1,0 +1,145 @@ +#include <windows.h> +#include <setupapi.h> +#include <tchar.h> +#include "resource.h" + +typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall); +typedef BOOL (WINAPI * FII_PROC)(BOOL fFullInit); + +/*** Shell32 undoc'd functions ***/ + /* Shell_GetImageLists @71 */ + /* FileIconInit @660 */ + +BOOL +DisplayImageList(HWND hwnd, + UINT uID) +{ + HWND hLV; + SP_CLASSIMAGELIST_DATA ImageListData; + LV_ITEM lvItem; + TCHAR Buf[6]; + INT ImageListCount = -1; + INT i = 0; + + hLV = GetDlgItem(hwnd, IDC_LSTVIEW); + (void)ListView_DeleteAllItems(hLV); + + if (uID == IDC_SYSTEM) + { + HIMAGELIST hLarge, hSmall; + HMODULE hShell32; + SH_GIL_PROC Shell_GetImageLists; + FII_PROC FileIconInit; + + hShell32 = LoadLibrary(_T("shell32.dll")); + if(hShell32 == NULL) + return FALSE; + + Shell_GetImageLists = (SH_GIL_PROC)GetProcAddress(hShell32, (LPCSTR)71); + FileIconInit = (FII_PROC)GetProcAddress(hShell32, (LPCSTR)660); + + if(Shell_GetImageLists == NULL || FileIconInit == NULL) + { + FreeLibrary(hShell32); + return FALSE; + } + + FileIconInit(TRUE); + + Shell_GetImageLists(&hLarge, &hSmall); + + ImageListCount = ImageList_GetImageCount(hSmall); + + (void)ListView_SetImageList(hLV, + hSmall, + LVSIL_SMALL); + + FreeLibrary(hShell32); + } + else if (uID == IDC_DEVICE) + { + ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); + SetupDiGetClassImageList(&ImageListData); + + ImageListCount = ImageList_GetImageCount(ImageListData.ImageList); + + (void)ListView_SetImageList(hLV, + ImageListData.ImageList, + LVSIL_SMALL); + } + else + return FALSE; + + lvItem.mask = LVIF_TEXT | LVIF_IMAGE; + + while (i <= ImageListCount) + { + lvItem.iItem = i; + lvItem.iSubItem = 0; + lvItem.pszText = _itot(i, Buf, 10); + lvItem.iImage = i; + + (void)ListView_InsertItem(hLV, &lvItem); + + i++; + } + + return TRUE; +} + + +BOOL CALLBACK +DlgProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwnd, 0); + return TRUE; + + case IDC_SYSTEM: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case IDC_DEVICE: + DisplayImageList(hwnd, IDC_DEVICE); + return TRUE; + } + } + } + + return FALSE; +} + +int WINAPI +WinMain(HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpszArgument, + int nCmdShow) +{ + INITCOMMONCONTROLSEX icex; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + InitCommonControlsEx(&icex); + + return DialogBox(hThisInstance, + MAKEINTRESOURCE(IDD_IMGLST), + NULL, + (DLGPROC)DlgProc); +} Added: trunk/rosapps/tests/Imagelistviewer/res.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/res.… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/res.rc (added) +++ trunk/rosapps/tests/Imagelistviewer/res.rc Thu Oct 19 20:55:11 2006 @@ -1,0 +1,14 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +IDD_IMGLST DIALOGEX 6,6,303,216 +CAPTION "Imagelist Viewer" +FONT 8, "MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU +BEGIN + CONTROL "", IDC_LSTVIEW, "SysListView32", WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_LIST | LVS_SMALLICON | LVS_SHAREIMAGELISTS, 0, 0, 302, 200 + DEFPUSHBUTTON "System IL", IDC_SYSTEM, 2, 202, 54, 13 + PUSHBUTTON "Device IL", IDC_DEVICE, 60, 202, 54, 13 + PUSHBUTTON "Close", IDOK, 248, 202, 54, 13 +END Added: trunk/rosapps/tests/Imagelistviewer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/reso… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/resource.h (added) +++ trunk/rosapps/tests/Imagelistviewer/resource.h Thu Oct 19 20:55:11 2006 @@ -1,0 +1,4 @@ +#define IDD_IMGLST 1000 +#define IDC_LSTVIEW 1001 +#define IDC_SYSTEM 1002 +#define IDC_DEVICE 1003 Modified: trunk/rosapps/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/tests/directory.rbuild (original) +++ trunk/rosapps/tests/directory.rbuild Thu Oct 19 20:55:11 2006 @@ -112,6 +112,9 @@ <directory name="icontest"> <xi:include href="icontest/icontest.rbuild" /> </directory> +<directory name="imagelistviewer"> + <xi:include href="imagelistviewer/imagelistviewer.rbuild" /> +</directory>

1 0

[ion] 24572: - Implement the entire kernel-mode native interface of Debug Objects, minus a few missing operations in NtWaitForDebugEvent: - NtCreateDebugObject, NtDebugContinue, NtDebugActiveProcess, NtRemoveProcessDebug, NtSetInformationDebugObject, NtWaitForDebugEvent. - Of course, the entire backend is stubbed out. - Implement Debug object initialization (not called yet) and close(not done) and delete (done) callbacks.
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 11:04:21 2006 New Revision: 24572 URL: http://svn.reactos.org/svn/reactos?rev=24572&view=rev Log: - Implement the entire kernel-mode native interface of Debug Objects, minus a few missing operations in NtWaitForDebugEvent: - NtCreateDebugObject, NtDebugContinue, NtDebugActiveProcess, NtRemoveProcessDebug, NtSetInformationDebugObject, NtWaitForDebugEvent. - Of course, the entire backend is stubbed out. - Implement Debug object initialization (not called yet) and close(not done) and delete (done) callbacks. Modified: trunk/reactos/include/ddk/ntstatus.h trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/include/ddk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstatus.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntstatus.h (original) +++ trunk/reactos/include/ddk/ntstatus.h Thu Oct 19 11:04:21 2006 @@ -1099,6 +1099,25 @@ #define STATUS_CLUSTER_NETWORK_NOT_INTERNAL ((NTSTATUS)0xC0130016L) #define STATUS_CLUSTER_POISONED ((NTSTATUS)0xC0130017L) +/* +* Debug codes +*/ + +#define DBG_EXCEPTION_HANDLED ((NTSTATUS)0x00010001) +#define DBG_CONTINUE ((NTSTATUS)0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS)0x40010001) +#define DBG_UNABLE_TO_PROVIDE_HANDLE ((NTSTATUS)0x40010002) +#define DBG_TERMINATE_THREAD ((NTSTATUS)0x40010003) +#define DBG_TERMINATE_PROCESS ((NTSTATUS)0x40010004) +#define DBG_CONTROL_C ((NTSTATUS)0x40010005) +#define DBG_PRINTEXCEPTION_C ((NTSTATUS)0x40010006) +#define DBG_RIPEXCEPTION ((NTSTATUS)0x40010007) +#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008) +#define DBG_COMMAND_EXCEPTION ((NTSTATUS)0x40010009) +#define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS)0x80010001) +#define DBG_NO_STATE_CHANGE ((NTSTATUS)0xC0010001) +#define DBG_APP_NOT_IDLE ((NTSTATUS)0xC0010002) + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h (original) +++ trunk/reactos/include/ndk/dbgktypes.h Thu Oct 19 11:04:21 2006 @@ -30,6 +30,7 @@ // #define DEBUG_OBJECT_WAIT_STATE_CHANGE 0x0001 #define DEBUG_OBJECT_ADD_REMOVE_PROCESS 0x0002 +#define DEBUG_OBJECT_SET_INFORMATION 0x0004 #define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) // @@ -172,8 +173,8 @@ typedef struct _DBGKM_MSG { PORT_MESSAGE h; - ULONG Opcode; - ULONG Status; + ULONG ApiNumber; + ULONG ReturnedStatus; union { DBGKM_EXCEPTION Exception; @@ -186,4 +187,25 @@ }; } DBGKM_MSG, *PDBGKM_MSG; +#ifndef NTOS_MODE_USER + +// +// Debug Event +// +typedef struct _DEBUG_EVENT +{ + LIST_ENTRY EventList; + KEVENT ContinueEvent; + CLIENT_ID ClientId; + PEPROCESS Process; + PETHREAD Thread; + NTSTATUS Status; + ULONG Flags; + PETHREAD BackoutThread; + DBGKM_MSG ApiMsg; +} DEBUG_EVENT, *PDEBUG_EVENT; + + #endif + +#endif Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Oct 19 11:04:21 2006 @@ -7,15 +7,76 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> POBJECT_TYPE DbgkDebugObjectType; - -/* FUNCTIONS *****************************************************************/ +KGUARDED_MUTEX DbgkpProcessDebugPortMutex; + +GENERIC_MAPPING DbgkDebugObjectMapping = +{ + STANDARD_RIGHTS_READ | DEBUG_OBJECT_WAIT_STATE_CHANGE, + STANDARD_RIGHTS_WRITE | DEBUG_OBJECT_ADD_REMOVE_PROCESS, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + DEBUG_OBJECT_ALL_ACCESS +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +DbgkpDeleteObject(IN PVOID Object) +{ + PDBGK_DEBUG_OBJECT DebugObject = Object; + PAGED_CODE(); + + /* Sanity check */ + ASSERT(IsListEmpty(&DebugObject->StateEventListEntry)); +} + +VOID +NTAPI +DbgkpCloseObject(IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount, + IN ULONG SystemHandleCount) +{ + /* FIXME: Implement */ + ASSERT(FALSE); +} + +VOID +INIT_FUNCTION +NTAPI +DbgkInitialize(VOID) +{ + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + PAGED_CODE(); + + /* Initialize the process debug port mutex */ + KeInitializeGuardedMutex(&DbgkpProcessDebugPortMutex); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"DebugObject"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DBGK_DEBUG_OBJECT); + ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_WAIT_STATE_CHANGE; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; + ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &DbgkDebugObjectType); +} VOID NTAPI @@ -35,6 +96,66 @@ return FALSE; } +VOID +NTAPI +DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +NTSTATUS +NTAPI +DbgkpPostFakeProcessCreateMessages(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT DebugObject, + IN PETHREAD *LastThread) +{ + /* FIXME: Implement */ + *LastThread = NULL; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkpSetProcessDebugObject(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT DebugObject, + IN NTSTATUS MsgStatus, + IN PETHREAD LastThread) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkClearProcessDebugObject(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT SourceDebugObject) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +VOID +NTAPI +DbgkpOpenHandles(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* FIXME: TODO */ + return; +} + + +/* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS NTAPI @@ -47,25 +168,23 @@ PDBGK_DEBUG_OBJECT DebugObject; HANDLE hDebug; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - DPRINT("NtCreateDebugObject(0x%p, 0x%x, 0x%p)\n", DebugHandle, DesiredAccess, ObjectAttributes); - - /* Check Output Safety */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWrite(DebugHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } _SEH_HANDLE { - + + /* Check if we were called from user mode*/ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the handle */ + ProbeForWrite(DebugHandle, sizeof(HANDLE), sizeof(ULONG)); + } + _SEH_HANDLE + { + /* Get exception error */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; } /* Create the Object */ @@ -78,10 +197,8 @@ 0, 0, (PVOID*)&DebugObject); - - /* Check for Success */ - if(NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Initialize the Debug Object's Fast Mutex */ ExInitializeFastMutex(&DebugObject->Mutex); @@ -104,16 +221,15 @@ ObDereferenceObject(DebugObject); /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { *DebugHandle = hDebug; - - } _SEH_HANDLE { - + } + _SEH_HANDLE + { Status = _SEH_GetExceptionCode(); - } _SEH_END; } } @@ -124,61 +240,507 @@ NTSTATUS NTAPI -NtWaitForDebugEvent(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL, - OUT PDBGUI_WAIT_STATE_CHANGE StateChange) -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtDebugContinue(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. +NtDebugContinue(IN HANDLE DebugHandle, IN PCLIENT_ID AppClientId, IN NTSTATUS ContinueStatus) { - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtDebugActiveProcess(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. - IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtRemoveProcessDebug(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. - IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSetInformationDebugObject(IN HANDLE DebugObject, // Debug object handle need not grant any particular access right. + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PDBGK_DEBUG_OBJECT DebugObject; + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_EVENT DebugEvent = NULL, DebugEventToWake = NULL; + PLIST_ENTRY ListHead, NextEntry; + BOOLEAN NeedsWake = FALSE; + CLIENT_ID ClientId; + PAGED_CODE(); + + /* Check if we were called from user mode*/ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the handle */ + ProbeForRead(AppClientId, sizeof(CLIENT_ID), sizeof(ULONG)); + ClientId = *AppClientId; + } + _SEH_HANDLE + { + /* Get exception error */ + Status = _SEH_GetExceptionCode(); + } _SEH_END; + if (!NT_SUCCESS(Status)) return Status; + } + + /* Make sure that the status is valid */ + if ((ContinueStatus != DBG_EXCEPTION_NOT_HANDLED) && + (ContinueStatus != DBG_REPLY_LATER) && + (ContinueStatus != DBG_UNABLE_TO_PROVIDE_HANDLE) && + (ContinueStatus != DBG_TERMINATE_THREAD) && + (ContinueStatus != DBG_TERMINATE_PROCESS)) + { + /* Invalid status */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Get the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Acquire the mutex */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Loop the state list */ + ListHead = &DebugObject->StateEventListEntry; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the current debug event */ + DebugEvent = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Compare process ID */ + if (DebugEvent->ClientId.UniqueProcess == + ClientId.UniqueProcess) + { + /* Check if we already found a match */ + if (NeedsWake) + { + /* Wake it up and break out */ + DebugEvent->Flags &= ~4; + KeSetEvent(&DebugEvent->ContinueEvent, + IO_NO_INCREMENT, + FALSE); + break; + } + + /* Compare thread ID and flag */ + if ((DebugEvent->ClientId.UniqueThread == + ClientId.UniqueThread) && (DebugEvent->Flags & 1)) + { + /* Remove the event from the list */ + RemoveEntryList(NextEntry); + + /* Remember who to wake */ + NeedsWake = TRUE; + DebugEventToWake = DebugEvent; + } + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Dereference the object */ + ObDereferenceObject(DebugObject); + + /* Check if need a wait */ + if (NeedsWake) + { + /* Set the continue status */ + DebugEvent->ApiMsg.ReturnedStatus = Status; + DebugEvent->Status = STATUS_SUCCESS; + + /* Wake the target */ + DbgkpWakeTarget(DebugEvent); + } + else + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtDebugActiveProcess(IN HANDLE ProcessHandle, + IN HANDLE DebugHandle) +{ + PEPROCESS Process; + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PETHREAD LastThread; + NTSTATUS Status; + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Don't allow debugging the initial system process */ + if (Process == PsInitialSystemProcess) return STATUS_ACCESS_DENIED; + + /* Reference the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_ADD_REMOVE_PROCESS, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Dereference the process and exit */ + ObDereferenceObject(Process); + return Status; + } + + /* Acquire process rundown protection */ + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Dereference the process and debug object and exit */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Send fake create messages for debuggers to have a consistent state */ + Status = DbgkpPostFakeProcessCreateMessages(Process, + DebugObject, + &LastThread); + Status = DbgkpSetProcessDebugObject(Process, + DebugObject, + Status, + LastThread); + + /* Release rundown protection */ + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Dereference the process and debug object and return status */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return Status; +} + +NTSTATUS +NTAPI +NtRemoveProcessDebug(IN HANDLE ProcessHandle, + IN HANDLE DebugHandle) +{ + PEPROCESS Process; + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + NTSTATUS Status; + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Reference the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_ADD_REMOVE_PROCESS, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Dereference the process and exit */ + ObDereferenceObject(Process); + return Status; + } + + /* Remove the debug object */ + Status = DbgkClearProcessDebugObject(Process, DebugObject); + + /* Dereference the process and debug object and return status */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return Status; +} + +static const INFORMATION_CLASS_INFO DbgkpDebugObjectInfoClass[] = +{ + /* DebugObjectUnusedInformation */ + ICI_SQ_SAME(sizeof(ULONG), sizeof(ULONG), 0), + /* DebugObjectKillProcessOnExitInformation */ + ICI_SQ_SAME(sizeof(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION), sizeof(ULONG), ICIF_SET), +}; + +NTSTATUS +NTAPI +NtSetInformationDebugObject(IN HANDLE DebugHandle, IN DEBUGOBJECTINFOCLASS DebugObjectInformationClass, IN PVOID DebugInformation, IN ULONG DebugInformationLength, OUT PULONG ReturnLength OPTIONAL) { - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION DebugInfo = DebugInformation; + PAGED_CODE(); + + /* Check buffers and parameters */ + Status = DefaultSetInfoBufferCheck(DebugObjectInformationClass, + DbgkpDebugObjectInfoClass, + sizeof(DbgkpDebugObjectInfoClass) / + sizeof(DbgkpDebugObjectInfoClass[0]), + DebugInformation, + DebugInformationLength, + PreviousMode); + + /* Return required length to user-mode */ + if (ReturnLength) *ReturnLength = sizeof(*DebugInfo); + if (!NT_SUCCESS(Status)) return Status; + + /* Open the Object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Acquire the object */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Set the proper flag */ + if (DebugInfo->KillProcessOnExit) + { + /* Enable killing the process */ + DebugObject->Flags |= 2; + } + else + { + /* Disable */ + DebugObject->Flags &= ~2; + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Release the Object */ + ObDereferenceObject(DebugObject); + } + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +NtWaitForDebugEvent(IN HANDLE DebugHandle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + LARGE_INTEGER SafeTimeOut; + PEPROCESS Process; + LARGE_INTEGER StartTime; + PETHREAD Thread; + BOOLEAN GotEvent; + LARGE_INTEGER NewTime; + PDBGK_DEBUG_OBJECT DebugObject; + DBGUI_WAIT_STATE_CHANGE WaitStateChange; + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_EVENT DebugEvent, DebugEvent2; + PLIST_ENTRY ListHead, NextEntry; + + /* Clear the initial wait state change structure */ + RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); + + /* Check if we came with a timeout from user mode */ + if ((Timeout) && (PreviousMode != KernelMode)) + { + _SEH_TRY + { + /* Make a copy on the stack */ + SafeTimeOut = ProbeForReadLargeInteger(Timeout); + Timeout = &SafeTimeOut; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; + + /* Query the current time */ + KeQuerySystemTime(&StartTime); + } + + /* Check if the call is from user mode */ + if (PreviousMode == UserMode) + { + /* FIXME: Probe the state change structure */ + } + + /* Get the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Clear process and thread */ + Process = NULL; + Thread = NULL; + + /* Wait on the debug object given to us */ + Status = KeWaitForSingleObject(DebugObject, + Executive, + PreviousMode, + Alertable, + Timeout); + + /* Start the wait loop */ + while (TRUE) + { + if (!NT_SUCCESS(Status) || + (Status == STATUS_TIMEOUT) || + (Status == STATUS_ALERTED) || + (Status == STATUS_USER_APC)) + { + /* Break out the wait */ + break; + } + + /* Lock the object */ + GotEvent = FALSE; + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Check if a debugger is connected */ + if (DebugObject->Flags & 1) + { + /* Not connected */ + Status = STATUS_DEBUGGER_INACTIVE; + } + else + { + /* Loop the events */ + ListHead = &DebugObject->StateEventListEntry; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the debug event */ + DebugEvent = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Check flags */ + if (!(DebugEvent->Flags & (4 | 1))) + { + /* We got an event */ + GotEvent = TRUE; + + /* Loop the list internally */ + while (&DebugEvent->EventList != NextEntry) + { + /* Get the debug event */ + DebugEvent2 = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Try to match process IDs */ + if (DebugEvent2->ClientId.UniqueProcess == + DebugEvent->ClientId.UniqueProcess) + { + /* Found it, break out */ + DebugEvent->Flags |= 4; + DebugEvent->BackoutThread = NULL; + GotEvent = FALSE; + break; + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we still have a valid event */ + if (GotEvent) break; + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we have an event */ + if (GotEvent) + { + /* Save and reference the process and thread */ + Process = DebugEvent->Process; + Thread = DebugEvent->Thread; + ObReferenceObject(Process); + ObReferenceObject(Thread); + + /* Convert to user-mode structure */ + DbgkpConvertKernelToUserStateChange(&WaitStateChange, + DebugEvent); + + /* Set flag */ + DebugEvent->Flags |= 1; + Status = STATUS_SUCCESS; + } + else + { + /* Unsignal the event */ + DebugObject->Event.Header.SignalState = 0; + Status = STATUS_SUCCESS; + } + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + if (!NT_SUCCESS(Status)) break; + + /* Check if we got an event */ + if (GotEvent) + { + /* Check if we can wait again */ + if (!SafeTimeOut.QuadPart) + { + /* Query the new time */ + KeQuerySystemTime(&NewTime); + + /* Substract times */ + /* FIXME: TODO */ + } + } + else + { + /* Open the handles and dereference the objects */ + DbgkpOpenHandles(&WaitStateChange, Process, Thread); + ObDereferenceObject(Process); + ObDereferenceObject(Thread); + } + } + + /* We're, dereference the object */ + ObDereferenceObject(DebugObject); + + /* Return our wait state change structure */ + RtlMoveMemory(StateChange, + &WaitStateChange, + sizeof(DBGUI_WAIT_STATE_CHANGE)); + return Status; +} + /* EOF */

1 0

[jimtabor] 24571: Add four more members to the Gdi user data (DC_ATTR) structure. Sort the list later.
by jimtabor＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: jimtabor Date: Thu Oct 19 08:48:51 2006 New Revision: 24571 URL: http://svn.reactos.org/svn/reactos?rev=24571&view=rev Log: Add four more members to the Gdi user data (DC_ATTR) structure. Sort the list later. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Oct 19 08:48:51 2006 @@ -120,6 +120,10 @@ ULONG ulBackgroundClr; COLORREF crForegroundClr; ULONG ulForegroundClr; + COLORREF crBrushClr; + ULONG ulBrushClr; + COLORREF crPenClr; + ULONG ulPenClr; DWORD iCS_CP; INT iGraphicsMode; BYTE jROP2;

1 0

[ion] 24570: - Fix SD charges to 2048 bytes instead of 2000. - Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed.
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 07:09:19 2006 New Revision: 24570 URL: http://svn.reactos.org/svn/reactos?rev=24570&view=rev Log: - Fix SD charges to 2048 bytes instead of 2000. - Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Oct 19 07:09:19 2006 @@ -1559,8 +1559,9 @@ if (ObjectHeader->ObjectCreateInfo) { /* Free it */ - //ObpFreeAndReleaseCapturedAttributes(&ObjectCreateInfo); - //ObjectHeader->ObjectCreateInfo = NULL; + ObpFreeAndReleaseCapturedAttributes(ObjectHeader-> + ObjectCreateInfo); + ObjectHeader->ObjectCreateInfo = NULL; } } else Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 07:09:19 2006 @@ -105,7 +105,7 @@ TypeInfo.DefaultNonPagedPoolCharge; /* Add the SD charge too */ - if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2000; + if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2048; } /* FIXME: Should be returning quota */ @@ -546,7 +546,7 @@ ObjectType->TypeInfo.DefaultPagedPoolCharge) || (ObjectCreateInfo->NonPagedPoolCharge != ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || - (ObjectCreateInfo->SecurityDescriptorCharge > 2000) || + (ObjectCreateInfo->SecurityDescriptorCharge > 2048) || (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) { /* Set quota size */

1 0

[ion] 24569: - Implement Object Type Resource Lock, since object types are shared across all objects and thread-safety is critical. Used it everywhere where I think it's needed. Thomas, can you check if I missed anything please? - Use interlocked increase/decrease for accounting variables inside the Object Type instead of acquiring a full lock or not being thread safe. - Clear the creator type list of an object if it lost all its handles. - Fix a bug in NtduplicateObject which was potentially de
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 06:54:48 2006 New Revision: 24569 URL: http://svn.reactos.org/svn/reactos?rev=24569&view=rev Log: - Implement Object Type Resource Lock, since object types are shared across all objects and thread-safety is critical. Used it everywhere where I think it's needed. Thomas, can you check if I missed anything please? - Use interlocked increase/decrease for accounting variables inside the Object Type instead of acquiring a full lock or not being thread safe. - Clear the creator type list of an object if it lost all its handles. - Fix a bug in NtduplicateObject which was potentially derefernecing a garbage pointer (thanks Prefast!). Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Oct 19 06:54:48 2006 @@ -22,7 +22,6 @@ // Ob: // - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. -// - Use Object Type Mutex/Lock. // // Ke: // Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Thu Oct 19 06:54:48 2006 @@ -5,6 +5,30 @@ * PURPOSE: Intenral Inlined Functions for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ + +VOID +FORCEINLINE +ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType) +{ + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + /* Enter a critical region and acquire the resource */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&ObjectType->Mutex, TRUE); +} + +VOID +FORCEINLINE +ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType) +{ + /* Enter a critical region and acquire the resource */ + ExReleaseResourceLite(&ObjectType->Mutex); + KeLeaveCriticalRegion(); + + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Oct 19 06:54:48 2006 @@ -93,6 +93,8 @@ POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; LONG SystemHandleCount, ProcessHandleCount; + LONG NewCount; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); @@ -104,12 +106,31 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* FIXME: The process handle count should be in the Handle DB. Investigate */ SystemHandleCount = ObjectHeader->HandleCount; ProcessHandleCount = 0; /* Decrement the handle count */ - InterlockedDecrement(&ObjectHeader->HandleCount); + NewCount = InterlockedDecrement(&ObjectHeader->HandleCount); + + /* Check if we're out of handles */ + if (!NewCount) + { + /* Get the creator info */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); + if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) + { + /* Remove it from the list and re-initialize it */ + RemoveEntryList(&CreatorInfo->TypeList); + InitializeListHead(&CreatorInfo->TypeList); + } + } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Check if we have a close procedure */ if (ObjectType->TypeInfo.CloseProcedure) @@ -126,7 +147,7 @@ ObpDeleteNameCheck(ObjectBody); /* Decrease the total number of handles for this type */ - ObjectType->TotalNumberOfHandles--; + InterlockedDecrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Decremented count for: %p. HC LC %lx %lx\n", __FUNCTION__, @@ -306,6 +327,9 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); if (!NT_SUCCESS(Status)) return Status; @@ -346,6 +370,9 @@ /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); + /* FIXME: Use the Handle Database */ ProcessHandleCount = 0; @@ -361,7 +388,7 @@ } /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + InterlockedIncrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -423,6 +450,9 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); if (!NT_SUCCESS(Status)) return Status; @@ -445,6 +475,9 @@ /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); + + /* Release the object type */ + ObpLeaveObjectTypeMutex(ObjectType); /* FIXME: Use the Handle Database */ ProcessHandleCount = 0; @@ -461,7 +494,7 @@ } /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + InterlockedIncrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", __FUNCTION__, @@ -2000,9 +2033,7 @@ ObCloseHandle(IN HANDLE Handle, IN KPROCESSOR_MODE AccessMode) { - // - // Call the internal API - // + /* Call the internal API */ return ObpCloseHandle(Handle, AccessMode); } @@ -2142,7 +2173,7 @@ hTarget, TargetProcessHandle, Status); - ObDereferenceObject(TargetProcess); + ObDereferenceObject(Target); ObDereferenceObject(SourceProcess); return Status; } Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 06:54:48 2006 @@ -151,12 +151,18 @@ NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Check if the object is on a type list */ if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) { /* Remove the object from the type list */ RemoveEntryList(&CreatorInfo->TypeList); } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Check if we have a name */ if ((NameInfo) && (NameInfo->Name.Buffer)) @@ -782,15 +788,14 @@ if (!PagedPoolCharge) { /* Save it */ - PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + PagedPoolCharge = Type->TypeInfo.DefaultPagedPoolCharge; } /* Check for nonpaged charge */ if (!NonPagedPoolCharge) { /* Save it */ - NonPagedPoolCharge = ObjectType-> - TypeInfo.DefaultNonPagedPoolCharge; + NonPagedPoolCharge = Type->TypeInfo.DefaultNonPagedPoolCharge; } /* Write the pool charges */ @@ -1019,6 +1024,9 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); + /* Lock the object type */ + ObpEnterObjectTypeMutex(LocalObjectType); + /* Get creator info and insert it into the type list */ CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); if (CreatorInfo) InsertTailList(&ObTypeObjectType->TypeList, @@ -1031,6 +1039,9 @@ /* It fits, insert it */ ObpObjectTypes[LocalObjectType->Index - 1] = LocalObjectType; } + + /* Release the object type */ + ObpLeaveObjectTypeMutex(LocalObjectType); /* Check if we're actually creating the directory object itself */ if (!(ObpTypeDirectoryObject) || Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Oct 19 06:54:48 2006 @@ -191,6 +191,9 @@ &Context); if ((Object) && !(ObjectHeader->HandleCount)) { + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* First delete it from the directory */ ObpDeleteEntryDirectory(&Context); @@ -209,6 +212,9 @@ TypeInfo.PoolType, NULL); } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Free the name */ ExFreePool(ObjectNameInfo->Name.Buffer);

1 0

[ion] 24568: - Set OBJ_OPENLINK invalid for core object types. - Initialize symbolic link in-line with other core object types. - Use the SePublicDefaultUnrestrictedSd directly instead of building another SD. - Create core directory objects with Nt* functions instead of Ob*, to insure full accounting and error-handling. - Create core objects with OBJ_CASE_INSENSITIVE. - Fix the huge ObInit hack which was manually inserting Directory and Type object types in the type directory, and now loop the t
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 06:20:32 2006 New Revision: 24568 URL: http://svn.reactos.org/svn/reactos?rev=24568&view=rev Log: - Set OBJ_OPENLINK invalid for core object types. - Initialize symbolic link in-line with other core object types. - Use the SePublicDefaultUnrestrictedSd directly instead of building another SD. - Create core directory objects with Nt* functions instead of Ob*, to insure full accounting and error-handling. - Create core objects with OBJ_CASE_INSENSITIVE. - Fix the huge ObInit hack which was manually inserting Directory and Type object types in the type directory, and now loop the type list. Now we don't skip the Process, Token, Thread, Job, Section types anymore. - Support Quota Information during object allocation and deallocation isntead of ignoring it. - Use interlocked decrement when touching the object type (since it's a shared structure. We don't use the lock yet, but we won't for this anyways, since it's a simple lockable operation). - Use the right object key when freeing the object. - Modify the allocation function for a more optimized way of allocating objects instead of having to keep track of two sets of variables. - Add various accounting variables. - Make sure to properly handle allocations without object create info (ie, for object types). Now they get creator info and name info (which allowed us to cleanp the hack in ObInit). - Add checks to see if Quota informatio is needed. - Clear CreatorBackTraceIndex during allocation. - Remove CreatorUniqueProcess hack from back when the idle thread was NULL. - Do not zero out the header during allocation anymore, since this slows down the routine (instead, simply zero out the 2 fields that are NULL). - Locate and clearly display that the fact we zero objects on creation is a HACK that needs to be fixed. (The Token code makes this assumption). - Update HighWaterNumberOfObjects when needed. - If caller didn't give pool charges, use the one from the object type. - Clear the Total/HighWater* values for newly created object types instead of using random values. - Properly typecast the WCHAR tag as CHAR. - Insert each new object type in the ObTypeObjectType Type List. - Set the Index member of each new object type and insert each new object type in the ObpObjectTypes array. This is crucial for object type enumeration when implemented. - Fixup the way we insert new object types into the tree. Allow failure and don't return a type if we couldn't insert it, and only reference the type directory object if it actually exists. - Move DOS Devices\"??" initialization in its own routine and fix it: - Use Nt APIs for all operations instead of raw I/O. - Create GLOBALROOT link to \ - Create \??\Global link to \?? Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 19 06:20:32 2006 @@ -425,7 +425,7 @@ /* Create the environment string */ RtlInitEmptyUnicodeString(&Environment, ProcessParameters->Environment, - Size); + (USHORT)Size); /* Append the DLL path to it */ RtlAppendUnicodeToString(&Environment, L"Path=" ); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Oct 19 06:20:32 2006 @@ -112,8 +112,8 @@ // VOID NTAPI -ObInitSymbolicLinkImplementation( - VOID +ObpDeleteSymbolicLink( + IN PVOID ObjectBody ); NTSTATUS @@ -220,17 +220,6 @@ ); VOID -NTAPI -ObDereferenceDeviceMap(IN PEPROCESS Process); - -VOID -NTAPI -ObInheritDeviceMap( - IN PEPROCESS Parent, - IN PEPROCESS Process -); - -VOID FASTCALL ObpSetPermanentObject( IN PVOID ObjectBody, @@ -245,10 +234,35 @@ VOID NTAPI -ObClearProcessHandleTable(IN PEPROCESS Process); - -/* Security descriptor cache functions */ - +ObClearProcessHandleTable( + IN PEPROCESS Process +); + +// +// DOS Devices Functions +// +VOID +NTAPI +ObDereferenceDeviceMap( + IN PEPROCESS Process +); + +VOID +NTAPI +ObInheritDeviceMap( + IN PEPROCESS Parent, + IN PEPROCESS Process +); + +NTSTATUS +NTAPI +ObpCreateDosDevicesDirectory( + VOID +); + +// +// Security descriptor cache functions +// NTSTATUS NTAPI ObpInitSdCache( Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Thu Oct 19 06:20:32 2006 @@ -37,6 +37,14 @@ DIRECTORY_ALL_ACCESS }; +GENERIC_MAPPING ObpSymbolicLinkMapping = +{ + STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYMBOLIC_LINK_QUERY, + SYMBOLIC_LINK_ALL_ACCESS +}; + PDEVICE_MAP ObSystemDeviceMap = NULL; ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; @@ -124,12 +132,15 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; - SECURITY_DESCRIPTOR SecurityDescriptor; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; OBP_LOOKUP_CONTEXT Context; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\DosDevices"); HANDLE Handle; PKPRCB Prcb = KeGetCurrentPrcb(); + PLIST_ENTRY ListHead, NextEntry; + POBJECT_HEADER Header; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_NAME_INFO NameInfo; + NTSTATUS Status; /* Check if this is actually Phase 1 initialization */ if (ObpInitializationPhase != 0) goto ObPostPhase0; @@ -184,12 +195,11 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObTypeObjectType); /* Create the Directory Type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Directory"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = FALSE; ObjectTypeInitializer.MaintainTypeList = FALSE; @@ -197,6 +207,16 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); + /* Create 'symbolic link' object type */ + RtlInitUnicodeString(&Name, L"SymbolicLink"); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = + sizeof(OBJECT_SYMBOLIC_LINK); + ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; + ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; + ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; + ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); + /* Phase 0 initialization complete */ ObpInitializationPhase++; return TRUE; @@ -206,105 +226,102 @@ /* Re-initialize lookaside lists */ ObInit2(); - /* Create security descriptor */ - RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION1); - RtlSetOwnerSecurityDescriptor(&SecurityDescriptor, - SeAliasAdminsSid, - FALSE); - RtlSetGroupSecurityDescriptor(&SecurityDescriptor, - SeLocalSystemSid, - FALSE); - RtlSetDaclSecurityDescriptor(&SecurityDescriptor, - TRUE, - SePublicDefaultDacl, - FALSE); - - /* Create root directory */ + /* Initialize Object Types directory attributes */ + RtlInitUnicodeString(&Name, L"\\"); InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(OBJECT_DIRECTORY), - 0, - 0, - (PVOID*)&NameSpaceRoot); - ObInsertObject((PVOID)NameSpaceRoot, - NULL, - DIRECTORY_ALL_ACCESS, - 0, - NULL, - NULL); - - /* Create '\ObjectTypes' directory */ + SePublicDefaultUnrestrictedSd); + + /* Create the directory */ + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get a handle to it */ + Status = ObReferenceObjectByHandle(Handle, + 0, + ObDirectoryType, + KernelMode, + (PVOID*)&NameSpaceRoot, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Close the extra handle */ + Status = NtClose(Handle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Initialize Object Types directory attributes */ RtlInitUnicodeString(&Name, L"\\ObjectTypes"); InitializeObjectAttributes(&ObjectAttributes, &Name, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(OBJECT_DIRECTORY), - 0, - 0, - (PVOID*)&ObpTypeDirectoryObject); - ObInsertObject((PVOID)ObpTypeDirectoryObject, - NULL, - DIRECTORY_ALL_ACCESS, - 0, - NULL, - NULL); - - /* Insert the two objects we already created but couldn't add */ - /* NOTE: Uses TypeList & Creator Info in OB 2.0 */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObTypeObjectType))->Name, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context)) - { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObTypeObjectType)); - } - if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObDirectoryType))->Name, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context)) - { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObDirectoryType)); - } - - /* Create 'symbolic link' object type */ - ObInitSymbolicLinkImplementation(); - - /* Create the '\??' directory */ - RtlInitUnicodeString(&Name, L"\\??"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - 0, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, NULL); - ZwCreateDirectoryObject(&Handle, 0, &ObjectAttributes); - - /* Create link from '\DosDevices' to '\??' directory */ - RtlInitUnicodeString(&Name, L"\\??"); - IoCreateSymbolicLink(&LinkName, &Name); - - /* FIXME: Hack Hack! */ - ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), TAG('O', 'b', 'D', 'm')); - RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); + + /* Create the directory */ + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get a handle to it */ + Status = ObReferenceObjectByHandle(Handle, + 0, + ObDirectoryType, + KernelMode, + (PVOID*)&ObpTypeDirectoryObject, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Close the extra handle */ + Status = NtClose(Handle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Loop the object types */ + ListHead = &ObTypeObjectType->TypeList; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the creator info from the list */ + CreatorInfo = CONTAINING_RECORD(NextEntry, + OBJECT_HEADER_CREATOR_INFO, + TypeList); + + /* Recover the header and the name header from the creator info */ + Header = (POBJECT_HEADER)(CreatorInfo + 1); + NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); + + /* Make sure we have a name, and aren't inserted yet */ + if ((NameInfo) && !(NameInfo->Directory)) + { + /* Set up the context for the insert */ + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + + /* Do the initial lookup to setup the context */ + if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, + &NameInfo->Name, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context)) + { + /* Insert this object type */ + ObpInsertEntryDirectory(ObpTypeDirectoryObject, + &Context, + Header); + } + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Initialize DOS Devices Directory and related Symbolic Links */ + Status = ObpCreateDosDevicesDirectory(); + if (!NT_SUCCESS(Status)) return FALSE; return TRUE; } Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 06:20:32 2006 @@ -27,6 +27,10 @@ WORK_QUEUE_ITEM ObpReaperWorkItem; volatile PVOID ObpReaperList; +ULONG ObpObjectsCreated, ObpObjectsWithName, ObpObjectsWithPoolQuota; +ULONG ObpObjectsWithHandleDB, ObpObjectsWithCreatorInfo; +POBJECT_TYPE ObpObjectTypes[32]; + /* PRIVATE FUNCTIONS *********************************************************/ VOID @@ -39,6 +43,8 @@ POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_QUOTA_INFO QuotaInfo; + ULONG PagedPoolCharge, NonPagedPoolCharge; PAGED_CODE(); /* Get the header and assume this is what we'll free */ @@ -59,6 +65,13 @@ { HeaderLocation = HandleInfo; } + if ((QuotaInfo = OBJECT_HEADER_TO_QUOTA_INFO(Header))) + { + HeaderLocation = QuotaInfo; + } + + /* Decrease the total */ + InterlockedDecrement(&ObjectType->TotalNumberOfObjects); /* Check if we have create info */ if (Header->Flags & OB_FLAG_CREATE_INFO) @@ -71,6 +84,34 @@ Header->ObjectCreateInfo = NULL; } } + else + { + /* Check if it has a quota block */ + if (Header->QuotaBlockCharged) + { + /* Check if we have quota information */ + if (QuotaInfo) + { + /* Get charges from quota information */ + PagedPoolCharge = QuotaInfo->PagedPoolCharge + + QuotaInfo->SecurityDescriptorCharge; + NonPagedPoolCharge = QuotaInfo->NonPagedPoolCharge; + } + else + { + /* Get charges from object type */ + PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + NonPagedPoolCharge = ObjectType-> + TypeInfo.DefaultNonPagedPoolCharge; + + /* Add the SD charge too */ + if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2000; + } + + /* FIXME: Should be returning quota */ + DPRINT("Quotas: %lx %lx\n", PagedPoolCharge, NonPagedPoolCharge); + } + } /* Check if a handle database was active */ if ((HandleInfo) && !(Header->Flags & OB_FLAG_SINGLE_PROCESS)) @@ -89,11 +130,7 @@ } /* Free the object using the same allocation tag */ - ExFreePoolWithTag(HeaderLocation, - ObjectType ? TAG('T', 'j', 'b', 'O') : ObjectType->Key); - - /* Decrease the total */ - ObjectType->TotalNumberOfObjects--; + ExFreePoolWithTag(HeaderLocation, ObjectType->Key); } VOID @@ -134,6 +171,7 @@ /* Check if we have a security descriptor */ if (Header->SecurityDescriptor) { + /* Call the security procedure to delete it */ ObjectType->TypeInfo.SecurityProcedure(Object, DeleteSecurityDescriptor, 0, @@ -247,9 +285,7 @@ /* First Probe the String */ ProbeForReadUnicodeString(ObjectName); LocalName = *ObjectName; - ProbeForRead(LocalName.Buffer, - LocalName.Length, - sizeof(WCHAR)); + ProbeForRead(LocalName.Buffer, LocalName.Length, sizeof(WCHAR)); } else { @@ -311,6 +347,7 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Handle exception and free the string buffer */ Status = _SEH_GetExceptionCode(); if (StringBuffer) ExFreePool(StringBuffer); } @@ -461,59 +498,125 @@ IN POBJECT_HEADER *ObjectHeader) { POBJECT_HEADER Header; - BOOLEAN HasHandleInfo = FALSE; - BOOLEAN HasNameInfo = FALSE; - BOOLEAN HasCreatorInfo = FALSE; + ULONG QuotaSize, HandleSize, NameSize, CreatorSize; POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_QUOTA_INFO QuotaInfo; POOL_TYPE PoolType; - ULONG FinalSize = ObjectSize; + ULONG FinalSize; ULONG Tag; PAGED_CODE(); - /* If we don't have an Object Type yet, force NonPaged */ - if (!ObjectType) - { + /* Accounting */ + ObpObjectsCreated++; + + /* Check if we don't have an Object Type yet */ + if (!ObjectType) + { + /* Use default tag and non-paged pool */ PoolType = NonPagedPool; Tag = TAG('O', 'b', 'j', 'T'); } else { + /* Use the pool and tag given */ PoolType = ObjectType->TypeInfo.PoolType; Tag = ObjectType->Key; } - /* Check if the Object has a name */ - if (ObjectName->Buffer) - { - FinalSize += sizeof(OBJECT_HEADER_NAME_INFO); - HasNameInfo = TRUE; - } - - if (ObjectType) - { - /* Check if the Object maintains handle counts */ + /* Check if we have no create information (ie: we're an object type) */ + if (!ObjectCreateInfo) + { + /* Use defaults */ + QuotaSize = HandleSize = 0; + NameSize = sizeof(OBJECT_HEADER_NAME_INFO); + CreatorSize = sizeof(OBJECT_HEADER_CREATOR_INFO); + } + else + { + /* Check if we have quota */ + if ((ObjectCreateInfo->PagedPoolCharge != + ObjectType->TypeInfo.DefaultPagedPoolCharge) || + (ObjectCreateInfo->NonPagedPoolCharge != + ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || + (ObjectCreateInfo->SecurityDescriptorCharge > 2000) || + (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) + { + /* Set quota size */ + QuotaSize = sizeof(OBJECT_HEADER_QUOTA_INFO); + ObpObjectsWithPoolQuota++; + } + else + { + /* No Quota */ + QuotaSize = 0; + } + + /* Check if we have a handle database */ if (ObjectType->TypeInfo.MaintainHandleCount) { - FinalSize += sizeof(OBJECT_HEADER_HANDLE_INFO); - HasHandleInfo = TRUE; - } - + /* Set handle database size */ + HandleSize = sizeof(OBJECT_HEADER_HANDLE_INFO); + ObpObjectsWithHandleDB++; + } + else + { + /* None */ + HandleSize = 0; + } + + /* Check if the Object has a name */ + if (ObjectName->Buffer) + { + /* Set name size */ + NameSize = sizeof(OBJECT_HEADER_NAME_INFO); + ObpObjectsWithName++; + } + else + { + /* No name */ + NameSize = 0; + } + /* Check if the Object maintains type lists */ - if (ObjectType->TypeInfo.MaintainTypeList) - { - FinalSize += sizeof(OBJECT_HEADER_CREATOR_INFO); - HasCreatorInfo = TRUE; - } - } + if (ObjectType->TypeInfo.MaintainTypeList) + { + /* Set owner/creator size */ + CreatorSize = sizeof(OBJECT_HEADER_CREATOR_INFO); + ObpObjectsWithCreatorInfo++; + } + else + { + /* No info */ + CreatorSize = 0; + } + } + + /* Set final header size */ + FinalSize = QuotaSize + + HandleSize + + NameSize + + CreatorSize + + FIELD_OFFSET(OBJECT_HEADER, Body); /* Allocate memory for the Object and Header */ - Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); + Header = ExAllocatePoolWithTag(PoolType, FinalSize + ObjectSize, Tag); if (!Header) return STATUS_INSUFFICIENT_RESOURCES; + /* Initialize quota info */ + if (QuotaSize) + { + QuotaInfo = (POBJECT_HEADER_QUOTA_INFO)Header; + QuotaInfo->PagedPoolCharge = ObjectCreateInfo->PagedPoolCharge; + QuotaInfo->NonPagedPoolCharge = ObjectCreateInfo->NonPagedPoolCharge; + QuotaInfo->SecurityDescriptorCharge = ObjectCreateInfo->SecurityDescriptorCharge; + QuotaInfo->ExclusiveProcess = NULL; + Header = (POBJECT_HEADER)(QuotaInfo + 1); + } + /* Initialize Handle Info */ - if (HasHandleInfo) + if (HandleSize) { HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; HandleInfo->SingleEntry.HandleCount = 0; @@ -521,7 +624,7 @@ } /* Initialize the Object Name Info */ - if (HasNameInfo) + if (NameSize) { NameInfo = (POBJECT_HEADER_NAME_INFO)Header; NameInfo->Name = *ObjectName; @@ -530,59 +633,104 @@ } /* Initialize Creator Info */ - if (HasCreatorInfo) + if (CreatorSize) { CreatorInfo = (POBJECT_HEADER_CREATOR_INFO)Header; - CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcess() ? - PsGetCurrentProcessId() : 0; + CreatorInfo->CreatorBackTraceIndex = 0; + CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); InitializeListHead(&CreatorInfo->TypeList); Header = (POBJECT_HEADER)(CreatorInfo + 1); } + /* Check for quota information */ + if (QuotaSize) + { + /* Set the offset */ + Header->QuotaInfoOffset = (UCHAR)(QuotaSize + + HandleSize + + NameSize + + CreatorSize); + } + else + { + /* No offset */ + Header->QuotaInfoOffset = 0; + } + + /* Check for handle information */ + if (HandleSize) + { + /* Set the offset */ + Header->HandleInfoOffset = (UCHAR)(HandleSize + + NameSize + + CreatorSize); + } + else + { + /* No offset */ + Header->HandleInfoOffset = 0; + } + + /* Check for name information */ + if (NameSize) + { + /* Set the offset */ + Header->NameInfoOffset = (UCHAR)(NameSize + CreatorSize); + } + else + { + /* No Name */ + Header->NameInfoOffset = 0; + } + + /* Set the new object flag */ + Header->Flags = OB_FLAG_CREATE_INFO; + + /* Remember if we have creator info */ + if (CreatorSize) Header->Flags |= OB_FLAG_CREATOR_INFO; + + /* Remember if we have handle info */ + if (HandleSize) Header->Flags |= OB_FLAG_SINGLE_PROCESS; + /* Initialize the object header */ - RtlZeroMemory(Header, ObjectSize); Header->PointerCount = 1; + Header->HandleCount = 0; Header->Type = ObjectType; - Header->Flags = OB_FLAG_CREATE_INFO; Header->ObjectCreateInfo = ObjectCreateInfo; - - /* Set the Offsets for the Info */ - if (HasHandleInfo) - { - Header->HandleInfoOffset = HasNameInfo * - sizeof(OBJECT_HEADER_NAME_INFO) + - sizeof(OBJECT_HEADER_HANDLE_INFO) + - HasCreatorInfo * - sizeof(OBJECT_HEADER_CREATOR_INFO); - - /* Set the flag so we know when freeing */ - Header->Flags |= OB_FLAG_SINGLE_PROCESS; - } - if (HasNameInfo) - { - Header->NameInfoOffset = sizeof(OBJECT_HEADER_NAME_INFO) + - HasCreatorInfo * - sizeof(OBJECT_HEADER_CREATOR_INFO); - } - if (HasCreatorInfo) Header->Flags |= OB_FLAG_CREATOR_INFO; + Header->SecurityDescriptor = NULL; + + /* Check if this is a permanent object */ if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_PERMANENT)) { /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_PERMANENT; } + + /* Check if this is an exclusive object */ if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) { /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_EXCLUSIVE; } - if (PreviousMode == KernelMode) - { - /* Set the kernel flag */ - Header->Flags |= OB_FLAG_KERNEL_MODE; - } - - /* Increase the number of objects of this type */ - if (ObjectType) ObjectType->TotalNumberOfObjects++; + + /* Set kernel-mode flag */ + if (PreviousMode == KernelMode) Header->Flags |= OB_FLAG_KERNEL_MODE; + + /* Check if we have a type */ + if (ObjectType) + { + /* Increase the number of objects of this type */ + ObjectType->TotalNumberOfObjects++; + + /* Update the high water */ + ObjectType->HighWaterNumberOfObjects = max(ObjectType-> + TotalNumberOfObjects, + ObjectType-> + HighWaterNumberOfObjects); + } + + /* OMG-Hack-Of-Doom */ + RtlZeroMemory(&Header->Body, ObjectSize); /* Return Header */ *ObjectHeader = Header; @@ -593,7 +741,7 @@ NTSTATUS NTAPI -ObCreateObject(IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, +ObCreateObject(IN KPROCESSOR_MODE ProbeMode OPTIONAL, IN POBJECT_TYPE Type, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, @@ -616,22 +764,36 @@ /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, - ObjectAttributesAccessMode, + ProbeMode, FALSE, ObjectCreateInfo, &ObjectName); if (NT_SUCCESS(Status)) { /* Validate attributes */ - if (Type->TypeInfo.InvalidAttributes & - ObjectCreateInfo->Attributes) + if (Type->TypeInfo.InvalidAttributes & ObjectCreateInfo->Attributes) { /* Fail */ Status = STATUS_INVALID_PARAMETER; } else { - /* Save the pool charges */ + /* Check if we have a paged charge */ + if (!PagedPoolCharge) + { + /* Save it */ + PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + } + + /* Check for nonpaged charge */ + if (!NonPagedPoolCharge) + { + /* Save it */ + NonPagedPoolCharge = ObjectType-> + TypeInfo.DefaultNonPagedPoolCharge; + } + + /* Write the pool charges */ ObjectCreateInfo->PagedPoolCharge = PagedPoolCharge; ObjectCreateInfo->NonPagedPoolCharge = NonPagedPoolCharge; @@ -639,7 +801,7 @@ Status = ObpAllocateObject(ObjectCreateInfo, &ObjectName, Type, - ObjectSize + sizeof(OBJECT_HEADER), + ObjectSize, AccessMode, &Header); if (NT_SUCCESS(Status)) @@ -652,7 +814,7 @@ { /* Do the privilege check */ if (!SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, - ObjectAttributesAccessMode)) + ProbeMode)) { /* Fail */ ObpDeallocateObject(*Object); @@ -691,6 +853,7 @@ PWCHAR p; ULONG i; UNICODE_STRING ObjectName; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Verify parameters */ if (!(TypeName) || @@ -752,7 +915,7 @@ Status = ObpAllocateObject(NULL, &ObjectName, ObTypeObjectType, - sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), + sizeof(OBJECT_TYPE), KernelMode, (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) @@ -767,21 +930,30 @@ LocalObjectType->Name = ObjectName; Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; + /* Clear accounting data */ + LocalObjectType->TotalNumberOfObjects = + LocalObjectType->TotalNumberOfHandles = + LocalObjectType->HighWaterNumberOfObjects = + LocalObjectType->HighWaterNumberOfHandles = 0; + /* Check if this is the first Object Type */ if (!ObTypeObjectType) { + /* It is, so set this as the type object */ ObTypeObjectType = LocalObjectType; Header->Type = ObTypeObjectType; + + /* Set the hard-coded key and object count */ LocalObjectType->TotalNumberOfObjects = 1; LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } else { /* Set Tag */ - Tag[0] = TypeName->Buffer[0]; - Tag[1] = TypeName->Buffer[1]; - Tag[2] = TypeName->Buffer[2]; - Tag[3] = TypeName->Buffer[3]; + Tag[0] = (CHAR)TypeName->Buffer[0]; + Tag[1] = (CHAR)TypeName->Buffer[1]; + Tag[2] = (CHAR)TypeName->Buffer[2]; + Tag[3] = (CHAR)TypeName->Buffer[3]; LocalObjectType->Key = *(PULONG)Tag; } @@ -797,9 +969,10 @@ } /* Calculate how much space our header'll take up */ - HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + HeaderSize = sizeof(OBJECT_HEADER) + + sizeof(OBJECT_HEADER_NAME_INFO) + (ObjectTypeInitializer->MaintainHandleCount ? - sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); + sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); /* Check the pool type */ if (ObjectTypeInitializer->PoolType == NonPagedPool) @@ -846,17 +1019,37 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); + /* Get creator info and insert it into the type list */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); + if (CreatorInfo) InsertTailList(&ObTypeObjectType->TypeList, + &CreatorInfo->TypeList); + + /* Set the index and the entry into the object type array */ + LocalObjectType->Index = ObTypeObjectType->TotalNumberOfObjects; + if (LocalObjectType->Index < 32) + { + /* It fits, insert it */ + ObpObjectTypes[LocalObjectType->Index - 1] = LocalObjectType; + } + /* Check if we're actually creating the directory object itself */ - if (ObpTypeDirectoryObject) - { - /* Insert it into the Object Directory */ - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); - ObReferenceObject(ObpTypeDirectoryObject); - } - - /* Return the object type and creations tatus */ - *ObjectType = LocalObjectType; - return Status; + if (!(ObpTypeDirectoryObject) || + (ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header))) + { + /* Check if the type directory exists */ + if (ObpTypeDirectoryObject) + { + /* Reference it */ + ObReferenceObject(ObpTypeDirectoryObject); + } + + /* Return the object type and success */ + *ObjectType = LocalObjectType; + return STATUS_SUCCESS; + } + + /* If we got here, then we failed */ + return STATUS_INSUFFICIENT_RESOURCES; } /*++ @@ -878,7 +1071,7 @@ ObMakeTemporaryObject(IN PVOID ObjectBody) { /* Call the internal API */ - ObpSetPermanentObject (ObjectBody, FALSE); + ObpSetPermanentObject(ObjectBody, FALSE); } /*++ Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Oct 19 06:20:32 2006 @@ -20,6 +20,82 @@ POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +ObpCreateDosDevicesDirectory(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name, LinkName; + HANDLE Handle, SymHandle; + NTSTATUS Status; + + /* Create the '\??' directory */ + RtlInitUnicodeString(&Name, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Initialize the GLOBALROOT path */ + RtlInitUnicodeString(&LinkName, L"GLOBALROOT"); + RtlInitUnicodeString(&Name, L""); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + Handle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* Link \??\Global to \?? */ + RtlInitUnicodeString(&LinkName, L"Global"); + RtlInitUnicodeString(&Name, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + Handle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* Close the directory handle */ + NtClose(Handle); + if (!NT_SUCCESS(Status)) return Status; + + /* Create link from '\DosDevices' to '\??' directory */ + RtlCreateUnicodeString(&LinkName, L"\\DosDevices"); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* FIXME: Hack Hack! */ + ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*ObSystemDeviceMap), + TAG('O', 'b', 'D', 'm')); + RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); + + /* Return status */ + return Status; +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Thu Oct 19 06:20:32 2006 @@ -20,14 +20,6 @@ /* GLOBALS ******************************************************************/ POBJECT_TYPE ObSymbolicLinkType = NULL; - -static GENERIC_MAPPING ObpSymbolicLinkMapping = -{ - STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE | SYMBOLIC_LINK_QUERY, - SYMBOLIC_LINK_ALL_ACCESS -}; /* PRIVATE FUNCTIONS *********************************************************/ @@ -181,40 +173,6 @@ return STATUS_REPARSE; } -/*++ -* @name ObInitSymbolicLinkImplementation -* -* The ObInitSymbolicLinkImplementation routine <FILLMEIN> -* -* @param None. -* -* @return None. -* -* @remarks None. -* -*--*/ -VOID -INIT_FUNCTION -NTAPI -ObInitSymbolicLinkImplementation(VOID) -{ - UNICODE_STRING Name; - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - - /* Initialize the Directory type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"SymbolicLink"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_SYMBOLIC_LINK); - ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; - ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); -} - /* PUBLIC FUNCTIONS **********************************************************/ /*++

1 0

[hpoussin] 24567: Fix calling convention for class callbacks
by hpoussin＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: hpoussin Date: Thu Oct 19 02:40:39 2006 New Revision: 24567 URL: http://svn.reactos.org/svn/reactos?rev=24567&view=rev Log: Fix calling convention for class callbacks Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Thu Oct 19 02:40:39 2006 @@ -438,7 +438,7 @@ return Status; } -static BOOLEAN +static BOOLEAN CALLBACK ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PKEYBOARD_INPUT_DATA DataStart, Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Thu Oct 19 02:40:39 2006 @@ -414,7 +414,7 @@ return Status; } -static BOOLEAN +static BOOLEAN CALLBACK ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PMOUSE_INPUT_DATA DataStart,

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