Changeset 352 for trunk/dll/collect.c

Timestamp:

Jul 26, 2006, 9:35:45 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/collect.c (modified) (23 diffs)

trunk/dll/collect.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2005 Steven H. Levine
+  Copyright (c) 2003, 2006 Steven H. Levine
 
   15 Oct 02 MK Baseline
@@ -22 +22 @@
   24 Oct 05 SHL CollectorCnrWndProc: avoid excess writes to Status2 window
   10 Nov 05 SHL CollectorCnrWndProc: correct missing button window updates
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -48 +49 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(COLLECTOR,CollectorCnrWndProc,CollectorObjWndProc)
 #pragma alloc_text(COLLECTOR,CollectorClientWndProc,CollectorTextProc)
@@ -113 +117 @@
                                id);
             dcd = WinQueryWindowPtr(WinWindowFromID(WinQueryWindow(hwnd,
-                                                                 QW_PARENT),
+                                                                   QW_PARENT),
                                                     COLLECTOR_CNR),
                                     QWL_USER);
@@ -631 +635 @@
                                        DIR_SELECTED),
                        GetPString(IDS_COLLECTINGTEXT));
-      for (x = 0; li -> list[x]; x++)
-      {
-        ;
-      }
-      ulMaxFiles = x;
-      if (ulMaxFiles)
-      {
+      for (ulMaxFiles = 0; li -> list[ulMaxFiles]; ulMaxFiles++)
+        ;                               // Count
+
+      if (ulMaxFiles) {
         pci = WinSendMsg(dcd -> hwndCnr, CM_ALLOCRECORD,
                          MPFROMLONG(EXTRA_RECORD_BYTES),
                          MPFROMLONG(ulMaxFiles));
-        if (pci)
-        {
+        if (pci) {
+          Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed", ulMaxFiles);
+          break;
+        }
+        else {
           pciFirst = pci;
           for (x = 0; li -> list[x]; x++)
@@ -933 +937 @@
         WORKER *wk;
 
-        wk = malloc(sizeof(WORKER));
-        if (wk)
-        {
-          memset(wk, 0, sizeof(WORKER));
+        wk = xmallocz(sizeof(WORKER),pszSrcFile,__LINE__);
+        if (!wk) {
+          FreeListInfo((LISTINFO *) mp1);
+        }
+        else {
           wk -> size = sizeof(WORKER);
           wk -> hwndCnr = dcd -> hwndCnr;
@@ -946 +951 @@
           if (_beginthread(MassAction, NULL, 122880, (PVOID) wk) == -1)
           {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
             free(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
         }
-        else
-          FreeListInfo((LISTINFO *) mp1);
       }
     }
@@ -964 +968 @@
         WORKER *wk;
 
-        wk = malloc(sizeof(WORKER));
-        if (wk)
-        {
-          memset(wk, 0, sizeof(WORKER));
+        wk = xmallocz(sizeof(WORKER),pszSrcFile,__LINE__);
+        if (!wk)
+          FreeListInfo((LISTINFO *) mp1);
+        else {
           wk -> size = sizeof(WORKER);
           wk -> hwndCnr = dcd -> hwndCnr;
@@ -977 +981 @@
           if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1)
           {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
             free(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
         }
-        else
-          FreeListInfo((LISTINFO *) mp1);
       }
     }
@@ -1158 +1161 @@
       if (!IsFile(leftdir) && !IsFile(rightdir))
       {
-        cmp = malloc(sizeof(COMPARE));
+        cmp = xmallocz(sizeof(COMPARE),pszSrcFile,__LINE__);
         if (cmp)
         {
-          memset(cmp, 0, sizeof(COMPARE));
           cmp -> size = sizeof(COMPARE);
           strcpy(cmp -> leftdir, leftdir);
@@ -1350 +1352 @@
 
   case UM_CONTAINER_FILLED:
-    DosBeep(1000, 50);
+    DosBeep(1000, 50);          // fixme to know why beep here
     WinSendMsg(hwnd,
                CM_INVALIDATERECORD,
@@ -1469 +1471 @@
         if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1)
         {
+          Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
           return 0;
@@ -1584 +1587 @@
         if (!PostMsg(dcd -> hwndObject, UM_COLLECTFROMFILE, mp1, mp2))
         {
+          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
           free(mp1);
-          DosBeep(50, 100);
         }
       }
@@ -1602 +1605 @@
         if (!PostMsg(dcd -> hwndObject, UM_COMMAND, mp1, mp2))
         {
+          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
           FreeListInfo((LISTINFO *) mp1);
-          DosBeep(50, 100);
         }
         else
@@ -1720 +1723 @@
           if (insert_filename(hwnd, filename, FALSE, FALSE))
           {
-            p = strdup(filename);
+            p = xstrdup(filename,pszSrcFile,__LINE__);
             if (p)
             {
@@ -1838 +1841 @@
           LISTINFO *li;
 
-          li = malloc(sizeof(LISTINFO));
+          li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
           if (li)
           {
-            memset(li, 0, sizeof(LISTINFO));
             li -> list = ListFromClipboard(hwnd);
             if (!li -> list || !li -> list[0])
@@ -1909 +1911 @@
           LISTINFO *li;
 
-          li = malloc(sizeof(LISTINFO));
+          li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
           if (li)
           {
-            memset(li, 0, sizeof(LISTINFO));
             li -> list = mp2;
             if (!li -> list || !li -> list[0])
@@ -1946 +1947 @@
 
       case IDM_GREP:
-        if (!dcd -> amextracted)
+        if (dcd -> amextracted) {
+          // fixme to disable?
+          Runtime_Error(pszSrcFile, __LINE__, "busy");
+        }
+        else
         {
           if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
@@ -1961 +1966 @@
           }
         }
-        else
-          DosBeep(50, 100);             // Complain about busy
         break;
 
@@ -2221 +2224 @@
           ULONG action = UM_ACTION;
 
-          li = malloc(sizeof(LISTINFO));
+          li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
           if (li)
           {
-            memset(li, 0, sizeof(LISTINFO));
             li -> type = SHORT1FROMMP(mp1);
             li -> hwnd = hwnd;
@@ -2263 +2265 @@
                            MPVOID))
               {
+                Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
                 FreeListInfo(li);
-                DosBeep(50, 100);
               }
               else if (fUnHilite)
@@ -2385 +2387 @@
           if (!DrgAccessDraginfo(pDInfo))
           {
-            Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+            Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                       "%s",
                       GetPString(IDS_DROPERRORTEXT));
@@ -3000 +3002 @@
     id = COLLECTOR_FRAME + idinc++;
     WinSetWindowUShort(hwndFrame, QWS_ID, id);
-    dcd = malloc(sizeof(DIRCNRDATA));
-    if (dcd)
-    {
-      memset(dcd, 0, sizeof(DIRCNRDATA));
+    dcd = xmallocz(sizeof(DIRCNRDATA),pszSrcFile,__LINE__);
+    if (dcd) {
       dcd -> size = sizeof(DIRCNRDATA);
       dcd -> id = id;