Changeset 319

Timestamp:

May 31, 2006, 12:18:22 AM (19 years ago)

Author:

pr

Message:

Move doshIsWarp4 to dosh2 and query Syslevel to determine W4/MCP difference

File:

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

trunk/src/helpers/nls.c

@@ -22 +22 @@
 
 /*
- *      Copyright (C) 1997-2002 Ulrich M”ller.
+ *      Copyright (C) 1997-2006 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -379 +379 @@
  *@@added V1.0.1 (2003-01-17) [umoeller]
  *@@changed V1.0.4 (2005-10-15) [pr]: Added support for Locale object settings on MCP systems @@fixes 614
+ *@@changed V1.0.5 (2006-05-29) [pr]: Read Country rather than Locale settings on Warp 4 FP13+ @@fixes 614
  */
 
 VOID nlsGetAMPM(PCOUNTRYAMPM pampm)
 {
-    PrfQueryProfileString(HINI_USER,
-                          "PM_National",
-                          "s2359",        // key
-                          "PM",           // default
-                          pampm->sz2359,
-                          sizeof(pampm->sz2359));
-
-    PrfQueryProfileString(HINI_USER,
-                          "PM_National",
-                          "s1159",        // key
-                          "AM",           // default
-                          pampm->sz1159,
-                          sizeof(pampm->sz1159));
-    if (doshIsWarp4()==2)
+    if (doshIsWarp4()==3)       // V1.0.5 (2006-05-29) [pr]
     {
         UconvObject         uconv_object;
@@ -465 +453 @@
         }
     }
+    else
+    {
+        PrfQueryProfileString(HINI_USER,
+                              "PM_National",
+                              "s2359",        // key
+                              "PM",           // default
+                              pampm->sz2359,
+                              sizeof(pampm->sz2359));
+
+        PrfQueryProfileString(HINI_USER,
+                              "PM_National",
+                              "s1159",        // key
+                              "AM",           // default
+                              pampm->sz1159,
+                              sizeof(pampm->sz1159));
+    }
 }
 
@@ -488 +492 @@
  *@@changed V1.0.4 (2005-10-15) [bvl]: Added support for Locale object settings on MCP systems @@fixes 614
  *@@changed V1.0.4 (2005-10-29) [pr]: Rewritten to prevent memory leaks and errors
+ *@@changed V1.0.5 (2006-05-29) [pr]: Read Country rather than Locale settings on Warp 4 FP13+ @@fixes 614
  */
 
@@ -495 +500 @@
     {
         PCOUNTRYSETTINGS pcs = &pcs2->cs;
-        pcs->ulDateFormat = PrfQueryProfileInt(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "iDate",
-                                               0);
-        pcs->ulTimeFormat = PrfQueryProfileInt(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "iTime",
-                                               0);
-        pcs->cDateSep = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sDate",
-                                             '/');
-        pcs->cTimeSep = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sTime",
-                                             ':');
-        pcs->cDecimal = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sDecimal",
-                                             '.');
-        pcs->cThousands = prfhQueryProfileChar(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "sThousand",
-                                               ',');
-        if (doshIsWarp4()==2)
+
+        if (doshIsWarp4()==3)   // V1.0.5 (2006-05-29) [pr]
         {
             UconvObject         uconv_object;
@@ -591 +573 @@
                 UniFreeUconvObject(uconv_object);
             }
+        }
+        else
+        {
+            pcs->ulDateFormat = PrfQueryProfileInt(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "iDate",
+                                                   0);
+            pcs->ulTimeFormat = PrfQueryProfileInt(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "iTime",
+                                                   0);
+            pcs->cDateSep = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sDate",
+                                                 '/');
+            pcs->cTimeSep = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sTime",
+                                                 ':');
+            pcs->cDecimal = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sDecimal",
+                                                 '.');
+            pcs->cThousands = prfhQueryProfileChar(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "sThousand",
+                                                   ',');
         }