Changeset 330 for trunk/dll/systemf.c

Timestamp:

Jul 25, 2006, 8:45:04 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/systemf.c (modified) (21 diffs)

trunk/dll/systemf.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2004 Steven H.Levine
-
-  Revisions     21 Nov 03 SHL - Comments
-                31 Jul 04 SHL - Indent -i2
-                01 Aug 04 SHL - Rework lstrip/rstrip usage
+  Copyright (c) 2003, 2006 Steven H.Levine
+
+  21 Nov 03 SHL Comments
+  31 Jul 04 SHL Indent -i2
+  01 Aug 04 SHL Rework lstrip/rstrip usage
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -19 +20 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -27 +28 @@
 #include <ctype.h>
 #include <time.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
 
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(SYSTEMF,ShowSession,ExecOnList,runemf2)
 
@@ -39 +43 @@
 BOOL ShowSession(HWND hwnd, PID pid)
 {
-
   HSWITCH hswitch;
   SWCNTRL swctl;
@@ -64 +67 @@
                char **list, char *prompt)
 {
-
   /* executes the command once for all files in list */
 
@@ -177 +179 @@
             sprintf(&listfile[strlen(listfile)], "%s%03x",
                     LISTTEMPROOT, (clock() & 4095L));
-            fp = fopen(listfile, "w");
+            fp = xfopen(listfile, "w",pszSrcFile,__LINE__);
             if (fp)
             {
@@ -667 +669 @@
             char *formatstring,...)
 {
-
   /* example:
 
@@ -713 +714 @@
     hwnd = HWND_DESKTOP;
 
-  rc = DosAllocMem((PVOID) & s,
+  rc = DosAllocMem((PVOID)&s,
                    MAXSTRG,
                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
-  if (rc)
+  if (rc) {
+    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
     return -1;
+  }
 
   *savedir = 0;
@@ -761 +764 @@
       p++;
       temp = *p;
-      if (temp)
-        rc = DosAllocMem((PVOID) & s2,
+      if (temp) {
+        rc = DosAllocMem((PVOID)&s2,
                          MAXSTRG * 2,
                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        if (rc)
+          Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+      }
       else
         s2 = NULL;
@@ -842 +848 @@
           switch_to(directory);
         }
-        ret = (int) DosQAppType(s,
-                                &apptype);
+        ret = (int) DosQAppType(s,&apptype);
         if (!strchr(s, '\\') &&
             !strchr(s, ':') &&
@@ -851 +856 @@
         if (ret)
         {
-          DosBeep(50, 100);
+          Dos_Error(MB_CANCEL,ret,hwnd,pszSrcFile,__LINE__,"DosQAppType");
           if (s)
             DosFreeMem(s);
@@ -863 +868 @@
               (apptype & FAPPTYP_PHYSDRV) || (apptype & FAPPTYP_PROTDLL))
           {
-            DosBeep(250, 100);
+            Runtime_Error(pszSrcFile, __LINE__, "unexpected apptype");
             if (s)
               DosFreeMem(s);
@@ -873 +878 @@
               (apptype & FAPPTYP_WINDOWSPROT) || (apptype & 0x1000))
           {
-            DosBeep(500, 100);
+            Runtime_Error(pszSrcFile, __LINE__, "unexpected apptype");
             if (s)
               DosFreeMem(s);
@@ -893 +898 @@
         if (directory && *directory)
           switch_to(savedir);
-        if (ret)
-          Dos_Error(MB_ENTER,
-                    ret,
-                    hwnd,
-                    __FILE__,
-                    __LINE__,
+        if (ret) {
+          Dos_Error(MB_ENTER,ret,hwnd,pszSrcFile,__LINE__,
                     GetPString(IDS_DOSEXECPGMFAILEDTEXT));
+        }
       }
     }
@@ -910 +912 @@
       if (rc)
       {
+        Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
         DosFreeMem(s);
         return -1;
@@ -1141 +1144 @@
       if (directory && *directory)
         switch_to(savedir);
-      if (ret && ret != ERROR_SMG_START_IN_BACKGROUND)
-        Dos_Error(MB_CANCEL | MB_ICONEXCLAMATION,
-                  ret,
-                  hwnd,
-                  __FILE__,
-                  __LINE__,
-                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),
-                  s,
-                  s2);
+      if (ret && ret != ERROR_SMG_START_IN_BACKGROUND) {
+        Dos_Error(MB_CANCEL,ret,hwnd,pszSrcFile,__LINE__,
+                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),s,s2);
+      }
       else if (type & WAIT)
       {
@@ -1157 +1155 @@
         if (!hque)
         {
-
           STATUSDATA sd;
 
@@ -1226 +1223 @@
           PROGTYPE * progt, ULONG fl, char *formatstring,...)
 {
-
   PROGDETAILS pgd;
   register char *p;
@@ -1238 +1234 @@
     ulOptions |= SAF_STARTCHILDAPP;
 
-  executable = malloc(MAXSTRG);
-  if (executable)
-  {
-    memset(executable, 0, MAXSTRG);
+  executable = xmallocz(MAXSTRG,pszSrcFile,__LINE__);
+  if (executable) {
     va_start(parguments, formatstring);
     vsprintf(executable, formatstring, parguments);
@@ -1248 +1242 @@
     if (*executable)
     {
-      parameters = malloc(MAXSTRG);
+      parameters = xmalloc(MAXSTRG,pszSrcFile,__LINE__);
       if (parameters)
       {
@@ -1288 +1282 @@
           char *temp;
 
-          temp = malloc(CCHMAXPATH * 2);
+          temp = xmalloc(CCHMAXPATH * 2,pszSrcFile,__LINE__);
           if (temp)
           {