Changeset 340

Timestamp:

Jul 26, 2006, 3:48:27 AM (19 years ago)

Author:

root

Message:

Check more run time errors

Location:

trunk/dll

Files:

• filter.c (modified) (7 diffs)
• flesh.c (modified) (10 diffs)

trunk/dll/filter.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004 Steven H.Levine
-
-  Revisions     01 Aug 04 SHL - Rework lstrip/rstrip usage
+  Copyright (c) 2004, 2006 Steven H.Levine
+
+  01 Aug 04 SHL Rework lstrip/rstrip usage
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -13 +14 @@
 #define INCL_WIN
 #define INCL_DOS
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -24 +26 @@
 
 #pragma data_seg(FILTER_DATA)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(FILTER,Filter)
 
@@ -129 +134 @@
       bstripcr(s);
       if(*s && *s != ';') {
-        info = malloc(sizeof(LINKMASKS));
+        info = xmalloc(sizeof(LINKMASKS),pszSrcFile,__LINE__);
         if(info) {
-          info->mask = strdup(s);
+          info->mask = xstrdup(s,pszSrcFile,__LINE__);
           if(info->mask) {
             info->next = NULL;
@@ -165 +170 @@
       strcat(s,"\\");
     strcat(s,"FILTERS.DAT");
-    fp = fopen(s,"w");
-    if(fp) {
+    fp = xfopen(s,"w",pszSrcFile,__LINE__);
+    if (fp) {
       fputs(GetPString(IDS_FILTERFILETEXT),fp);
       info = maskhead;
@@ -197 +202 @@
     info = info->next;
   }
-  info = malloc(sizeof(LINKMASKS));
+  info = xmalloc(sizeof(LINKMASKS),pszSrcFile,__LINE__);
   if(info) {
-    info->mask = strdup(mask);
+    info->mask = xstrdup(mask,pszSrcFile,__LINE__);
     if(info->mask) {
       info->next = NULL;
@@ -634 +639 @@
               }
               else
-                DosBeep(50,100);
+                DosBeep(50,100);                // MSK_DELETE
             }
           }

trunk/dll/flesh.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005 Steven H. Levine
+  Copyright (c) 2006 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
@@ -13 +13 @@
   28 May 05 SHL Clean while reading code
   24 Oct 05 SHL Delete obsolete code
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -19 +20 @@
 #define INCL_DOSERRORS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -31 +32 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(FLESH,Flesh,FleshEnv,Unflesh,Stubby)
 
@@ -60 +64 @@
     path[strlen(path) - 1] = 0;
     if(!stricmp(path,"LIBPATH")) {
-      var = malloc(65536);
+      var = xmalloc(65536,pszSrcFile,__LINE__);
       if(var)
         LoadLibPath(var,65536);
@@ -176 +180 @@
   BOOL        includefiles = fFilesInTree;
 
-  if(!pciParent || (INT)pciParent == -1 || !hwndCnr)
+  if (!pciParent || (INT)pciParent == -1 || !hwndCnr)
     return FALSE;
   pciL = (PCNRITEM)WinSendMsg(hwndCnr,
@@ -466 +470 @@
                          MPFROMLONG(EXTRA_RECORD_BYTES2),
                          MPFROMLONG(1L));
-        if(pci) {
-
+        if(!pci) {
+          Win_Error(hwndCnr,HWND_DESKTOP,__FILE__,__LINE__,
+                    GetPString(IDS_RECORDALLOCFAILEDTEXT));
+        }
+        else {
           RECORDINSERT ri;
 
@@ -486 +493 @@
             DosSleep(100L);
             WinSetFocus(HWND_DESKTOP,hwndCnr);
-            if(WinIsWindow((HAB)0,hwndCnr)) {
-              if(WinSendMsg(hwndCnr,
-                            CM_INSERTRECORD,
-                            MPFROMP(pci),
-                            MPFROMP(&ri)))
-                ret = TRUE;
-              else {
+            if (WinIsWindow((HAB)0,hwndCnr)) {
+              if (!WinSendMsg(hwndCnr,
+                             CM_INSERTRECORD,
+                             MPFROMP(pci),
+                             MPFROMP(&ri))) {
                 Win_Error(hwndCnr,HWND_DESKTOP,__FILE__,__LINE__,
                           GetPString(IDS_RECORDINSERTFAILEDTEXT));
@@ -499 +504 @@
                            MPFROMP(&pci),
                            MPFROMSHORT(1));
-              }
+              }
+              else
+                ret = TRUE;
             }
           }
@@ -505 +512 @@
             ret = TRUE;
         }
-        else
-          Win_Error(hwndCnr,HWND_DESKTOP,__FILE__,__LINE__,
-                    GetPString(IDS_RECORDALLOCFAILEDTEXT));
       }
       else if(toupper(*str) > 'B' && str[1] == ':' && str[2] == '\\' &&