Changeset 68121 in vbox

Timestamp:

Jul 26, 2017 1:11:21 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117188

Message:

IPRT: Added RTLocaleQueryNormalizedBaseLocaleName.

Location:

trunk

Files:

• include/iprt/locale.h (modified) (3 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (8 diffs)
• src/VBox/Runtime/r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp (added)
• src/VBox/Runtime/r3/win/RTLocaleQueryNormalizedBaseLocaleName-win.cpp (added)
• src/VBox/Runtime/r3/win/RTLocaleQueryUserCountryCode-win.cpp (modified) (1 diff)

trunk/include/iprt/locale.h

@@ -32 +32 @@
 RT_C_DECLS_BEGIN
 
-/** @defgroup grp_rt_time   RTLocale - Locale and Related Info
+/** @defgroup grp_rt_locale RTLocale - Locale and Related Info
  * @ingroup grp_rt
  * @{
@@ -47 +47 @@
 RTDECL(int) RTLocaleQueryLocaleName(char *pszName, size_t cbName);
 
+/**
+ * Returns a normalized base locale name ('{ll}_{CC}' or 'C').
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_NOT_SUPPORTED if not supported.
+ * @param   pszName         Where to return the name.
+ * @param   cbName          The size of the name buffer.
+ *
+ * @sa      RTLOCALE_IS_LANGUAGE2_UNDERSCORE_COUNTRY2
+ */
+RTDECL(int) RTLocaleQueryNormalizedBaseLocaleName(char *pszName, size_t cbName);
 
 /**
@@ -61 +72 @@
 RTDECL(int) RTLocaleQueryUserCountryCode(char pszCountryCode[3]);
 
+
+/**
+ * Checks whether @a a_psz seems to start with a
+ * language-code-underscore-country-code sequence.
+ *
+ * We perform a check for a likely ISO 639-1 language code, followed by an
+ * underscore, followed by a likely ISO 3166-1 alpha-2 country code.
+ *
+ * @return true if probable '{ll}_{CC}' sequence, false if surely not.
+ * @param  a_psz        The string to test the start of.
+ *
+ * @note User must include iprt/ctype.h separately.
+ */
+#define RTLOCALE_IS_LANGUAGE2_UNDERSCORE_COUNTRY2(a_psz) \
+    (   RT_C_IS_LOWER((a_psz)[0]) \
+     && RT_C_IS_LOWER((a_psz)[1]) \
+     && (a_psz)[2] == '_' \
+     && RT_C_IS_UPPER((a_psz)[3]) \
+     && RT_C_IS_UPPER((a_psz)[4]) )
+
+
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -1124 +1124 @@
 # define RTLocalIpcSessionQueryGroupId                  RT_MANGLER(RTLocalIpcSessionQueryGroupId)
 # define RTLocaleQueryLocaleName                        RT_MANGLER(RTLocaleQueryLocaleName)
+# define RTLocaleQueryNormalizedBaseLocaleName          RT_MANGLER(RTLocaleQueryNormalizedBaseLocaleName)
 # define RTLocaleQueryUserCountryCode                   RT_MANGLER(RTLocaleQueryUserCountryCode)
 # define RTLockValidatorClassAddPriorClass              RT_MANGLER(RTLockValidatorClassAddPriorClass)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -820 +820 @@
         r3/win/RTCrStoreCreateSnapshotById-win.cpp \
         r3/win/RTHandleGetStandard-win.cpp \
+        r3/win/RTLocaleQueryNormalizedBaseLocaleName-win.cpp \
         r3/win/RTLocaleQueryUserCountryCode-win.cpp \
         r3/win/RTSystemQueryOSInfo-win.cpp \
@@ -888 +889 @@
         generic/uuid-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -999 +1001 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -1081 +1084 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -1154 +1158 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -1226 +1231 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -1291 +1297 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
@@ -1381 +1388 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \

trunk/src/VBox/Runtime/r3/win/RTLocaleQueryUserCountryCode-win.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Log To Debugger, Win32.
+ * IPRT - RTLocaleQueryUserCountryCode, ring-3, Windows.
  */
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as