Changeset 26603 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Feb 17, 2010 12:24:34 PM (15 years ago)

Author:

vboxsync

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

57796

Message:

Main: back out r57775

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -451 +451 @@
     if(hr == S_OK)
     {
-        Bstr name(lpszName);
+        size_t cUnicodeName = wcslen(lpszName) + 1;
+        size_t uniLen = (cUnicodeName * 2 + sizeof (OLECHAR) - 1) / sizeof (OLECHAR);
+        Bstr name (uniLen + 1 /* extra zero */);
+        wcscpy((wchar_t *) name.mutableRaw(), lpszName);
 
         hr = pncc->GetInstanceGuid(&IfGuid);
@@ -461 +464 @@
             iface.createObject();
             /* remove the curly bracket at the end */
-            if (SUCCEEDED(iface->init(name, Guid (IfGuid), HostNetworkInterfaceType_Bridged)))
+            if (SUCCEEDED(iface->init (name, Guid (IfGuid), HostNetworkInterfaceType_Bridged)))
             {
 //                iface->setVirtualBox(m->pParent);
@@ -1287 +1290 @@
 STDMETHODIMP Host::FindHostDVDDrive(IN_BSTR aName, IMedium **aDrive)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aDrive);
 
@@ -1314 +1317 @@
 STDMETHODIMP Host::FindHostFloppyDrive(IN_BSTR aName, IMedium **aDrive)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aDrive);
 
@@ -1448 +1451 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgStrNotEmptyOrNull(aAddress);
+    CheckComArgNotNull(aAddress);
     CheckComArgOutPointerValid(aDevice);