Changeset 350 for trunk/dll/extract.c

Timestamp:

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

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/extract.c (modified) (9 diffs)

trunk/dll/extract.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
   05 Jun 05 SHL Use QWL_USER
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -14 +15 @@
 #define INCL_WIN
 #define INCL_DOS
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -21 +22 @@
 #include <time.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -26 +28 @@
 
 #pragma data_seg(DATA1)
+
 #pragma alloc_text(FMEXTRACT,ExtractTextProc,ExtractDlgProc)
 
-
-MRESULT EXPENTRY ExtractTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+static PSZ pszSrcFile = __FILE__;
+
+MRESULT EXPENTRY ExtractTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   PFNWP        oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0);
   static BOOL  emphasized = FALSE;
@@ -76 +80 @@
 
 
-MRESULT EXPENTRY ExtractDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ExtractDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   EXTRDATA    *arcdata = NULL;
 
@@ -314 +318 @@
             }
           }
-          DosBeep(50,100);
+          DosBeep(50,100);              // Complain a refuse to quit
           break;
 
@@ -347 +351 @@
             WinQueryDlgItemText(hwnd,EXT_COMMAND,256,s);
             lstrip(s);
-            if(*s) {
+            if (!*s)
+              Runtime_Error(pszSrcFile, __LINE__, "no command");
+            else {
               p = strchr(s,' ');
-              if(p)
-                *p = 0;
+              if (p)
+                *p = 0;                 // Drop options
               memset(&ex,0,sizeof(EXECARGS));
               ex.commandline = s;
@@ -363 +369 @@
                            MPFROMP(&ex)) &&
                  *s)
+              {
                 runemf2(ex.flags,
                         hwnd,
@@ -369 +376 @@
                         "%s",
                         s);
-            }
-            else
-              DosBeep(50,100);
+              }
+            }
           }
           break;