Changeset 1395 for trunk/dll

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

Location:

trunk/dll

Files:

• arccnrs.c (modified) (5 diffs)
• archive.c (modified) (3 diffs)
• autoview.c (modified) (6 diffs)
• avv.c (modified) (1 diff)
• collect.c (modified) (11 diffs)
• colors.c (modified) (2 diffs)
• commafmt.c (modified) (2 diffs)
• commafmt.h (modified) (2 diffs)
• common.c (modified) (13 diffs)
• comp.c (modified) (3 diffs)
• datamin.c (modified) (6 diffs)
• dircnrs.c (modified) (9 diffs)
• dirsize.c (modified) (3 diffs)
• eas.c (modified) (4 diffs)
• errutil.c (modified) (11 diffs)
• errutil.h (modified) (3 diffs)
• extract.c (modified) (2 diffs)
• filldir.c (modified) (12 diffs)
• filter.c (modified) (4 diffs)
• fm3dlg.h (modified) (2 diffs)
• fm3res.dlg (modified) (4 diffs)
• fm3res.rc (modified) (8 diffs)
• fm3str.h (modified) (5 diffs)
• grep.c (modified) (2 diffs)
• grep2.c (modified) (3 diffs)
• info.c (modified) (4 diffs)
• inis.c (modified) (21 diffs)
• init.c (modified) (9 diffs)
• init.h (modified) (3 diffs)
• mainwnd.c (modified) (20 diffs)
• menu.c (modified) (2 diffs)
• misc.c (modified) (2 diffs)
• newview.c (modified) (13 diffs)
• notebook.c (modified) (10 diffs)
• notebook.h (modified) (3 diffs)
• notify.c (modified) (3 diffs)
• objwin.c (modified) (3 diffs)
• printer.c (modified) (9 diffs)
• rename.c (modified) (6 diffs)
• saveclip.c (modified) (11 diffs)
• seeall.c (modified) (13 diffs)
• tools.c (modified) (3 diffs)
• treecnr.c (modified) (7 diffs)
• uudecode.c (modified) (3 diffs)
• viewer.c (modified) (5 diffs)
• viewinf.c (modified) (6 diffs)
• worker.c (modified) (3 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);

trunk/dll/archive.c

@@ -14 +14 @@
   22 Mar 07 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -223 +224 @@
         }
       }
-      DosBeep(50, 100);
+      if (!fAlertBeepOff)
+        DosBeep(50, 100);
       break;
 
@@ -272 +274 @@
                      pszSrcFile, __LINE__);
         }
-        else
+        else if (!fErrorBeepOff)
           DosBeep(50, 100);
       }

trunk/dll/autoview.c

@@ -26 +26 @@
   10 Dec 08 SHL Integrate exception handler support
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Add *DateFormat functions to format dates bassed on locale
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -452 +454 @@
 
             static FILEFINDBUF4L ffb[130];
-            CHAR fullname[CCHMAXPATH + 4], szCmmaFmtFileSize[81];
+            CHAR fullname[CCHMAXPATH + 4], szCmmaFmtFileSize[81], szDate[11];
             HDIR hdir = HDIR_CREATE;
             ULONG x, nm, ml, mc, bufflen;
@@ -462 +464 @@
 
             BldFullPathName(fullname, currfile, "*");
-            //sprintf(fullname,
-            //        "%s%s*",
-            //        currfile,
-            //        (currfile[strlen(currfile) - 1] == '\\') ? "" : "\\");
             DosError(FERR_DISABLEHARDERR);
             nm = sizeof(ffb) / sizeof(FILEFINDBUF4L);
@@ -507 +505 @@
                                 sizeof(szCmmaFmtFileSize),
                                 pffbFile->cbFile + CBLIST_TO_EASIZE(pffbFile->cbList),
-                                ' ');
+                                ' ');
+                    FDateFormat(szDate, pffbFile->fdateLastWrite);
                     sprintf(p,
-                            "%s%-*.*s  %-8s  [%s%s%s%s]  %04lu/%02lu/%02lu "
-                              "%02lu:%02lu:%02lu\r",
+                            "%s%-*.*s  %-8s  [%s%s%s%s]  %s "
+                              "%02lu%s%02lu%s%02lu\r",
                             pffbFile->attrFile & FILE_DIRECTORY ? "\\" : " ",
                             ml,
@@ -520 +519 @@
                             pffbFile->attrFile & FILE_HIDDEN ? "H" : "-",
                             pffbFile->attrFile & FILE_SYSTEM ? "S" : "-",
-                            pffbFile->fdateLastWrite.year + 1980,
-                            pffbFile->fdateLastWrite.month,
-                            pffbFile->fdateLastWrite.day,
-                            pffbFile->ftimeLastWrite.hours,
-                            pffbFile->ftimeLastWrite.minutes,
+                            szDate,
+                            pffbFile->ftimeLastWrite.hours, TimeSeparator,
+                            pffbFile->ftimeLastWrite.minutes, TimeSeparator,
                             pffbFile->ftimeLastWrite.twosecs * 2);
                     p += strlen(p);
@@ -683 +680 @@
                                     0L, 0L, HWND_TOP, OBJ_FRAME, NULL, NULL);
       if (!hwndAutoObj) {
-        Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
         if (!PostMsg(hwndParent, UM_CLOSE, MPVOID, MPVOID))
           WinSendMsg(hwndParent, UM_CLOSE, MPVOID, MPVOID);

trunk/dll/avv.c

@@ -267 +267 @@
     t = time(NULL);
     tm = localtime(&t);
-
+    //fixme to use DateFmt from locale
     fprintf(fpNew,
             ";\n; %s file written by FM/2 v%d.%02d on %u/%u/%u %u:%02u:%02u\n;\n",

trunk/dll/collect.c

@@ -59 +59 @@
   26 Dec 08 GKY Fixed DROPHELP to check for copy as default is action is DO_DEFAULT
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
+  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.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Move repeated strings to PCSZs.
 
 ***********************************************************************/
@@ -877 +881 @@
           CHAR filename[CCHMAXPATH], *p, *pp;
 
-          strcpy(filename, "*.LST");
+          strcpy(filename, PCSZ_STARDOTLST);
           size = CCHMAXPATH;
           PrfQueryProfileData(fmprof, appname, "SaveToListName", filename,
@@ -1264 +1268 @@
     if (dcd) {
       CNRINFO cnri;
-      CHAR s[CCHMAXPATH + 69], tb[81], tf[81], *p;
+      CHAR s[CCHMAXPATH + 69], tb[81], tf[81], szDate[11], *p;
       PCNRITEM pci = NULL;
 
@@ -1332 +1336 @@
             }
             CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-            if (!fMoreButtons) {
-              sprintf(s, " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
-                      tb, pci->date.year, pci->date.month,
-                      pci->date.day, pci->time.hours, pci->time.minutes,
-                      pci->time.seconds, pci->pszDispAttr, p);
+            if (!fMoreButtons) {
+              DateFormat(szDate, pci->date);
+              sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
+                      tb, szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
+                      TimeSeparator, pci->time.seconds, pci->pszDispAttr, p);
             }
             else {
@@ -1350 +1354 @@
           }
           if (fMoreButtons) {
-            WinSetWindowText(hwndName, pci->pszFileName);
-            sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
-                    pci->date.year, pci->date.month,
-                    pci->date.day, pci->time.hours, pci->time.minutes,
-                    pci->time.seconds);
+            WinSetWindowText(hwndName, pci->pszFileName);
+            DateFormat(szDate, pci->date);
+            sprintf(s, "%s %02u%s%02u%s%02u",
+                    szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
+                    TimeSeparator, pci->time.seconds);
             WinSetWindowText(hwndDate, s);
             WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -1379 +1383 @@
 
   case UM_CONTAINER_FILLED:
-    DosBeep(1000, 50);                  // Wake up user?
+    if (!fAlertBeepOff)
+      DosBeep(1000, 50);                        // Wake up user?
     WinSendMsg(hwnd,
                CM_INVALIDATERECORD,
@@ -1686 +1691 @@
           CHAR filename[CCHMAXPATH], *p, *pp;
 
-          strcpy(filename, "*.LST");
+          strcpy(filename, PCSZ_STARDOTLST);
           size = CCHMAXPATH;
           PrfQueryProfileData(fmprof, appname, "SaveToListName",
@@ -2670 +2675 @@
           PNOTIFYRECORDEMPHASIS pre = mp2;
           PCNRITEM pci;
-          CHAR s[CCHMAXPATH + 91], tb[81], tf[81], *p;
+          CHAR s[CCHMAXPATH + 91], tb[81], tf[81], szDate[11], *p;
 
           pci = (PCNRITEM) ((pre) ? pre->pRecord : NULL);
@@ -2720 +2725 @@
                   }
                   CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-                  if (!fMoreButtons)
-                    sprintf(s, " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
-                            tb, pci->date.year,
-                            pci->date.month, pci->date.day, pci->time.hours,
-                            pci->time.minutes, pci->time.seconds,
-                            pci->pszDispAttr, p);
+                  if (!fMoreButtons) {
+                    DateFormat(szDate, pci->date);
+                    sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
+                            tb, szDate, pci->time.hours, TimeSeparator,
+                            pci->time.minutes, TimeSeparator, pci->time.seconds,
+                            pci->pszDispAttr, p);
+                  }
                   else {
                     if (pci->cbFile + pci->easize > 1024)
@@ -2739 +2745 @@
                 }
                 if (fMoreButtons) {
-                  WinSetWindowText(hwndName, pci->pszFileName);
-                  sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
-                          pci->date.year, pci->date.month,
-                          pci->date.day, pci->time.hours, pci->time.minutes,
-                          pci->time.seconds);
+                  WinSetWindowText(hwndName, pci->pszFileName);
+                  DateFormat(szDate, pci->date);
+                  sprintf(s, "%s %02u%s%02u%s%02u",
+                          szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
+                          TimeSeparator, pci->time.seconds);
                   WinSetWindowText(hwndDate, s);
                   WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -3023 +3029 @@
                                      (ULONG) COLLECTOR_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);

trunk/dll/colors.c

@@ -12 +12 @@
   22 Mar 07 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -151 +152 @@
         co->colors[co->currentcolor] = (LONG) (SHORT1FROMMP(mp1) -
                                                COLOR_FIRST);
-        DosBeep(1000, 1);               // fixme to be gone?
+        //DosBeep(1000, 1);             // fixme to be gone?
       }
       break;

trunk/dll/commafmt.c

@@ -15 +15 @@
   05 Nov 07 GKY Use commafmtULL to display file sizes for large file support
   10 Nov 07 GKY Get thousands separator from country info for file sizes.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -172 +173 @@
 }
 
