Changeset 1891 for trunk/dll/errutil.c

Timestamp:

Jan 31, 2020, 3:47:37 AM (6 years ago)

Author:

Steven Levine

Message:

Rework FreeCnrItem to ensure all CNRITEMs deleted.
Use WinSendMsg CMA_NEXT.
Was using preccNextRecord which is not recommended because control does
not maintain linkage after inserts and deletes.
Note: arccnrs.c still needs to be reworked to use common functions from filldir.c.

File:

• trunk/dll/errutil.c (modified) (13 diffs)

trunk/dll/errutil.c

@@ -6 +6 @@
   Error reporting
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2015 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2004-2020 Steven H. Levine
 
   12 Aug 04 SHL Comments
@@ -41 +41 @@
   15 Feb 14 GKY Improvements to saymsg2 some code cleanup
   16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
-                and so it works with move to trashcan inabled.
+                and so it works with move to trashcan inabled.
   09 Nov 13 SHL Use GetTidForThread in DbgMsg and tweak for for editors that understand file:line
+  28 Jan 20 SHL Add PmPrintf_Report
 
 ***********************************************************************/
@@ -66 +67 @@
 #include "fm3dll2.h"
 
+#ifdef PMPRINTF
+#define _PMPRINTF_                      // Enable debug macros
+#include "PMPRINTF.H"
+#endif
+
 #pragma data_seg(DATA1)
 
@@ -86 +92 @@
   va_list va;
 
-#if 1 // fixme to be selectable
+#if 1 // FIXME to be selectable
 
   static ULONG ul1stMSec;
@@ -94 +100 @@
 
   if (!ul1stMSec) {
-    ul1stMSec = msec;      // Avoid big delta 1st time
+    ul1stMSec = msec;                   // Avoid big delta 1st time
   }
 
@@ -124 +130 @@
  */
 
-// 2010-12-01 SHL fixme for ULONG to be APIRET
+// 2010-12-01 SHL FIXME for ULONG to be APIRET
 
 INT Dos_Error(ULONG mb_type, ULONG apiret, HWND hwndOwner,
@@ -240 +246 @@
   if (pszBuf[cBufBytes - 1]) {
     fprintf(stderr, "Buffer overflow in formatWinError - need %u bytes\n",
-            strlen(pszBuf) + 1);
+            strlen(pszBuf) + 1);
     fflush(stderr);
   }
@@ -263 +269 @@
     if (!hwndOwner)
       hwndOwner = HWND_DESKTOP;
-    // Find message offset in array of message offsets Assume 1 message - fixme?
+    // 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
@@ -303 +309 @@
 }
 
+#ifdef PMPRINTF
+
+/**
+ * Format runtime error message and output using PmPrintf
+ * @note: Local errors written directly to stderr
+ * @note: If pszFmt is NULL a No Data error message is returned GKY 20 Feb 09 (Replaces Runtime_Error2)
+ */
+
+VOID PmPrintf_Report(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...)
+{
+  CHAR szMsg[4096];
+  va_list va;
+
+  // Format caller's message
+  if (!pszFmt)
+    pszFmt = PCSZ_NODATA;
+  va_start(va, pszFmt);
+  szMsg[sizeof(szMsg) - 1] = 0;
+  vsprintf(szMsg, pszFmt, va);
+  va_end(va);
+
+  if (szMsg[sizeof(szMsg) - 1]) {
+    fprintf(stderr, "Buffer overflow in PmPrintf_Report - need %u bytes\n", strlen(szMsg) + 1);
+    fflush(stderr);
+  }
+
+  if (strchr(szMsg, ' ') == NULL) {
+    strcat(szMsg, " ");
+    strcat(szMsg, GetPString(IDS_FAILEDTEXT));  // Assume simple function name
+  }
+
+  // Avoid leading \n in IDS_GENERR1TEXT
+  strcat(szMsg, " ");
+  sprintf(szMsg + strlen(szMsg),
+          GetPString(IDS_GENERR1TEXT) + 1, pszSrcFile, uSrcLineNo);
+
+  PmPrintfString(szMsg);
+
+} // PmPrintf_Report
+
+#endif
+
 /**
  * Format runtime error message and output using showMsg
@@ -369 +417 @@
 
 APIRET saymsg2(PCSZ pszButtonNames, int DefaultButton, HWND hwnd,
-               PCSZ pszTitle, PCSZ pszFmt, ...)
+               PCSZ pszTitle, PCSZ pszFmt, ...)
 {
   ULONG i;
@@ -412 +460 @@
     rc = WinMessageBox2(HWND_DESKTOP, hwnd,
                         szMsg, pszTitle, SM2_DIALOG,
-                        pmbInfo);
+                        pmbInfo);
     WinSetFocus(HWND_DESKTOP, SM2_DIALOG);
     free(pmbInfo);
@@ -460 +508 @@
   va_start(va, pszFmt);
   formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile,
-                 uSrcLineNo, pszFmt, va);
+                 uSrcLineNo, pszFmt, va);
   va_end(va);
 
@@ -484 +532 @@
   va_start(va, pszFmt);
   formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile, uSrcLineNo,
-                 pszFmt, va);
+                 pszFmt, va);
   va_end(va);