[CMAKE] Use modules instead of shared libraries

[reactos.git] / dll / ntdll / dbg / dbgui.c

diff --git a/dll/ntdll/dbg/dbgui.c b/dll/ntdll/dbg/dbgui.c
index e745374..ccc89fb 100644 (file)
--- a/dll/ntdll/dbg/dbgui.c
+++ b/dll/ntdll/dbg/dbgui.c
@@ -62,22 +62,19 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
                                  OUT PVOID Win32DebugEvent)
 {
     NTSTATUS Status;
-    OBJECT_ATTRIBUTES ObjectAttributes;
     THREAD_BASIC_INFORMATION ThreadBasicInfo;
     LPDEBUG_EVENT DebugEvent = Win32DebugEvent;
-    HANDLE ThreadHandle;
-
+    
     /* Write common data */
-    DebugEvent->dwProcessId = (DWORD)WaitStateChange->
-                                     AppClientId.UniqueProcess;
-    DebugEvent->dwThreadId = (DWORD)WaitStateChange->AppClientId.UniqueThread;
+    DebugEvent->dwProcessId = PtrToUlong(WaitStateChange->AppClientId.UniqueProcess);
+    DebugEvent->dwThreadId = PtrToUlong(WaitStateChange->AppClientId.UniqueThread);
 
     /* Check what kind of even this is */
     switch (WaitStateChange->NewState)
     {
         /* New thread */
         case DbgCreateThreadStateChange:
-
+        {
             /* Setup Win32 code */
             DebugEvent->dwDebugEventCode = CREATE_THREAD_DEBUG_EVENT;
 
@@ -106,10 +103,11 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
                     ThreadBasicInfo.TebBaseAddress;
             }
             break;
+        }
 
         /* New process */
         case DbgCreateProcessStateChange:
-
+        {
             /* Write Win32 debug code */
             DebugEvent->dwDebugEventCode = CREATE_PROCESS_DEBUG_EVENT;
 
@@ -157,30 +155,33 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
             DebugEvent->u.CreateProcessInfo.lpImageName = NULL;
             DebugEvent->u.CreateProcessInfo.fUnicode = TRUE;
             break;
+        }
 
         /* Thread exited */
         case DbgExitThreadStateChange:
-
+        {
             /* Write the Win32 debug code and the exit status */
             DebugEvent->dwDebugEventCode = EXIT_THREAD_DEBUG_EVENT;
             DebugEvent->u.ExitThread.dwExitCode =
                 WaitStateChange->StateInfo.ExitThread.ExitStatus;
             break;
+        }
 
         /* Process exited */
         case DbgExitProcessStateChange:
-
+        {
             /* Write the Win32 debug code and the exit status */
             DebugEvent->dwDebugEventCode = EXIT_PROCESS_DEBUG_EVENT;
             DebugEvent->u.ExitProcess.dwExitCode =
                 WaitStateChange->StateInfo.ExitProcess.ExitStatus;
             break;
+        }
 
         /* Any sort of exception */
         case DbgExceptionStateChange:
         case DbgBreakpointStateChange:
         case DbgSingleStepStateChange:
-
+        {
             /* Check if this was a debug print */
             if (WaitStateChange->StateInfo.Exception.ExceptionRecord.
                 ExceptionCode == DBG_PRINTEXCEPTION_C)
@@ -222,66 +223,40 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
                     WaitStateChange->StateInfo.Exception.FirstChance;
             }
             break;
+        }
 
         /* DLL Load */
         case DbgLoadDllStateChange:
-
+        {
             /* Set the Win32 debug code */
             DebugEvent->dwDebugEventCode = LOAD_DLL_DEBUG_EVENT;
 
             /* Copy the rest of the data */
-            DebugEvent->u.LoadDll.lpBaseOfDll =
-                WaitStateChange->StateInfo.LoadDll.BaseOfDll;
             DebugEvent->u.LoadDll.hFile =
                 WaitStateChange->StateInfo.LoadDll.FileHandle;
+            DebugEvent->u.LoadDll.lpBaseOfDll =
+                WaitStateChange->StateInfo.LoadDll.BaseOfDll;
             DebugEvent->u.LoadDll.dwDebugInfoFileOffset =
                 WaitStateChange->StateInfo.LoadDll.DebugInfoFileOffset;
             DebugEvent->u.LoadDll.nDebugInfoSize =
                 WaitStateChange->StateInfo.LoadDll.DebugInfoSize;
-
-            /* Open the thread */
-            InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
-            Status = NtOpenThread(&ThreadHandle,
-                                  THREAD_QUERY_INFORMATION,
-                                  &ObjectAttributes,
-                                  &WaitStateChange->AppClientId);
-            if (NT_SUCCESS(Status))
-            {
-                /* Query thread information */
-                Status = NtQueryInformationThread(ThreadHandle,
-                                                  ThreadBasicInformation,
-                                                  &ThreadBasicInfo,
-                                                  sizeof(ThreadBasicInfo),
-                                                  NULL);
-                NtClose(ThreadHandle);
-            }
-
-            /* Check if we got thread information */
-            if (NT_SUCCESS(Status))
-            {
-                /* Save the image name from the TIB */
-                DebugEvent->u.LoadDll.lpImageName =
-                    ((PTEB)ThreadBasicInfo.TebBaseAddress)->
-                    NtTib.ArbitraryUserPointer;
-            }
-            else
-            {
-                /* Otherwise, no name */
-                DebugEvent->u.LoadDll.lpImageName = NULL;
-            }
+            DebugEvent->u.LoadDll.lpImageName =
+                WaitStateChange->StateInfo.LoadDll.NamePointer;
 
             /* It's Unicode */
             DebugEvent->u.LoadDll.fUnicode = TRUE;
             break;
+        }
 
         /* DLL Unload */
         case DbgUnloadDllStateChange:
-
+        {
             /* Set Win32 code and DLL Base */
             DebugEvent->dwDebugEventCode = UNLOAD_DLL_DEBUG_EVENT;
             DebugEvent->u.UnloadDll.lpBaseOfDll =
                 WaitStateChange->StateInfo.UnloadDll.BaseAddress;
             break;
+        }
 
         /* Anything else, fail */
         default: return STATUS_UNSUCCESSFUL;
@@ -296,14 +271,14 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
  */
 NTSTATUS
 NTAPI
-DbgUiWaitStateChange(OUT PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange,
+DbgUiWaitStateChange(OUT PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
                      IN PLARGE_INTEGER TimeOut OPTIONAL)
 {
     /* Tell the kernel to wait */
     return NtWaitForDebugEvent(NtCurrentTeb()->DbgSsReserved[1],
                                TRUE,
                                TimeOut,
-                               DbgUiWaitStateCange);
+                               WaitStateChange);
 }
 
 /*