Changeset 78732 in vbox for trunk/src

Timestamp:

May 24, 2019 3:28:44 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/string: Implemented RTUtf16CopyEx.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/string/RTUtf16CopyEx.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTUtf16Copy.cpp ) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -571 +571 @@
         common/string/RTUtf16Copy.cpp \
         common/string/RTUtf16CopyAscii.cpp \
+        common/string/RTUtf16CopyEx.cpp \
         common/string/RTUtf16Cat.cpp \
         common/string/RTUtf16CatAscii.cpp \
@@ -2914 +2915 @@
         common/string/RTUtf16Copy.cpp \
         common/string/RTUtf16CopyAscii.cpp \
+        common/string/RTUtf16CopyEx.cpp \
         common/string/RTUtf16Cat.cpp \
         common/string/RTUtf16CatAscii.cpp \

trunk/src/VBox/Runtime/common/string/RTUtf16CopyEx.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTUtf16Copy.
+ * IPRT - RTUtf16CopyEx.
  */
 
@@ -35 +35 @@
 
 
-RTDECL(int) RTUtf16Copy(PRTUTF16 pwszDst, size_t cwcDst, PCRTUTF16 pwszSrc)
+RTDECL(int) RTUtf16CopyEx(PRTUTF16 pwszDst, size_t cwcDst, PCRTUTF16 pwszSrc, size_t cwcSrcMax)
 {
-    size_t wcwSrc = RTUtf16Len(pwszSrc);
-    if (RT_LIKELY(wcwSrc < cwcDst))
+    size_t cwcSrc = RTUtf16NLen(pwszSrc, cwcSrcMax);
+    if (RT_LIKELY(cwcSrc < cwcDst))
     {
-        memcpy(pwszDst, pwszSrc, (wcwSrc + 1) * sizeof(RTUTF16));
+        memcpy(pwszDst, pwszSrc, cwcSrc * sizeof(RTUTF16));
+        pwszDst[cwcSrc] = '\0';
         return VINF_SUCCESS;
     }
@@ -51 +52 @@
     return VERR_BUFFER_OVERFLOW;
 }
-RT_EXPORT_SYMBOL(RTUtf16Copy);
+RT_EXPORT_SYMBOL(RTUtf16CopyEx);