Changeset 1395 for trunk/dll/errutil.c

Timestamp:

Feb 8, 2009, 2:48:16 AM (17 years ago)

Author:

Gregg Young

Message:

Allow user to turn off alert and/or error beeps in settings notebook. Ticket 341 Move repeated strings to PCSZs. Ticket 6 Add *DateFormat functions to format dates based on locale Ticket 28 Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error Ticket 6

File:

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

trunk/dll/errutil.c

@@ -29 +29 @@
   05 Jan 08 SHL Renamed from error.c to match errutil.h
   18 Dec 08 SHL Show thread id in DbgMsg
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -40 +43 @@
 #define INCL_DOSERRORS
 #define INCL_DOSPROCESS                 // PPIB PTIB
+#define INCL_LONGLONG
 
 #include "errutil.h"
 #include "strutil.h"                    // GetPString
 #include "fm3str.h"
+#include "notebook.h"                   // fErrorBeepOff
 
 #pragma data_seg(GLOBAL2)
@@ -135 +140 @@
   }
 
-  if (strchr(szMsg, ' ') == NULL)
-    strcat(szMsg, " failed");           // Assume simple function name
+  if (strchr(szMsg, ' ') == NULL) {
+    strcat(szMsg, " ");
+    strcat(szMsg, GetPString(IDS_FAILEDTEXT));          // Assume simple function name
+  }
 
   DosErrClass(ulRC, &Class, &action, &Locus);
@@ -185 +192 @@
 } // Dos_Error
 
-//== Dos_Error2: report Dos...() error using passed message id ===
+/*== Dos_Error2: report Dos...() error using passed message id ===
 
 INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner,
@@ -192 +199 @@
   return Dos_Error(mb_type, ulRC, hwndOwner, pszSrcFile, uSrcLineNo,
                    GetPString(idMsg));
-} // Dos_Error2
+} // Dos_Error2 */
 
 /**
@@ -224 +231 @@
   }
 
-  if (strchr(pszBuf, ' ') == NULL)
-    strcat(pszBuf, " failed");          // Assume simple function name
+  if (strchr(pszBuf, ' ') == NULL) {
+    strcat(pszBuf, " ");
+    strcat(pszBuf, GetPString(IDS_FAILEDTEXT));         // Assume simple function name
+  }
 
   // Append file name and line number and trailing space
@@ -303 +312 @@
   }
 
-  if (strchr(szMsg, ' ') == NULL)
-    strcat(szMsg, " failed");           // Assume simple function name
+  if (strchr(szMsg, ' ') == NULL) {
+    strcat(szMsg, " ");
+    strcat(szMsg, GetPString(IDS_FAILEDTEXT));          // Assume simple function name
+  }
 
   sprintf(szMsg + strlen(szMsg),
           GetPString(IDS_GENERR1TEXT), pszSrcFile, uSrcLineNo);
 
-  showMsg(MB_ICONEXCLAMATION, HWND_DESKTOP, DEBUG_STRING, szMsg, TRUE);
+  showMsg(MB_ICONEXCLAMATION, HWND_DESKTOP, GetPString(IDS_DEBUG_STRING), szMsg, TRUE);
 
 } // Runtime_Error
@@ -358 +369 @@
   if (!hwndOwner)
     hwndOwner = HWND_DESKTOP;
-
-  DosBeep(250, 100);
+  if (!fErrorBeepOff)
+    DosBeep(250, 100);
 
   return WinMessageBox(HWND_DESKTOP,    // Parent
@@ -386 +397 @@
 } // Win_Error
 
-//== Win_Error2: report Win...() error using passed message id ===
+/*== Win_Error2: report Win...() error using passed message id ===
 
 VOID Win_Error2(HWND hwndErr, HWND hwndOwner,
@@ -393 +404 @@
   Win_Error(hwndErr, hwndOwner, pszSrcFile, uSrcLineNo, GetPString(idMsg));
 
-} // Win_Error2
+} // Win_Error2 */
 
 /**
@@ -417 +428 @@
   fputc('\n', stderr);
   fflush(stderr);
-
-  DosBeep(250, 100);
+  if (!fErrorBeepOff)
+    DosBeep(250, 100);
 
 } // Win_Error_NoMsgBox