Changeset 358 for trunk/dll/dircnrs.c

Timestamp:

Jul 26, 2006, 11:29:54 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

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

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H. Levine
+  Copyright (c) 2001, 2006 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -17 +17 @@
   05 Jun 05 SHL Use QWL_USER
   10 Nov 05 SHL Comments
+  13 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -43 +44 @@
 #pragma alloc_text(STARTUP,StartDirCnr)
 
+static PSZ pszSrcFile = __FILE__;
 
 MRESULT EXPENTRY DirFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
@@ -1097 +1099 @@
           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;
@@ -1108 +1111 @@
             strcpy(wk->directory,dcd->directory);
             if(_beginthread(MassAction,NULL,122880,(PVOID)wk) == -1) {
+              Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
               free(wk);
               FreeListInfo((LISTINFO *)mp1);
             }
           }
-          else
-            FreeListInfo((LISTINFO *)mp1);
         }
       }
@@ -1126 +1128 @@
           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;
@@ -1137 +1140 @@
             strcpy(wk->directory,dcd->directory);
             if(_beginthread(Action,NULL,122880,(PVOID)wk) == -1) {
+              Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
               free(wk);
               FreeListInfo((LISTINFO *)mp1);
             }
           }
-          else
-            FreeListInfo((LISTINFO *)mp1);
         }
       }
@@ -1352 +1354 @@
         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);
@@ -1699 +1700 @@
                                dcd,
                                FALSE);
-          if (_beginthread(MakeObjWin,
-                           NULL,
-                           245760,
-                           (PVOID)dcd) == -1) {
-            PostMsg(hwnd,
-                    WM_CLOSE,
-                    MPVOID,
-                    MPVOID);
+          if (_beginthread(MakeObjWin,NULL,245760,(PVOID)dcd) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID);
             return 0;
           }
@@ -1910 +1906 @@
                        mp2))
           {
+            Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
             FreeListInfo((LISTINFO *)mp1);
-            DosBeep(50,100);
           }
           else
@@ -1972 +1968 @@
                   if (test != 1)
                     fp = fopen(newfile,"w");
-                  if (test == 1 || fp) {
+                  if (test != 1 && !fp) {
+                    saymsg(MB_ENTER,
+                           hwnd,
+                           GetPString(IDS_ERRORTEXT),
+                           GetPString(IDS_CREATEERRORTEXT),
+                           newfile);
+                  }
+                  else {
                     if (fp) {
                       WinSendMsg(hwnd,
@@ -2008 +2011 @@
                       ShowCnrRecord(hwnd,(PMINIRECORDCORE)pci);
                   }
-                  else
-                    saymsg(MB_ENTER,
-                           hwnd,
-                           GetPString(IDS_ERRORTEXT),
-                           GetPString(IDS_CREATEERRORTEXT),
-                           newfile);
                 }
               }
@@ -2378 +2375 @@
           case IDM_DESELECTSMALLER:
             if (ParentIsDesktop(hwnd,dcd->hwndParent)) {
-              DosBeep(50,100);
+              Runtime_Error(pszSrcFile, __LINE__, "ParentIsDesktop unexpected");
               break;
             }
@@ -2780 +2777 @@
               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;
@@ -2864 +2860 @@
                                MPFROMP(li),
                                MPVOID)) {
+                    Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
                     FreeListInfo(li);
-                    DosBeep(50,100);
                   }
                   else if (fUnHilite)
@@ -2957 +2953 @@
                     CHAR  volumelength;
                     CHAR  volumelabel[CCHMAXPATH];
-                  }         volser;
+                  } volser;
+                  APIRET rc;
 
                   memset(&volser,0,sizeof(volser));
                   DosError(FERR_DISABLEHARDERR);
-                  if (!DosQueryFSInfo(toupper(*pci->szFileName) - '@',
-                                     FSIL_VOLSER,
-                                     &volser,
-                                     (ULONG)sizeof(volser))) {
+                  // fixme
+                  rc = DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+                                      FSIL_VOLSER,
+                                      &volser,
+                                      sizeof(volser));
+                  if (rc) {
+                    Dos_Error(MB_ENTER,
+                              rc,
+                              HWND_DESKTOP,
+                              pszSrcFile,
+                              __LINE__,
+                              // fixme GetPString(IDS_CANTFINDDIRTEXT),
+                              "Can't find drive %s",
+                              pci->szFileName);
+                    // fixme DosBeep(250,100);
+                    driveserial[toupper(*pci->szFileName) - 'A'] = -1;
+                    UnFlesh(hwnd,pci);
+                    PostMsg(hwnd,
+                            UM_RESCAN,
+                            MPVOID,
+                            MPVOID);
+                  }
+                  else {
                     if (SHORT2FROMMP(mp1) == CN_COLLAPSETREE &&
                        !volser.serial ||
@@ -2982 +2998 @@
                       volser.serial;
                   }
-                  else {
-                    driveserial[toupper(*pci->szFileName) - 'A'] = -1;
-                    UnFlesh(hwnd,pci);
-                    PostMsg(hwnd,
-                            UM_RESCAN,
-                            MPVOID,
-                            MPVOID);
-                    DosBeep(250,100);
-                  }
                 }
                 else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
@@ -3079 +3086 @@
               pDInfo = (PDRAGINFO)((PCNRDRAGINFO)mp2)->pDragInfo;
               if (!DrgAccessDraginfo(pDInfo)) {
-                  Win_Error(hwnd,hwnd,__FILE__,__LINE__,
+                  Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,
                             GetPString(IDS_DROPERRORTEXT));
                 break;
@@ -3210 +3217 @@
                 }
                 else if (!*dcd->directory || IsRoot(dcd->directory)) {
-                  DosBeep(50,100);
+                  Runtime_Error(pszSrcFile, __LINE__, "directory unexpected");
                   break;
                 }
@@ -3452 +3459 @@
 
           case CN_EMPHASIS:
-            if (mp2) {
-
+            if (!mp2)
+              Runtime_Error(pszSrcFile, __LINE__, "mp2 NULL");
+            else {
               PNOTIFYRECORDEMPHASIS pre = mp2;
               PCNRITEM              pci;
@@ -3550 +3558 @@
               }
             }
-            else
-              DosBeep(2000,100);
             break;
 
@@ -3877 +3883 @@
         idinc = 0;
       WinSetWindowUShort(hwndFrame,QWS_ID,id);
-      dcd = malloc(sizeof(DIRCNRDATA));
-      if(dcd) {
-        memset(dcd,0,sizeof(DIRCNRDATA));
+      dcd = xmallocz(sizeof(DIRCNRDATA),pszSrcFile,__LINE__);
+      if (!dcd) {
+        PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
+        hwndFrame = (HWND)0;
+      }
+      else {
         dcd->size = sizeof(DIRCNRDATA);
         dcd->id = id;
@@ -3976 +3985 @@
         }
       }
-      else {
-        PostMsg(hwndClient,
-                WM_CLOSE,
-                MPVOID,
-                MPVOID);
-        hwndFrame = (HWND)0;
-      }
     }
   }