Changeset 304 for branches

Timestamp:

Oct 29, 2005, 4:05:59 PM (20 years ago)

Author:

pr

Message:

Bug 614 fixes for NLS on MCP systems

File:

• branches/branch-1-0/src/helpers/nls.c (modified) (5 diffs)

branches/branch-1-0/src/helpers/nls.c

@@ -49 +49 @@
 #include <string.h>
 #include <math.h>
+#include <unidef.h>
+#include <uconv.h>
 
 // XWP's setup.h replaces strchr and the like, and
@@ -55 +57 @@
 #include "setup.h"                      // code generation and debugging options
 
+#include "helpers\dosh.h"
 #include "helpers\nls.h"
 #include "helpers\prfh.h"
@@ -60 +63 @@
 
 #pragma hdrstop
+
+#pragma library("LIBULS")
+#pragma library("LIBCONV")
 
 /*
@@ -367 +373 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V0.9.7 (2000-12-02) [umoeller]: added cDecimal
+ *@@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
  */
 
@@ -397 +405 @@
                                                "sThousand",
                                                ',');
+        if (doshIsWarp4()==2)
+        {
+            UconvObject         uconv_object;
+
+            if (UniCreateUconvObject((UniChar *)L"",
+                                     &uconv_object) == ULS_SUCCESS)
+            {
+                LocaleObject locale_object;
+
+                if (UniCreateLocaleObject(UNI_UCS_STRING_POINTER,
+                                          (UniChar *)L"",
+                                          &locale_object) == ULS_SUCCESS)
+                {
+                    int i;
+                    struct LOCALE_ITEMLIST
+                    {
+                        LocaleItem      lclItem;
+                        PVOID           vTarget;
+                        int             iType;
+                    } itemList[] = {
+                        { LOCI_iDate, &pcs->ulDateFormat, 1 },
+                        { LOCI_iTime, &pcs->ulTimeFormat, 1 },
+                        { LOCI_sDate, &pcs->cDateSep, 2 },
+                        { LOCI_sTime, &pcs->cTimeSep, 2 },
+                        { LOCI_sDecimal, &pcs->cDecimal, 2 },
+                        { LOCI_sThousand, &pcs->cThousands, 2 }
+                                   };
+
+                    for (i = 0;
+                         i < sizeof(itemList) / sizeof(itemList[0]);
+                         i++)
+                    {
+                        UniChar *pItem;
+
+                        if (UniQueryLocaleItem(locale_object,
+                                               itemList[i].lclItem,
+                                               &pItem) == ULS_SUCCESS)
+                        {
+                            int iLen = UniStrlen(pItem) + 1;
+                            PSZ pszResult = malloc(iLen);
+
+                            if (UniStrFromUcs(uconv_object,
+                                              pszResult,
+                                              pItem,
+                                              iLen) == ULS_SUCCESS)
+                            {
+                                switch(itemList[i].iType)
+                                {
+                                    case 1:
+                                        *((ULONG *) itemList[i].vTarget) = atol(pszResult);
+                                        break;
+
+                                    case 2:
+                                        *((CHAR *) itemList[i].vTarget) = pszResult[0];
+                                        break;
+                                }
+                            }
+
+                            free(pszResult);
+                            UniFreeMem(pItem);
+                        }
+                    }
+
+                    UniFreeLocaleObject(locale_object);
+                }
+
+                UniFreeUconvObject(uconv_object);
+            }
+        }
     }
 }