Changeset 1718 for trunk/dll/errutil.c

Timestamp:

Feb 16, 2014, 12:16:50 AM (11 years ago)

Author:

Gregg Young

Message:

Improvements to saymsg2 some code cleanup

File:

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

trunk/dll/errutil.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2013 Steven H. Levine
+  Copyright (c) 2004, 2014 Steven H. Levine
 
   12 Aug 04 SHL Comments
@@ -39 +39 @@
                 Added saymsg2 for this purpose
   07 Nov 13 SHL Update comments
+  15 Feb 14 GKY Improvements to saymsg2 some code cleanup
 
 ***********************************************************************/
@@ -242 +243 @@
 
   if (pszBuf[cBufBytes - 1]) {
-    fprintf(stderr, "Buffer overflow in formatWinError - need %u bytes\n", strlen(pszBuf) + 1);
+    fprintf(stderr, "Buffer overflow in formatWinError - need %u bytes\n",
+            strlen(pszBuf) + 1);
     fflush(stderr);
   }
@@ -370 +372 @@
  */
 
-APIRET saymsg2(PCSZ pszButtonNames, int DefaultButton, HWND hwnd, PCSZ pszTitle, PCSZ pszFmt, ...)
+APIRET saymsg2(PCSZ pszButtonNames, int DefaultButton, HWND hwnd,
+               PCSZ pszTitle, PCSZ pszFmt, ...)
 {
   ULONG i;
@@ -391 +394 @@
 
   memset(mb2dBut, 0, sizeof(MB2D) * 4);
-  //fixme to use GetPString
-  strcpy(mb2dBut[0].achText, /*pszButtonNames[0] ? &pszButtonNames[0] :*/ GetPString(IDS_MB2DYES));
-  strcpy(mb2dBut[1].achText, /*pszButtonNames[1] ? &pszButtonNames[1] :*/ GetPString(IDS_MB2DYESDONTASK));
-  strcpy(mb2dBut[2].achText, /*pszButtonNames[2] ? &pszButtonNames[2] :*/ GetPString(IDS_MB2DNO));
-  strcpy(mb2dBut[3].achText,/* pszButtonNames[3] ? &pszButtonNames[3] :*/ GetPString(IDS_MB2DCANCELOP));
+  strcpy(mb2dBut[0].achText,GetPString(IDS_MB2DYES));
+  strcpy(mb2dBut[1].achText,GetPString(IDS_MB2DYESDONTASK));
+  strcpy(mb2dBut[2].achText,GetPString(IDS_MB2DNO));
+  strcpy(mb2dBut[3].achText,GetPString(IDS_MB2DCANCELOP));
   mb2dBut[0].idButton = 1;
   mb2dBut[1].idButton = 2;
@@ -407 +409 @@
     pmbInfo->hIcon      = 0;
     pmbInfo->cButtons   = 4;
-    pmbInfo->flStyle    = MB_MOVEABLE;
+    pmbInfo->flStyle    = MB_MOVEABLE | MB_SYSTEMMODAL | MB_ICONQUESTION ;
     pmbInfo->hwndNotify = NULLHANDLE;
     for (i = 0; i < 4; i++) {
@@ -414 +416 @@
     rc = WinMessageBox2(HWND_DESKTOP, hwnd,
                         szMsg, pszTitle, 1234,
-                        pmbInfo);
+                        pmbInfo);
     free(pmbInfo);
     return rc;
@@ -460 +462 @@
   // Format callers message
   va_start(va, pszFmt);
-  formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile, uSrcLineNo, pszFmt, va);
+  formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile,
+                 uSrcLineNo, pszFmt, va);
   va_end(va);
 
@@ -483 +486 @@
   // Format callers message
   va_start(va, pszFmt);
-  formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile, uSrcLineNo, pszFmt, va);
+  formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile, uSrcLineNo,
+                 pszFmt, va);
   va_end(va);
 
@@ -495 +499 @@
 } // Win_Error_NoMsgBox
 
-#pragma alloc_text(ERROR,Win_Error,Dos_Error,saymsg,showMsg,Runtime_Error,GetMSecTimer)
+#pragma alloc_text(ERROR,Win_Error,Dos_Error,saymsg,saymsg2,showMsg,Runtime_Error,GetMSecTimer)