Changeset 91 for branches/v2.9_Lars/classes/c

Timestamp:

Oct 1, 2023, 4:30:02 PM (23 months ago)

Author:

erdmann

Message:

merging v2.9 into v2.9_Lars branch, in particular, this means adding french,spanish,russian translations

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/c/c_common/except.c (modified) (4 diffs)
• classes/c/c_common/helper.c (modified) (2 diffs)
• classes/c/cwmm.DEF (modified) (2 diffs)

branches/v2.9_Lars/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*/
@@ -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)

branches/v2.9_Lars/classes/c/c_common/helper.c

@@ -23 +23 @@
  * http://www.geocities.com/SiliconValley/Sector/5785/
  */
+#define INCL_BASE
 #define INCL_WIN
 #define INCL_DOS
@@ -222 +223 @@
    return hModule;
  }
-
-/*APIRET APIENTRY DosQueryModFromEIP( HMODULE *phMod,
-                                    ULONG *pObjNum,
-                                    ULONG BuffLen,
-                                    PCHAR pBuff,
-                                    ULONG *pOffset,
-                                    PVOID Address );*/
 
  /* Get the HMODULE of the MM class DLL */

branches/v2.9_Lars/classes/c/cwmm.DEF

@@ -1 +1 @@
 ; CWMM.DEF: DEF-file for CWMM.dll
 ;
-;                    (C) Chris Wohlgemuth 2002-2005
+;                    (C) Chris Wohlgemuth 2002-2020
 ;/*
 ; * This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 
 LIBRARY CWMM INITGLOBAL
-DESCRIPTION '$@#(C) C. Wohlgemuth 2005:0.2        #@##1## 11/05/05 17:35:09        My ;-)  ::::9::@@CWMM-classes V0.2.9'
+DESCRIPTION '$@#(C) C. Wohlgemuth 2020:0.2        #@##1## 18/07/20 19:38:26        My ;-)  ::::9::@@CWMM-classes V0.2.9'
 
 PROTMODE