Changeset 350 for trunk/dll/misc.c

Timestamp:

Jul 26, 2006, 9:01:20 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/misc.c (modified) (18 diffs)

trunk/dll/misc.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2005 Steven H. Levine
+  Copyright (c) 2003, 2006 Steven H. Levine
 
   11 Jun 03 SHL Add JFS and FAT32 support
@@ -15 +15 @@
   24 Jul 05 SHL Beautify
   24 Jul 05 SHL Correct longname display option
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -21 +22 @@
 #define INCL_WIN
 #define INCL_GPI
-
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -29 +30 @@
 #include <ctype.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -34 +36 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(MAINWND5,SetSysMenu)
 #pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow)
@@ -165 +170 @@
         len = WinQueryWindowTextLength(hwnd);
         if (len)
-            s = malloc(len + 1);
+            s = xmalloc(len + 1,pszSrcFile,__LINE__);
         if (s)
         {
@@ -756 +761 @@
                     else
                         ealen = sizeof(FEALIST) + 9;
-                    if (!DosAllocMem((PPVOID) & pfealist,
-                                     ealen + 64L,
-                              OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE))
-                    {
+                    rc = DosAllocMem((PPVOID) & pfealist,ealen + 64L,
+                                     OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+                    if (rc)
+                      Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+                    else {
                         memset(pfealist, 0, ealen + 1);
                         pfealist -> cbList = ealen;
@@ -831 +837 @@
                         *p = 0;
                     bstrip(szData);
-                    if (IsFullName(szData))
+                    if (!IsFullName(szData))
+                        Runtime_Error(pszSrcFile, __LINE__, "bad name");
+                    else
                     {
                         if (DosQueryPathInfo(szData,
@@ -853 +861 @@
                                 return (MRESULT) FALSE;
                             }
-                            if (!docopyf(MOVE,
-                                         szData,
-                                         "%s",
-                                         testname))
-                            {
-
+                            if (docopyf(MOVE,szData,"%s",testname))
+                                Runtime_Error(pszSrcFile, __LINE__, "docopyf");
+                            else {
                                 CHAR *filename;
 
-                                filename = strdup(testname);
+                                filename = xstrdup(testname,pszSrcFile,__LINE__);
                                 if (filename)
                                 {
@@ -876 +881 @@
                                             MPFROMLONG(-1),
                                             MPFROMP(pci));
-                                    filename = strdup(pci -> szFileName);
+                                    filename = xstrdup(pci -> szFileName,pszSrcFile,__LINE__);
                                     if (filename)
                                     {
@@ -887 +892 @@
                                 }
                             }
-                            else
-                                DosBeep(100, 100);
                         }
                     }
-                    else
-                        DosBeep(250, 100);
                 }
             }
@@ -1447 +1448 @@
 {
     ULONG postcount;
-
-    if (!DosCreateEventSem(NULL, &CompactSem, 0L, FALSE))
+    APIRET rc;
+
+    rc = DosCreateEventSem(NULL, &CompactSem, 0L, FALSE);
+    if (rc)
+        Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DosCreateEventSem");
+    else
     {
         priority_normal();
@@ -1458 +1463 @@
             DosResetEventSem(CompactSem, &postcount);
         }
-    }
-    else
-    {
-        DosBeep(250, 100);
-        DosBeep(1000, 100);
-        DosBeep(500, 100);
-//    DosExit(EXIT_PROCESS,1);
     }
 }
@@ -2078 +2076 @@
             *var = 0;
         }
-        fp = fopen(configsys, "r");
+        fp = xfopen(configsys, "r",pszSrcFile,__LINE__);
         if (fp)
         {
@@ -2118 +2116 @@
     char *s = NULL;
 
-    s = malloc(CCHMAXPATH);
+    s = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__);
     if (s)
     {
@@ -2143 +2141 @@
     char *s = NULL;
 
-    s = malloc(CCHMAXPATH);
+    s = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__);
     if (s)
     {
@@ -2163 +2161 @@
     char *s = NULL;
 
-    s = malloc(CCHMAXPATH * 2);
+    s = xmalloc(CCHMAXPATH * 2,pszSrcFile,__LINE__);
     if (s)
     {
@@ -2303 +2301 @@
             (LONG) sizeof(SWENTRY);
         /* Allocate memory for list */
-        if ((pswb = malloc((unsigned) ulSize)) != NULL)
-        {
+        pswb = xmalloc(ulSize,pszSrcFile,__LINE__);
+        if (pswb) {
             /* Put the info in the list */
             ulcEntries = WinQuerySwitchList(0, pswb,