Changeset 104 for trunk/classes/c/c_common/except.c

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• classes/c/c_common/except.c (modified) (11 diffs)

trunk/classes/c/c_common/except.c

@@ -130 +130 @@
    USHORT  SS;
 } DbgBuf;
-/*-------------------------------------*/
-APIRET APIENTRY DOSQUERYMODFROMEIP( HMODULE *phMod,
-                                    ULONG *pObjNum,
-                                    ULONG BuffLen,
-                                    PCHAR pBuff,
-                                    ULONG *pOffset,
-                                    PVOID Address );
-/*APIRET APIENTRY DosQueryModFromEIP( HMODULE *phMod,
-                                    ULONG *pObjNum,
-                                    ULONG BuffLen,
-                                    PCHAR pBuff,
-                                    ULONG *pOffset,
-                                    PVOID Address );*/
-
-/*-------------------------------------*/
+
 /* CW
 #define DBG_O_OBJMTE       0x10000000L*/
@@ -459 +445 @@
 
   return 'c';
-} 
+}
 
 ULONG _System excHandler(PEXCEPTIONREPORTRECORD pERepRec,
@@ -515 +501 @@
 {
   ULONG rc = XCPT_CONTINUE_SEARCH;
-  
+
   if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
     return (XCPT_CONTINUE_SEARCH);
@@ -522 +508 @@
   if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
     return (XCPT_CONTINUE_SEARCH);
-  
+
   if ((pERepRec->ExceptionNum & XCPT_SEVERITY_CODE) == XCPT_FATAL_EXCEPTION)
     {
@@ -655 +641 @@
           }
 #endif
-        
+
         fAlreadyTrapped = TRUE;
         /* end  John Currier's recursion prevention */
@@ -663 +649 @@
             (Version[0]>=20) &&
             (Version[1]>=10) ) {
-          /* version must be over 2.1 for DOSQUERYMODFROMEIP */
+          /* version must be over 2.1 for DosQueryModFromEIP */
           fprintf(hTrap,"OS/2 Version %d.%d\n",Version[0]/10,Version[1]);
-          rc=DOSQUERYMODFROMEIP( &hMod, &ObjNum, CCHMAXPATH,
+          rc=DosQueryModFromEIP( &hMod, &ObjNum, CCHMAXPATH,
                                  Name, &Offset, pERepRec->ExceptionAddress);
             if (rc==0) {
@@ -814 +800 @@
      if ((AllocationFlags&PAG_EXECUTE)&&
          (AllocationFlags&PAG_BASE)) {
-        rc=DOSQUERYMODFROMEIP( &hMod, &ObjNum, CCHMAXPATH,
+        rc=DosQueryModFromEIP( &hMod, &ObjNum, CCHMAXPATH,
                               Name, &Offset, BaseAddress);
         if (rc==0) {
@@ -1038 +1024 @@
             break; /* avoid infinite loops */
          } else {
-            rc = DOSQUERYMODFROMEIP(&hMod, &ObjNum, sizeof(Name),
+            rc = DosQueryModFromEIP(&hMod, &ObjNum, sizeof(Name),
                                     Name, &Offset, (PVOID)RetAddr);
             if (rc == NO_ERROR && ObjNum != -1)
@@ -1181 +1167 @@
 }
 
-#include <exe.h>
 #include <newexe.h>
 #define  FOR_EXEHDR  1  /* avoid define conflicts between newexe.h and exe386.h */
@@ -1835 +1820 @@
                do {
                   read(fh,(void *)&FirstLine,sizeof(FirstLine));
-   
+
                   if (FirstLine.LineNum!=0) {
                      fprintf(hTrap,"Missing Line table information\n");
@@ -1864 +1849 @@
                         }
                         break;
-   
+
                      case 1:
                         lseek(fh, sizeof(struct linlist_rec), SEEK_CUR);
                         break;
-   
+
                      case 2:
                         lseek(fh, sizeof(struct linsourcelist_rec), SEEK_CUR);
                         break;
-   
+
                      case 3:
                         lseek(fh, sizeof(struct filenam_rec), SEEK_CUR);
                         break;
-   
+
                      case 4:
                         lseek(fh, sizeof(struct pathtab_rec), SEEK_CUR);
                         break;
-   
+
                   }
                }