Changeset 53122 in vbox for trunk/src/VBox/Main/src-server/darwin

Timestamp:

Oct 22, 2014 8:43:04 PM (10 years ago)

Author:

vboxsync

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

96652

Message:

Main/HostDnsService: revert r96327 and follow-up r96329 and r96331 to
revert conversion of HostDnsInformation to Unicode.

HostDnsServiceWin.cpp behavioral changes will be redone as a separate
commit against old definition of HostDnsInformation.

Intervening SafeArray cleanup in r96372 is preserved, hopefully
without errors. Please review.

File:

• trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

@@ -18 +18 @@
 #include <VBox/com/string.h>
 #include <VBox/com/ptr.h>
-#include <VBox/log.h>
 
 
@@ -163 +162 @@
 
     return VINF_SUCCESS;
-}
-
-
-static wchar_t *darwinCFStringToUtf16(CFStringRef pStringRef)
-{
-    /* Number of characters (UTF16 encoded, 2 bytes) in the pStringRef. */
-    CFIndex ccStringRef = CFStringGetLength(pStringRef);
-
-    if (ccStringRef > 0)
-    {
-        size_t  cbTmpBuf = (size_t)ccStringRef * sizeof(wchar_t) + 1 /* end of string */;
-        wchar_t *pTmpBuf = (wchar_t *)RTMemAlloc(cbTmpBuf);
-        if (pTmpBuf)
-        {
-            CFIndex ccConverted = CFStringGetBytes(pStringRef,
-                                                   CFRangeMake(0, ccStringRef),
-                                                   kCFStringEncodingUTF16,
-                                                   0,
-                                                   false,
-                                                   (UInt8 *)pTmpBuf,
-                                                   (CFIndex)cbTmpBuf - 1 /* w/o end of string */,
-                                                   NULL);
-            if (ccConverted > 0)
-            {
-                /* Set end of string. */
-                pTmpBuf[ccConverted] = 0;
-                return pTmpBuf;
-            }
-
-            RTMemFree(pTmpBuf);
-        }
-    }
-
-    return NULL;
 }
 
@@ -230 +195 @@
     if (domainNameRef)
     {
-        wchar_t *pwszDomainName = darwinCFStringToUtf16(domainNameRef);
-        if (pwszDomainName)
-        {
-            info.domain = std::wstring(pwszDomainName);
-            RTMemFree(pwszDomainName);
-        }
+        const char *pszDomainName = CFStringGetCStringPtr(domainNameRef,
+                                                    CFStringGetSystemEncoding());
+        if (pszDomainName)
+            info.domain = pszDomainName;
     }
 
@@ -250 +213 @@
                 continue;
 
-            wchar_t *pwszServerAddress = darwinCFStringToUtf16(serverAddressRef);
-            if (!pwszServerAddress)
-                continue;
-
-            info.servers.push_back(std::wstring(pwszServerAddress));
-            RTMemFree(pwszServerAddress);
+            const char *pszServerAddress = CFStringGetCStringPtr(serverAddressRef,
+                                                           CFStringGetSystemEncoding());
+            if (!pszServerAddress)
+                continue;
+
+            info.servers.push_back(std::string(pszServerAddress));
         }
     }
@@ -271 +234 @@
                 continue;
 
-            wchar_t *pwszSearchString = darwinCFStringToUtf16(searchStringRef);
-            if (!pwszSearchString)
-                continue;
-
-            info.searchList.push_back(std::wstring(pwszSearchString));
-            RTMemFree(pwszSearchString);
+            const char *pszSearchString = CFStringGetCStringPtr(searchStringRef,
+                                                          CFStringGetSystemEncoding());
+            if (!pszSearchString)
+                continue;
+
+            info.searchList.push_back(std::string(pszSearchString));
         }
     }