Changeset 2280 for trunk/src

Timestamp:

Dec 31, 1999, 11:47:12 AM (26 years ago)

Author:

sandervl

Message:

EB's debug support added

Location:

trunk/src/kernel32

Files:

• debug.cpp (added)
• makefile (modified) (4 diffs)
• oslibdebug.cpp (added)
• oslibdebug.h (added)
• stubs.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (5 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.75 1999-12-29 18:49:50 sandervl Exp $
+# $Id: makefile,v 1.76 1999-12-31 10:47:11 sandervl Exp $
 
 #
@@ -47 +47 @@
 atom.obj disk.obj directory.obj cvtbitmap.obj hmmmap.obj winfakepeldr.obj \
 cvtaccel.obj cvticon.obj cvticongrp.obj oslibexcept.obj cpu.obj process.obj \
-cvtcursor.obj cvtcursorgrp.obj stubs.obj interlock.obj toolhelp.obj codepage.obj
+cvtcursor.obj cvtcursorgrp.obj stubs.obj interlock.obj toolhelp.obj codepage.obj \
+debug.obj oslibdebug.obj 
 
 
@@ -211 +212 @@
     $(PDWIN32_INCLUDE)\wprocess.h \
     $(PDWIN32_INCLUDE)\win\thread.h \
+    oslibdebug.h \
     console2.h \
     mmap.h \
@@ -413 +415 @@
 codepage.obj: codepage.cpp oslibdos.h profile.h $(PDWIN32_INCLUDE)\codepage.h
 
+debug.obj:      debug.cpp oslibdebug.h
+oslibdebug.obj: oslibdebug.cpp oslibdebug.h
+
 clean:
         $(RM) *.OBJ *.LIB *.dll *.lrf *.res *.map *.pch kernelrsrc.asm

trunk/src/kernel32/stubs.cpp

@@ -1 @@
-/* $Id: stubs.cpp,v 1.16 1999-12-28 19:16:35 sandervl Exp $ */
+/* $Id: stubs.cpp,v 1.17 1999-12-31 10:47:11 sandervl Exp $ */
 
 /*
@@ -607 +607 @@
 
 
-/*****************************************************************************
- * Name      : BOOL WIN32API ContinueDebugEvent
- * Purpose   : The ContinueDebugEvent function enables a debugger to continue
- *             a thread that previously reported a debugging event.
- * Parameters: DWORD dwProcessId       process to continue
-               DWORD dwThreadId        thread to continue
-               DWORD dwContinueStatus  continuation status
- * Variables :
- * Result    : If the function succeeds, the return value is nonzero.
- *             If the function fails, the return value is zero.
- *             To get extended error information, call GetLastError.
- * Remark    : Only the thread that created dwProcessId with the CreateProcess
- *             function can call ContinueDebugEvent.
- *             After the ContinueDebugEvent function succeeds, the specified
- *             thread continues. Depending on the debugging event previously
- *             reported by the thread, different actions occur. If the continued
- *             thread previously reported an EXIT_THREAD_DEBUG_EVENT
- *             debugging event, ContinueDebugEvent closes the handle the
- *             debugger has to the thread. If the continued thread previously
- *             reported an EXIT_PROCESS_DEBUG_EVENT debugging event,
- *             ContinueDebugEvent closes the handles the debugger has to the
- *             process and to the thread.
- * Status    : UNTESTED STUB
- *
- * Author    : Markus Montkowski [Thu, 1998/05/19 11:46]
- *****************************************************************************/
-
-BOOL WIN32API ContinueDebugEvent( DWORD dwProcessId, DWORD dwThreadId,
-                                          DWORD dwContinueStatus)
-{
-
-  dprintf(("KERNEL32:  ContinueDebugEvent(%08x,%08x,%08x)not implemented\n",
-           dwProcessId, dwThreadId, dwContinueStatus
-          ));
-
-  return (FALSE);
-}
 
 /*****************************************************************************
@@ -2870 +2833 @@
 }
 
-
-/*****************************************************************************
- * Name      : BOOL WaitForDebugEvent
- * Purpose   : The WaitForDebugEvent function waits for a debugging event to
- *             occur in a process being debugged.
- * Parameters: LPDEBUG_EVENT lpde      address of structure for event information
- *             DWORD         dwTimeout number of milliseconds to wait for event
- * Variables :
- * Result    : TRUE / FALSE
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *****************************************************************************/
-
-BOOL WIN32API WaitForDebugEvent(LPDEBUG_EVENT lpde,
-                                DWORD         dwTimeout)
-{
-  dprintf(("KERNEL32: WaitForDebugEvent(%08xh,%08xh) not implemented.\n",
-           lpde,
-           dwTimeout));
-
-  return (FALSE);
-}
-
-
 /*****************************************************************************
  * Name      : BOOL WaitNamedPipeA

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.62 1999-12-30 11:19:54 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.63 1999-12-31 10:47:12 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include "exceptutil.h"
 #include "oslibmisc.h"
+#include "oslibdebug.h"
 
 #include "console.h"
@@ -707 +708 @@
                             LPPROCESS_INFORMATION lpProcessInfo )
 {
+ THDB *pThreadDB = (THDB*)GetThreadTHDB();
+ char *cmdline = NULL;
  BOOL  rc;
- char *cmdline = NULL;
 
     dprintf(("KERNEL32: CreateProcessA %s cline:%s inherit:%d cFlags:%x Env:%x CurDir:%s StartupFlags:%x\n",
@@ -722 +724 @@
                          lpEnvironment, lpCurrentDirectory, lpStartupInfo,
                          lpProcessInfo) == TRUE)
-        return(TRUE);
-
+    {
+      if (dwCreationFlags & DEBUG_PROCESS && pThreadDB != NULL)
+      {
+        if(pThreadDB->pidDebuggee != 0)
+        {
+          // TODO: handle this
+          dprintf(("KERNEL32: CreateProcess ERROR: This thread is already a debugger\n"));
+        }
+        else
+        {
+          pThreadDB->pidDebuggee = lpProcessInfo->dwProcessId;
+          OSLibStartDebugger((ULONG*)&pThreadDB->pidDebuggee);
+        }
+      }
+      else pThreadDB->pidDebuggee = 0;
+
+      return(TRUE);
+    }
     //probably a win32 exe, so run it in the pe loader
     if(lpApplicationName) {
@@ -751 +769 @@
                          lpEnvironment, lpCurrentDirectory, lpStartupInfo,
                          lpProcessInfo);
+    if(rc == TRUE) {
+      if (dwCreationFlags & DEBUG_PROCESS && pThreadDB != NULL)
+      {
+        if(pThreadDB->pidDebuggee != 0)
+        {
+          // TODO: handle this
+          dprintf(("KERNEL32: CreateProcess ERROR: This thread is already a debugger\n"));
+        }
+        else
+        {
+          pThreadDB->pidDebuggee = lpProcessInfo->dwProcessId;
+          OSLibStartDebugger((ULONG*)&pThreadDB->pidDebuggee);
+        }
+      }
+      else
+        pThreadDB->pidDebuggee = 0;
+    }
     if(cmdline)
         free(cmdline);