[ros-diffs] [ion] 25011: - Kill some debug prints. - Remove debug-test infinite loop from DbgkForwardException - Fix missing "break" statement in DbgkFreeDebugEvent, causing a handle leak, and in DbgkpOpenHandles, causing user-mode to get a kernel-mode handle for DLL images instead of the correct duplicated one. - Currently struggling with the fact that ArbitraryUserPointer seems to be reset to zero before it's read for the debug event, so DLL names don't come through.

Author: ion
Date: Fri Dec  1 11:20:37 2006
New Revision: 25011

URL: http://svn.reactos.org/svn/reactos?rev=25011&view=rev
Log:
- Kill some debug prints.
- Remove debug-test infinite loop from DbgkForwardException
- Fix missing "break" statement in DbgkFreeDebugEvent, causing a handle leak,
and in DbgkpOpenHandles, causing user-mode to get a kernel-mode handle for DLL images
instead of the correct duplicated one.
- Currently struggling with the fact that ArbitraryUserPointer seems to be reset to zero
before it's read for the debug event, so DLL names don't come through.

Modified:
    trunk/reactos/dll/ntdll/dbg/dbgui.c
    trunk/reactos/dll/ntdll/ldr/utils.c
    trunk/reactos/ntoskrnl/dbgk/debug.c
    trunk/reactos/ntoskrnl/ke/i386/exp.c

Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/dbg/dbgui.c (original)
+++ trunk/reactos/dll/ntdll/dbg/dbgui.c Fri Dec  1 11:20:37 2006
@@ -282,7 +282,6 @@
                 DebugEvent->u.LoadDll.lpImageName =
                     ((PTEB)ThreadBasicInfo.TebBaseAddress)->
                     Tib.ArbitraryUserPointer;
-                DPRINT1("Image name: %p\n",
DebugEvent->u.LoadDll.lpImageName);
             }
             else
             {

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c Fri Dec  1 11:20:37 2006
@@ -2030,7 +2030,6 @@
         ImageBase = 0;
         ArbitraryUserPointer = NtCurrentTeb()->Tib.ArbitraryUserPointer;
         NtCurrentTeb()->Tib.ArbitraryUserPointer = FullDosName.Buffer;
-        DPRINT1("POI. DAT: %p %S\n",
NtCurrentTeb()->Tib.ArbitraryUserPointer, FullDosName.Buffer);
         Status = NtMapViewOfSection(SectionHandle,
                                     NtCurrentProcess(),
                                     &ImageBase,
@@ -2042,7 +2041,6 @@
                                     MEM_COMMIT,
                                     PAGE_READONLY);
         NtCurrentTeb()->Tib.ArbitraryUserPointer = ArbitraryUserPointer;
-        DPRINT1("Poi gone!\n");
         if (!NT_SUCCESS(Status))
           {
             DPRINT1("map view of section failed (Status 0x%08lx)\n", Status);

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 Dec  1 11:20:37 2006
@@ -329,7 +329,6 @@
     PAGED_CODE();
     DBGKTRACE(DBGK_EXCEPTION_DEBUG,
               "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort);
-    while (TRUE);
 
     /* Setup the API Message */
     ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 |
@@ -401,6 +400,7 @@
 
             /* Get the pointer */
             Handle = &DebugEvent->ApiMsg.CreateProcess.FileHandle;
+            break;
 
         /* As does DLL load */
         case DbgKmLoadDllApi:
@@ -1021,6 +1021,7 @@
 
             /* Fall through to duplicate file handle */
             DupHandle = &WaitStateChange->StateInfo.LoadDll.FileHandle;
+            break;
 
         /* Anything else has no handles */
         default:

Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/exp.c (original)
+++ trunk/reactos/ntoskrnl/ke/i386/exp.c Fri Dec  1 11:20:37 2006
@@ -693,7 +693,7 @@
             if (PsGetCurrentProcess()->DebugPort)
             {
                 /* FIXME : TODO */
-                ASSERT(FALSE);
+                //KEBUGCHECK(0);
             }
             else if (KiDebugRoutine(TrapFrame,
                                     ExceptionFrame,