Use Unicode for all native Win32 calls. Unicode Windows applications

use UTF-16 internally and GTK+ 2.x uses UTF-8, which means we have to
do a lots of conversions.

Add utf_8to16() and utf_16to8 convenience functions to strutil.c.

svn path=/trunk/; revision=17534

1 files changed, 91 insertions, 0 deletions

diff --git a/epan/strutil.c b/epan/strutil.c
index 1ac18f9559..1572717dc4 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -33,6 +33,11 @@
 #include "strutil.h"
 #include "emem.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#include <tchar.h>
+#include <wchar.h>
+#endif
 
 /*
  * Given a pointer into a data buffer, and to the end of the buffer,
@@ -652,3 +657,89 @@ g_strlcat(gchar *dst, gchar *src, gsize size)
 }
 #endif
 
+#ifdef _WIN32
+
+/*
+ * XXX - Should we use g_utf8_to_utf16() and g_utf16_to_utf8()
+ * instead?  The goal of the functions below was to provide simple
+ * wrappers for UTF-8 <-> UTF-16 conversion without making the
+ * caller worry about freeing up memory afterward.
+ */
+
+/* Convert from UTF-8 to UTF-16. */
+wchar_t * utf_8to16(const char *utf8str) {
+  static wchar_t *utf16buf[3];
+  static int utf16buf_len[3];
+  static int idx;
+
+  if (utf8str == NULL)
+    return NULL;
+
+  idx = (idx + 1) % 3;
+
+  /*
+   * Allocate the buffer if it's not already allocated.
+   */
+  if (utf16buf[idx] == NULL) {
+    utf16buf_len[idx] = INITIAL_FMTBUF_SIZE;
+    utf16buf[idx] = g_malloc(utf16buf_len[idx] * sizeof(wchar_t));
+  }
+
+  while (MultiByteToWideChar(CP_UTF8, 0, utf8str,
+      -1, NULL, 0) >= utf16buf_len[idx]) {
+    /*
+     * Double the buffer's size if it's not big enough.
+     * The size of the buffer starts at 128, so doubling its size
+     * adds at least another 128 bytes, which is more than enough
+     * for one more character plus a terminating '\0'.
+     */
+    utf16buf_len[idx] *= 2;
+    utf16buf[idx] = g_realloc(utf16buf[idx], utf16buf_len[idx]);
+  }
+
+  if (MultiByteToWideChar(CP_UTF8, 0, utf8str,
+      -1, utf16buf[idx], utf16buf_len[idx]) == 0)
+    return NULL;
+
+  return utf16buf[idx];
+}
+
+/* Convert from UTF-16 to UTF-8. */
+gchar * utf_16to8(const wchar_t *utf16str) {
+  static gchar *utf8buf[3];
+  static int utf8buf_len[3];
+  static int idx;
+
+  if (utf16str == NULL)
+    return NULL;
+
+  idx = (idx + 1) % 3;
+
+  /*
+   * Allocate the buffer if it's not already allocated.
+   */
+  if (utf8buf[idx] == NULL) {
+    utf8buf_len[idx] = INITIAL_FMTBUF_SIZE;
+    utf8buf[idx] = g_malloc(utf8buf_len[idx]);
+  }
+
+  while (WideCharToMultiByte(CP_UTF8, 0, utf16str, -1,
+      NULL, 0, NULL, NULL) >= utf8buf_len[idx]) {
+    /*
+     * Double the buffer's size if it's not big enough.
+     * The size of the buffer starts at 128, so doubling its size
+     * adds at least another 128 bytes, which is more than enough
+     * for one more character plus a terminating '\0'.
+     */
+    utf8buf_len[idx] *= 2;
+    utf8buf[idx] = g_realloc(utf8buf[idx], utf8buf_len[idx]);
+  }
+
+  if (WideCharToMultiByte(CP_UTF8, 0, utf16str, -1,
+      utf8buf[idx], utf8buf_len[idx], NULL, NULL) == 0)
+    return NULL;
+
+  return utf8buf[idx];
+}
+
+#endif
\ No newline at end of file