Locale to charset name mapping for Win95/98.

intl/locale/src/windows/nsCollationWin.cpp

@@ -20,7 +20,10 @@
 #include "nsCollationWin.h"
 #include "nsIComponentManager.h"
 #include "nsLocaleCID.h"
+#include "nsILocaleService.h"
+#include "nsIPlatformCharset.h"
 #include "nsIWin32Locale.h"
+#include "nsCOMPtr.h"
 #include "prmem.h"
 #include "plstr.h"
 #include <windows.h>
@@ -29,6 +32,7 @@
 static NS_DEFINE_CID(kWin32LocaleFactoryCID, NS_WIN32LOCALEFACTORY_CID);
 static NS_DEFINE_IID(kIWin32LocaleIID, NS_IWIN32LOCALE_IID);
 static NS_DEFINE_IID(kICollationIID, NS_ICOLLATION_IID);
+static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); 
 
 NS_IMPL_ISUPPORTS(nsCollationWin, kICollationIID);
 
@@ -48,6 +52,9 @@ nsCollationWin::~nsCollationWin()
 nsresult nsCollationWin::Initialize(nsILocale* locale) 
 {
   NS_ASSERTION(mCollation == NULL, "Should only be initialized once.");
+
+  nsresult res;
+
   mCollation = new nsCollation;
   if (mCollation == NULL) {
     return NS_ERROR_OUT_OF_MEMORY;
@@ -64,28 +71,64 @@ nsresult nsCollationWin::Initialize(nsILocale* locale)
     mW_API = PR_FALSE;
   }
 
-  // store local charset name
-  mCharset.SetString("ISO-8859-1"); //TODO: need to get this from locale
-
-  // locale -> LCID 
-  mLCID = 1033; // initialize to en-US
-  if (locale != nsnull) {
-    PRUnichar *aLocaleUnichar;
-    nsString aLocale;
-    nsString aCategory("NSILOCALE_COLLATE");
-    nsresult res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
-    if (NS_FAILED(res)) {
-      return res;
-    }
-    aLocale.SetString(aLocaleUnichar);
+  // default charset name
+  mCharset.SetString("ISO-8859-1");
   
-	  nsIWin32Locale* win32Locale;
-	  res = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID, NULL, kIWin32LocaleIID, (void**)&win32Locale);
-    if (NS_FAILED(res)) {
-      return res;
+  // default LCID (en-US)
+  mLCID = 1033;
+
+  PRUnichar *aLocaleUnichar = NULL;
+  nsString aCategory("NSILOCALE_COLLATE");
+
+  // get locale string, use app default if no locale specified
+  if (locale == nsnull) {
+    nsILocaleService *localeService;
+
+    res = nsComponentManager::CreateInstance(kLocaleServiceCID, NULL, 
+                                             nsILocaleService::GetIID(), (void**)&localeService);
+    if (NS_SUCCEEDED(res)) {
+      nsILocale *appLocale;
+      res = localeService->GetApplicationLocale(&appLocale);
+	    localeService->Release();
+      if (NS_SUCCEEDED(res)) {
+        res = appLocale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
+        appLocale->Release();
+      }
+    }
+  }
+  else {
+    res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
+  }
+
+  // Get LCID and charset name from locale, if available
+  if (NS_SUCCEEDED(res)) {
+    nsString aLocale;
+    aLocale.SetString(aLocaleUnichar);
+    if (NULL != aLocaleUnichar) {
+      nsAllocator::Free(aLocaleUnichar);
+    }
+
+    nsCOMPtr <nsIWin32Locale> win32Locale;
+    res = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID, NULL, kIWin32LocaleIID, getter_AddRefs(win32Locale));
+    if (NS_SUCCEEDED(res)) {
+      LCID lcid;
+  	  res = win32Locale->GetPlatformLocale(&aLocale, &lcid);
+      if (NS_SUCCEEDED(res)) {
+        mLCID = lcid;
+      }
+    }
+
+    nsCOMPtr <nsIPlatformCharset> platformCharset;
+    res = nsComponentManager::CreateInstance(kPlatformCharsetCID, NULL, 
+                                             nsIPlatformCharset::GetIID(), getter_AddRefs(platformCharset));
+    if (NS_SUCCEEDED(res)) {
+      PRUnichar* mappedCharset = NULL;
+      res = platformCharset->GetDefaultCharsetForLocale(aLocale.GetUnicode(), &mappedCharset);
+      if (NS_SUCCEEDED(res) && mappedCharset) {
+        mCharset.SetString(mappedCharset);
+        nsAllocator::Free(mappedCharset);
+      }
     }
-    res = win32Locale->GetPlatformLocale(&aLocale, (LCID *) &mLCID);
-	  win32Locale->Release();
   }
 
   return NS_OK;

intl/locale/src/windows/nsDateTimeFormatWin.cpp

@@ -21,9 +21,12 @@
 #include "nsIComponentManager.h"
 #include "nsICharsetConverterManager.h"
 #include "nsLocaleCID.h"
+#include "nsILocaleService.h"
+#include "nsIPlatformCharset.h"
 #include "nsIWin32Locale.h"
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
+#include "prmem.h"
 
 #define NSDATETIMEFORMAT_BUFFER_LEN  80
 
@@ -34,6 +37,8 @@ static NS_DEFINE_IID(kIDateTimeFormatIID, NS_IDATETIMEFORMAT_IID);
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID);
 