-#pragma alloc_text(MISC8,commafmt,CommaFmtU64)
+VOID DateFormat(PSZ pszBuf, CDATE Date)
+{
+  switch(ulDateFmt) {
+
+  case 3:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
+            Date.day, DateSeparator, Date.month);
+    break;
+
+  case 2:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
+            Date.month, DateSeparator, Date.day);
+    break;
+
+  case 1:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
+            Date.month, DateSeparator, Date.year);
+    break;
+
+  case 0:
+  default:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
+            Date.day, DateSeparator, Date.year);
+    break;
+  }
+}
+
+VOID FDateFormat(PSZ pszBuf, FDATE Date)
+{
+  switch(ulDateFmt) {
+
+  case 3:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year + 1980, DateSeparator,
+            Date.day, DateSeparator, Date.month);
+    break;
+
+  case 2:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year + 1980, DateSeparator,
+            Date.month, DateSeparator, Date.day);
+    break;
+
+  case 1:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
+            Date.month, DateSeparator, Date.year + 1980);
+    break;
+
+  case 0:
+  default:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
+            Date.day, DateSeparator, Date.year + 1980);
+    break;
+  }
+}
+
+VOID DTDateFormat(PSZ pszBuf, DATETIME Date)
+{
+  switch(ulDateFmt) {
+
+  case 3:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
+            Date.day, DateSeparator, Date.month);
+    break;
+
+  case 2:
+
+    sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
+            Date.month, DateSeparator, Date.day);
+    break;
+
+  case 1:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
+            Date.month, DateSeparator, Date.year);
+    break;
+
+  case 0:
+  default:
+
+    sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
+            Date.day, DateSeparator, Date.year);
+    break;
+  }
+}
+
+#pragma alloc_text(MISC8,commafmt,CommaFmtUL,CommaFmtULL)

trunk/dll/commafmt.h

@@ -10 +10 @@
 
   Change log
+  07 Feb 09 GKY Add *DateFormat functions to format dates bassed on locale
 
 ***********************************************************************/
@@ -22 +23 @@
 size_t commafmt(PSZ pszBuf, UINT cBufSize, LONG lNumber);
 
+VOID DateFormat(PSZ pszBuf, CDATE Date);
+
+VOID FDateFormat(PSZ pszBuf, FDATE Date);
+
+VOID DTDateFormat(PSZ pszBuf, DATETIME Date);
+
 #endif // COMMAFMT_H

trunk/dll/common.c

@@ -24 +24 @@
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -230 +231 @@
                               HWND_TOP, ids[x], NULL, NULL);
     if (!hwndTmp)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
   } // for
 }
@@ -407 +409 @@
                                hwndFrame, HWND_TOP, MAIN_STATUS, NULL, NULL);
   if (!hwndStatus)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   // Right status window
@@ -428 +431 @@
                                 HWND_TOP, MAIN_STATUS2, NULL, NULL);
   if (!hwndStatus2)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndAttr = WinCreateWindow(hwndFrame,
@@ -446 +450 @@
                              20, hwndFrame, HWND_TOP, IDM_ATTRS, NULL, NULL);
   if (!hwndAttr)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndDate = WinCreateWindow(hwndFrame,
@@ -464 +469 @@
                              20, hwndFrame, HWND_TOP, IDM_INFO, NULL, NULL);
   if (!hwndDate)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndName = WinCreateWindow(hwndFrame,
@@ -482 +488 @@
                              20, hwndFrame, HWND_TOP, IDM_RENAME, NULL, NULL);
   if (!hwndName)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndTmp = WinCreateWindow(hwndFrame,
@@ -499 +506 @@
                             30, hwndFrame, HWND_TOP, MAIN_TOOLS, NULL, NULL);
   if (!hwndTmp)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndBack = WinCreateWindow(hwndFrame,
@@ -518 +526 @@
 
   if (!hwndBack)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndLED = WinCreateWindow(hwndFrame,
@@ -529 +538 @@
                             12, hwndFrame, HWND_TOP, MAIN_LED, NULL, NULL);
   if (!hwndLED)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndLEDHdr = WinCreateWindow(hwndFrame,
@@ -542 +552 @@
                                hwndFrame, HWND_TOP, MAIN_LEDHDR, NULL, NULL);
   if (!hwndLEDHdr)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndAutoview = WinCreateWindow(hwndFrame,
@@ -562 +573 @@
                                  HWND_TOP, MAIN_AUTOVIEW, NULL, NULL);
   if (!hwndAutoview)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   hwndAutoMLE = WinCreateWindow(hwndFrame,
@@ -583 +595 @@
                                 HWND_TOP, MAIN_AUTOVIEWMLE, NULL, NULL);
   if (!hwndAutoMLE)
-    Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
 
   oldproc = WinSubclassWindow(hwndAutoMLE, AutoViewProc);

trunk/dll/comp.c

@@ -61 +61 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis.
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -142 +143 @@
   HDIR hdir = HDIR_CREATE;
   ULONG ulFindCnt;
+  CHAR  szCmmaFmtFileSize[81], szDate[11];
 
   // 13 Aug 07 SHL fimxe to use FileToGet
@@ -161 +163 @@
         do {
           strcpy(enddir, pffb->achName);
-          if (!(pffb->attrFile & FILE_DIRECTORY))
-            // 27 Sep 07 SHL fixme to use CommaFmtULL
+          if (!(pffb->attrFile & FILE_DIRECTORY)) {
+            CommaFmtULL(szCmmaFmtFileSize,
+                        sizeof(szCmmaFmtFileSize), pffb->cbFile, ' ');
+            FDateFormat(szDate, pffb->fdateLastWrite);
             fprintf(fp,
-                    "\"%s\",%u,%llu,%04u/%02u/%02u,%02u:%02u:%02u,%lu,%lu,N\n",
+                    "\"%s\",%u,%s,%s,%02u%s%02u%s%02u,%lu,%lu,N\n",
                     mask,
                     enddir - mask,
-                    pffb->cbFile,
-                    (pffb->fdateLastWrite.year + 1980),
-                    pffb->fdateLastWrite.month,
-                    pffb->fdateLastWrite.day,
-                    pffb->ftimeLastWrite.hours,
-                    pffb->ftimeLastWrite.minutes,
+                    szCmmaFmtFileSize,
+                    szDate,
+                    pffb->ftimeLastWrite.hours,
+                    TimeSeparator,
+                    pffb->ftimeLastWrite.minutes,
+                    TimeSeparator,
                     pffb->ftimeLastWrite.twosecs,
                     pffb->attrFile,
-                    pffb->cbList > 4 ? pffb->cbList / 2 : 0);
+                    pffb->cbList > 4 ? pffb->cbList / 2 : 0);
+          }
           // Skip . and ..
           else if (recurse &&

trunk/dll/datamin.c

@@ -25 +25 @@
                 Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -260 +262 @@
                              MINI_X,
                              MINI_Y, hwnd, HWND_TOP, ids[c], NULL, NULL)) {
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
         x += (MINI_X + 4);
@@ -318 +321 @@
                                  WS_VISIBLE, x, y, MINI_X, MINI_Y, hwnd,
                                  HWND_TOP, MINI_DRIVEA + c, NULL, NULL)) {
-              Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,
-                         IDS_WINCREATEWINDOW);
+              Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                        PCSZ_WINCREATEWINDOW);
             }
             numdrives++;
@@ -747 +750 @@
   case UM_TIMER:
     {
-      CHAR s[134];
+      CHAR s[134], szDate[11];
       DATETIME dt;
 
@@ -754 +757 @@
                         HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
       if (counter && (counter % 19) && (counter % 20)) {
-        if (!DosGetDateTime(&dt)) {
+        if (!DosGetDateTime(&dt)) {
+          DTDateFormat(szDate, dt);
           sprintf(s,
-                  " %02hu:%02hu:%02hu  %s %04u/%02u/%02u",
-                  dt.hours,
-                  dt.minutes,
+                  " %02hu%s%02hu%s%02hu  %s %s",
+                  dt.hours, TimeSeparator,
+                  dt.minutes, TimeSeparator,
                   dt.seconds,
                   GetPString(IDS_SUNDAY + dt.weekday),
-                  dt.year, dt.month, dt.day);
+                  szDate);
           WinSetDlgItemText(hwnd, MINI_TIME, s);
         }
@@ -944 +948 @@
                   numdays, GetPString(IDS_DAYTEXT), &"s"[numdays == 1L]);
         nummins = val % (60L * 24L);
-        sprintf(s + strlen(s), " %lu:%02lu", nummins / 60, nummins % 60);
+        sprintf(s + strlen(s), " %lu%s%02lu", nummins / 60, TimeSeparator, nummins % 60);
         WinSetDlgItemText(hwnd, MINI_TIME, s);
       }

trunk/dll/dircnrs.c

@@ -54 +54 @@
   26 Dec 08 GKY Fixed DROPHELP to check for copy as default is action is DO_DEFAULT
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Move repeated strings to PCSZs.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -987 +991 @@
           ULONG size;
 
-          strcpy(filename, "*.LST");
+          strcpy(filename, PCSZ_STARDOTLST);
           size = CCHMAXPATH;
           PrfQueryProfileData(fmprof, appname, "SaveToListName",
@@ -1470 +1474 @@
 
       CNRINFO cnri;
-      CHAR s[CCHMAXPATH * 2], tf[81], tb[81];
+      CHAR s[CCHMAXPATH * 2], tf[81], tb[81], szDate[11];
       PCNRITEM pci;
 
@@ -1500 +1504 @@
             if (fSplitStatus && hwndStatus2) {
               CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-              if (!fMoreButtons)
-                sprintf(s,
-                        " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+              if (!fMoreButtons) {
+                DateFormat(szDate, pci->date);
+                sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
                         tb,
-                        pci->date.year,
-                        pci->date.month,
-                        pci->date.day,
-                        pci->time.hours,
-                        pci->time.minutes,
+                        szDate,
+                        pci->time.hours,
+                        TimeSeparator,
+                        pci->time.minutes,
+                        TimeSeparator,
                         pci->time.seconds,
-                        pci->pszDispAttr, pci->pszFileName);
+                        pci->pszDispAttr, pci->pszFileName);
+              }
               else {
                 *tf = 0;
@@ -1525 +1530 @@
               WinSetWindowText(hwndStatus2, NullStr);
             if (fMoreButtons) {
-              WinSetWindowText(hwndName, pci->pszFileName);
-              sprintf(s,
-                      "%04u/%02u/%02u %02u:%02u:%02u",
-                      pci->date.year,
-                      pci->date.month,
-                      pci->date.day,
-                      pci->time.hours, pci->time.minutes, pci->time.seconds);
+              WinSetWindowText(hwndName, pci->pszFileName);
+              DateFormat(szDate, pci->date);
+              sprintf(s, "%s %02u%s%02u%s%02u",
+                      szDate,
+                      pci->time.hours, TimeSeparator,
+                      pci->time.minutes, TimeSeparator,
+                      pci->time.seconds);
               WinSetWindowText(hwndDate, s);
               WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -2827 +2832 @@
                 Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
                           GetPString(IDS_CANTFINDDIRTEXT),
-                          pci->pszFileName);
-                DosBeep(250,100);
+                          pci->pszFileName);
+                if (!fErrorBeepOff)
+                  DosBeep(250,100);
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
                 UnFlesh(hwnd, pci);
