Changeset 1395 for trunk/dll/init.c

Timestamp:

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

Author:

Gregg Young

Message:

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

File:

• trunk/dll/init.c (modified) (9 diffs)

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);