Changeset 328 for trunk/dll/viewinf.c

Timestamp:

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

Author:

root

Message:

Use Runtime_Error

File:

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

trunk/dll/viewinf.c

@@ -4 +4 @@
   $Id$
 
+  Launch inf viewer
+
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004 Steven H.Levine
-
-  Revisions     01 Aug 04 SHL - Rework lstrip/rstrip usage
+  Copyright (c) 2004, 2006 Steven H.Levine
+
+  01 Aug 04 SHL Rework lstrip/rstrip usage
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -15 +18 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -22 +25 @@
 #include <ctype.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -27 +31 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(VIEWINFS,FillListbox,ViewInfProc)
 
@@ -36 +43 @@
 
 
-static VOID FillListbox (VOID *args) {
-
+static VOID FillListbox (VOID *args)
+{
   HWND hwnd;
   DUMMY *dummy = (DUMMY *)args;
@@ -70 +77 @@
       }
       else {
-        holdenv = malloc(strlen(env) + 2L);
-        if(!holdenv)
-          saymsg(MB_CANCEL,
-                 hwnd,
-                 GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_OUTOFMEMORY));
-        else {
+        holdenv = xmalloc(strlen(env) + 2L,pszSrcFile,__LINE__);
+        if (holdenv) {
           strcpy(holdenv,env);
 Repeat:
@@ -168 +170 @@
                                    &size) &&
                size) {
-              holdenv = malloc(size + 2L);
-              if(holdenv) {
-                if(PrfQueryProfileData(fmprof,
-                                       FM3Str,
-                                       key,
-                                       holdenv,
-                                       &size))
+              holdenv = xmalloc(size + 2L,pszSrcFile,__LINE__);
+              if (holdenv) {
+                if (!PrfQueryProfileData(fmprof,FM3Str,key,holdenv,&size)) {
+                  Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"PrfQueryProfileData");
+                  free(holdenv);
+                }
+                else
                   goto Repeat;
-                else
-                  free(holdenv);
               }
             }
@@ -192 +192 @@
 
 
-MRESULT EXPENTRY ViewInfProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ViewInfProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   static HWND     hwndMe = (HWND)0;
   static BOOL     help = FALSE;
@@ -213 +213 @@
       }
       help = (mp2 != (MPARAM)0);
-      if(help) {
+      if (help) {
 
         SWP swp;
@@ -282 +282 @@
         DUMMY *d;
 
-        d = malloc(sizeof(DUMMY));
-        if(d) {
-          memset(d,0,sizeof(DUMMY));
+        d = xmallocz(sizeof(DUMMY),pszSrcFile,__LINE__);
+        if (!d) {
+          WinDismissDlg(hwnd,0);
+          return 0;
+        }
+        else {
           d->size = sizeof(DUMMY);
           d->hwnd = hwnd;
-          if(help)
+          if (help)
             d->help = 1;
           if(_beginthread(FillListbox,NULL,65536,(PVOID)d) == -1) {
-            DosBeep(50,100);
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
             free(d);
             WinDismissDlg(hwnd,0);
@@ -297 +300 @@
           WinEnableWindow(WinWindowFromID(hwnd,DID_CANCEL),FALSE);
           threaddone = FALSE;
-        }
-        else {
-          DosBeep(100,100);
-          WinDismissDlg(hwnd,0);
-          return 0;
         }
       }
@@ -478 +476 @@
                 sSelect++;
             }
-#else
+#else // !BUGIFIXED
             for(sSelect = 0;sSelect < sTotal;sSelect++)
               WinSendDlgItemMsg(hwnd,
@@ -524 +522 @@
                 sSelect++;
             }
-#endif
+#endif // BUGFIXED
           }
           break;
@@ -532 +530 @@
             CHAR szBuffer[1001],*key = "INFPaths";
 
-            if(help)
+            if (help)
               key = "HLPPaths";
             *szBuffer = 0;
@@ -569 +567 @@
                                                MPFROM2SHORT(LIT_FIRST,0),
                                                MPVOID);
-            if(sSelect >= 0) {
-              if(help) {
+            if (sSelect < 0) {
+                DosBeep(50,100);
+            }
+            else {
+              if (help) {
                 *text = 0;
                 WinSendDlgItemMsg(hwnd,
@@ -578 +579 @@
                                   MPFROMP(text));
                 p = strchr(text,'>');
-                if(!p)
+                if(!p) {
+                  DosBeep(50,100);
                   break;
+                }
                 p++;
                   bstrip(p);
-                if(*p)
+                if (!*p)
+                  DosBeep(50,100);
+                else
                   ViewHelp(p);
-                else
-                  DosBeep(250,100);
                 break;
               }
@@ -592 +595 @@
                 strcat(filename,"\\");
               strcat(filename,"FM2VINF.CMD");
-              fp = fopen(filename,"w");
-              if(fp) {
+              fp = xfopen(filename,"w",pszSrcFile,__LINE__);
+              if (fp) {
                 fprintf(fp,"@ECHO OFF\nSET FM2REF=");
                 while(sSelect >= 0) {
@@ -619 +622 @@
                                                      MPFROM2SHORT(sSelect,0),
                                                      MPVOID);
-                }
+                } // while
                 *text = 0;
                 WinQueryDlgItemText(hwnd,