Changeset 18239 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Mar 25, 2009 7:49:45 AM (16 years ago)

Author:

vboxsync

Message:

NAT: better wide character handling in DNS suffix resolving

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -11 +11 @@
 # include <poll.h>
 #else
+# include <Winnls.h>
 # define _WINSOCK2API_
 # include <IPHlpApi.h>
@@ -332 +333 @@
     PIP_ADAPTER_DNS_SERVER_ADDRESS dns = NULL;
     ULONG size = 0;
+    int wlen = 0;
     char *suffix;
     struct dns_entry *da = NULL;
@@ -395 +397 @@
             dns = dns->Next;
         }
+#if 1
         buff_size = wcstombs(NULL, addr->DnsSuffix, 0);
         if (buff_size == 0 || buff_size == (size_t)-1)
@@ -400 +403 @@
         suffix = RTMemAllocZ(buff_size + 1);
         wcstombs(suffix, addr->DnsSuffix, buff_size);
+        suffix[buff_size] = '\0';
         LogRel(("NAT: adding %s to DNS suffix list\n", suffix));
+#else
+        /*Probably more correct way but not working */
+        buff_size = WideCharToMultiByte(CP_ACP, 0, addr->DnsSuffix, -1, NULL, 0, NULL, NULL);
+        suffix = RTMemAllocZ(buff_size);
+        WideCharToMultiByte(CP_ACP, 0, addr->DnsSuffix, -1, suffix, buff_size, NULL, NULL);
+#endif
         *ppszDomain = suffix;
     next: