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

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

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (6 diffs)
• HostDnsService.h (modified) (1 diff)
• HostImpl.cpp (modified) (5 diffs)
• MachineImpl.cpp (modified) (16 diffs)
• USBProxyService.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67 +67 @@
 
 inline static void detachVectorOfWString(const std::vector<std::wstring>& v,
-                                        ComSafeArrayOut(BSTR, aBstrArray))
-{
-    com::SafeArray<BSTR> aBstr(v.size());
-
-    std::vector<std::wstring>::const_iterator it;
-
-    int i = 0;
-    it = v.begin();
-    for (; it != v.end(); ++it, ++i)
-        Utf8Str(it->c_str()).cloneTo(&aBstr[i]);
-
-    aBstr.detachTo(ComSafeArrayOutArg(aBstrArray));
+                                         std::vector<com::Utf8Str> &aArray)
+{
+    aArray.resize(v.size());
+    size_t i = 0;
+    for (std::vector<std::wstring>::const_iterator it = v.begin(); it != v.end(); ++it, ++i)
+        aArray[i] = Utf8Str(it->c_str());
 }
 
@@ -265 +259 @@
 }
 
-HRESULT HostDnsMonitorProxy::GetNameServers(ComSafeArrayOut(BSTR, aNameServers))
+HRESULT HostDnsMonitorProxy::GetNameServers(std::vector<com::Utf8Str> &aNameServers)
 {
     AssertReturn(m && m->info, E_FAIL);
@@ -276 +270 @@
     dumpHostDnsStrVector("Name Server", m->info->servers);
 
-    detachVectorOfWString(m->info->servers, ComSafeArrayOutArg(aNameServers));
+    detachVectorOfWString(m->info->servers, aNameServers);
 
     return S_OK;
 }
 
-HRESULT HostDnsMonitorProxy::GetDomainName(BSTR *aDomainName)
+HRESULT HostDnsMonitorProxy::GetDomainName(com::Utf8Str *pDomainName)
 {
     AssertReturn(m && m->info, E_FAIL);
@@ -291 +285 @@
     LogRel(("HostDnsMonitorProxy::GetDomainName: %s\n", m->info->domain.c_str()));
 
-    Utf8Str(m->info->domain.c_str()).cloneTo(aDomainName);
+    *pDomainName = m->info->domain.c_str();
 
     return S_OK;
 }
 
-HRESULT HostDnsMonitorProxy::GetSearchStrings(ComSafeArrayOut(BSTR, aSearchStrings))
+HRESULT HostDnsMonitorProxy::GetSearchStrings(std::vector<com::Utf8Str> &aSearchStrings)
 {
     AssertReturn(m && m->info, E_FAIL);
@@ -307 +301 @@
     dumpHostDnsStrVector("Search String", m->info->searchList);
 
-    detachVectorOfWString(m->info->searchList, ComSafeArrayOutArg(aSearchStrings));
+    detachVectorOfWString(m->info->searchList, aSearchStrings);
 
     return S_OK;

trunk/src/VBox/Main/src-server/HostDnsService.h

@@ -112 +112 @@
     void notify() const;
 
-    HRESULT GetNameServers(ComSafeArrayOut(BSTR, aNameServers));
-    HRESULT GetDomainName(BSTR *aDomainName);
-    HRESULT GetSearchStrings(ComSafeArrayOut(BSTR, aSearchStrings));
+    HRESULT GetNameServers(std::vector<com::Utf8Str> &aNameServers);
+    HRESULT GetDomainName(com::Utf8Str *pDomainName);
+    HRESULT GetSearchStrings(std::vector<com::Utf8Str> &aSearchStrings);
 
     bool operator==(PCHostDnsMonitorProxy&);

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);
 }
 

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

