Changeset 4648 for trunk/src/kernel32/oslibdebug.cpp

Timestamp:

Nov 20, 2000, 10:52:37 AM (25 years ago)

Author:

sandervl

Message:

MN: Updates + fixes for debug api functions

File:

• trunk/src/kernel32/oslibdebug.cpp (modified) (16 diffs)

trunk/src/kernel32/oslibdebug.cpp

@@ -1 @@
-/* $Id: oslibdebug.cpp,v 1.4 2000-10-02 18:39:35 sandervl Exp $ */
+/* $Id: oslibdebug.cpp,v 1.5 2000-11-20 09:52:37 sandervl Exp $ */
 
 /*
  * OS/2 debug apis
  *
- * Copyright 1999 Edgar Buerkle
+ * Copyright 2000 Sander van Leeuwen
+ * Copyright 2000 Edgar Buerkle
+ * Copyright 2000 Michal Necasek
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -36 +38 @@
 VOID _Optlink DebugThread(VOID *argpid)
 {
-  CHAR   QueueName[30]=DEBUG_QUEUENAME;
-  CHAR   SemName[30]=DEBUG_SEMNAME;
-  CHAR   QSemName[30]=DEBUG_QSEMNAME;
-  HQUEUE QueueHandle=0;
-  HEV    hevSem=0, hevQSem=0;
+  BOOL   fTerminate    = FALSE;
+  CHAR   QueueName[30] = DEBUG_QUEUENAME;
+  CHAR   SemName[30]   = DEBUG_SEMNAME;
+  CHAR   QSemName[30]  = DEBUG_QSEMNAME;
+  HQUEUE QueueHandle   = 0;
+  HEV    hevSem        = 0,
+         hevQSem       = 0;
+  uDB_t  DbgBuf        = {0};
   int    rc;
-  uDB_t  DbgBuf={0};
   char   path[CCHMAXPATH];
   Win32DllBase *winmod;
   LPDEBUG_EVENT lpde;
   ULONG  *pid = (ULONG*)argpid;
+  ULONG  staticPid = *pid;
   char   tmp[12];
 
@@ -91 +96 @@
   }
 
-  while(rc == 0)
+  while (rc == 0)
   {
     DosWaitEventSem(hevSem, SEM_INDEFINITE_WAIT);
@@ -104 +109 @@
       dprintf(("DosDebug error: rc = %d", rc));
 
+    if (fTerminate) // break out of the while loop
+       break;
+
     switch (DbgBuf.Cmd)
     {
@@ -109 +117 @@
         dprintf(("DosDebug: GO ok"));
         goto DosDebug_GO;
+
       case DBG_N_Error:
         dprintf(("DosDebug: Error %d", DbgBuf.Value));
@@ -118 +127 @@
         }
         break;    // end thread !!!
+
       case DBG_N_ProcTerm:
-        dprintf(("DosDebug: Process terminated with rc %d\n",DbgBuf.Value));
+        dprintf(("DosDebug: Process terminated with rc %d\n", DbgBuf.Value));
         lpde = (LPDEBUG_EVENT) malloc(sizeof(DEBUG_EVENT));
         lpde->dwDebugEventCode = EXIT_PROCESS_DEBUG_EVENT_W;
@@ -126 +136 @@
         lpde->u.ExitThread.dwExitCode = DbgBuf.Value;
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
-        break;
+        // We should now fire final DBG_C_Go and end processing. We shouldn't
+        // get any more debug events.
+        fTerminate = TRUE;
+        // goto DosDebug_GO; *pid is invalid?!?
+        DbgBuf.Cmd = DBG_C_Go;
+        DbgBuf.Pid = staticPid;
+        goto DebugApi;
+        break;
+
       case DBG_N_Exception:
         dprintf(("DosDebug: Exception"));
@@ -136 +154 @@
         DbgBuf.Value = XCPT_CONTINUE_SEARCH;
         goto DebugApi;
+
       case DBG_N_ModuleLoad:
         DosQueryModuleName(DbgBuf.Value, CCHMAXPATH, path);
@@ -161 +180 @@
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
+
       case DBG_N_CoError:
         dprintf(("DosDebug: Coprocessor Error"));
@@ -166 +186 @@
         goto DosDebug_GO;
         break;
+
       case DBG_N_ThreadTerm:
         dprintf(("DosDebug: Thread %d terminated with rc %d", DbgBuf.Tid,DbgBuf.Value));
@@ -175 +196 @@
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
+
       case DBG_N_AsyncStop:
         dprintf(("DosDebug: Async stop"));
         goto DosDebug_GO;
         break;
+
       case DBG_N_NewProc:
         dprintf(("DosDebug: Debuggee started new Pid %d",DbgBuf.Value));
@@ -198 +221 @@
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
+
       case DBG_N_AliasFree:
         dprintf(("DosDebug: AliasFree"));
         goto DosDebug_GO;
         break;
+
       case DBG_N_Watchpoint:
         dprintf(("DosDebug: WatchPoint"));
         goto DosDebug_GO;
         break;
+
       case DBG_N_ThreadCreate:
+        // Note: Win32 debuggers expect a process creation event first!
         dprintf(("DosDebug: Thread %d created",DbgBuf.Tid));
+
+        if (DbgBuf.Tid == 1) { // Is this the first thread of a process?
+            // If so, fake a process creation event
+            dprintf(("DosDebug: Faking process creation event"));
+            lpde = (LPDEBUG_EVENT) malloc(sizeof(DEBUG_EVENT));
+            lpde->dwDebugEventCode = CREATE_PROCESS_DEBUG_EVENT_W;
+            lpde->dwProcessId = *pid;
+            lpde->dwThreadId = 0;
+            //TODO: fill union
+            lpde->u.CreateProcessInfo.hFile = 0;
+            lpde->u.CreateProcessInfo.hProcess = 0;
+            lpde->u.CreateProcessInfo.hThread = 0;
+            lpde->u.CreateProcessInfo.lpBaseOfImage = NULL;
+            lpde->u.CreateProcessInfo.dwDebugInfoFileOffset = 0;
+            lpde->u.CreateProcessInfo.nDebugInfoSize = 0;
+            lpde->u.CreateProcessInfo.lpThreadLocalBase = NULL;
+            lpde->u.CreateProcessInfo.lpStartAddress = NULL;
+            lpde->u.CreateProcessInfo.lpImageName = NULL;
+            lpde->u.CreateProcessInfo.fUnicode = FALSE;
+            DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
+        }
         lpde = (LPDEBUG_EVENT) malloc(sizeof(DEBUG_EVENT));
         lpde->dwDebugEventCode = CREATE_THREAD_DEBUG_EVENT_W;
@@ -218 +266 @@
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
+
       case DBG_N_ModuleFree:
         DosQueryModuleName(DbgBuf.Value, CCHMAXPATH, path);
@@ -235 +284 @@
         DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde, 0);
         break;
+
       case DBG_N_RangeStep:
         dprintf(("DosDebug: RangeStep"));
         goto DosDebug_GO;
         break;
+
       default:
         dprintf(("DosDebug: Unkown Notify %d", DbgBuf.Cmd));
@@ -246 +297 @@
   }
 
+  dprintf(("DosDebug - ending the service thread"));
   DosCloseQueue(QueueHandle);
   DosCloseEventSem(hevSem);
   DosCloseEventSem(hevQSem);
-  *pid = 0;
-
+//  *pid = 0;  No can do - for some reason *pid is invalid by now
 }
+
 //******************************************************************************
 //******************************************************************************
@@ -389 +441 @@
 
    tid = _beginthread(DebugThread, NULL, 1024, (PVOID) pid);
-   if(tid == 0)
+   if (tid == 0)
    {
-      dprintf(("OSLibStartDebugger: Could create debug thread"));
+      dprintf(("OSLibStartDebugger: Could not create debug thread!"));
       SetFS(sel);
       return;