Changeset 8775 for trunk/src

Timestamp:

Jun 26, 2002, 9:14:18 AM (23 years ago)

Author:

sandervl

Message:

debug updates + added OSLibDosGetTickCount

Location:

trunk/src/kernel32

Files:

• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (1 diff)
• exceptions.cpp (modified) (3 diffs)
• kernel32.mak (modified) (2 diffs)
• oslibtime.cpp (added)
• oslibtime.h (added)

trunk/src/kernel32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.25 2002-06-09 19:55:53 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.26 2002-06-26 07:14:17 sandervl Exp $ */
 
 /*
@@ -138 +138 @@
 "string",
 "char",
-"osliblvm"
+"osliblvm",
+"oslibtime",
+"conodin32"
 };
 //******************************************************************************

trunk/src/kernel32/dbglocal.h

@@ -135 +135 @@
 #define DBG_char           115
 #define DBG_osliblvm       116
-#define DBG_MAXFILES       117
+#define DBG_oslibtime      117
+#define DBG_conodin32      118
+#define DBG_MAXFILES       119
 
 extern USHORT DbgEnabledKERNEL32[DBG_MAXFILES];

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.59 2002-06-02 12:42:09 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.60 2002-06-26 07:14:18 sandervl Exp $ */
 
 /*
@@ -69 +69 @@
 #include "WinDllBase.h"
 #include "WinExeBase.h"
+
+/* Really lazy! But, including wincon.h means lot's of missing COORD. */
+#define CTRL_C_EVENT     0     //#include <wincon.h>
+#define CTRL_BREAK_EVENT 1     //#include <wincon.h>
+#include "console.h"
+
 
 #define DBG_LOCALLOG    DBG_exceptions
@@ -1315 +1321 @@
         goto continuesearch;
 
-  case XCPT_SIGNAL:
-        if(pERepRec->ExceptionInfo[0] == XCPT_SIGNAL_KILLPROC)          /* resolve signal information */
+
+    /*
+     * In OS/2 VIO Ctrl-C and Ctrl-Break is special stuff which comes in
+     * thru the exception handler. In Win32 CUI they are handled by a
+     * ControlCtrlEvent procedure. So, if we receive one of those signals
+     * we assume that this is a VIO program and let the handlers handle this.
+     * (If they want to.)
+     */
+    case XCPT_SIGNAL:
+        switch (pERepRec->ExceptionInfo[0])
         {
-            SetExceptionChain((ULONG)-1);
-            goto continuesearch;
+            case XCPT_SIGNAL_BREAK:
+                if (InternalGenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, 0))
+                    goto continueexecution;
+                goto continuesearch;
+            case XCPT_SIGNAL_INTR:
+                if (InternalGenerateConsoleCtrlEvent(CTRL_C_EVENT, 0))
+                    goto continueexecution;
+                goto continuesearch;
+
+            case XCPT_SIGNAL_KILLPROC:  /* resolve signal information */
+                SetExceptionChain((ULONG)-1);
+                goto continuesearch;
         }
         goto CrashAndBurn;

trunk/src/kernel32/kernel32.mak

@@ -1 @@
-# $Id: kernel32.mak,v 1.31 2002-06-06 11:31:12 sandervl Exp $
+# $Id: kernel32.mak,v 1.32 2002-06-26 07:14:18 sandervl Exp $
 
 #
@@ -148 +148 @@
 $(OBJDIR)\hmmailslot.obj \
 $(OBJDIR)\mailslot.obj \
+$(OBJDIR)\oslibtime.obj \
+$(OBJDIR)\conodin32.obj \
 $(OBJDIR)\kernelrsrc.obj