Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 455738 - Add support for new Vista locales; r=smontagu

Browse Source
This commit is contained in:
Siddharth Agarwal 2008-10-16 17:28:24 +02:00
parent 9f3ec1013a
commit 0dd884b576
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
intl/locale/src/windows/nsIWin32LocaleImpl.cpp
View File

@ -61,6 +61,10 @@ struct iso_map
iso_pair sublang_list[20];
};
HMODULE nsIWin32LocaleImpl::sKernelDLL = NULL;
nsIWin32LocaleImpl::LocaleNameToLCIDPtr nsIWin32LocaleImpl::localeNameToLCID = NULL;
nsIWin32LocaleImpl::LCIDToLocaleNamePtr nsIWin32LocaleImpl::lcidToLocaleName = NULL;
// Older versions of VC++ and Win32 SDK and mingw don't have
// macros for languages and sublanguages recently added to Win32.
// see http://www.tug.org/ftp/tex/texinfo/intl/localename.c
@ -608,11 +612,18 @@ NS_IMPL_ISUPPORTS1(nsIWin32LocaleImpl,nsIWin32Locale)
nsIWin32LocaleImpl::nsIWin32LocaleImpl(void)
{
// We use the Vista and above functions if we have them
sKernelDLL = LoadLibraryW(L"kernel32.dll");
if (sKernelDLL) {
localeNameToLCID = (LocaleNameToLCIDPtr) GetProcAddress(sKernelDLL, "LocaleNameToLCID");
lcidToLocaleName = (LCIDToLocaleNamePtr) GetProcAddress(sKernelDLL, "LCIDToLocaleName");
}
}
nsIWin32LocaleImpl::~nsIWin32LocaleImpl(void)
{
if (sKernelDLL)
FreeLibrary(sKernelDLL);
}
//
@ -624,6 +635,18 @@ nsIWin32LocaleImpl::~nsIWin32LocaleImpl(void)
NS_IMETHODIMP
nsIWin32LocaleImpl::GetPlatformLocale(const nsAString& locale,LCID* winLCID)
{
if (localeNameToLCID) {
nsAutoString locale_autostr(locale);
LCID lcid = localeNameToLCID(locale_autostr.get(), 0);
// The function returning 0 means that the locale name couldn't be matched,
// so we fallback to the old function
if (lcid != 0)
{
*winLCID = lcid;
return NS_OK;
}
}
char locale_string[9] = {'\0','\0','\0','\0','\0','\0','\0','\0','\0'};
char* language_code;
char* country_code;
@ -660,6 +683,19 @@ nsIWin32LocaleImpl::GetPlatformLocale(const nsAString& locale,LCID* winLCID)
NS_IMETHODIMP
nsIWin32LocaleImpl::GetXPLocale(LCID winLCID, nsAString& locale)
{
if (lcidToLocaleName)
{
WCHAR ret_locale[LOCALE_NAME_MAX_LENGTH];
int rv = lcidToLocaleName(winLCID, ret_locale, LOCALE_NAME_MAX_LENGTH, 0);
// rv 0 means that the function failed to match up the LCID, so we fallback
// to the old function
if (rv != 0)
{
locale.Assign(ret_locale);
return NS_OK;
}
}
DWORD lang_id, sublang_id;
int i,j;

9
intl/locale/src/windows/nsIwin32LocaleImpl.h
View File

@ -59,6 +59,15 @@ public:
NS_IMETHOD GetPlatformLocale(const nsAString& locale, LCID* winLCID);
NS_IMETHOD GetXPLocale(LCID winLCID, nsAString& locale);
typedef LCID (WINAPI*LocaleNameToLCIDPtr)(LPCWSTR lpName, DWORD dwFlags);
typedef int (WINAPI*LCIDToLocaleNamePtr)(LCID Locale, LPWSTR lpName,
int cchName, DWORD dwFlags);
static LocaleNameToLCIDPtr localeNameToLCID;
static LCIDToLocaleNamePtr lcidToLocaleName;
private:
static HMODULE sKernelDLL;
};
#endif