@@ -3322 +3328 @@
                 if (fSplitStatus && hwndStatus2) {
                   CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-                  if (!fMoreButtons) {
-                    sprintf(s, " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
-                            tb, pci->date.year,
-                            pci->date.month, pci->date.day, pci->time.hours,
-                            pci->time.minutes, pci->time.seconds,
+                  if (!fMoreButtons) {
+                    CHAR date[11];
+
+                    DateFormat(date, pci->date);
+                    sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
+                            tb, date, pci->time.hours, TimeSeparator,
+                            pci->time.minutes, TimeSeparator, pci->time.seconds,
                             pci->pszDispAttr, pci->pszFileName);
                   }
@@ -3341 +3349 @@
                   WinSetWindowText(hwndStatus2, s);
                 }
-                if (fMoreButtons) {
-                  WinSetWindowText(hwndName, pci->pszFileName);
-                  sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
-                          pci->date.year, pci->date.month,
-                          pci->date.day, pci->time.hours, pci->time.minutes,
-                          pci->time.seconds);
+                if (fMoreButtons) {
+                  CHAR szDate[11];
+
+                  WinSetWindowText(hwndName, pci->pszFileName);
+                  DateFormat(szDate, pci->date);
+                  sprintf(s, "%s %02u%s%02u%s%02u",
+                          szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
+                          TimeSeparator, pci->time.seconds);
                   WinSetWindowText(hwndDate, s);
                   WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -3677 +3687 @@
                                        HWND_TOP, (ULONG) DIR_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);

trunk/dll/dirsize.c

@@ -42 +42 @@
   23 Aug 08 GKY Fix memory leak (failure to free cnritems)
   10 Dec 08 SHL Integrate exception handler support
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -631 +632 @@
     WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_SORTRECORD, MPFROMP(SortSizeCnr),
                       MPVOID);
-    DosBeep(500, 25);                   // Wake up user
+    if (!fAlertBeepOff)
+      DosBeep(500, 25);                 // Wake up user
     return 0;
 
@@ -1016 +1018 @@
           pState->dying = TRUE;
           pState->chStopFlag = (CHAR)0xff;
-          DosBeep(1000, 100);           // Complain?
+          if (!fAlertBeepOff)
+            DosBeep(1000, 100);         // Complain?
         }
         else

trunk/dll/eas.c

@@ -22 +22 @@
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
   29 Feb 08 GKY Use xfree where appropriate
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -157 +158 @@
         else {
           if (CheckEA(head, s)) {
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             WinSetDlgItemText(hwnd, EAC_TEXT,
                               GetPString(IDS_EANAMEEXISTSTEXT));
@@ -164 +166 @@
           for (x = 0; *forbidden[x]; x++) {
             if (!strcmp(forbidden[x], s)) {
-              DosBeep(50, 100);
+              if (!fAlertBeepOff)
+                DosBeep(50, 100);
               WinSetDlgItemText(hwnd, EAC_TEXT,
                                 GetPString(IDS_EANAMERESERVEDTEXT));
@@ -177 +180 @@
             if (!strcmp(restypes[x].name, s)) {
               if (type != restypes[x].type) {
-                DosBeep(50, 100);
+                if (!fAlertBeepOff)
+                  DosBeep(50, 100);
                 WinSetDlgItemText(hwnd, EAC_TEXT,
                                   GetPString(IDS_EAWRONGTYPETEXT));

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

trunk/dll/errutil.h

@@ -10 +10 @@
 
   05 Jan 08 SHL Move from fm3dll.h to here
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -23 +24 @@
 INT Dos_Error(ULONG mb_type, ULONG ulRC, HWND hwndOwner,
               PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
-INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner, PCSZ pszSrcFile,
-               UINT uSrcLineNo, UINT idMsg);
+//INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner, PCSZ pszSrcFile,
+//             UINT uSrcLineNo, UINT idMsg);
 ULONG GetMSecTimer(void);
 VOID Runtime_Error(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
@@ -31 +32 @@
 VOID Win_Error(HWND hwndErr, HWND hwndOwner,
                PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
-VOID Win_Error2(HWND hwndErr, HWND hwndOwner, PCSZ pszSrcFile,
-                UINT uSrcLineNo, UINT idMsg);
+//VOID Win_Error2(HWND hwndErr, HWND hwndOwner, PCSZ pszSrcFile,
+//              UINT uSrcLineNo, UINT idMsg);
 VOID Win_Error_NoMsgBox(HWND hwndErr, HWND hwndOwner,
                         PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);

trunk/dll/extract.c

@@ -17 +17 @@
   29 Nov 08 GKY Add the option of creating a subdirectory from the arcname
                 for the extract path.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -452 +453 @@
         }
       }
-      DosBeep(50, 100);                 // Complain a refuse to quit
+      if (!fErrorBeepOff)
+        DosBeep(50, 100);                       // Complain a refuse to quit
       break;
 

trunk/dll/filldir.c

@@ -64 +64 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -1056 +1057 @@
                                   MPFROMLONG(ulSelCnt));
             if (!pciFirst) {
-              Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                         IDS_CMALLOCRECERRTEXT);
+              Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                        GetPString(IDS_CMALLOCRECERRTEXT));
               ok = FALSE;
               ullTotalBytes = 0;
@@ -1089 +1090 @@
                                 CM_INSERTRECORD,
                                 MPFROMP(pciFirst), MPFROMP(&ri))) {
-                  Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                             IDS_CMINSERTERRTEXT);
+                  Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                            GetPString(IDS_CMINSERTERRTEXT));
                   ok = FALSE;
                   ullTotalBytes = 0;
@@ -1148 +1149 @@
                               MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulTotal));
         if (!pciFirst) {
-          Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                     IDS_CMALLOCRECERRTEXT);
+          Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    GetPString(IDS_CMALLOCRECERRTEXT));
           ok = FALSE;
           ullTotalBytes = 0;
@@ -1181 +1182 @@
               if (!WinSendMsg(hwndCnr, CM_INSERTRECORD,
                               MPFROMP(pciFirst), MPFROMP(&ri))) {
-                Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                           IDS_CMINSERTERRTEXT);
+                Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                          GetPString(IDS_CMINSERTERRTEXT));
                 ok = FALSE;
                 ullTotalBytes = 0;
@@ -1326 +1327 @@
               rc,
               HWND_DESKTOP,
-              pszSrcFile, __LINE__, GetPString(IDS_FILLDIRQCURERRTEXT));
+              pszSrcFile, __LINE__, PCSZ_FILLDIRQCURERRTEXT);
     exit(0);
   }
@@ -1344 +1345 @@
 
   if (!pciFirst) {
-    Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
+    Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, GetPString(IDS_CMALLOCRECERRTEXT));
     // 04 Jan 08 SHL fixme not just up and die
     exit(0);
@@ -1537 +1538 @@
                     CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri)))
     {
-      Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                 IDS_CMINSERTERRTEXT);
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                GetPString(IDS_CMINSERTERRTEXT));
     }
   }
@@ -1628 +1629 @@
                               CM_INSERTRECORD,
                               MPFROMP(pci), MPFROMP(&ri))) {
-                Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                           IDS_CMINSERTERRTEXT);
+                Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                          GetPString(IDS_CMINSERTERRTEXT));
                 FreeCnrItem(hwndCnr, pci);
               }
@@ -1908 +1909 @@
 
   if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
-    // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
     Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
               "CM_FREERECORD hwnd %x pci %p file %s",
@@ -1934 +1934 @@
   if (usCount) {
     if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(usCount))) {
-      // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
       Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD hwnd %x pci %p cnt %u", hwnd, pci, usCount);
     }
@@ -1993 +1992 @@
     remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), 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 pci %p cnt %u", hwnd, pciFirst, usCnt);
     }

trunk/dll/filter.c

@@ -17 +17 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  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.
 
 ***********************************************************************/
