Changeset 616 for trunk/dll/error.c

Timestamp:

Apr 20, 2007, 8:53:00 PM (18 years ago)

Author:

Steven Levine

Message:

Add DbgMsg
Correct IDS_GENERR1TEXT formatting

File:

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

trunk/dll/error.c

@@ -22 +22 @@
   07 Jan 07 GKY Move error strings etc. to string file
   18 Apr 07 SHL showMsg: correct selective logging checks
+  19 Apr 07 SHL Add DbgMsg
+  20 Apr 07 SHL Correct IDS_GENERR1TEXT formatting
 
 ***********************************************************************/
@@ -58 +60 @@
 
   if (hwndErr == NULLHANDLE)
-    hab = (HAB) 0;
+    hab = (HAB)0;
   else
     hab = WinQueryAnchorBlock(hwndErr);
@@ -78 +80 @@
   // Append file name and line number
   sprintf(szMsg + strlen(szMsg),
-          GetPString(IDS_GENERR1TEXT), pszFileName, ulLineNo, " ");
+          GetPString(IDS_GENERR1TEXT), pszFileName, ulLineNo);
 
   // Get last PM error for the current thread
@@ -274 +276 @@
 //=== showMsg: display error popup ===
 
-static APIRET showMsg(ULONG mb_type, HWND hwnd, PCSZ pszTitle, PCSZ pszMsg, BOOL wantLog)
+static APIRET showMsg(ULONG mb_type, HWND hwndOwner, PCSZ pszTitle, PCSZ pszMsg, BOOL wantLog)
 {
   if (wantLog) {
@@ -283 +285 @@
   }
 
-  if (!hwnd)
-    hwnd = HWND_DESKTOP;
+  if (!hwndOwner)
+    hwndOwner = HWND_DESKTOP;
 
   DosBeep(250, 100);
 
   return WinMessageBox(HWND_DESKTOP,    // Parent
-                       hwnd,            // Owner
+                       hwndOwner,
                        (PSZ) pszMsg, (PSZ) pszTitle, 0, // help id
                        mb_type | MB_MOVEABLE);
 } // showMsg
+
+//=== DbgMsg: output debug message stderr ===
+
+VOID DbgMsg(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...)
+{
+  va_list va;
+
+  // OK for source file name to be null
+  fprintf(stderr, "%s %u", pszSrcFile ? pszSrcFile : "n/a", uSrcLineNo);
+  // If format null want just file and line
+  if (pszFmt) {
+    fputc(' ', stderr);
+    va_start(va, pszFmt);
+    vfprintf(stderr, pszFmt, va);
+    va_end(va);
+  }
+  fputc('\n', stderr);
+  fflush(stderr);
+
+} // DbgMsg
+