New test.

[mono.git] / mono / metadata / locales.c

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index cb0e6141fa4de038396302e8d96ccb6b215980db..ed18312270f3fbcd059675cced906686e738c8fc 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -5,7 +5,8 @@
  *     Dick Porter (dick@ximian.com)
  *     Mohammad DAMT (mdamt@cdl2000.com)
  *
- * (C) 2003 Ximian, Inc.
+ * Copyright 2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  * (C) 2003 PT Cakram Datalingga Duaribu  http://www.cdl2000.com
  */
 
@@ -25,6 +26,9 @@
 
 
 #include <locale.h>
+#if defined(__APPLE__)
+#include <CoreFoundation/CoreFoundation.h>
+#endif
 
 #undef DEBUG
 
@@ -102,7 +106,7 @@ create_group_sizes_array (const gint *gs, gint ml)
                len++;
        }
        
-       ret = mono_array_new (mono_domain_get (),
+       ret = mono_array_new_cached (mono_domain_get (),
                        mono_get_int32_class (), len);
 
        for(i = 0; i < len; i++)
@@ -129,7 +133,7 @@ create_names_array_idx (const guint16 *names, int ml)
                len++;
        }
 
-       ret = mono_array_new (mono_domain_get (), mono_get_string_class (), len);
+       ret = mono_array_new_cached (mono_domain_get (), mono_get_string_class (), len);
 
        for(i = 0; i < len; i++)
                mono_array_setref (ret, i, mono_string_new (domain, idx2string (names [i])));
@@ -194,6 +198,8 @@ ves_icall_System_Globalization_CultureInfo_construct_number_format (MonoCultureI
        MONO_ARCH_SAVE_REGS;
 
        g_assert (this->number_format != 0);
+       if (this->number_index < 0)
+               return;
 
        number = this->number_format;
        nfe = &number_format_entries [this->number_index];
@@ -300,7 +306,10 @@ construct_culture_from_specific_name (MonoCultureInfo *ci, gchar *name)
        if (entry->lcid != entry->specific_lcid)
                entry = culture_info_entry_from_lcid (entry->specific_lcid);
 
-       return construct_culture (ci, entry);
+       if (entry)
+               return construct_culture (ci, entry);
+       else
+               return FALSE;
 }
 
 static const CultureInfoEntry*
@@ -368,17 +377,61 @@ get_posix_locale (void)
        return g_strdup (posix_locale);
 }
 
+#if defined (__APPLE__)
+static gchar*
+get_darwin_locale (void)
+{
+       static gchar *darwin_locale = NULL;
+       CFLocaleRef locale = NULL;
+       CFStringRef locale_cfstr = NULL;
+       CFIndex len;
+       int i;
+
+       if (darwin_locale != NULL)
+               return g_strdup (darwin_locale);
+
+       locale = CFLocaleCopyCurrent ();
+
+       if (locale) {
+               locale_cfstr = CFLocaleGetIdentifier (locale);
+
+               if (locale_cfstr) {
+                       len = CFStringGetMaximumSizeForEncoding (CFStringGetLength (locale_cfstr), kCFStringEncodingMacRoman) + 1;
+                       darwin_locale = (char *) malloc (len);
+                       if (!CFStringGetCString (locale_cfstr, darwin_locale, len, kCFStringEncodingMacRoman)) {
+                               free (darwin_locale);
+                               CFRelease (locale);
+                               darwin_locale = NULL;
+                               return NULL;
+                       }
+
+                       for (i = 0; i < strlen (darwin_locale); i++)
+                               if (darwin_locale [i] == '_')
+                                       darwin_locale [i] = '-';
+               }
+
+               CFRelease (locale);
+       }
+
+       return g_strdup (darwin_locale);
+}
+#endif
+
 static gchar*
 get_current_locale_name (void)
 {
        gchar *locale;
        gchar *corrected = NULL;
        const gchar *p;
-        gchar *c;
+       gchar *c;
 
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
        locale = g_win32_getlocale ();
-#else  
+#elif defined (__APPLE__)      
+       locale = get_darwin_locale ();
+       if (!locale)
+               locale = get_posix_locale ();
+#else
        locale = get_posix_locale ();
 #endif 
 
@@ -387,7 +440,7 @@ get_current_locale_name (void)
 
        if ((p = strchr (locale, '.')) != NULL) {
                /* assume new locale can't be larger than old one? */
-               corrected = malloc (strlen (locale));
+               corrected = g_malloc (strlen (locale));
                strncpy (corrected, locale, p - locale);
                corrected [p - locale] = 0;
 
@@ -406,7 +459,7 @@ get_current_locale_name (void)
                 */
 
                if (corrected == NULL) {
-                       corrected = malloc (strlen (locale));
+                       corrected = g_malloc (strlen (locale));
                        strncpy (corrected, locale, p - locale);
                        corrected [p - locale] = 0;
                }