@@ -406 +408 @@
                              50,
                              swpE.cy, hwnd, HWND_TOP, 65535, NULL, NULL)) {
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
         if (!WinCreateWindow(hwnd,
@@ -417 +420 @@
                              swpL.cx - 54,
                              swpE.cy, hwnd, HWND_TOP, MSK_TEXT, NULL, NULL)) {
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
         WinSendDlgItemMsg(hwnd,
@@ -652 +656 @@
             WinDismissDlg(hwnd, 1);
           }
-          else
+          else if (!fAlertBeepOff)
             DosBeep(50, 100);           // MSK_DELETE
         }

trunk/dll/fm3dlg.h

@@ -30 +30 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -650 +651 @@
 #define CFGG_CMDLNLNGTH                                                                 25216
 #define CFGG_TRASHCAN                                                                   25217
+#define CFGG_ALERTBEEPOFF                                                               25218
+#define CFGG_ERRORBEEPOFF                                                               25219
 
 #define CFGB_FRAME                                                                      25250

trunk/dll/fm3res.dlg

@@ -43 +43 @@
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -712 +713 @@
         CHECKBOX        "System", FLE_SYSTEM, 243, 96, 50, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
-        CHECKBOX        "Readable", FLE_READABLE, 4, 80, 58, 10,
-                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
-        CHECKBOX        "Writeable", FLE_WRITEABLE, 67, 80, 58, 10,
-                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
-        CHECKBOX        "Open", FLE_OPEN, 131, 80, 40, 10, BS_NOPOINTERFOCUS |
+        CHECKBOX        "Readable", FLE_READABLE, 4, 80, 38, 10,
+                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
+        CHECKBOX        "Writeable", FLE_WRITEABLE, 55, 80, 38, 10,
+                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
+        CHECKBOX        "Open", FLE_OPEN, 101, 80, 30, 10, BS_NOPOINTERFOCUS |
                         NOT WS_TABSTOP
-        CONTROL         "Is Archive", FLE_ISARCHIVE, 176, 80, 58, 10,
+        CONTROL         "Is Archive", FLE_ISARCHIVE, 177, 80, 35, 10,
                         WC_BUTTON, BS_3STATE | BS_NOPOINTERFOCUS |
                         WS_VISIBLE
-        CONTROL         "Is Binary", FLE_BINARY, 276, 80, 54, 10, WC_BUTTON,
+        CONTROL         "Is Binary", FLE_BINARY, 135, 80, 35, 10, WC_BUTTON,
                         BS_3STATE | BS_NOPOINTERFOCUS | WS_VISIBLE
-        LTEXT           "", FLE_ARCNAME, 234, 81, 38, 8
+        CTEXT           "", FLE_ARCNAME, 213, 78, 93, 8
                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
         CHECKBOX        "OS/2 Full screen", FLE_OS2FS, 9, 57, 90, 10,
@@ -2782 +2783 @@
         AUTOCHECKBOX    "Con~firm target", CFGG_CONFIRMTARGET, 4, 56, 106,
                         10
+        AUTOCHECKBOX    "Alert beep off", CFGG_ALERTBEEPOFF, 4, 44, 106,
+                        10
         LTEXT           "Target directory:", -1, 4, 34, 102, 8
         ENTRYFIELD      "", CFGG_TARGETDIR, 6, 22, 246, 8, ES_MARGIN
@@ -2797 +2800 @@
         AUTOCHECKBOX    "Delete = move to ~trashcan", CFGG_TRASHCAN, 122, 56, 126,
                         10
-        LTEXT           "Command line length:", -1, 122, 44, 60, 10, NOT WS_GROUP
-        CONTROL         "", CFGG_CMDLNLNGTH, 184, 46, 44, 10, WC_SPINBUTTON,
+        AUTOCHECKBOX    "No beep on error", CFGG_ERRORBEEPOFF, 122, 44, 126,
+                        10
+        LTEXT           "Command line length:", -1, 122, 4, 60, 10, NOT WS_GROUP
+        CONTROL         "", CFGG_CMDLNLNGTH, 184, 6, 44, 10, WC_SPINBUTTON,
                         SPBS_NUMERICONLY | SPBS_MASTER | SPBS_SERVANT |
                         SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN |

trunk/dll/fm3res.rc

@@ -45 +45 @@
   11 Jan 08 GKY Move strings that will need translating to stringtable from sting file cut to
                 255 where necessary
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -2406 +2407 @@
     IDS_EDITTEXT                          "Edit"
     IDS_NOTPROTECTONLYEXE                 "The file %s is a Dos or Windows executible, however Dos and WinOS2 are not currently activated on this system."
+    IDS_INIFAILURETEXT                    "Check INI header failed will attempt to replace with backup if backup fails or not found will open with new ini"
     IDS_SHUTDOWNSTATE                     "FM2Shutdown"
     IDS_HELPCMDTEXT                       "/HELP"
@@ -2450 +2452 @@
     IDS_NOKEEPCMDTEXT                     "/NOKEEP"
     IDS_FILTERCMDTEXT                     "/FILTER"
-    IDS_FM2CMDHELPHDRTEXT                 "                                            FM/2 mini-command line help"
+    IDS_FM2CMDHELPHDRTEXT                 "FM/2 mini-command line help"
     IDS_MISSINGTEXT                       "Some text is missing"
     IDS_TOOLHELPTEXTBLANK                 "You need to provide both button text & help."
@@ -2660 +2662 @@
     IDS_NOFILESFOUNDTEXT                  "No files found."
     IDS_VIEWHELPFILESTEXT                 "FM/2: View HELP files"
+    IDS_DEBUG_STRING                      "Debug -- please report to author"
     IDS_GENERR1TEXT                       "\nModule: %s Line number: %u"
-    IDS_GENERR2TEXT                       "                                  Error Message Information"
+    IDS_GENERR2TEXT                       "Error Message Information"
     IDS_DOSERR1TEXT                       "\nModule: %s Line number: %u\nOS/2 error: %d\nClass: %s\nAction: %s\nLocation: %s"
-    IDS_DOSERR2TEXT                       "                                  OS/2 Error Message Information"
+    IDS_DOSERR2TEXT                       "OS/2 Error Message Information"
     IDS_ERRCLASS1TEXT                     "Out of resource"
     IDS_ERRCLASS2TEXT                     "Temporary situation"
@@ -2915 +2918 @@
     IDS_INIPRFRESETFAILEDTEXT             "PrfReset failed."
     IDS_INISWAPOS2INISTITLETEXT           "FM/2: Swap OS/2 INIs "
-    IDS_INIQUERYPRFFAILEDTEXT             "PrfQueryProfile failed."
     IDS_SUCCESSTEXT                       "Success!"
     IDS_INIEDITINITITLETEXT               "FM/2: Edit INI entry"
@@ -3136 +3138 @@
     IDS_CANTLOADHELPTEXT                  "Can't load help.%s"
     IDS_NOHELPACCEPTTEXT                  "  I'll continue, but you should find FM3.HLP and place it into FM/2's working directory."
-    IDS_MISMATCHTITLETEXT                 "                        EXE/DLL Mismatch warning!"
+    IDS_MISMATCHTITLETEXT                 "EXE/DLL Mismatch warning!"
     IDS_MISMATCHTEXT                      "The EXE file you're running is from a newer version than the DLL. Please reinstall _all_ the files from the warpin archive so that FM/2 can run properly (overwrite existing files, and be sure that no parts of FM/2 are running while you reinstall)."
     IDS_CHECKSYSTEMCLOCKTEXT              "Check your system clock."
@@ -3229 +3231 @@
     IDS_TREESTATUSSTARTTEXT               " [%c:  \"%s\"  SN: %08lx%s]"
     IDS_GREPFILETEXT                      "; FM/2 seek and scan mask file, one mask set per line\n"
-    IDS_WINCREATEWINDOW                   "WinCreateWindow"
     IDS_CMINSERTERRTEXT                   "Record insert failed"
     IDS_CMALLOCRECERRTEXT                 "Record allocation failed"
-    IDS_PRFQUERYPROFILESIZE               "PrfQueryProfileSize"
-    IDS_PRFQUERYPROFILEDATA               "PrfQueryProfileData"
-    IDS_FILLDIRQCURERRTEXT                "DosQCurDisk failed"
     IDS_NOWINDOWTEXT                      "No window"
     IDS_MAKEARCTITLETEXT                  "FM/2: Makearc\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32"
@@ -3250 +3248 @@
     IDS_CLEARTARGETTEXT                   "Do you want to clear the Target directory (in other words, have no preset Target directory)?"
     IDS_TARGETDIRTITLETEXT                "Target:\32"
-    IDS_SUGGESTTITLETEXT                  "                        FM/2 startup suggestion:\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32"
+    IDS_SUGGESTTITLETEXT                  "FM/2 startup suggestion:\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32"
     IDS_SUGGEST2TEXT                      " -- this includes one or more drives you had excluded, by the way"
     IDS_NOTEBUBBLE1TEXT                   "~Bubbles"

trunk/dll/fm3str.h

@@ -28 +28 @@
                 255 where necessary
   04 Feb 09 SHL Switch to STRINGTABLE
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -87 +88 @@
 #define IDS_10SYSPROTEXT                                      49
 #define IDS_NOTPROTECTONLYEXE                                 50
+#define IDS_INIFAILURETEXT                                    51
 #define IDS_8HELVTEXT                                         52
 #define IDS_6HELVTEXT                                         53
@@ -593 +595 @@
 #define IDS_INSTANTHELPTITLETEXT                              563
 #define IDS_INSTANTHELPTEXT                                   564
-//Moved codepages to a character array in codepage.c 11 Jan 09 GKY
+//Moved codepages to a character array in codepage.c 11 Jan 09 GKY 565-588
+#define IDS_DEBUG_STRING                                      565
 #define IDS_DOSSTARTSESSIONFAILEDTEXT                         589
 #define IDS_DOSEXECPGMFAILEDTEXT                              590
@@ -622 +625 @@
 #define IDS_INIPRFRESETFAILEDTEXT                             627
 #define IDS_INISWAPOS2INISTITLETEXT                           628
-#define IDS_INIQUERYPRFFAILEDTEXT                             629
 #define IDS_SUCCESSTEXT                                       630
 #define IDS_INIEDITINITITLETEXT                               631
@@ -952 +954 @@
 #define IDS_TREESTATUSSTARTTEXT                               960
 #define IDS_GREPFILETEXT                                      961
-#define IDS_WINCREATEWINDOW                                   962
 #define IDS_CMINSERTERRTEXT                                   963
 #define IDS_CMALLOCRECERRTEXT                                 964
-#define IDS_PRFQUERYPROFILESIZE                               965
-#define IDS_PRFQUERYPROFILEDATA                               966
-#define IDS_FILLDIRQCURERRTEXT                                967
 #define IDS_NOWINDOWTEXT                                      968
 #define IDS_2SYSTEMVIOTEXT                                    969

trunk/dll/grep.c

@@ -30 +30 @@
   29 Feb 08 GKY Use xfree where appropriate
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -1519 +1520 @@
     else {
       // Insufficient memory - fall back to slow method - fixme to saymsg?
-      DosBeep(50, 100);
+      if (!fErrorBeepOff)
+        DosBeep(50, 100);
       if (!hwndStatus)
         WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));

trunk/dll/grep2.c

@@ -24 +24 @@
   10 Dec 08 SHL Integrate exception handler support
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
   fixme for more excess locals to be gone
@@ -157 +158 @@
         bstrip(p);
         if (!*p) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ENV_NAME));
         }
@@ -851 +853 @@
         bstrip(p);
         if (!*p) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
           free(p);

trunk/dll/info.c

@@ -29 +29 @@
                 to prevent duplicate directory names in tree following a copy before initial scan.
   11 Jan 08 GKY Add Write verify off and recures scan to drive info display when appropriate.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -657 +659 @@
       CHAR s[97];
       CHAR szCmmaFmtFileSize[81], szCmmaFmtEASize[81];
-      CHAR szCmmaFmtFileEASize[81], szCmmaFmtFileEASizeK[81];
+      CHAR szCmmaFmtFileEASize[81], szCmmaFmtFileEASizeK[81], szDate[11];
       FILEFINDBUF4L fs;
       HDIR hdir = HDIR_CREATE;
@@ -675 +677 @@
         SHORT sSelect, numitems;
 
-        DosBeep(250, 100);              // Wake up user
+        if (!fAlertBeepOff)
+          DosBeep(250, 100);            // Wake up user
         sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
                                             FLE_NAME,
@@ -696 +699 @@
       }
       else {
-        DosFindClose(hdir);
-        sprintf(s,
-                "%04u/%02u/%02u  %02u:%02u:%02u",
-                1980 + fs.fdateLastWrite.year,
-                fs.fdateLastWrite.month,
-                fs.fdateLastWrite.day,
-                fs.ftimeLastWrite.hours,
-                fs.ftimeLastWrite.minutes, fs.ftimeLastWrite.twosecs * 2);
+        DosFindClose(hdir);
+        FDateFormat(szDate, fs.fdateLastWrite);
+        sprintf(s, "%s  %02u%s%02u%s%02u",
+                szDate,
+                fs.ftimeLastWrite.hours, TimeSeparator,
+                fs.ftimeLastWrite.minutes, TimeSeparator, fs.ftimeLastWrite.twosecs * 2);
         WinSetDlgItemText(hwnd, FLE_LASTWRITE, s);
         if (fs.fdateCreation.year &&
-            fs.fdateCreation.month && fs.fdateCreation.day) {
-          sprintf(s,
-                  "%04u/%02u/%02u  %02u:%02u:%02u",
-                  1980 + fs.fdateCreation.year,
-                  fs.fdateCreation.month,
-                  fs.fdateCreation.day,
-                  fs.ftimeCreation.hours,
-                  fs.ftimeCreation.minutes, fs.ftimeCreation.twosecs * 2);
+            fs.fdateCreation.month && fs.fdateCreation.day) {
+          FDateFormat(szDate, fs.fdateCreation);
+          sprintf(s, "%s  %02u%s%02u%s%02u",
+                  szDate,
+                  fs.ftimeCreation.hours, TimeSeparator,
+                  fs.ftimeCreation.minutes, TimeSeparator, fs.ftimeCreation.twosecs * 2);
           WinSetDlgItemText(hwnd, FLE_CREATE, s);
         }
         if (fs.fdateLastAccess.year &&
-            fs.fdateLastAccess.month && fs.fdateLastAccess.day) {
-          sprintf(s,
-                  "%04u/%02u/%02u  %02u:%02u:%02u",
-                  1980 + fs.fdateLastAccess.year,
-                  fs.fdateLastAccess.month,
-                  fs.fdateLastAccess.day,
-                  fs.ftimeLastAccess.hours,
-                  fs.ftimeLastAccess.minutes, fs.ftimeLastAccess.twosecs * 2);
+            fs.fdateLastAccess.month && fs.fdateLastAccess.day) {
+          FDateFormat(szDate, fs.fdateLastAccess);
+          sprintf(s, "%s  %02u%s%02u%s%02u",
+                  szDate,
+                  fs.ftimeLastAccess.hours, TimeSeparator,
+                  fs.ftimeLastAccess.minutes, TimeSeparator, fs.ftimeLastAccess.twosecs * 2);
           WinSetDlgItemText(hwnd, FLE_LASTACCESS, s);
         }

trunk/dll/inis.c

@@ -29 +29 @@
   10 Dec 08 SHL Integrate exception handler support
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Move repeated strings to PCSZs.
+  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
 
 ***********************************************************************/
@@ -701 +704 @@
         WinQueryWindowText(hwndMLE, 8192, s);
         if (!*s) {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }
@@ -722 +726 @@
                                       LM_QUERYITEMCOUNT, MPVOID, MPVOID);
         if (!numitems) {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }
