Changeset 121 for trunk/dll/error.c

Timestamp:

Dec 5, 2004, 1:16:38 AM (21 years ago)

Author:

root

Message:

Comments

File:

• trunk/dll/error.c (modified) (6 diffs)

trunk/dll/error.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Error reporting
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2004 Steven H.Levine
+
+  Revisions     12 Aug 04 SHL Comments
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_DOSERRORS
@@ -8 +22 @@
 #include <string.h>
 #include <stdarg.h>
+
 #include "fm3dll.h"
 #include "fm3str.h"
@@ -14 +29 @@
 #pragma alloc_text(FMINPUT,General_Error,Dos_Error)
 
+// fixme to have MiscError instead of saymsg
 
-VOID General_Error(HAB hab,HWND hwnd, PSZ ErrModule,LONG ErrLine,CHAR *s,...) {
+// fixme to be Win_Error
+// fixme to pass hwndError rather hab
 
+VOID General_Error(HAB hab,HWND hwndOwner, PSZ ErrModule,LONG ErrLine,CHAR *s,...)
+{
   PERRINFO         pErrInfoBlk;    /* Pointer to ERRINFO structure that is filled
                                       by WinGetErrorInfo */
   PSZ              pszOffset;      /* Pointer to the current error message returned
                                       by WinGetErrorInfo */
-  CHAR             ErrBuffer[4096]; /* The whole error message that is displayed to
+  CHAR             ErrBuffer[4096]; /* The error message that is displayed to
                                        the user via WinMessageBox */
+  PSZ              psz;
   va_list          ap;
 
+  // Format callers message
   va_start(ap,s);
   vsprintf(ErrBuffer,s,ap);
   va_end(ap);
-  sprintf(&ErrBuffer[strlen(ErrBuffer)],
+
+  // Append file name and line number
+  sprintf(ErrBuffer + strlen(ErrBuffer),
           GetPString(IDS_GENERR1TEXT),
-          ErrModule,
-          ErrLine,
-          "  ");
-  /* Get last error for the current thread. */
+          ErrModule, ErrLine, "  ");
+
+  /* Get last PM error for the current thread */
   pErrInfoBlk = WinGetErrorInfo(hab);
-  if(pErrInfoBlk != (PERRINFO)NULL) {
-    if(!hwnd)
-      hwnd = HWND_DESKTOP;
-    /* Find offset in array of message offsets */
+  if(pErrInfoBlk != NULL) {
+    if(!hwndOwner)
+      hwndOwner = HWND_DESKTOP;
+    /* Find message offset in array of message offsets
+       Assume 1 message - fixme?
+     */
     pszOffset = ((PSZ)pErrInfoBlk) + pErrInfoBlk->offaoffszMsg;
     /* Address error message in array of messages and
-       append error message to source code linenumber */
-    sprintf(&ErrBuffer[strlen(ErrBuffer)],"#0x%04x  \"",
-            ERRORIDERROR(pErrInfoBlk->idError));
-    strcat(ErrBuffer,(((PSZ)pErrInfoBlk) + *((PSHORT)pszOffset)));
-    strcat(ErrBuffer,"\"");
-    WinFreeErrorInfo(pErrInfoBlk);            /* Free resource segment */
-    WinMessageBox(HWND_DESKTOP,               /* Parent window is DESKTOP */
-                  hwnd,                       /* Owner window is DESKTOP */
-                  (PSZ)ErrBuffer,             /* General_Error message */
-                                              /* Title bar message */
-                  GetPString(IDS_GENERR2TEXT),
-                  0,                          /* Message identifier */
+       append error message to source code linenumber
+     */
+    psz = ErrBuffer + strlen(ErrBuffer);
+    sprintf(psz,"#0x%04x  \"", ERRORIDERROR(pErrInfoBlk->idError));
+    psz += strlen(psz);
+    strcpy(psz,((PSZ)pErrInfoBlk) + *(PSHORT)pszOffset);
+    psz += strlen(psz);
+    strcpy(psz,"\"");
+    WinFreeErrorInfo(pErrInfoBlk);      /* Free resource segment */
+
+    WinMessageBox(HWND_DESKTOP,                 /* Parent window */
+                  hwndOwner,                    /* Owner window */
+                  ErrBuffer,                    /* Formatted message */
+                  GetPString(IDS_GENERR2TEXT),  /* Titlebar message */
+                  0,                            /* Message identifier */
                   MB_ENTER | MB_ICONEXCLAMATION | MB_MOVEABLE);
   }
@@ -58 +85 @@
 
 
-INT Dos_Error(INT type,ULONG Error,HWND hwnd, PSZ ErrModule,
-              LONG ErrLine,CHAR *s,...) {
-
+INT Dos_Error(INT type,ULONG Error,HWND hwndOwner, PSZ ErrModule,
+              LONG ErrLine,CHAR *s,...)
+{
   CHAR             MsgBuffer[4096]; /* The whole error message that
                                        is displayed to
@@ -68 +95 @@
   ULONG            Locus = 7;       /* Error location */
   ULONG            len;
-  CHAR            *p,*pp;
+  CHAR            *pszMsgStart;
+  CHAR            *psz;
   va_list          ap;
 
   if(Error != 0) {
-    strset(MsgBuffer,0);
-    if(!hwnd)
-      hwnd = HWND_DESKTOP;
+    strset(MsgBuffer,0);                // fixme?
+    if(!hwndOwner)
+      hwndOwner = HWND_DESKTOP;
+
+    // Format caller's message
     va_start(ap,s);
     vsprintf(MsgBuffer,s,ap);
     va_end(ap);
+
     DosErrClass(Error,&Class,&action,&Locus);
+
     sprintf(&MsgBuffer[strlen(MsgBuffer)],
             GetPString(IDS_DOSERR1TEXT),
@@ -87 +119 @@
             GetPString(IDS_ERRACTION1TEXT + (action - 1)),
             GetPString(IDS_ERRLOCUS1TEXT + (Locus - 1)));
-    p = MsgBuffer + strlen(MsgBuffer) + 1;
-    if(!DosGetMessage(NULL,0L,(PCHAR)p + 1,1024,Error,"OSO001.MSG",&len) ||
-       !DosGetMessage(NULL,0L,(PCHAR)p + 1,1024,Error,"OSO001H.MSG",&len)) {
-      p[len + 1] = 0;
-      *(p - 1) = '\n';
-      *p = '\"';
-      pp = p + len;
-      while(*pp && (*pp == '\r' || *pp == '\n' || *pp == ' ' || *pp == '\t')) {
-        *pp = 0;
-        pp--;
+    pszMsgStart = MsgBuffer + strlen(MsgBuffer) + 1;
+    // Get mesasge leaving space for NL separator
+    if(!DosGetMessage(NULL,0L,(PCHAR)pszMsgStart + 1,1024,Error,"OSO001.MSG",&len) ||
+       !DosGetMessage(NULL,0L,(PCHAR)pszMsgStart + 1,1024,Error,"OSO001H.MSG",&len))
+    {
+      // Got message
+      pszMsgStart[len + 1] = 0;         // Terminate
+      *(pszMsgStart - 1) = '\n';        // Stuff NL before message text
+      *pszMsgStart = '\"';              // Prefix message text with quote
+      psz = pszMsgStart + len;          // Point at last char
+      // Chop trailing NL CR TAB
+      while (*psz &&
+             (*psz == '\r' || *psz == '\n' || *psz == ' ' || *psz == '\t')) {
+        *psz = 0;
+        psz--;
       }
-      strcat(p,"\"");
-      pp = p;
-      while(*pp) {
-        if(*pp == '\n' || *pp == '\r') {
-          while(*(pp + 1) == '\n' || *(pp + 1) == '\r')
-            memmove(pp,pp + 1,strlen(pp));
-          *pp = ' ';
+      strcat(pszMsgStart,"\"");         // Append trailing quote
+      // Convert CR and NL combos to single space
+      psz = pszMsgStart;
+      while (*psz) {
+        if (*psz == '\n' || *psz == '\r') {
+          while (*(psz + 1) == '\n' || *(psz + 1) == '\r')
+            memmove(psz,psz + 1,strlen(psz));
+          *psz = ' ';
         }
         else
-          pp++;
+          psz++;
       }
     }
-    return WinMessageBox(HWND_DESKTOP,            /* Parent window is DESKTOP */
-                         hwnd,                    /* Owner window */
-                         (PSZ)MsgBuffer,          /* DOS API error message */
-                                                  /* Title bar message */
-                         GetPString(IDS_DOSERR2TEXT),
-                         0,                       /* Message identifier */
+    return WinMessageBox(HWND_DESKTOP,                  /* Parent window */
+                         hwndOwner,                     /* Owner window */
+                         MsgBuffer,                     /* Formatted message */
+                         GetPString(IDS_DOSERR2TEXT),   /* Title bar message */
+                         0,                             /* Message identifier */
                          type | MB_ICONEXCLAMATION | MB_MOVEABLE);
   }
   return MBID_ENTER;
 }
-