Changeset 126 for pjproject/trunk/pjlib/include/pj/unicode.h

Timestamp:

Jan 20, 2006 9:03:36 PM (18 years ago)

Author:

bennylp

Message:

Completed testing for WinCE port

File:

• pjproject/trunk/pjlib/include/pj/unicode.h (moved) (moved from pjproject/trunk/pjlib/include/pj/compat/unicode.h) (2 diffs)

pjproject/trunk/pjlib/include/pj/unicode.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJ_COMPAT_UNICODE_H__
-#define __PJ_COMPAT_UNICODE_H__
+#ifndef __PJ_UNICODE_H__
+#define __PJ_UNICODE_H__
 
 #include <pj/types.h>
@@ -27 +27 @@
  */
 
+/**
+ * Convert ANSI strings to Unicode strings.
+ *
+ * @param str               The ANSI string to be converted.
+ * @param len               The length of the input string.
+ * @param wbuf              Buffer to hold the Unicode string output.
+ * @param wbuf_count        Buffer size, in number of elements (not bytes).
+ *
+ * @return                  The Unicode string, NULL terminated.
+ */
+PJ_DECL(wchar_t*) pj_ansi_to_unicode(const char *str, pj_size_t len,
+                                     wchar_t *wbuf, pj_size_t wbuf_count);
+
+
+/**
+ * Convert Unicode string to ANSI string.
+ *
+ * @param wstr              The Unicode string to be converted.
+ * @param len               The length of the input string.
+ * @param buf               Buffer to hold the ANSI string output.
+ * @param buf_size          Size of the output buffer.
+ *
+ * @return                  The ANSI string, NULL terminated.
+ */
+PJ_DECL(char*) pj_unicode_to_ansi(const wchar_t *wstr, pj_size_t len,
+                                  char *buf, pj_size_t buf_size);
+
+
 #if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
 
-#   define PJ_DECL_UNICODE_TEMP_BUF(var,size)    wchar_t var[size]
-#   define PJ_NATIVE_STRING(s,buf) pj_ansi_to_unicode(s,buf,PJ_ARRAY_SIZE(buf))
+#   define PJ_DECL_UNICODE_TEMP_BUF(buf,size)    wchar_t buf[size]
+#   define PJ_STRING_TO_NATIVE(s,buf)            pj_ansi_to_unicode( \
+                                                    s, strlen(s), \
+                                                    buf, PJ_ARRAY_SIZE(buf))
+#   define PJ_TEXT(s)                            _TEXT(s)
 
-    PJ_DECL(wchar_t*) pj_ansi_to_unicode(const char *s, wchar_t *buf,
-                                         pj_size_t buf_count);
-
-#else   /* PJ_NATIVE_STRING_IS_UNICODE */
+#else
 
 #   define PJ_DECL_UNICODE_TEMP_BUF(var,size)
-#   define PJ_NATIVE_STRING(s, buf)             s
+#   define PJ_STRING_TO_NATIVE(s, buf)          (s)
+#   define PJ_TEXT(s)                           (s)
 
-#endif  /* PJ_NATIVE_STRING_IS_UNICODE */
+#endif
 
 
-#endif  /* __PJ_COMPAT_UNICODE_H__ */
+
+#endif  /* __PJ_UNICODE_H__ */