@@ -930 +935 @@
         bstrip(inirec->app2);
         if (!*inirec->app2) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           break;
         }
@@ -937 +943 @@
           bstrip(inirec->key2);
           if (!*inirec->key2) {
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -1005 +1012 @@
         else
           *filename = 0;
-        strcat(filename, "*.INI");
+        strcat(filename, PCSZ_STARDOTINI);
         if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
           WinSetDlgItemText(hwnd, id, filename);
@@ -1114 +1121 @@
         else
           *filename = 0;
-        strcat(filename, "*.INI");
+        strcat(filename, PCSZ_STARDOTINI);
         if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
           WinSetDlgItemText(hwnd, id, filename);
@@ -1145 +1152 @@
         prfp.pszSysName = (PSZ) oldsysini;
         if (!PrfQueryProfile(WinQueryAnchorBlock(hwnd), &prfp)) {
-          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                    GetPString(IDS_INIQUERYPRFFAILEDTEXT));
+          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                    PCSZ_INIQUERYPRFTEXT);
           break;
         }
@@ -1641 +1648 @@
       if (!inidata || !*inidata->ininame || !*inidata->applname ||
           !inidata->keyname) {
-        DosBeep(50, 100);
+        if (!fAlertBeepOff)
+          DosBeep(50, 100);
         break;
       }
@@ -1835 +1843 @@
          WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
          HWND_TOP, INI_APPLIST, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow
@@ -1841 +1850 @@
          WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
          HWND_TOP, INI_KEYLIST, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow
@@ -1847 +1857 @@
          WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
          HWND_TOP, INI_DATALIST, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
                          INI_NUMAPPS, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
                          INI_NUMKEYS, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
                          INI_NUMDATA, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
@@ -1871 +1885 @@
                          0,
                          0, 0, 0, hwnd, HWND_TOP, INI_APPHDR, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
@@ -1880 +1895 @@
                          0,
                          0, 0, 0, hwnd, HWND_TOP, INI_KEYHDR, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
@@ -1889 +1905 @@
                          0,
                          0, 0, 0, hwnd, HWND_TOP, INI_DATAHDR, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
 
@@ -2272 +2289 @@
         }
       }
-      else
-        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT),
-                         GetPString(IDS_INIQUERYPRFFAILEDTEXT));
+      else {
+        CHAR s[100];
+
+        sprintf(s, PCSZ_INIQUERYPRFTEXT, GetPString(IDS_FAILEDTEXT));
+        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT), s);
+      }
       return 0;
     }
@@ -2327 +2347 @@
             rstrip(tofind);
             if (!*tofind) {
-              DosBeep(50, 100);
+              if (!fAlertBeepOff)
+                DosBeep(50, 100);
               break;
             }
@@ -2352 +2373 @@
                      MPFROM2SHORT(x, 0), MPFROM2SHORT(TRUE, 0));
         }
-        else
+        else if (!fAlertBeepOff)
           DosBeep(250, 100);
       }
@@ -2370 +2391 @@
                     hwnd,
                     FilterIniProc, FM3ModHandle, IAF_FRAME, (PVOID) inidata);
-        else
+        else if (!fAlertBeepOff)
           DosBeep(50, 100);
       }
@@ -2493 +2514 @@
         else
           *filename = 0;
-        strcat(filename, "*.INI");
+        strcat(filename, PCSZ_STARDOTINI);
         if (export_filename(hwnd, filename, TRUE)) {
 
@@ -2634 +2655 @@
         else
           *filename = 0;
-        strcat(filename, "*.INI");
+        strcat(filename, PCSZ_STARDOTINI);
         if (insert_filename(hwnd,
                             filename,

trunk/dll/init.c

@@ -71 +71 @@
   11 Jan 09 GKY Move strings that shouldn't be translated (font names etc) compile time variables
   03 Feb 09 SHL Switch to STRINGTABLE
+  07 Feb 09 GKY Move repeated strings to PCSZs.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -179 +182 @@
 PFNWP PFNWPMLE;
 CHAR ThousandsSeparator[2];
+CHAR DateSeparator[2];
+CHAR TimeSeparator[2];
+ULONG ulTimeFmt;
+ULONG ulDateFmt;
 BOOL fInitialDriveScan;
 BOOL fAmAV2;
@@ -229 +236 @@
 CHAR *LONGNAME;
 CHAR *NullStr;
+PCSZ PCSZ_WINCREATEWINDOW;
+PCSZ PCSZ_INIQUERYPRFTEXT;
+PCSZ PCSZ_FILLDIRQCURERRTEXT;
+PCSZ PCSZ_STARDOTEXE;
+PCSZ PCSZ_STARDOTINI;
+PCSZ PCSZ_STARDOTLST;
 CHAR *Settings;
 CHAR SwapperDat[CCHMAXPATH];
@@ -433 +446 @@
     FNT_10SYSTEMVIO      =  "10.System VIO";
     FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
+    PCSZ_WINCREATEWINDOW = "WinCreateWindow";
+    PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
+    PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
+    PCSZ_STARDOTEXE    =  "*.EXE";
+    PCSZ_STARDOTINI    =  "*.INI";
+    PCSZ_STARDOTLST    =  "*.LST";
     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     WC_BUBBLE          =  "WC_BUBBLE";
@@ -534 +553 @@
     FNT_10SYSTEMVIO      =  "10.System VIO";
     FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
+    PCSZ_WINCREATEWINDOW = "WinCreateWindow";
+    PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
+    PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
+    PCSZ_STARDOTEXE    =  "*.EXE";
+    PCSZ_STARDOTINI    =  "*.INI";
+    PCSZ_STARDOTLST    =  "*.LST";
     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     WC_BUBBLE          =  "WC_BUBBLE";
@@ -935 +960 @@
       strcpy(inipath, profile);
     DosError(FERR_DISABLEHARDERR);
-
+    // fixme to check for backup if ini not found GKY 1-30-09
     rc = DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3));
     if (rc) {
@@ -941 +966 @@
       fWantFirstTimeInit = TRUE;
     }
-    else {
+    else { //Check the ini file header and restore from backup if corupted
       if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
-        saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,
-               "Check INI header failed will attempt to replace with backup \\
-               if backup fails or not found will open with new ini");
+        saymsg(MB_ENTER,HWND_DESKTOP, GetPString(IDS_DEBUG_STRING),
+               GetPString(IDS_INIFAILURETEXT));
         DosCopy("FM3.INI", "FM3INI.BAD", DCPY_EXISTING);
         DosCopy("FM3INI.BAK", "FM3.INI", DCPY_EXISTING);
@@ -1227 +1251 @@
   COUNTRYINFO CtryInfo   = {0};
 
-  DosQueryCtryInfo(sizeof(CtryInfo), &Country,
-                   &CtryInfo, &ulInfoLen);
-  *ThousandsSeparator = CtryInfo.szThousandsSeparator[0];
+  if (!DosQueryCtryInfo(sizeof(CtryInfo), &Country, &CtryInfo, &ulInfoLen)) {
+    *ThousandsSeparator = CtryInfo.szThousandsSeparator[0];
+    strcpy(DateSeparator, CtryInfo.szDateSeparator);
+    strcpy(TimeSeparator, CtryInfo.szTimeSeparator);
+    ulDateFmt = CtryInfo.fsDateFmt;
+    ulTimeFmt = CtryInfo.fsTimeFmt;
+    //DbgMsg(pszSrcFile, __LINE__, "Date Fmt %x", ulDateFmt);
+  }
+  else {
+    strcpy(ThousandsSeparator, ",");
+    strcpy(DateSeparator, "/");
+    strcpy(TimeSeparator, ":");
+    ulDateFmt = 0;
+    ulTimeFmt = 0;
+  }
   }
   { // Check for the existance of various partitioning tools to set up menu items
@@ -1365 +1401 @@
   PrfQueryProfileData(fmprof, FM3Str, "NoFinger", &fNoFinger, &size);
   size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "AlertBeepOff", &fAlertBeepOff, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "ErrorBeepOff", &fErrorBeepOff, &size);
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "SwitchTree", &fSwitchTree, &size);
   size = sizeof(BOOL);

trunk/dll/init.h

@@ -14 +14 @@
                 Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Move strings that shouldn't be translated (font names etc) compile time variables
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Move repeated strings to PCSZs.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -42 +45 @@
 extern CHAR SwapperDat[CCHMAXPATH];
 extern CHAR ThousandsSeparator[2];
+extern CHAR DateSeparator[2];
+extern CHAR TimeSeparator[2];
+extern ULONG ulTimeFmt;
+extern ULONG ulDateFmt;
 extern CHAR *FNT_6HELVETICA;
 extern CHAR *FNT_8HELVETICA;
@@ -51 +58 @@
 extern CHAR *FNT_10SYSTEMVIO;
 extern CHAR *FNT_8TIMESNEWROMAN;
+extern PCSZ PCSZ_WINCREATEWINDOW;
+extern PCSZ PCSZ_INIQUERYPRFTEXT;
+extern PCSZ PCSZ_FILLDIRQCURERRTEXT;
+extern PCSZ PCSZ_STARDOTEXE;
+extern PCSZ PCSZ_STARDOTINI;
+extern PCSZ PCSZ_STARDOTLST;
 extern CHAR *WC_ARCCONTAINER;
 extern CHAR *WC_ARCSTATUS;

trunk/dll/mainwnd.c

@@ -79 +79 @@
                 Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -360 +361 @@
                                        0L, HWND_TOP, OBJ_FRAME, NULL, NULL);
       if (!MainObjectHwnd)
-        Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       else {
         WinSetWindowPtr(MainObjectHwnd, QWL_USER, args);
@@ -991 +992 @@
                                HWND_DESKTOP, HWND_TOP, MAIN_HELP, NULL, NULL);
   if (!hwndBubble)