@@ -1659 +1659 @@
 HRESULT Machine::setVideoCaptureScreens(const std::vector<BOOL> &aVideoCaptureScreens)
 {
-    SafeArray<BOOL> screens(aVideoCaptureScreens);
-    AssertReturn(screens.size() <= RT_ELEMENTS(mHWData->maVideoCaptureScreens), E_INVALIDARG);
+    AssertReturn(aVideoCaptureScreens.size() <= RT_ELEMENTS(mHWData->maVideoCaptureScreens), E_INVALIDARG);
     bool fChanged = false;
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    for (unsigned i = 0; i < screens.size(); ++i)
-    {
-        if (mHWData->maVideoCaptureScreens[i] != RT_BOOL(screens[i]))
-        {
-            mHWData->maVideoCaptureScreens[i] = RT_BOOL(screens[i]);
+    for (unsigned i = 0; i < aVideoCaptureScreens.size(); ++i)
+    {
+        if (mHWData->maVideoCaptureScreens[i] != RT_BOOL(aVideoCaptureScreens[i]))
+        {
+            mHWData->maVideoCaptureScreens[i] = RT_BOOL(aVideoCaptureScreens[i]);
             fChanged = true;
         }
@@ -4823 +4822 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    com::SafeArray<BSTR> saKeys(mData->pMachineConfigFile->mapExtraDataItems.size());
     aKeys.resize(mData->pMachineConfigFile->mapExtraDataItems.size());
     size_t i = 0;
@@ -6331 +6329 @@
     *aHeight = u32Height;
 
-    com::SafeArray<BYTE> bitmap(cbData);
+    aData.resize(cbData);
     /* Convert pixels to format expected by the API caller. */
     if (aBGR)
@@ -6338 +6336 @@
         for (unsigned i = 0; i < cbData; i += 4)
         {
-            bitmap[i]     = pu8Data[i];
-            bitmap[i + 1] = pu8Data[i + 1];
-            bitmap[i + 2] = pu8Data[i + 2];
-            bitmap[i + 3] = 0xff;
+            aData[i]     = pu8Data[i];
+            aData[i + 1] = pu8Data[i + 1];
+            aData[i + 2] = pu8Data[i + 2];
+            aData[i + 3] = 0xff;
         }
     }
@@ -6349 +6347 @@
         for (unsigned i = 0; i < cbData; i += 4)
         {
-            bitmap[i]     = pu8Data[i + 2];
-            bitmap[i + 1] = pu8Data[i + 1];
-            bitmap[i + 2] = pu8Data[i];
-            bitmap[i + 3] = 0xff;
-        }
-    }
-    aData.resize(bitmap.size());
-    for (size_t i = 0; i < bitmap.size(); ++i)
-        aData[i] = bitmap[i];
+            aData[i]     = pu8Data[i + 2];
+            aData[i + 1] = pu8Data[i + 1];
+            aData[i + 2] = pu8Data[i];
+            aData[i + 3] = 0xff;
+        }
+    }
 
     freeSavedDisplayScreenshot(pu8Data);
@@ -6396 +6391 @@
     if (RT_SUCCESS(vrc))
     {
-        com::SafeArray<BYTE> screenData(cbPNG);
-        screenData.initFrom(pu8PNG, cbPNG);
+        aData.resize(cbPNG);
+        if (cbPNG)
+            memcpy(&aData.front(), pu8PNG, cbPNG);
         if (pu8PNG)
             RTMemFree(pu8PNG);
-        aData.resize(screenData.size());
-        for (size_t i = 0; i < screenData.size(); ++i)
-            aData[i] = screenData[i];
     }
     else
@@ -6468 +6461 @@
     *aHeight = u32Height;
 
-    com::SafeArray<BYTE> png(cbData);
-    png.initFrom(pu8Data, cbData);
-    aData.resize(png.size());
-    for (size_t i = 0; i < png.size(); ++i)
-        aData[i] = png[i];
+    aData.resize(cbData);
+    if (cbData)
+        memcpy(&aData.front(), pu8Data, cbData);
 
     freeSavedDisplayScreenshot(pu8Data);
@@ -6597 +6588 @@
      * One byte expands to approx. 25 bytes of breathtaking XML. */
     size_t cbData = (size_t)RT_MIN(aSize, 32768);
-    com::SafeArray<BYTE> logData(cbData);
+    aData.resize(cbData);
 
     RTFILE LogFile;
