Changeset 364 for trunk/dll/draglist.c

Timestamp:

Jul 27, 2006, 2:44:53 AM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/draglist.c (modified) (12 diffs)

trunk/dll/draglist.c

@@ -9 +9 @@
   Copyright (c) 2001, 2002 Steven H.Levine
 
-  Revisions     16 Oct 02 SHL - DoFileDrag: don't free stack
+  16 Oct 02 SHL DoFileDrag: don't free stack
+  26 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -15 +16 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(DRAGLIST,DragOne,DoFileDrag,DragList,PickUp)
-
 
 HWND DragOne (HWND hwndCnr,HWND hwndObj,CHAR *filename,BOOL moveok) {
@@ -185 +188 @@
       isdir = ((pci->attrFile & FILE_DIRECTORY) != 0);
       if(ulNumfiles + 2L > numdragalloc) {
-        if(!padiIcon) {
-          padiTest = realloc(padiIcon,sizeof(DRAGIMAGE) * (numdragalloc + 4L));
+        if (!padiIcon) {
+          padiTest = xrealloc(padiIcon,sizeof(DRAGIMAGE) * (numdragalloc + 4L), pszSrcFile, __LINE__);
           if(padiTest)
             padiIcon = padiTest;
@@ -203 +206 @@
           ulNumIcon = ulNumfiles + 1;
         }
-        ppTest = realloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 4L));
-        if(ppTest) {
+        ppTest = xrealloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 4L), pszSrcFile, __LINE__);
+        if (ppTest) {
           ppDItem = ppTest;
           numdragalloc += 4L;
@@ -211 +214 @@
           break;
       }
-      ppDItem[ulNumfiles] = malloc(sizeof(DRAGITEM));
-      if(ppDItem[ulNumfiles]) {
-        if(!ulNumIcon) {
+      ppDItem[ulNumfiles] = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      if (ppDItem[ulNumfiles]) {
+        if (!ulNumIcon) {
           padiIcon[ulNumfiles].cb = sizeof(DRAGIMAGE);
           padiIcon[ulNumfiles].cptl = 0;
@@ -255 +258 @@
       // Archive object
       if(ulNumfiles + 3L > numdragalloc) {
-        ppTest = realloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 5L));
-        if(ppTest) {
+        ppTest = xrealloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 5L), pszSrcFile, __LINE__);
+        if (!ppTest)
+          break;
+        else {
           ppDItem = ppTest;
           numdragalloc += 5L;
         }
-        else
-          break;
-      }
-      ppDItem[ulNumfiles] = malloc(sizeof(DRAGITEM));
-      if(ppDItem[ulNumfiles]) {
+      }
+      ppDItem[ulNumfiles] = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      if (!ppDItem[ulNumfiles])
+        break;
+      else {
         diFakeIcon.hImage = hptrFile;
         memset(ppDItem[ulNumfiles],0,sizeof(DRAGITEM));
@@ -281 +286 @@
         ppDItem[ulNumfiles]->fsSupportedOps = DO_COPYABLE;
         ulNumfiles++;
-        ppDItem[ulNumfiles] = malloc(sizeof(DRAGITEM));
-        if(ppDItem[ulNumfiles]) {
+        ppDItem[ulNumfiles] = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+        if (ppDItem[ulNumfiles]) {
           diFakeIcon.hImage = hptrFile;
           memset(ppDItem[ulNumfiles],0,sizeof(DRAGITEM));
@@ -302 +307 @@
         ppDItem[ulNumfiles] = NULL;
       }
-      else
-        break;
     }
     WinSendMsg(hwndCnr,CM_SETRECORDEMPHASIS,MPFROMP(pci),
@@ -419 +422 @@
                ((fs3.attrFile & FILE_DIRECTORY) != 0);
       if(ulNumfiles + 2L > numdragalloc) {
-        if(!padiIcon) {
-          padiTest = realloc(padiIcon,sizeof(DRAGIMAGE) * (numdragalloc + 4L));
-          if(padiTest)
+        if (!padiIcon) {
+          padiTest = xrealloc(padiIcon,sizeof(DRAGIMAGE) * (numdragalloc + 4L), pszSrcFile, __LINE__);
+          if (!padiTest)
+            break;
+          else
             padiIcon = padiTest;
-          else
-            break;
         }
         else if(!ulNumIcon) {
@@ -437 +440 @@
           ulNumIcon = ulNumfiles + 1;
         }
-        ppTest = realloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 4L));
-        if(ppTest) {
+        ppTest = xrealloc(ppDItem,sizeof(DRAGITEM *) * (numdragalloc + 4L), pszSrcFile, __LINE__);
+        if (!ppTest) 
+          break;
+        else {
           ppDItem = ppTest;
           numdragalloc += 4L;
         }
-        else
-          break;
-      }
-      ppDItem[ulNumfiles] = malloc(sizeof(DRAGITEM));
-      if(ppDItem[ulNumfiles]) {
+      }
+      ppDItem[ulNumfiles] = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      if (!ppDItem[ulNumfiles])
+        break;
+      else {
         if(!ulNumIcon) {
           padiIcon[ulNumfiles].cb = sizeof(DRAGIMAGE);
@@ -479 +484 @@
         ppDItem[ulNumfiles] = NULL;
       }
-      else
-        break;
-    }
-  }
-
-  if(ulNumfiles) {
+    }
+  } // for
+
+  if (ulNumfiles) {
     pDInfo = DrgAllocDraginfo(ulNumfiles);  /* Allocate DRAGINFO */
-    if(pDInfo) {
-      if((IsFullName(szBuffer) &&
-         (driveflags[toupper(*szBuffer) - 'A'] & DRIVE_NOTWRITEABLE)))
+    if (pDInfo) {
+      if ((IsFullName(szBuffer) &&
+          (driveflags[toupper(*szBuffer) - 'A'] & DRIVE_NOTWRITEABLE)))
         pDInfo->usOperation = DO_COPY;
       else
         pDInfo->usOperation = DO_DEFAULT;
-      if(IsRoot(list[0]))
+      if (IsRoot(list[0]))
         pDInfo->usOperation = DO_LINK;
       pDInfo->hwndSource = (hwndObj) ? hwndObj : hwnd;
       // pDInfo->hwndSource = hwnd;
-      for(Select = 0L;Select < ulNumfiles;Select++) {
+      for (Select = 0L;Select < ulNumfiles;Select++) {
         DrgSetDragitem(pDInfo,            /* Set item in DRAGINFO  */
                        ppDItem[Select],     /* Pointer to DRAGITEM   */
@@ -502 +505 @@
                        Select);           /* Index of DRAGITEM     */
         free(ppDItem[Select]);
-      }
+      } // for
 #ifdef __DEBUG_ALLOC__
       _heap_check();