-    Win_Error2(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
   else {
     HPS hps;
@@ -1599 +1600 @@
                                  NULL);
       if (!hwndTool)
-        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       tool->flags |= T_TEXT;
     }
@@ -1615 +1616 @@
                                  HWND_TOP, tool->id + 25000, NULL, NULL);
       if (!hwndTool)
-        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       else {
         SetPresParams(hwndTool,
@@ -1640 +1641 @@
                              13, hwndT, HWND_TOP, IDM_TOOLLEFT, NULL, NULL);
   if (!hwndTool)
-    Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+    Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
   hwndTool =
     WinCreateWindow(hwndT, WC_BUTTON, "#6011",
@@ -1647 +1648 @@
                     13, hwndT, HWND_TOP, IDM_TOOLRIGHT, NULL, NULL);
   if (!hwndTool)
-    Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+    Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
   if (resize)
     ResizeTools(hwndT);
@@ -2258 +2259 @@
                                 hwndT, HWND_TOP, y + IDM_DRIVEA, NULL, NULL);
         if (!hwndB)
-          Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         else {
           WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
@@ -2274 +2275 @@
                                   HWND_TOP, y + IDM_DRIVEATEXT, NULL, NULL);
           if (!hwndB)
-            Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                       IDS_WINCREATEWINDOW);
+            Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      PCSZ_WINCREATEWINDOW);
           else {
             //fixme to allow user to change presparams 1-10-09 GKY
@@ -2529 +2530 @@
                                 hwnd, HWND_TOP, COMMAND_BUTTON, NULL, NULL);
         if (!hwndB)
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         hwndE = WinCreateWindow(hwnd,
                                 WC_ENTRYFIELD,
@@ -2540 +2542 @@
                                 hwnd, HWND_TOP, COMMAND_LINE, NULL, NULL);
         if (!hwndE)
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         if (!hwndE || !hwndB) {
           PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -5622 +5625 @@
                                           SV_CYMINMAXBUTTON),
                          hwnd, HWND_TOP, IDM_IDEALSIZE, NULL, NULL)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     else {
@@ -5643 +5647 @@
                               22, hwnd, HWND_TOP, IDM_OPENWALK, NULL, NULL);
     if (!hwndTmp)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
 
     hwndTmp = WinCreateWindow(hwndFrame,
@@ -5655 +5660 @@
                               22, hwnd, HWND_TOP, IDM_USERLIST, NULL, NULL);
     if (!hwndTmp)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
 
     hwndUserlist = WinCreateWindow(hwndFrame,
@@ -5674 +5680 @@
                                    MAIN_USERLIST, NULL, NULL);
     if (!hwndUserlist)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     hwndCmdlist = WinCreateWindow(hwndFrame,
                                   WC_COMBOBOX,
@@ -5692 +5699 @@
                                   MAIN_CMDLIST, NULL, NULL);
     if (!hwndCmdlist)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
     hwndStatelist = WinCreateWindow(hwndFrame,
@@ -5711 +5719 @@
                                     MAIN_SETUPLIST, NULL, NULL);
     if (!hwndStatelist)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
 
     hwndDrivelist = WinCreateWindow(hwndFrame,
@@ -5729 +5738 @@
                                     HWND_TOP, MAIN_DRIVELIST, NULL, NULL);
     if (!hwndDrivelist)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     //fixme to allow user to change presparams 1-10-09 GKY
     SetPresParams(hwndDrivelist,
-                  NULL, NULL, NULL, "10.System Monospaced");
+                  NULL, NULL, NULL, FNT_10SYSTEMMONOTEXT);
     hwndButtonlist = WinCreateWindow(hwndFrame,
                                      WC_COMBOBOX,
@@ -5748 +5758 @@
                                      MAIN_BUTTONLIST, NULL, NULL);
     if (!hwndButtonlist)
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     WinSendMsg(WinWindowFromID(hwndUserlist, CBID_EDIT),
                EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
@@ -6442 +6453 @@
                 }
                 else {
-                  Win_Error2(hwnd, hwnd, __FILE__, __LINE__,
-                             IDS_PRFQUERYPROFILEDATA);
+                  Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                            PCSZ_INIQUERYPRFTEXT);
                 }
               }

trunk/dll/menu.c

@@ -76 +76 @@
 }
 
+// fixme why do I exist since the only call passes no filename and FM3MENU.DAT doesn't exist. GKY 1-30-09
 BOOL AddToMenu(CHAR * filename, HWND hwndMenu)
 {
@@ -134 +135 @@
       else {
         // fixme to complain?
-        // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tokenization failed");
+        // saymsg(MB_ENTER, HWND_DESKTOP, GetPString(IDS_DEBUG_STRING), "Tokenization failed");
       }
     }

trunk/dll/misc.c

@@ -53 +53 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
   28 Dec 08 GKY Check for LVM.EXE and remove Refresh removable media menu item as appropriate
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -925 +926 @@
             WinSetWindowText(hwndMLE, szData);
             if (strcmp(szData, testname)) {
-              if (stricmp(szData, testname) && IsFile(testname) != -1) {
-                DosBeep(50, 100);       /* exists; disallow */
+              if (stricmp(szData, testname) && IsFile(testname) != -1) {
+                if (!fAlertBeepOff)
+                  DosBeep(50, 100);       /* exists; disallow */
                 return (MRESULT) FALSE;
               }

trunk/dll/newview.c

@@ -34 +34 @@
   10 Dec 08 SHL Integrate exception handler support
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  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
 
 ***********************************************************************/
@@ -1095 +1097 @@
             DosReleaseMutexSem(ad->ScanSem);
             if (!ad->stopflag && firstline == ULONG_MAX) {
-              DosBeep(50, 50);
+              if (!fAlertBeepOff)
+                DosBeep(50, 50);
               WinSetWindowText(WinWindowFromID(ad->hwndFrame,
                                                NEWVIEW_STATUS1),
@@ -1205 +1208 @@
               DosReleaseMutexSem(ad->ScanSem);
               released = TRUE;
-              DosBeep(50, 100);
+              if (!fAlertBeepOff)
+                DosBeep(50, 100);
               WinSetWindowText(WinWindowFromID(ad->hwndFrame,
                                                NEWVIEW_STATUS1),
@@ -1749 +1753 @@
         s[SEARCHSTRINGLEN - 1] = 0;
         if (!*s) {
-          DosBeep(250, 100);            // Complain
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);          // Complain
           break;
         }
@@ -1811 +1816 @@
                                  HWND_TOP, IDM_PREVBLANKLINE, NULL, NULL);
       if (!temphwnd)
-        Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       else {
         //fixme to allow user to change presparams 1-10-09 GKY
@@ -1832 +1837 @@
                                  HWND_TOP, IDM_NEXTBLANKLINE, NULL, NULL);
       if (!temphwnd)
-        Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       else {
         //fixme to allow user to change presparams 1-10-09 GKY
@@ -1896 +1901 @@
                                           NEWVIEW_STATUS1, NULL, NULL);
         if (!ad->hwndStatus1)
-          Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
 
         ad->hwndStatus2 = WinCreateWindow(hwndFrame,
@@ -1912 +1917 @@
                                           NEWVIEW_STATUS2, NULL, NULL);
         if (!ad->hwndStatus2)
-          Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
 
         ad->hwndStatus3 = WinCreateWindow(hwndFrame,
@@ -1928 +1933 @@
                                           NEWVIEW_STATUS3, NULL, NULL);
         if (!ad->hwndStatus3)
-          Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
 
         ad->hwndListbox = WinCreateWindow(hwndFrame,
@@ -1943 +1948 @@
                                           NEWVIEW_LISTBOX, NULL, NULL);
         if (!ad->hwndListbox)
-          Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
 
         ad->hwndDrag = WinCreateWindow(hwndFrame,
@@ -1957 +1962 @@
                                        HWND_TOP, NEWVIEW_DRAG, NULL, NULL);
         if (!ad->hwndDrag)
-          Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
 
         oldproc = WinSubclassWindow(hwndFrame, ViewFrameWndProc);
@@ -3621 +3626 @@
             }
             WinSetPointer(HWND_DESKTOP, hptrArrow);
-            if (x >= ad->numlines)
+            if (x >= ad->numlines && !fAlertBeepOff)
               DosBeep(50, 100);
           }
@@ -3692 +3697 @@
               break;
             if (ad->numlines <= numlines) {
-              DosBeep(500, 100);
+              if (!fAlertBeepOff)
+                DosBeep(500, 100);
               break;
             }

trunk/dll/notebook.c

@@ -45 +45 @@
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Move repeated strings to PCSZs.
 
 ***********************************************************************/
@@ -94 +96 @@
 HWND Collector;
 DETAILS_SETTINGS dsDirCnrDefault;
+BOOL fAlertBeepOff;
 BOOL fAutoAddAllDirs;
 BOOL fAutoAddDirs;
@@ -111 +114 @@
 BOOL fEjectFlpyScan;
 BOOL fEjectRemovableScan;
+BOOL fErrorBeepOff;
 BOOL fExternalArcboxes;
 BOOL fExternalCollector;
@@ -268 +272 @@
                          SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
                          (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
+            if (!fAlertBeepOff)
             DosBeep(250, 100);          // Complain
             WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
@@ -310 +315 @@
         HWND hwndFocus;
 
-        strcpy(filename, "*.EXE");
+        strcpy(filename, PCSZ_STARDOTEXE);
         hwndFocus = WinQueryFocus(HWND_DESKTOP);
         if (hwndFocus) {
@@ -701 +706 @@
         HWND hwndFocus;
 
-        strcpy(filename, "*.EXE");
+        strcpy(filename, PCSZ_STARDOTEXE);
         hwndFocus = WinQueryFocus(HWND_DESKTOP);
         if (hwndFocus) {
@@ -909 +914 @@
         HWND hwndFocus;
 
-        strcpy(filename, "*.EXE");
+        strcpy(filename, PCSZ_STARDOTEXE);
         hwndFocus = WinQueryFocus(HWND_DESKTOP);
         if (hwndFocus) {
@@ -1511 +1516 @@
     WinCheckButton(hwnd, CFGG_DNDDLG, fDragndropDlg);
     WinCheckButton(hwnd, CFGG_DEFAULTDELETEPERM, fDefaultDeletePerm);
+    WinCheckButton(hwnd, CFGG_ERRORBEEPOFF, fErrorBeepOff);
+    WinCheckButton(hwnd, CFGG_ALERTBEEPOFF, fAlertBeepOff);
     {
       long th = fNoFinger ? 2 : (fNoDead ? 1 : 0);
@@ -1629 +1636 @@
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",
-                        &fConfirmTarget, sizeof(BOOL));
+                        &fConfirmTarget, sizeof(BOOL));
+    fAlertBeepOff = WinQueryButtonCheckstate(hwnd, CFGG_ALERTBEEPOFF);
+    PrfWriteProfileData(fmprof, appname, "AlertBeepOff",
+                        &fAlertBeepOff, sizeof(BOOL));
+    fErrorBeepOff = WinQueryButtonCheckstate(hwnd, CFGG_ERRORBEEPOFF);
+    PrfWriteProfileData(fmprof, appname, "ErrorBeepOff",
+                        &fErrorBeepOff, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
@@ -1728 +1741 @@
         HWND hwndFocus;
 
-        strcpy(filename, "*.EXE");
+        strcpy(filename, PCSZ_STARDOTEXE);
         hwndFocus = WinQueryFocus(HWND_DESKTOP);
         if (hwndFocus) {

trunk/dll/notebook.h

@@ -14 +14 @@
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -32 +33 @@
 extern DETAILS_SETTINGS dsDirCnrDefault;
 extern CHAR extractpath[CCHMAXPATH];
+extern BOOL fAlertBeepOff;
 extern BOOL fAutoAddAllDirs;
 extern BOOL fAutoAddDirs;
@@ -49 +51 @@
 extern BOOL fEjectFlpyScan;
 extern BOOL fEjectRemovableScan;
+extern BOOL fErrorBeepOff;
 extern BOOL fExternalArcboxes;
 extern BOOL fExternalCollector;

trunk/dll/notify.c

@@ -16 +16 @@
   10 Dec 08 SHL Integrate exception handler support
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  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
 
 ***********************************************************************/
@@ -212 +214 @@
                            x, y, cx, cy, hwndP, HWND_TOP, id++, NULL, NULL);
     if (!hwndP)
-      Win_Error2(hwndP, hwndP, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwndP, hwndP, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
 
     if (p != str)
@@ -268 +271 @@
       strcat(errortext, GetPString(IDS_DISKLOCKEDTEXT));
   }
-  DosBeep(250, 10);
-  DosBeep(500, 10);
-  DosBeep(250, 10);
-  DosBeep(500, 10);
+  if (!fErrorBeepOff) {
+    DosBeep(250, 10);
+    DosBeep(500, 10);
+    DosBeep(250, 10);
+    DosBeep(500, 10);
+  }
   Notify(errortext);
 }

trunk/dll/objwin.c

@@ -14 +14 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   08 Jul 08 SHL Correct Fortify_LeaveScope usage and avoid spurious reports
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -33 +34 @@
 #include "objwin.h"
 #include "treecnr.h"                    // TreeObjWndProc
-
+#include "strutil.h"                    // GetPString
 
 static PSZ pszSrcFile = __FILE__;
@@ -83 +84 @@
                                    0L, 0L, HWND_TOP, OBJ_FRAME, NULL, NULL);
       if (!ObjectHwnd)
-        Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       else {
 #       ifdef FORTIFY

trunk/dll/printer.c

@@ -14 +14 @@
   22 Mar 07 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -498 +499 @@
           if (atol(s) < 24 || atol(s) > 4096) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_WIDTH));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -508 +510 @@
           if (atol(s) < 24 || atol(s) > 4096) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_LENGTH));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -518 +521 @@
           if (atol(s) < 0 || atol(s) > prnwidth - 1) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_LMARGIN));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -528 +532 @@
           if (atol(s) < 0 || atol(s) > (prnwidth - prnlmargin) - 1) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_RMARGIN));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -539 +544 @@
               atol(s) > prnwidth - ((prnlmargin + prnrmargin) - 1)) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_TABSPACES));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -549 +555 @@
           if (atol(s) < 0 || atol(s) > prnlength - 1) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_TMARGIN));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -559 +566 @@
           if (atol(s) < 0 || atol(s) > (prnlength - prntmargin) - 1) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_BMARGIN));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }
