2007-08-13 Rodrigo Kumpera <rkumpera@novell.com>

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

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index dd781e8fa9a58ea7aa6a8d76a2fd9efe0739d2de..dd5c498564ecf2e96532dd8bc645360cdc38fd84 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -153,6 +153,7 @@ ves_icall_System_Globalization_CultureInfo_construct_datetime_format (MonoCultur
 
        domain = mono_domain_get ();
 
+       datetime->readOnly = this->is_read_only;
        MONO_OBJECT_SETREF (datetime, AbbreviatedDayNames, create_names_array_idx (dfe->abbreviated_day_names,
                        NUM_DAYS));
        MONO_OBJECT_SETREF (datetime, AbbreviatedMonthNames, create_names_array_idx (dfe->abbreviated_month_names,
@@ -199,6 +200,7 @@ ves_icall_System_Globalization_CultureInfo_construct_number_format (MonoCultureI
 
        domain = mono_domain_get ();
 
+       number->readOnly = this->is_read_only;
        number->currencyDecimalDigits = nfe->currency_decimal_digits;
        MONO_OBJECT_SETREF (number, currencyDecimalSeparator, mono_string_new (domain,
                        idx2string (nfe->currency_decimal_separator)));
@@ -250,6 +252,7 @@ construct_culture (MonoCultureInfo *this, const CultureInfoEntry *ci)
        MONO_OBJECT_SETREF (this, win3lang, mono_string_new (domain, idx2string (ci->win3lang)));
        MONO_OBJECT_SETREF (this, iso3lang, mono_string_new (domain, idx2string (ci->iso3lang)));
        MONO_OBJECT_SETREF (this, iso2lang, mono_string_new (domain, idx2string (ci->iso2lang)));
+       MONO_OBJECT_SETREF (this, territory, mono_string_new (domain, idx2string (ci->territory)));
        this->parent_lcid = ci->parent_lcid;
        this->specific_lcid = ci->specific_lcid;
        this->datetime_index = ci->datetime_format_index;
@@ -300,25 +303,6 @@ construct_culture_from_specific_name (MonoCultureInfo *ci, gchar *name)
        return construct_culture (ci, entry);
 }
 
-static gboolean
-construct_region_from_specific_name (MonoRegionInfo *ri, gchar *name)
-{
-       const RegionInfoEntry *entry;
-       const RegionInfoNameEntry *ne;
-
-       MONO_ARCH_SAVE_REGS;
-
-       ne = bsearch (name, region_name_entries, NUM_REGION_ENTRIES,
-                       sizeof (RegionInfoNameEntry), region_name_locator);
-
-       if (ne == NULL)
-               return FALSE;
-
-       entry = &region_entries [ne->region_entry_index];
-
-       return construct_region (ri, entry);
-}
-
 static const CultureInfoEntry*
 culture_info_entry_from_lcid (int lcid)
 {
@@ -455,6 +439,8 @@ ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_curren
 
        ret = construct_culture_from_specific_name (ci, locale);
        g_free (locale);
+       ci->is_read_only = TRUE;
+       ci->use_user_override = TRUE;
 
        return ret;
 }
@@ -599,6 +585,7 @@ ves_icall_System_Globalization_CultureInfo_internal_get_cultures (MonoBoolean ne
                        culture = (MonoCultureInfo *) mono_object_new (domain, class);
                        mono_runtime_object_init ((MonoObject *) culture);
                        construct_culture (culture, ci);
+                       culture->use_user_override = TRUE;
                        mono_array_setref (ret, len++, culture);
                }
        }
@@ -936,12 +923,12 @@ void load_normalization_resource (guint8 **argProps,
                                  guint8 **argMapIdxToComposite,
                                  guint8 **argCombiningClass)
 {
-       *argProps = props;
+       *argProps = (guint8*)props;
        *argMappedChars = (guint8*) mappedChars;
        *argCharMapIndex = (guint8*) charMapIndex;
        *argHelperIndex = (guint8*) helperIndex;
        *argMapIdxToComposite = (guint8*) mapIdxToComposite;
-       *argCombiningClass = combiningClass;
+       *argCombiningClass = (guint8*)combiningClass;
 }