@@ -6604 +6595 @@
     if (RT_SUCCESS(vrc))
     {
-        vrc = RTFileReadAt(LogFile, aOffset, logData.raw(), cbData, &cbData);
+        vrc = RTFileReadAt(LogFile, aOffset, cbData? &aData.front(): NULL, cbData, &cbData);
         if (RT_SUCCESS(vrc))
-            logData.resize(cbData);
+            aData.resize(cbData);
         else
             rc = setError(VBOX_E_IPRT_ERROR,
@@ -6619 +6610 @@
 
     if (FAILED(rc))
-        logData.resize(0);
-
-    aData.resize(logData.size());
-    for (size_t i = 0; i < logData.size(); ++i)
-        aData[i] = logData[i];
+        aData.resize(0);
 
     return rc;
@@ -6982 +6969 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    com::SafeArray<BYTE> icon(mUserData->mIcon.size());
-    aIcon.resize(mUserData->mIcon.size());
-    memcpy(icon.raw(), &mUserData->mIcon[0], mUserData->mIcon.size());
-    aIcon.resize(icon.size());
-    for (size_t i = 0; i < icon.size(); ++i)
-        aIcon[i] = icon[i];
+    size_t cbIcon = mUserData->mIcon.size();
+    aIcon.resize(cbIcon);
+    if (cbIcon)
+        memcpy(&aIcon.front(), &mUserData->mIcon[0], cbIcon);
     return S_OK;
 }
@@ -6999 +6984 @@
         i_setModified(IsModified_MachineData);
         mUserData.backup();
-        com::SafeArray<BYTE> icon(aIcon);
-        mUserData->mIcon.resize(aIcon.size());
-        memcpy(&mUserData->mIcon[0], icon.raw(), mUserData->mIcon.size());
+        size_t cbIcon = aIcon.size();
+        mUserData->mIcon.resize(cbIcon);
+        if (cbIcon)
+            memcpy(&mUserData->mIcon[0], &aIcon.front(), cbIcon);
     }
     return hrc;
@@ -7008 +6994 @@
 HRESULT Machine::getUSBProxyAvailable(BOOL *aUSBProxyAvailable)
 {
-
 #ifdef VBOX_WITH_USB
     *aUSBProxyAvailable = true;
@@ -8424 +8409 @@
                         cbOut,
                         DECODE_STR_MAX);
-    com::SafeArray<BYTE> iconByte(cbOut);
-    int vrc = RTBase64Decode(pszStr, iconByte.raw(), cbOut, NULL, NULL);
+    mUserData->mIcon.resize(cbOut);
+    int vrc = VINF_SUCCESS;
+    if (cbOut)
+        vrc = RTBase64Decode(pszStr, &mUserData->mIcon.front(), cbOut, NULL, NULL);
     if (RT_FAILURE(vrc))
+    {
+        mUserData->mIcon.resize(0);
         return setError(E_FAIL,
                         tr("Failure to Decode Icon Data. '%s' (%Rrc)"),
                         pszStr,
                         vrc);
-    mUserData->mIcon.resize(iconByte.size());
-    memcpy(&mUserData->mIcon[0], iconByte.raw(), mUserData->mIcon.size());
+    }
 
     // look up the object by Id to check it is valid
@@ -9821 +9809 @@
 
     // Encode the Icon Override data from Machine and store on config userdata.
-    com::SafeArray<BYTE> iconByte;
-    COMGETTER(Icon)(ComSafeArrayAsOutParam(iconByte));
+    std::vector<BYTE> iconByte;
+    getIcon(iconByte);
     ssize_t cbData = iconByte.size();
     if (cbData > 0)
@@ -9829 +9817 @@
         Utf8Str strIconData;
         strIconData.reserve(cchOut+1);
-        int vrc = RTBase64Encode(iconByte.raw(), cbData,
+        int vrc = RTBase64Encode(&iconByte.front(), cbData,
                                  strIconData.mutableRaw(), strIconData.capacity(),
                                  NULL);

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

@@ -133 +133 @@
  * @remarks The caller must own the write lock of the host object.
  */
-HRESULT USBProxyService::getDeviceCollection(ComSafeArrayOut(IHostUSBDevice *, aUSBDevices))
+HRESULT USBProxyService::getDeviceCollection(std::vector<ComPtr<IHostUSBDevice> > &aUSBDevices)
 {
     AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
-    CheckComArgOutSafeArrayPointerValid(aUSBDevices);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    SafeIfaceArray<IHostUSBDevice> Collection(mDevices);
-    Collection.detachTo(ComSafeArrayOutArg(aUSBDevices));
+    aUSBDevices.resize(mDevices.size());
+    size_t i = 0;
+    for (HostUSBDeviceList::const_iterator it = mDevices.begin(); it != mDevices.end(); ++it, ++i)
+        aUSBDevices[i] = *it;
 
     return S_OK;

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

@@ -3209 +3209 @@
  * Takes a list of machine groups, and sanitizes/validates it.
  *
- * @param aMachineGroups    Safearray with the machine groups.
+ * @param aMachineGroups    Array with the machine groups.
  * @param pllMachineGroups  Pointer to list of strings for the result.
  *