+static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); 
+
 NS_IMPL_ISUPPORTS(nsDateTimeFormatWin, kIDateTimeFormatIID);
 
 
@@ -58,7 +63,8 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale,
   DWORD dwFlags_Date = 0, dwFlags_Time = 0;
   int dateLen, timeLen;
   PRUnichar dateBuffer[NSDATETIMEFORMAT_BUFFER_LEN], timeBuffer[NSDATETIMEFORMAT_BUFFER_LEN];
-  LCID lcid = GetUserDefaultLCID();
+  LCID lcid;
+  nsresult res;
 
   // Map tm to SYSTEMTIME
 	system_time.wYear = 1900 + tmTime->tm_year;
@@ -114,25 +120,60 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale,
     mW_API = PR_FALSE;
   }
 
-  // store local charset name
-  mCharset.SetString("ISO-8859-1"); //TODO: need to get this from locale
-  // Get LCID
-  if (locale != nsnull) {
-    PRUnichar *aLocaleUnichar;
+  // default charset name
+  mCharset.SetString("ISO-8859-1");
+  
+  // default LCID (en-US)
+  lcid = 1033;
+
+  PRUnichar *aLocaleUnichar = NULL;
+  nsString aCategory("NSILOCALE_TIME");
+
+  // get locale string, use app default if no locale specified
+  if (locale == nsnull) {
+    nsILocaleService *localeService;
+
+    res = nsComponentManager::CreateInstance(kLocaleServiceCID, NULL, 
+                                             nsILocaleService::GetIID(), (void**)&localeService);
+    if (NS_SUCCEEDED(res)) {
+      nsILocale *appLocale;
+      res = localeService->GetApplicationLocale(&appLocale);
+	    localeService->Release();
+      if (NS_SUCCEEDED(res)) {
+        res = appLocale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
+        appLocale->Release();
+      }
+    }
+  }
+  else {
+    res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
+  }
+
+  // Get LCID and charset name from locale, if available
+  if (NS_SUCCEEDED(res)) {
     nsString aLocale;
-    nsString aCategory("NSILOCALE_TIME");
-    nsresult res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
-    if (NS_FAILED(res)) {
-      return res;
-    }
     aLocale.SetString(aLocaleUnichar);
-  	
-	  nsCOMPtr <nsIWin32Locale> win32Locale;
-	  res = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID, NULL, kIWin32LocaleIID, getter_AddRefs(win32Locale));
-    if (NS_FAILED(res)) {
-      return res;
+    if (NULL != aLocaleUnichar) {
+      nsAllocator::Free(aLocaleUnichar);
+    }
+
+    nsCOMPtr <nsIWin32Locale> win32Locale;
+    res = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID, NULL, kIWin32LocaleIID, getter_AddRefs(win32Locale));
+    if (NS_SUCCEEDED(res)) {
+  	  res = win32Locale->GetPlatformLocale(&aLocale, &lcid);
+    }
+
+    nsCOMPtr <nsIPlatformCharset> platformCharset;
+    res = nsComponentManager::CreateInstance(kPlatformCharsetCID, NULL, 
+                                             nsIPlatformCharset::GetIID(), getter_AddRefs(platformCharset));
+    if (NS_SUCCEEDED(res)) {
+      PRUnichar* mappedCharset = NULL;
+      res = platformCharset->GetDefaultCharsetForLocale(aLocale.GetUnicode(), &mappedCharset);
+      if (NS_SUCCEEDED(res) && mappedCharset) {
+        mCharset.SetString(mappedCharset);
+        nsAllocator::Free(mappedCharset);
+      }
     }
-  	res = win32Locale->GetPlatformLocale(&aLocale, &lcid);
   }
 
   // Call GetDateFormatW