Changeset 328 for trunk/dll/undel.c

Timestamp:

Jul 25, 2006, 8:37:24 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

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

trunk/dll/undel.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2005 Steven H. Levine
+  Copyright (c) 2004, 2006 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
   24 May 05 SHL Rework Win_Error usage
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -15 +16 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -22 +23 @@
 #include <time.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -27 +29 @@
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(UNDELETE,FillUndelList,UndeleteDlgProc)
 
@@ -36 +41 @@
 
 
-VOID FillUndelList (VOID *arg) {
-
+VOID FillUndelList (VOID *arg)
+{
   HWND  hwnd;
   CHAR  s[CCHMAXPATH * 2];
@@ -60 +65 @@
     WinSendDlgItemMsg(hwnd,UNDEL_LISTBOX,LM_DELETEALL,MPVOID,MPVOID);
     unlinkf("%s","$UDELETE.#$#");
-    fp = fopen("$UDELETE.#$#","w");
-    if(fp) {
+    fp = xfopen("$UDELETE.#$#","w",pszSrcFile,__LINE__);
+    if (!fp) {
+      Win_Error(NULLHANDLE,hwnd,pszSrcFile,__LINE__,
+                GetPString(IDS_REDIRECTERRORTEXT));
+      killme = TRUE;
+      goto Abort;
+    }
+    else {
       newstdout = -1;
-      if(DosDupHandle(fileno(stdout),&newstdout)) {
+      if (DosDupHandle(fileno(stdout),&newstdout)) {
         saymsg(MB_CANCEL,
                hwnd,
@@ -86 +97 @@
       fclose(fp);
     }
-    else {
-      Win_Error(NULLHANDLE,hwnd,__FILE__,__LINE__,
-                GetPString(IDS_REDIRECTERRORTEXT));
-      killme = TRUE;
-      goto Abort;
-    }
-    fp = fopen("$UDELETE.#$#","r");
-    if(fp) {
+    fp = xfopen("$UDELETE.#$#","r",pszSrcFile,__LINE__);
+    if (fp) {
       fgets(s,CCHMAXPATH + 128,fp);
       while(!feof(fp)) {
@@ -162 +167 @@
 
 
-MRESULT EXPENTRY UndeleteDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY UndeleteDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   SHORT           sSelect;
   static BOOL     listdone,changed = FALSE,refresh = FALSE;
@@ -172 +177 @@
       listdone = TRUE;
       if(!mp2 || !*(CHAR *)mp2) {
+        Runtime_Error(pszSrcFile, __LINE__, "no data");
         WinDismissDlg(hwnd,0);
-        DosBeep(50,100);
         break;
       }
@@ -202 +207 @@
 
         listdone = FALSE;
-        undelinfo = malloc(sizeof(struct tempstruct));
-        if(undelinfo) {
-          memset(undelinfo,0,sizeof(undelinfo));
+        undelinfo = xmallocz(sizeof(struct tempstruct),pszSrcFile,__LINE__);
+        if (!undelinfo) {
+          listdone = TRUE;
+          WinDismissDlg(hwnd,0);
+        }
+        else {
           undelinfo->hwnd = hwnd;
           WinQueryDlgItemText(hwnd,
@@ -218 +226 @@
                   toupper(*undelinfo->path));
           WinSetWindowText(hwnd,s);
-          if(_beginthread(FillUndelList,
-                          NULL,
-                          65536,
-                          (PVOID)undelinfo) != -1)
-            DosSleep(500L);
-          else {
+          if (_beginthread(FillUndelList,NULL,65536,(PVOID)undelinfo) == -1)
+          {
+            Runtime_Error(pszSrcFile, __LINE__,GetPString(IDS_COULDNTSTARTTHREADTEXT));
             free(undelinfo);
             listdone = TRUE;
-            saymsg(MB_ENTER,
-                   hwnd,
-                   GetPString(IDS_UHOHTEXT),
-                   GetPString(IDS_COULDNTSTARTTHREADTEXT));
             WinDismissDlg(hwnd,0);
-          }
-        }
-        else {
-          listdone = TRUE;
-          saymsg(MB_ENTER,
-                 hwnd,
-                 GetPString(IDS_UHOHTEXT),
-                 GetPString(IDS_OUTOFMEMORY));
-          WinDismissDlg(hwnd,0);
+          }
+          else
+            DosSleep(500L);
         }
         refresh = FALSE;
@@ -291 +286 @@
         case UNDEL_DRIVELIST:
           if(!listdone) {
-            DosBeep(250,50);
+            Runtime_Error(pszSrcFile, __LINE__, "not listdone");
             break;
           }
@@ -304 +299 @@
                                     3,
                                     s);
-                if(isalpha(*s)) {
+                if (!isalpha(*s)) {
+                  Runtime_Error(pszSrcFile, __LINE__, "no data");
+                }
+                else {
                   drive = toupper(*s);
                   WinQueryDlgItemText(hwnd,
@@ -331 +329 @@
                   PostMsg(hwnd,UM_SETUP,MPVOID,MPVOID);
                 }
-                else
-                  DosBeep(50,100);
               }
               break;
@@ -412 +408 @@
         case UNDEL_DEL:
         case DID_OK:
-          if(!changed && listdone) {
+          if (changed || !listdone) {
+            Runtime_Error(pszSrcFile, __LINE__, "not done");
+          }
+          else {
             sSelect = (USHORT)WinSendDlgItemMsg(hwnd,UNDEL_LISTBOX,
                               LM_QUERYSELECTION,MPFROMSHORT(LIT_FIRST),
@@ -422 +421 @@
 
               DosForceDelete("\\FMUNDEL.CMD");
-              fp = fopen("\\FMUNDEL.CMD","w");
-              if(fp) {
+              fp = xfopen("\\FMUNDEL.CMD","w",pszSrcFile,__LINE__);
+              if (fp) {
                 while(sSelect >= 0) {
                   *s = 0;
@@ -478 +477 @@
             }
           }
+          break;
+
+        case DID_CANCEL:
+          if (!listdone)
+            Runtime_Error(pszSrcFile, __LINE__, "is busy");
           else
-            DosBeep(50,100);
-          break;
-
-        case DID_CANCEL:
-          if(listdone)
             WinDismissDlg(hwnd,0);
-          else
-            DosBeep(100,100);
           break;
 
@@ -499 +496 @@
 
     case WM_CLOSE:
-      if(listdone)
-        break;
-      DosBeep(100,100);
-      return 0;
+      if (!listdone) {
+        Runtime_Error(pszSrcFile, __LINE__, "not listdone");
+        return 0;
+      }
+      break;
 
     case WM_DESTROY: