Changeset 341 for trunk/dll/autoview.c

Timestamp:

Jul 26, 2006, 3:58:56 AM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/autoview.c (modified) (17 diffs)

trunk/dll/autoview.c

@@ -14 +14 @@
   23 May 05 SHL Use QWL_USER
   29 May 06 SHL Sync with archiver.bb2 mods
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -21 +22 @@
 #define INCL_WIN
 #define INCL_GPI
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -33 +35 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(AUTOVIEW,AutoViewProc,CreateHexDump,AutoObjProc)
 #pragma alloc_text(AUTOVIEW2,MakeAutoWin,WriteEA,PutComments)
 
-static HWND hwndAutoObj = (HWND)0;
+static HWND hwndAutoObj;
 static CHAR stopflag;
 static CHAR currfile[CCHMAXPATH];
 
-BOOL WriteEA (HWND hwnd,CHAR *filename,CHAR *eaname,USHORT type,CHAR *data) {
-
+BOOL WriteEA (HWND hwnd,CHAR *filename,CHAR *eaname,USHORT type,CHAR *data)
+{
   /* save an ea to disk */
 
@@ -88 +93 @@
   }
 
-  if(!DosAllocMem((PPVOID)&pfealist,ealen,PAG_COMMIT | PAG_READ |
-                  PAG_WRITE | OBJ_TILE) && pfealist) {
+  rc = DosAllocMem((PPVOID)&pfealist,ealen,PAG_COMMIT | PAG_READ |
+                   PAG_WRITE | OBJ_TILE);
+  if (rc || !pfealist)
+    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+  else {
     memset(pfealist,0,ealen);
     pfealist->list[0].cbName = strlen(eaname);
@@ -194 +202 @@
 
 
-BOOL PutComments (HWND hwnd,CHAR *filename,CHAR *comments) {
-
+BOOL PutComments (HWND hwnd,CHAR *filename,CHAR *comments)
+{
   register CHAR *p;
 
@@ -272 +280 @@
 MRESULT EXPENTRY AutoObjProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
-
   switch(msg) {
     case UM_LOADFILE:
@@ -304 +311 @@
                           0L)) {
                 ibufflen = (AutoviewHeight < 96) ? 512 : 3072;
-                ibuff = malloc(ibufflen + 2);
-                if(ibuff) {
+                ibuff = xmalloc(ibufflen + 2,pszSrcFile,__LINE__);
+                if (ibuff) {
                   // Depends on CreateHexDump line width
                   obufflen = (ibufflen / 16) * (6 + 3 * 16 + 1 + 16 + 1) + 80;
-                  obuff = malloc(obufflen + 1);
-                  if(obuff) {
+                  obuff = xmalloc(obufflen + 1,pszSrcFile,__LINE__);
+                  if (obuff) {
                     *obuff = 0;
                     if(!DosRead(handle,
@@ -450 +457 @@
                 }
                 bufflen = (CCHMAXPATHCOMP + 42) * nm;
-                buff = malloc(bufflen);
-                if(buff) {
+                buff = xmalloc(bufflen,pszSrcFile,__LINE__);
+                if (buff) {
                   p = buff;
                   *p = 0;
@@ -518 +525 @@
             BOOL          readonly = FALSE;
 
-            pgealist = malloc(sizeof(GEA2LIST) + 64);
-            if(pgealist) {
-              memset(pgealist,0,sizeof(GEA2LIST) + 64);
+            pgealist = xmallocz(sizeof(GEA2LIST) + 64,pszSrcFile,__LINE__);
+            if (pgealist) {
               pgea = &pgealist->list[0];
               strcpy(pgea->szName,".COMMENTS");
@@ -526 +532 @@
               pgea->oNextEntryOffset = 0L;
               pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName);
-              pfealist = malloc(65536);
-              if(pfealist) {
-                memset(pfealist,0,65536);
+              pfealist = xmallocz(65536,pszSrcFile,__LINE__);
+              if (pfealist) {
                 pfealist->cbList = 65536;
                 eaop.fpGEA2List = pgealist;
@@ -543 +548 @@
                     value[pfea->cbValue] = 0;
                     if(*(USHORT *)value == EAT_MVMT) {
-                      buff = malloc(65536);
-                      if(buff) {
+                      buff = xmalloc(65536,pszSrcFile,__LINE__);
+                      if (buff) {
                         p = buff;
                         *buff = 0;
@@ -619 +624 @@
 
 
-VOID MakeAutoWin (VOID *args) {
-
+VOID MakeAutoWin (VOID *args)
+{
   HAB         hab2;
   HMQ         hmq2;
@@ -669 +674 @@
 
 
-MRESULT EXPENTRY AutoViewProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY AutoViewProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   USHORT id = WinQueryWindowUShort(hwnd,QWS_ID);
 
@@ -678 +683 @@
         MRESULT mr;
 
-        if(!hwndAutoObj &&
-           _beginthread(MakeAutoWin,
-                        NULL,
-                        65536,
-                        (PVOID)hwnd) == -1)
-          PostMsg(hwnd,
-                  UM_CLOSE,
-                  MPVOID,
-                  MPVOID);
+        if (!hwndAutoObj) {
+          if (_beginthread(MakeAutoWin,NULL,65536,(PVOID)hwnd) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            PostMsg(hwnd,
+                    UM_CLOSE,
+                    MPVOID,
+                    MPVOID);
+          }
+        }
         mr = PFNWPStatic(hwnd,msg,mp1,mp2);
         SetPresParams(hwnd,
@@ -791 +796 @@
             if(*currfile) {
               if(MLEgetchanged(hwnd)) {
-
-                CHAR *ea = malloc(32768);
-
-                if(ea) {
+                CHAR *ea = xmalloc(32768,pszSrcFile,__LINE__);
+                if (ea) {
                   *ea = 0;
                   WinQueryWindowText(hwnd,32767,ea);
@@ -863 +866 @@
           if(*currfile) {
 
-            CHAR *cf = strdup(currfile);
-
-            if(cf) {
+            CHAR *cf = xstrdup(currfile,pszSrcFile,__LINE__);
+
+            if (cf) {
               stopflag++;
               if(!PostMsg(hwndAutoObj,
@@ -1003 +1006 @@
   return PFNWPStatic(hwnd,msg,mp1,mp2);
 }
-