Changeset 328 for trunk/dll/viewer.c

Timestamp:

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

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/viewer.c (modified) (14 diffs)

trunk/dll/viewer.c

@@ -7 +7 @@
 
   Copyright (c) 1993-97 M. Kimes
-  Copyright (c) 2005 Steven H. Levine
+  Copyright (c) 2005, 2006 Steven H. Levine
 
   23 May 05 SHL Use QWL_USER
+  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 <io.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -28 +30 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(VIEWER,MLEEditorProc,MLESubProc)
 #pragma alloc_text(STARTUP,StartMLEEditor)
@@ -66 +71 @@
     return StartViewer(hwndClient,(USHORT)flags,filename,hwndRestore);
 
-  vw = malloc(sizeof(XMLEWNDPTR));
-  if(!vw) {
-    DosBeep(50,100);
+  vw = xmallocz(sizeof(XMLEWNDPTR),pszSrcFile,__LINE__);
+  if(!vw)
     return (HWND)0;
-  }
-  memset(vw,0,sizeof(XMLEWNDPTR));
   vw->size = sizeof(XMLEWNDPTR);
   if(flags & 1) {
@@ -758 +760 @@
       }
       switch(SHORT1FROMMP(mp1)) {
-/*
+        /*
         case MLE_PREVIEW:
           preview_text(hwndMLE);
           break;
-*/
+        */
         case MLE_VIEWFTP:
           MLEinternet(hwndMLE,TRUE);
@@ -871 +873 @@
 
         case MLE_TOGGLEREADONLY:
-          if(!vw->busy && vw->hex != 1) {  /* I dunno why I gotta reset the colors... */
-
+          if (vw->busy || vw->hex == 1) {
+            DosBeep(50,100);
+          }
+          else {
+            /* I dunno why I gotta reset the colors... */
             BOOL ro;
             LONG fColor,bColor;
@@ -914 +919 @@
                        MPVOID);
           }
-          else
-            DosBeep(50,100);
           break;
 
@@ -953 +956 @@
                 break;
             }
-            { /* zero file length instead of unlink (protects EAs from loss) */
+            {
+              /* zero file length instead of unlink (protects EAs from loss) */
               FILE *fp;
 
-              fp = fopen(vw->exportfilename,"r+");
-              if(fp) {
+              fp = xfopen(vw->exportfilename,"r+",pszSrcFile,__LINE__);
+              if (fp) {
                 oldsize = filelength(fileno(fp));
                 DosSetFileSize(fileno(fp),0L);
@@ -963 +967 @@
               }
             }
-            if(!MLEexportfile(hwndMLE,
+            if (!MLEexportfile(hwndMLE,
                               vw->exportfilename,
                               vw->ExpandTabs,
@@ -969 +973 @@
                               vw->fStripTrail)) {
               FILE *fp;
-
-              DosBeep(50,100);
-              fp = fopen(vw->exportfilename,"r+");
-              if(fp) {
+              Runtime_Error(pszSrcFile, __LINE__, "MLEexportfile");
+              fp = xfopen(vw->exportfilename,"r+",pszSrcFile,__LINE__);
+              if (fp) {
                 DosSetFileSize(fileno(fp),oldsize);
                 fclose(fp);
@@ -1191 +1194 @@
             sip.title = GetPString(IDS_NVLINEJUMPTITLETEXT);
             numlines = MLEnumlines(hwndMLE);
-            if(numlines) {
+            if(!numlines)
+              DosBeep(50,100);
+            else {
               sprintf(sip.prompt,
                       GetPString(IDS_NVJUMPTEXT),
@@ -1203 +1208 @@
                         STR_FRAME,
                         &sip);
-              if(*s) {
+              if (*s) {
                 linenum = atol(s);
-                if(linenum > 0 && linenum <= numlines) {
+                if (linenum > 0 && linenum <= numlines) {
                   MLEsettopline(hwndMLE,
                                 MLEstartofline(hwndMLE,
@@ -1215 +1220 @@
               }
             }
-            else
-              DosBeep(50,100);
           }
           break;