Changeset 1395 for trunk/dll/arccnrs.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/arccnrs.c (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -70 +70 @@
                 menu option is selected.
   10 Dec 08 SHL Integrate exception handler support
+  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.
 
 ***********************************************************************/
@@ -525 +527 @@
     remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst), MPFROM2SHORT(usCnt, usFlags));
     if (remaining == -1) {
-      // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
-      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pai %p cnt %u", hwnd, paiFirst, usCnt);
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pai %p cnt %u",
+                hwnd, paiFirst, usCnt);
     }
   }
@@ -891 +893 @@
             goto ReTry;
           }
-        } while (tinfo);
-        DosBeep(750, 50);               // wake up user
+        } while (tinfo);
+        if (!fAlertBeepOff)
+          DosBeep(750, 50);             // wake up user
         sprintf(errstr, GetPString(IDS_ARCERRORINFOTEXT),
                 arcname,
@@ -3371 +3374 @@
           LISTINFO *li;
 
-          DosBeep(500, 100);            // fixme to know why beep?
+          //DosBeep(500, 100);          // fixme to know why beep?
           li = DoFileDrop(hwnd, dcd->arcname, FALSE, mp1, mp2);
-          DosBeep(50, 100);             // fixme to know why beep?
+          //DosBeep(50, 100);           // fixme to know why beep?
           CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
@@ -3817 +3820 @@
                                        HWND_TOP, (ULONG) ARC_CNR, NULL, NULL);
         if (!dcd->hwndCnr) {
-          Win_Error2(hwndClient, hwndClient, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndClient, hwndClient, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
           free(dcd);