Changeset 350 for trunk/dll/killproc.c

Timestamp:

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

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/killproc.c (modified) (16 diffs)

trunk/dll/killproc.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005 Steven H. Levine
+  Copyright (c) 2005, 2006 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -16 +17 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -25 +26 @@
 #include <process.h>
 #include <limits.h>
+
 #include "procstat.h"
 #include "fm3dll.h"
@@ -31 +33 @@
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(KILLPROC,FillKillList,FillKillList2,GetDosPgmName,KillDlgProc)
 
-
-CHAR *GetDosPgmName (PID pid,CHAR *string) {
-
+CHAR *GetDosPgmName (PID pid,CHAR *string)
+{
   HSWITCH hs;
   SWCNTRL swctl;
@@ -64 +68 @@
 
 
-VOID FillKillList2 (VOID *arg) {
-
+VOID FillKillList2 (VOID *arg)
+{
   HWND          hwnd = *(HWND *)arg;
   CHAR          s[1036];
@@ -80 +84 @@
 
   WinSendDlgItemMsg(hwnd,KILL_LISTBOX,LM_DELETEALL,MPVOID,MPVOID);
-  if(!DosAllocMem((PVOID)&pbh,USHRT_MAX + 4096,
-                  PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE)) {
+  rc = DosAllocMem((PVOID)&pbh,USHRT_MAX + 4096,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  if (rc)
+    Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+  else {
     rc = DosQProcStatus(pbh,USHRT_MAX);
-    if(!rc) {
+    if (!rc) {
       ppi = pbh->ppi;
       while(ppi->ulEndIndicator != PROCESS_END_INDICATOR ) {
@@ -100 +107 @@
                 strcat(s,GetPString(IDS_UNKNOWNPROCTEXT));
             }
-            if(WinIsWindow(thab,hwnd))
+            if (WinIsWindow(thab,hwnd)) {
               WinSendDlgItemMsg(hwnd,KILL_LISTBOX,LM_INSERTITEM,
                                 MPFROM2SHORT(LIT_SORTASCENDING,0),
                                              MPFROMP(s));
+            }
             else
               break;
@@ -109 +117 @@
         }
         ppi = (PPROCESSINFO)(ppi->ptiFirst + ppi->usThreadCount);
-      }
+      } // while
     }
     DosFreeMem(pbh);
   }
-Abort:
+
   if(WinIsWindow(thab,hwnd))
     PostMsg(hwnd,UM_CONTAINER_FILLED,MPVOID,MPVOID);
@@ -121 +129 @@
 
 
-VOID FillKillList (VOID *arg) {
-
+VOID FillKillList (VOID *arg)
+{
   HWND  hwnd = *(HWND *)arg;
   CHAR  s[1036],progname[1027],*p;
@@ -149 +157 @@
   unlinkf("%s",s);
   fp = fopen(s,"w");
-  if(fp) {
+  if(!fp) {
+    Win_Error(NULLHANDLE,HWND_DESKTOP,__FILE__,__LINE__,
+              GetPString(IDS_REDIRECTERRORTEXT));
+    goto Abort;
+  }
+  else {
     newstdout = -1;
-    if(DosDupHandle(fileno(stdout),&newstdout))
-      DosBeep(50,100);
+    rc = DosDupHandle(fileno(stdout),&newstdout);
+    if (rc)
+      Dos_Error(MB_CANCEL,rc,hwnd,__FILE__,__LINE__,"DosDupHandle");
     oldstdout = fileno(stdout);
     DosDupHandle(fileno(fp),&oldstdout);
@@ -173 +187 @@
     }
   }
-  else {
-    Win_Error(NULLHANDLE,HWND_DESKTOP,__FILE__,__LINE__,
-              GetPString(IDS_REDIRECTERRORTEXT));
-    goto Abort;
-  }
   fp = fopen(s,"r");
   if(fp) {
@@ -225 +234 @@
 
 
-MRESULT EXPENTRY KillDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY KillDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   SHORT           sSelect;
   PID             pid;
@@ -387 +396 @@
                 if(SHORT1FROMMP(mp1) == DID_OK) {
                   error = DosKillProcess(DKP_PROCESS,pid);
-                  if(error && error != ERROR_INVALID_PROCID)
+                  if(error && error != ERROR_INVALID_PROCID) {
                     Dos_Error(MB_CANCEL,
                               error,
@@ -394 +403 @@
                               __LINE__,
                               GetPString(IDS_DOSKILLFAILEDTEXT));
+                  }
                   else
                     WinSendDlgItemMsg(hwnd,
@@ -409 +419 @@
 
         case DID_CANCEL:
-          if(listdone)
+          if(!listdone)
+            Runtime_Error(pszSrcFile, __LINE__, "busy");
+          else
             WinDismissDlg(hwnd,0);
-          else
-            DosBeep(100,100);
           break;
 
@@ -426 +436 @@
     case WM_CLOSE:
       if(!listdone) {
-        DosBeep(100,100);
+        Runtime_Error(pszSrcFile, __LINE__, "busy");
         return 0;
       }