@@ -570 +578 @@
               atol(s) > ((prnlength - prntmargin) - prnbmargin) - 1) {
             WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, PRN_SPACING));
-            DosBeep(50, 100);
+            if (!fAlertBeepOff)
+              DosBeep(50, 100);
             break;
           }

trunk/dll/rename.c

@@ -14 +14 @@
   30 Dec 07 GKY Use TestFDates for comparing dates
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -86 +88 @@
 
         FILESTATUS3L fs1, fs2;
-        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81];
+        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81], szDate[11];
         INT sourceexists = 0, targetexists = 0,
             sourcenewer = 0, sourcesmaller = 0;
@@ -103 +105 @@
           CommaFmtULL(szCmmaFmtFileSize,
                       sizeof(szCmmaFmtFileSize), fs1.cbFile, ' ');
-          sprintf(s,
-                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
+          FDateFormat(szDate, fs1.fdateLastWrite);
+          sprintf(s, " %s%s %ss %s %02u%s%02u%s%02u",
                   fs1.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
                   szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
-                  fs1.fdateLastWrite.year + 1980,
-                  fs1.fdateLastWrite.month,
-                  fs1.fdateLastWrite.day,
-                  fs1.ftimeLastWrite.hours,
-                  fs1.ftimeLastWrite.minutes, fs1.ftimeLastWrite.twosecs * 2);
+                  szDate,
+                  fs1.ftimeLastWrite.hours, TimeSeparator,
+                  fs1.ftimeLastWrite.minutes, TimeSeparator, fs1.ftimeLastWrite.twosecs * 2);
           WinSetDlgItemText(hwnd, REN_SOURCEINFO, s);
           sourceexists = 1;
@@ -131 +131 @@
           CommaFmtULL(szCmmaFmtFileSize,
                       sizeof(szCmmaFmtFileSize), fs2.cbFile, ' ');
-          sprintf(s,
-                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
+          FDateFormat(szDate, fs2.fdateLastWrite);
+          sprintf(s, " %s%s %ss %s %02u%s%02u%s%02u",
                   fs2.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
                   szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
-                  fs2.fdateLastWrite.year + 1980,
-                  fs2.fdateLastWrite.month,
-                  fs2.fdateLastWrite.day,
-                  fs2.ftimeLastWrite.hours,
-                  fs2.ftimeLastWrite.minutes, fs2.ftimeLastWrite.twosecs * 2);
+                  szDate,
+                  fs2.ftimeLastWrite.hours, TimeSeparator,
+                  fs2.ftimeLastWrite.minutes, TimeSeparator, fs2.ftimeLastWrite.twosecs * 2);
           WinSetDlgItemText(hwnd, REN_TARGETINFO, s);
           targetexists = 1;
@@ -327 +325 @@
             if (SetDir(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                       QW_OWNER), hwnd, path, 0)) {
-              DosBeep(250, 100);
+              if (!fAlertBeepOff)
+                DosBeep(250, 100);
               WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, REN_TARGET));
               break;
@@ -335 +334 @@
         }
         else {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, REN_TARGET));
         }

trunk/dll/saveclip.c

@@ -25 +25 @@
   20 Jul 08 GKY Modify ListtoClipHab to provide either fullpath name or filename for save to clipboard
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Move repeated strings to PCSZs.
 
 ***********************************************************************/
@@ -376 +379 @@
         WinQueryDlgItemText(hwnd, SAV_FILENAME, CCHMAXPATH, savename);
         if (!*savename)
-          strcpy(savename, "*.LST");
+          strcpy(savename, PCSZ_STARDOTLST);
         if (export_filename(hwnd, savename, 1) && *savename) {
           if (!strchr(savename, '.'))
@@ -401 +404 @@
         if (!*pattern) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(150, 100);
+          if (!fAlertBeepOff)
+            DosBeep(150, 100);
           break;
         }
@@ -437 +441 @@
         if (!*pattern) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }
@@ -446 +451 @@
         if (!*savename) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(100, 100);
+          if (!fAlertBeepOff)
+            DosBeep(100, 100);
           break;
         }
@@ -506 +512 @@
                       break;
                     case 'd':
-                    case 'D':
-                      fprintf(fp,
-                              "%04u/%02u/%02u",
-                              pci->date.year, pci->date.month, pci->date.day);
-                      break;
+                    case 'D':
+                      {
+                        CHAR szDate[11];
+
+                        DateFormat(szDate, pci->date);
+                        fprintf(fp,"%s", szDate);
+                        break;
+                      }
                     case 't':
                     case 'T':
                       fprintf(fp,
-                              "%02u:%02u:%02u",
-                              pci->time.hours,
-                              pci->time.minutes, pci->time.seconds);
+                              "%02u%s%02u%s%02u",
+                              pci->time.hours, TimeSeparator,
+                              pci->time.minutes, TimeSeparator, pci->time.seconds);
                       break;
                     case 'l':
@@ -731 +740 @@
         WinQueryDlgItemText(hwnd, SAV_FILENAME, CCHMAXPATH, savename);
         if (!*savename)
-          strcpy(savename, "*.LST");
+          strcpy(savename, PCSZ_STARDOTLST);
         if (export_filename(hwnd, savename, 1) && *savename) {
           if (!strchr(savename, '.'))
@@ -758 +767 @@
         if (!*pattern) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(150, 100);
+          if (!fAlertBeepOff)
+            DosBeep(150, 100);
           break;
         }
@@ -794 +804 @@
         if (!*pattern) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }
@@ -803 +814 @@
         if (!*savename) {
           WinEnableWindow(hwnd, TRUE);
-          DosBeep(100, 100);
+          if (!fAlertBeepOff)
+            DosBeep(100, 100);
           break;
         }
@@ -945 +957 @@
                       break;
                     case 'd':
-                    case 'D':
-                      fprintf(fp,
-                              "%04u/%02u/%02u",
-                              ffb4.fdateLastWrite.year + 1980,
-                              ffb4.fdateLastWrite.month,
-                              ffb4.fdateLastWrite.day);
-                      break;
+                    case 'D':
+                      {
+                        CHAR szDate[11];
+
+                        FDateFormat(szDate, ffb4.fdateLastWrite);
+                        fprintf(fp,"%s", szDate);
+                        break;
+                      }
                     case 't':
                     case 'T':
                       fprintf(fp,
-                              "%02u:%02u:%02u",
-                              ffb4.ftimeLastWrite.hours,
-                              ffb4.ftimeLastWrite.minutes,
+                              "%02u%s%02u%s%02u",
+                              ffb4.ftimeLastWrite.hours,
+                              TimeSeparator,
+                              ffb4.ftimeLastWrite.minutes,
+                              TimeSeparator,
                               ffb4.ftimeLastWrite.twosecs * 2);
                       break;

trunk/dll/seeall.c

@@ -42 +42 @@
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
   11 Jan 08 GKY Change flag on GetMLEFont to 3 from 11 to give a larger selection of mono spaced fonts
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -1028 +1031 @@
                       (hs > 1) ?
                       GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
-            if (ro || hs || sysdir)
+            if ((ro || hs || sysdir) && !fAlertBeepOff)
               DosBeep(300, 100);
             strcat(prompt, GetPString(IDS_DELPROMPT6TEXT));
@@ -1150 +1153 @@
                 x != 1 ? GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
         WinSetWindowText(WinWindowFromID(hwndFrame, SEEALL_STATUS), message);
-        if (toupper(*path) < 'C')
+        if (toupper(*path) < 'C' && !fAlertBeepOff)
           DosBeep(1000, 25);
         DosSleep(16);                   // 05 Aug 07 GKY 33
@@ -1210 +1213 @@
                                   0, 0, HWND_TOP, SEEALL_OBJ, NULL, NULL);
         if (!hwndObj) {
-          Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
           if (!PostMsg(ad->hwndClient, WM_CLOSE, MPVOID, MPVOID))
             WinSendMsg(ad->hwndClient, WM_CLOSE, MPVOID, MPVOID);
@@ -1652 +1655 @@
                   &d2->date, &d2->time,
                   &d1->date, &d1->time);
