Changeset 346 for trunk/dll/datamin.c

Timestamp:

Jul 26, 2006, 7:42:34 AM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/datamin.c (modified) (13 diffs)

trunk/dll/datamin.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H. Levine
+  Copyright (c) 2001, 2006 Steven H. Levine
 
   14 Sep 02 SHL Handle large partitions
@@ -15 +15 @@
   25 May 05 SHL Use ULONGLONG and CommaFmtULL
   06 Jun 05 SHL Drop unused code
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -38 +39 @@
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(DATAMIN,DataDlgProc,MiniTimeProc)
 
@@ -58 +62 @@
   case WM_CREATE:
     {
-      PVOID pv = malloc(sizeof(tDataMin));
+      PVOID pv = xmalloc(sizeof(tDataMin),pszSrcFile,__LINE__);
       WinSetWindowPtr(hwnd, QWL_DATAMIN_PTR, pv);
     }
@@ -78 +82 @@
                       rc,
                       HWND_DESKTOP,
-                      __FILE__,
+                      pszSrcFile,
                       __LINE__,
                       "Post Semaphore failed"   // GetPString(IDS_POSTSEMFAILED)
@@ -203 +207 @@
       {
         PVOID pv = WinQueryWindowPtr(hwnd, QWL_DATAMIN_PTR);
-        if (pv)
-          free(pv);
+        xfree(pv);
       }
       break;
@@ -406 +409 @@
                     TRUE);
       if (numdrives) {
-        if (_beginthread(dataminThread,
-                         NULL,
-                         32768,
-                         (PVOID)hwnd) == -1)
-        {
-          Dos_Error(MB_ENTER,
-                    _doserrno,
-                    HWND_DESKTOP,
-                    __FILE__,
-                    __LINE__,
-                    GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          PostMsg(hwnd,
-                  WM_CLOSE,
-                  MPVOID,
-                  MPVOID);
+        if (_beginthread(dataminThread,NULL,32768,(PVOID)hwnd) == -1) {
+          Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID);
         }
       }
@@ -588 +579 @@
                     rc,
                     HWND_DESKTOP,
-                    __FILE__,
+                    pszSrcFile,
                     __LINE__,
                     "Post Semaphore failed"     // GetPString(IDS_POSTSEMFAILED)
@@ -1037 +1028 @@
         MODINFO *pmi;
         ULONG numprocs = 0, numthreads = 0;
-
-        if (!DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE))
-        {
-          if (!DosQProcStatus(pbh, USHRT_MAX))
-          {
+        APIRET rc;
+
+        rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        if (rc)
+          Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+        else
+        {
+          if (DosQProcStatus(pbh, USHRT_MAX))
+            noqproc = TRUE;
+          else {
             ppi = pbh -> ppi;
             while (ppi -> ulEndIndicator != PROCESS_END_INDICATOR)
@@ -1068 +1064 @@
                               s);
           }
-          else
-            noqproc = TRUE;
           DosFreeMem(pbh);
         }
@@ -1228 +1222 @@
                 rc,
                 HWND_DESKTOP,
-                __FILE__,
+                pszSrcFile,
                 __LINE__,
                 "Create Semaphore failed"       // GetPString(IDS_CREATESEMFAILED)
@@ -1310 +1304 @@
                   rc,
                   HWND_DESKTOP,
-                  __FILE__,
+                  pszSrcFile,
                   __LINE__,
                   "Wait Semaphore failed"       // GetPString(IDS_POSTSEMFAILED)
@@ -1322 +1316 @@
                   rc,
                   HWND_DESKTOP,
-                  __FILE__,
+                  pszSrcFile,
                   __LINE__,
                   "Reset Semaphore failed"      // GetPString(IDS_POSTSEMFAILED)