Changeset 184 for trunk/src/helpers/nls.c

Timestamp:

Jul 5, 2002, 9:13:36 AM (23 years ago)

Author:

umoeller

Message:

Second round of fixes for 0.9.19.

File:

• trunk/src/helpers/nls.c (modified) (11 diffs)

trunk/src/helpers/nls.c

@@ -85 +85 @@
 
 BOOL        G_afLeadByte[MAX_LEADBYTE] = {0};
-ULONG       G_fDBCS = -1;       // not queried yet
+ULONG       G_fDBCS = 2;       // not queried yet
 COUNTRYCODE G_cc = { 0, 0 };
 DBCSVECTOR  G_aDBCSVector[8];
@@ -94 +94 @@
  *
  *@@added V0.9.19 (2002-06-13) [umoeller]
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: fixed, this never worked
  */
 
 BOOL nlsDBCS(VOID)
 {
-    int i;
-
-    if (G_fDBCS != -1)
+    APIRET arc;
+
+    if (G_fDBCS != 2)
         // already queried:
         return G_fDBCS;
 
-    if (DosQueryDBCSEnv(8 * sizeof(DBCSVECTOR),
-                        &G_cc,
-                        (PCHAR)G_aDBCSVector))
+    // V0.9.20 (2002-07-03) [umoeller]
+    // assume a non-DBCS system UNLESS the below
+    // loop gives us something meaningful; even
+    // on non-DBCS systems like mine, DosQueryDBCSEnv
+    // does not return an error
+    G_fDBCS = FALSE;
+
+    if (arc = DosQueryDBCSEnv(8 * sizeof(DBCSVECTOR),
+                              &G_cc,
+                              (PCHAR)G_aDBCSVector))
+    {
         // not DBCS:
-        return (G_fDBCS = FALSE);
-
-    for (i = 0;
-         i < 8;
-         ++i)
-    {
-        if (    (G_aDBCSVector[i].bLow)
-             && (G_aDBCSVector[i].bHigh)
-           )
+        _PmpfF(("DosQueryDBCSEnv returned arc %d", arc));
+    }
+    else
+    {
+        int i;
+        for (i = 0;
+             i < 8;
+             ++i)
         {
-            int n;
-            for (n = G_aDBCSVector[i].bLow;
-                 n <= G_aDBCSVector[i].bHigh;
-                 ++n)
-                G_afLeadByte[n] = TRUE;
-            G_fDBCS = TRUE;
+            if (    (G_aDBCSVector[i].bLow)
+                 && (G_aDBCSVector[i].bHigh)
+               )
+            {
+                int n;
+                for (n = G_aDBCSVector[i].bLow;
+                     n <= G_aDBCSVector[i].bHigh;
+                     ++n)
+                    G_afLeadByte[n] = TRUE;
+                G_fDBCS = TRUE;
+            }
+            else
+                break;
         }
-        else
-            break;
     }
 
@@ -342 +355 @@
  *
  *      Use nlsThousandsDouble for "double" values.
+ *
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: optimized
  */
 
@@ -350 +365 @@
     USHORT ust, uss, usc;
     CHAR   szTemp[40];
-    sprintf(szTemp, "%lu", ul);
+    usc = sprintf(szTemp, "%lu", ul);  // V0.9.20 (2002-07-03) [umoeller]
 
     ust = 0;
-    usc = strlen(szTemp);
+    // usc = strlen(szTemp);
     for (uss = 0; uss < usc; uss++)
     {
@@ -367 +382 @@
     pszTarget[ust] = '\0';
 
-    return (pszTarget);
+    return pszTarget;
 }
 
@@ -382 +397 @@
                                 CHAR cThousands)     // in: separator char (e.g. '.')
 {
-    return (nlsThousandsULong(pszTarget, ul, cThousands));
+    return nlsThousandsULong(pszTarget, ul, cThousands);
 }
 
@@ -389 +404 @@
  *      like nlsThousandsULong, but for a "double"
  *      value. Note that after-comma values are truncated.
+ *
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: optimized
  */
 
@@ -397 +414 @@
     USHORT ust, uss, usc;
     CHAR   szTemp[40];
-    sprintf(szTemp, "%.0f", floor(dbl));
+    usc = sprintf(szTemp, "%.0f", floor(dbl)); // V0.9.20 (2002-07-03) [umoeller]
 
     ust = 0;
-    usc = strlen(szTemp);
+    // usc = strlen(szTemp);
     for (uss = 0; uss < usc; uss++)
     {
@@ -414 +431 @@
     pszTarget[ust] = '\0';
 
-    return (pszTarget);
+    return pszTarget;
 }
 
@@ -424 +441 @@
  *
  *@@added V0.9.6 (2000-11-12) [pr]
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: now using PCSZ pcszUnits
  */
 
 PSZ nlsVariableDouble(PSZ pszTarget,
                       double dbl,
-                      PSZ pszUnits,
+                      PCSZ pcszUnits,
                       CHAR cThousands)
 {
     if (dbl < 100.0)
-        sprintf(pszTarget, "%.2f%s", dbl, pszUnits);
+        sprintf(pszTarget, "%.2f%s", dbl, pcszUnits);
     else
         if (dbl < 1000.0)
-            sprintf(pszTarget, "%.1f%s", dbl, pszUnits);
+            sprintf(pszTarget, "%.1f%s", dbl, pcszUnits);
         else
             strcat(nlsThousandsDouble(pszTarget, dbl, cThousands),
-                   pszUnits);
-
-    return(pszTarget);
+                   pcszUnits);
+
+    return pszTarget;
 }
 
@@ -700 +718 @@
             cc.country = 0;         // use system country code
             cc.codepage = 0;        // use process default codepage
-            return (DosMapCase(ulLength,
-                               &cc,
-                               psz));
+            return DosMapCase(ulLength,
+                              &cc,
+                              psz);
         }
     }
 
-    return (ERROR_INVALID_PARAMETER);
-}
-
-
+    return ERROR_INVALID_PARAMETER;
+}
+
+