Changeset 52934 in vbox for trunk/src/VBox/Main/src-server/HostImpl.cpp

Timestamp:

Oct 2, 2014 1:53:30 PM (11 years ago)

Author:

vboxsync

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

96372

Message:

Main: safearray cleanup, removed unnecessary SafeArray<->vector conversions

File:

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

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -776 +776 @@
 #  endif /* RT_OS_LINUX */
 
-    SafeIfaceArray<IHostNetworkInterface> networkInterfaces(list);
-    networkInterfaces.detachTo(ComSafeArrayOutArg(aNetworkInterfaces));
+    aNetworkInterfaces.resize(list.size());
+    size_t i = 0;
+    for (std::list<ComObjPtr<HostNetworkInterface> >::const_iterator it = list.begin(); it != list.end(); ++it, ++i)
+        aNetworkInterfaces[i] = *it;
 
     return S_OK;
@@ -796 +798 @@
         return rc;
 
-    SafeIfaceArray<IHostUSBDevice> resultArr;
-    rc = m->pUSBProxyService->getDeviceCollection(ComSafeArrayAsOutParam(resultArr));
-    if (FAILED(rc))
-        return rc;
-
-    aUSBDevices.resize(resultArr.size());
-    for (size_t i = 0; i < resultArr.size(); ++i)
-    {
-         ComPtr<IHostUSBDevice> iHu = resultArr[i];
-         iHu.queryInterfaceTo(aUSBDevices[i].asOutParam());
-    }
-
-    return rc;
+    return m->pUSBProxyService->getDeviceCollection(aUSBDevices);
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no
@@ -827 +817 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    com::SafeArray<BSTR> resultArr;
-    HRESULT rc = m->hostDnsMonitorProxy.GetNameServers(ComSafeArrayAsOutParam(resultArr));
-    if (FAILED(rc))
-        return rc;
-
-    aNameServers.resize(resultArr.size());
-    for (size_t i = 0; i < resultArr.size(); ++i)
-        aNameServers[i] = com::Utf8Str(resultArr[i]);
-
-    return S_OK;
+    return m->hostDnsMonitorProxy.GetNameServers(aNameServers);
 }
 
@@ -848 +828 @@
     /* XXX: note here should be synchronization with thread polling state
      * changes in name resoving system on host */
-    Bstr tmpName;
-    HRESULT rc = m->hostDnsMonitorProxy.GetDomainName(tmpName.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    aDomainName = com::Utf8Str(tmpName);
-
-    return S_OK;
+    return m->hostDnsMonitorProxy.GetDomainName(&aDomainName);
 }
 
@@ -865 +838 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    com::SafeArray<BSTR> resultArr;
-    HRESULT rc = m->hostDnsMonitorProxy.GetSearchStrings(ComSafeArrayAsOutParam(resultArr));
-    if (FAILED(rc))
-        return rc;
-
-    aSearchStrings.resize(resultArr.size());
-    for (size_t i = 0; i < resultArr.size(); ++i)
-        aSearchStrings[i] = com::Utf8Str(resultArr[i]);
-
-    return S_OK;
+    return m->hostDnsMonitorProxy.GetSearchStrings(aSearchStrings);
 }