Changeset 104 for trunk/classes/c/c_common

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)
• classes/c/c_common/helper.c (modified) (19 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;
-   
+
                   }
                }

trunk/classes/c/c_common/helper.c

@@ -19 +19 @@
 /*
  * If you need another license for your prject/product contact me at
- * 
+ *
  * http://www.os2world.com/cdwriting
  * http://www.geocities.com/SiliconValley/Sector/5785/
  */
+#define INCL_BASE
 #define INCL_WIN
 #define INCL_DOS
@@ -41 +42 @@
 
 #ifndef BS_NOTEBOOKBUTTON
-#define BS_NOTEBOOKBUTTON 8L   /* Warp 4 notebook style */  
+#define BS_NOTEBOOKBUTTON 8L   /* Warp 4 notebook style */
 #endif
 
@@ -66 +67 @@
 
 
-  memset(&pDetails, 0, sizeof(pDetails)); 
+  memset(&pDetails, 0, sizeof(pDetails));
   pDetails.Length          = sizeof(PROGDETAILS);
   pDetails.progt.progc     = PROG_DEFAULT;
@@ -81 +82 @@
   }
   pDetails.pszExecutable   = wrapperExe;
-  
+
   pDetails.pszEnvironment  = NULLHANDLE;
   pDetails.swpInitial.fl   = SWP_ACTIVATE|SWP_ZORDER; /* window positioning */
@@ -92 +93 @@
   //  pDetails.swpInitial.ulReserved1      = 0;
   //  pDetails.swpInitial.ulReserved2      = 0;
-  
+
   /* Create an object window which will process the WM_APPTERMINATE message. While processing of this
    message the view item (see below) will be removed from the inuse list thus removing the inuse emphasis. */
@@ -150 +151 @@
   if(!hModule)
     {
-      
+
       if(queryModuleHandle())
         {
@@ -170 +171 @@
               if(NO_ERROR!=DosScanEnv("LANG", &pszLang))
                 break;
-              
+
               /* Skip leading spaces */
               chrPtr=pszLang;
               while(*chrPtr==' ')
                 chrPtr++;
-              
+
               /* Check if value seems to be valid. The var must be something like xx_XX thus length is 5 */
               if(strlen(chrPtr)<5)
                 break;
-              
-              /* Extract the first two chars */        
+
+              /* Extract the first two chars */
               sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]);
               strcat(resDLLPath,buf);
@@ -187 +188 @@
               //  HlpWriteToTrapLog(resDLLPath);
               //  HlpWriteToTrapLog("\n");
-        
+
               rc=DosLoadModule(buf,sizeof(buf), resDLLPath, &hModule);
               if(rc==NO_ERROR)
                 break;
-        
+
               /* Insert message in Logfile */
               //  writeLog("Ressource-DLL for the current countrycode not found. Trying to load default one (CDFLD001.DLL).\n");
-        
+
               /* NLS DLL not found. Try to load default */
               found=strrchr(resDLLPath,'\\');
               if(!found)
                 break;
-              
+
               *found=0;
 
@@ -206 +207 @@
               //   HlpWriteToTrapLog(resDLLPath);
               //   HlpWriteToTrapLog("\n");
-              
+
               rc=DosLoadModule(buf,sizeof(buf), resDLLPath, &hModule);
               if(rc!=NO_ERROR) {
@@ -215 +216 @@
                 //writeLog("Ressource DLL loaded.\n");
               }
-              
+
               break;
             }while(TRUE);
@@ -223 +224 @@
  }
 
-/*APIRET APIENTRY DosQueryModFromEIP( HMODULE *phMod,
-                                    ULONG *pObjNum,
-                                    ULONG BuffLen,
-                                    PCHAR pBuff,
-                                    ULONG *pOffset,
-                                    PVOID Address );*/
-
  /* Get the HMODULE of the MM class DLL */
 HMODULE queryModuleHandle(void)
@@ -242 +236 @@
       ULONG ulObj, ulBufLen, ulOffset;
       char thePath[CCHMAXPATH];
-      
+
       if(DosQueryModFromEIP( &hModule,
                              &ulObj,
@@ -248 +242 @@
                              thePath,
                              &ulOffset,
-                             (PVOID)queryModuleHandle )!=NO_ERROR) {
+                             (ULONG)queryModuleHandle )!=NO_ERROR) {
         SysWriteToTrapLog("Can't get module handle for CWMM class DLL!\n");
         hModule=0;
@@ -291 +285 @@
       strncpy(classDLLPath,moduleName, sizeof(classDLLPath));
       classDLLPath[sizeof(classDLLPath)-1]=0;
-      
+
       /* Get install dir */
       strncpy(chrInstallDir,moduleName, sizeof(chrInstallDir));
@@ -303 +297 @@
         strncpy(classDLLPath,chrInstallDir, sizeof(classDLLPath));
         classDLLPath[sizeof(classDLLPath)-1]=0;
-        
+
         /* Get install dir */
         if((chrPtr=strrchr(chrInstallDir,'\\'))!=NULLHANDLE)
@@ -352 +346 @@
     HENUM henum;
     HWND hwnd;
-    
+
     /* Move the default notebook buttons */
     if((henum=WinBeginEnumWindows(hwndDlg))!=NULLHANDLE) {
@@ -396 +390 @@
     {
       snprintf(setup, sizeof(setup), "LOCATOR=%s;%s", chrUrl, "OPEN=DEFAULT");
-      WinCreateObject("WPUrl","tempUrl", setup, tempDir, 
+      WinCreateObject("WPUrl","tempUrl", setup, tempDir,
                       CO_UPDATEIFEXISTS);
         /* WinDestroyObject(hObject); Don't use it, blocks PM */
@@ -402 +396 @@
 }
 
-/* This function checks if the given file exists */ 
+/* This function checks if the given file exists */
 ULONG checkFileSize(char* chrFileName)
 {
@@ -410 +404 @@
   if(stat(chrFileName , &statBuf)==-1)
     return 0;
- 
+
   return statBuf.st_size;
 }