-    /*(d1->date.year > d2->date.year) ? 1 :
-    (d1->date.year < d2->date.year) ? -1 :
-    (d1->date.month > d2->date.month) ? 1 :
-    (d1->date.month < d2->date.month) ? -1 :
-    (d1->date.day > d2->date.day) ? 1 :
-    (d1->date.day < d2->date.day) ? -1 :
-    (d1->time.hours > d2->time.hours) ? 1 :
-    (d1->time.hours < d2->time.hours) ? -1 :
-    (d1->time.minutes > d2->time.minutes) ? 1 :
-    (d1->time.minutes < d2->time.minutes) ? -1 :
-    (d1->time.twosecs > d2->time.twosecs) ? 1 :
-    (d1->time.twosecs < d2->time.twosecs) ? -1 : 0;*/
 
   if (!ret)
@@ -2336 +2327 @@
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
   POINTL ptl;
-  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
+  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
   ULONG len, y;
 
@@ -2371 +2362 @@
   }
   CommaFmtULL(szCmmaFmtFileSize,
-              sizeof(szCmmaFmtFileSize), ad->afindex[y]->cbFile, ' ');
+              sizeof(szCmmaFmtFileSize), ad->afindex[y]->cbFile, ' ');
+  FDateFormat(szDate, ad->afindex[y]->date);
   len = sprintf(szBuff,
-                "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                "%c%-*.*s  %-12s  %c%c%c%c%c  %s %02u%s%02u%s%02u ",
                 whichfile == ad->cursored - 1 ? '>' : ' ',
                 ad->fullnames ? ad->longestw : ad->longest,
@@ -2385 +2377 @@
                 "-S"[((ad->afindex[y]->attrFile & FILE_SYSTEM) != 0)],
                 "-D"[((ad->afindex[y]->attrFile & FILE_DIRECTORY) != 0)],
-                ad->afindex[y]->date.year + 1980,
-                ad->afindex[y]->date.month,
-                ad->afindex[y]->date.day,
-                ad->afindex[y]->time.hours,
-                ad->afindex[y]->time.minutes,
+                szDate,
+                ad->afindex[y]->time.hours, TimeSeparator,
+                ad->afindex[y]->time.minutes, TimeSeparator,
                 ad->afindex[y]->time.twosecs * 2);
   GpiCharStringAt(hps, &ptl, len, szBuff);
@@ -2653 +2643 @@
                                             SEEALL_STATUS, NULL, NULL);
           if (!pAD->hwndStatus)
-            Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                       IDS_WINCREATEWINDOW);
+            Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                      PCSZ_WINCREATEWINDOW);
           else {
             PFNWP oldproc;
@@ -3440 +3430 @@
       pAD->multiplier = 1;
       if (!pAD->afindexcnt) {
-        DosBeep(250, 50);
+        if (!fAlertBeepOff)
+          DosBeep(250, 50);
         PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       }
       else {
-        DosBeep(1000, 25);
+        if (!fAlertBeepOff)
+          DosBeep(1000, 25);
         WinInvalidateRect(hwnd, NULL, FALSE);
         PostMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
@@ -3467 +3459 @@
       register ULONG x;
       ULONG y, len, numlines;
-      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
+      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
       BOOL inverted, hidsys, reado, wascursored;
 
@@ -3555 +3547 @@
                                              [COLORS_CURSOREDNORMALBACK]]);
             CommaFmtULL(szCmmaFmtFileSize,
-                        sizeof(szCmmaFmtFileSize), pAD->afindex[y]->cbFile, ' ');
+                        sizeof(szCmmaFmtFileSize), pAD->afindex[y]->cbFile, ' ');
+            FDateFormat(szDate, pAD->afindex[y]->date);
             len =
               sprintf(szBuff,
-                      "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                      "%c%-*.*s  %-12s  %c%c%c%c%c  %s %02u%s%02u%s%02u ",
                       wascursored ? '>' : ' ',
                       pAD->fullnames ? pAD->longestw : pAD->longest,
@@ -3570 +3563 @@
                       "-H"[((pAD->afindex[y]->attrFile & FILE_HIDDEN) != 0)],
                       "-S"[((pAD->afindex[y]->attrFile & FILE_SYSTEM) != 0)],
-                      "-D"[((pAD->afindex[y]->attrFile & FILE_DIRECTORY) !=
-                            0)], pAD->afindex[y]->date.year + 1980,
-                      pAD->afindex[y]->date.month, pAD->afindex[y]->date.day,
-                      pAD->afindex[y]->time.hours,
-                      pAD->afindex[y]->time.minutes,
+                      "-D"[((pAD->afindex[y]->attrFile & FILE_DIRECTORY) != 0)],
+                      szDate,
+                      pAD->afindex[y]->time.hours, TimeSeparator,
+                      pAD->afindex[y]->time.minutes, TimeSeparator,
                       pAD->afindex[y]->time.twosecs * 2);
             GpiCharStringAt(hpsp, &ptl, len, szBuff);

trunk/dll/tools.c

@@ -22 +22 @@
   26 Aug 08 GKY Require unique ID plus text and help strings for all tools save toolbar on button delete
   01 Sep 08 GKY Save toolbars immediately on change.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -784 +785 @@
         WinQueryDlgItemText(hwnd, ADDBTN_ID, 6, idstr);
         if (!(USHORT) atoi(idstr)) {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }
@@ -832 +834 @@
         WinQueryDlgItemText(hwnd, ADDBTN_ID, 6, idstr);
         if (!(USHORT) atoi(idstr)) {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           break;
         }

trunk/dll/treecnr.c

@@ -59 +59 @@
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -1220 +1223 @@
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
                                            MAIN_STATUS), pci->pszFileName);
-        if (fMoreButtons && hwndName) {
+        if (fMoreButtons && hwndName) {
+          CHAR szDate[11];
+
+          DateFormat(szDate, pci->date);
           WinSetWindowText(hwndName, pci->pszFileName);
-          sprintf(str,
-                  "%04u/%02u/%02u %02u:%02u:%02u",
-                  pci->date.year,
-                  pci->date.month,
-                  pci->date.day,
-                  pci->time.hours, pci->time.minutes, pci->time.seconds);
+          sprintf(str, "%s %02u%s%02u%s%02u", szDate,
+                  pci->time.hours, TimeSeparator,
+                  pci->time.minutes, TimeSeparator, pci->time.seconds);
           WinSetWindowText(hwndDate, str);
           WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -1837 +1840 @@
                 UnFlesh(hwnd, pci);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-                DosBeep(250, 100);
+                if (!fAlertBeepOff)
+                  DosBeep(250, 100);
               }
             }
@@ -1905 +1909 @@
           !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
         if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           if (hwndStatus)
             WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
@@ -3208 +3213 @@
                                               SV_CYMINMAXBUTTON), hwndFrame,
                                               HWND_TOP, IDM_OPENWINDOW, NULL, NULL)) {
-          Win_Error2(hwndFrame, hwndParent, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwndParent, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
       }
@@ -3225 +3230 @@
                                              * 2), 22, hwndFrame, HWND_TOP,
                              MAIN_STATUS, NULL, NULL)) {
-          Win_Error2(hwndFrame, hwndParent, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwndParent, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
       }
@@ -3258 +3263 @@
                                      HWND_TOP, (ULONG) TREE_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);

trunk/dll/uudecode.c

@@ -16 +16 @@
   22 Mar 07 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -343 +344 @@
         WinQueryDlgItemText(hwnd, MRG_TARGETNAME, CCHMAXPATH, szBuffer);
         if (!*szBuffer) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, MRG_TARGETNAME));
           break;
@@ -350 +352 @@
                              FIL_QUERYFULLNAME,
                              wk->li->targetpath, CCHMAXPATH)) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, MRG_TARGETNAME));
           break;

trunk/dll/viewer.c

@@ -17 +17 @@
   26 Nov 07 GKY Add "Save as" menu option to editor
   29 Feb 08 GKY Refactor global command line variables to notebook.h
+  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
 
 ***********************************************************************/
@@ -362 +364 @@
                          0,
                          0, 0, hwnd, HWND_TOP, MLE_MLE, MPVOID, MPVOID)) {
-      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                PCSZ_WINCREATEWINDOW);
     }
     else {
@@ -701 +704 @@
   case WM_COMMAND:
     if (vw->busy && SHORT1FROMMP(mp1) != MLE_QUIT) {
-      DosBeep(50, 100);
+      if (!fAlertBeepOff)
+        DosBeep(50, 100);
       return 0;
     }
@@ -807 +811 @@
     case MLE_TOGGLEREADONLY:
       if (vw->busy || vw->hex == 1) {
-        DosBeep(50, 100);
+        if (!fAlertBeepOff)
+          DosBeep(50, 100);
       }
       else {
@@ -1088 +1093 @@
         sip.title = GetPString(IDS_NVLINEJUMPTITLETEXT);
         numlines = MLEnumlines(hwndMLE);
-        if (!numlines)
-          DosBeep(50, 100);
+        if (!numlines)
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
         else {
           sprintf(ss,

trunk/dll/viewinf.c

@@ -17 +17 @@
   10 Dec 08 SHL Integrate exception handler support
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  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.
 
 ***********************************************************************/
@@ -250 +252 @@
                            swp.cy,
                            hwnd, HWND_TOP, VINF_LISTBOX, NULL, NULL)) {
-        Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                  PCSZ_WINCREATEWINDOW);
       }
       else {
@@ -438 +441 @@
                                             MPVOID);
         if (sSelect == LIT_NONE) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           break;
         }
@@ -538 +542 @@
                                             MPVOID);
         if (sSelect < 0) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
         }
         else {
@@ -550 +555 @@
             p = strchr(text, '>');
             if (!p) {
-              DosBeep(50, 100);
+              if (!fAlertBeepOff)
+                DosBeep(50, 100);
               break;
             }
@@ -556 +562 @@
             bstrip(p);
             if (!*p)
-              DosBeep(50, 100);
+              if (!fAlertBeepOff)
+                DosBeep(50, 100);
             else
               ViewHelp(p);

trunk/dll/worker.c

@@ -38 +38 @@
   25 Dec 08 GKY Add DRIVE_RSCANNED flag to monitor for the first recursive drive scan per session
                 to prevent duplicate directory names in tree following a copy before initial scan.
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
 
 ***********************************************************************/
@@ -1019 +1020 @@
                       GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
               Notify(message);
-              if (toupper(*wk->li->targetpath) < 'C')
+              if (toupper(*wk->li->targetpath) < 'C' && !fAlertBeepOff)
                 DosBeep(1000, 25);      // Wake up user
               DosSleep(16);//05 Aug 07 GKY 33
@@ -1613 +1614 @@
                           (hs > 1) ?
                           GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
-                if (ro || hs || sysdir)
+                if ((ro || hs || sysdir) && !fAlertBeepOff)
                   DosBeep(300, 100);    // Wake up user
                 strcat(prompt, GetPString(IDS_DELPROMPT6TEXT));