VirtualBox

儲存庫 vbox 的更動 49760


忽略:
時間撮記:
2013-12-3 下午05:57:11 (11 年 以前)
作者:
vboxsync
訊息:

6813 stage 2 rev 4

位置:
trunk/src/VBox/Main
檔案:
修改 3 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Main/include/ApplianceImpl.h

    r49749 r49760  
    8888    /* private instance data */
    8989private:
    90     /** weak VirtualBox parent */
    9190    // wrapped IAppliance properties
    9291    HRESULT getPath(com::Utf8Str &aPath);
    … …  
    109108    HRESULT getWarnings(std::vector<com::Utf8Str> &aWarnings);
    110109
    111 
     110    /** weak VirtualBox parent */
    112111    VirtualBox* const   mVirtualBox;
    113112

  • trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

    r49742 r49760  
    15081508void VirtualSystemDescription::i_removeByType(VirtualSystemDescriptionType_T aType)
    15091509{
    1510     for (std::vector<VirtualSystemDescriptionEntry>::iterator it = m->maDescriptions.begin();  it != m->maDescriptions.end(); ++it)
     1510    std::vector<VirtualSystemDescriptionEntry>::iterator it = m->maDescriptions.begin();
     1511    while (it != m->maDescriptions.end())
    15111512    {
    15121513        if (it->type == aType)
    15131514            it = m->maDescriptions.erase(it);
     1515        else
     1516            ++it;
    15141517    }
    15151518}

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

    r49744 r49760  
    516516 * Returns a list of host DVD drives.
    517517 *
    518  * @returns COM status code
     518 * @returns status code
    519519 * @param drives address of result pointer
    520520 */
    … …  
    524524    AutoWriteLock alock(m->pParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
    525525    MediaList *pList;
     526    aDVDDrives.resize(0);
    526527    HRESULT rc = i_getDrives(DeviceType_DVD, true /* fRefresh */, pList);
    527528    if (SUCCEEDED(rc))
    … …  
    541542 * Returns a list of host floppy drives.
    542543 *
    543  * @returns COM status code
     544 * @returns status code
    544545 * @param drives address of result pointer
    545546 */
    … …  
    549550
    550551    MediaList *pList;
     552    aFloppyDrives.resize(0);
    551553    HRESULT rc = i_getDrives(DeviceType_Floppy, true /* fRefresh */, pList);
    552554    if (SUCCEEDED(rc))
    … …  
    610612 * Returns a list of host network interfaces.
    611613 *
    612  * @returns COM status code
     614 * @returns status code
    613615 * @param drives address of result pointer
    614616 */
    615617HRESULT Host::getNetworkInterfaces(std::vector<ComPtr<IHostNetworkInterface> > &aNetworkInterfaces)
    616618{
     619    aNetworkInterfaces.resize(0);
    617620#if defined(RT_OS_WINDOWS) ||  defined(VBOX_WITH_NETFLT) /*|| defined(RT_OS_OS2)*/
    618621    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    … …  
    795798HRESULT Host::getUSBDevices(std::vector<ComPtr<IHostUSBDevice> > &aUSBDevices)
    796799{
     800    aUSBDevices.resize(0);
    797801#ifdef VBOX_WITH_USB
    798802    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    799     aUSBDevices.resize(0);
    800803    HRESULT rc = i_checkUSBProxyService();
    801804    if (FAILED(rc)) return rc;
    … …  
    868871    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    869872    com::SafeArray<BSTR> resultArr;
     873    aSearchStrings.resize(0);
    870874    resultArr.setNull();
    871875    HRESULT rc = m->hostDnsMonitorProxy.GetSearchStrings(ComSafeArrayAsOutParam(resultArr));
    … …  
    881885HRESULT Host::getUSBDeviceFilters(std::vector<ComPtr<IHostUSBDeviceFilter> > &aUSBDeviceFilters)
    882886{
     887    aUSBDeviceFilters.resize(0);
    883888#ifdef VBOX_WITH_USB
    884889    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    885     aUSBDeviceFilters.resize(0);
    886890    HRESULT rc = i_checkUSBProxyService();
    887891    if (FAILED(rc)) return rc;
    … …  
    909913 * Returns the number of installed logical processors
    910914 *
    911  * @returns VBOX status code
     915 * @returns status code
    912916 * @param   count address of result variable
    913917 */
    … …  
    924928 * Returns the number of online logical processors
    925929 *
    926  * @returns COM status code
     930 * @returns status code
    927931 * @param   count address of result variable
    928932 */
    … …  
    938942 * Returns the number of installed physical processor cores.
    939943 *
    940  * @returns COM status code
     944 * @returns status code
    941945 * @param   count address of result variable
    942946 */
    … …  
    952956 * Returns the number of installed physical processor cores.
    953957 *
    954  * @returns COM status code
     958 * @returns status code
    955959 * @param   count address of result variable
    956960 */
    … …  
    966970 * Returns the (approximate) maximum speed of the given host CPU in MHz
    967971 *
    968  * @returns COM status code
     972 * @returns status code
    969973 * @param   cpu id to get info for.
    970974 * @param   speed address of result variable, speed is 0 if unknown or aCpuId is invalid.
    … …  
    982986 * Returns a description string for the host CPU
    983987 *
    984  * @returns COM status code
     988 * @returns status code
    985989 * @param   cpu id to get info for.
    986990 * @param   description address of result variable, empty string if not known or aCpuId is invalid.
    … …  
    991995
    992996    char szCPUModel[80];
    993     szCPUModel[0] = *"\0";
     997    szCPUModel[0] = 0;
    994998    int vrc = RTMpGetDescription(aCpuId, szCPUModel, sizeof(szCPUModel));
    995999    if (RT_FAILURE(vrc))
    … …  
    10021006 * Returns whether a host processor feature is supported or not
    10031007 *
    1004  * @returns COM status code
     1008 * @returns status code
    10051009 * @param   Feature to query.
    10061010 * @param   address of supported bool result variable
    … …  
    10881092 * Returns the specific CPUID leaf.
    10891093 *
    1090  * @returns COM status code
     1094 * @returns status code
    10911095 * @param   aCpuId              The CPU number. Mostly ignored.
    10921096 * @param   aLeaf               The leaf number.
    … …  
    11221126 * Returns the amount of installed system memory in megabytes
    11231127 *
    1124  * @returns COM status code
     1128 * @returns status code
    11251129 * @param   size address of result variable
    11261130 */
    … …  
    11401144 * Returns the current system memory free space in megabytes
    11411145 *
    1142  * @returns COM status code
     1146 * @returns status code
    11431147 * @param   available address of result variable
    11441148 */
    … …  
    11581162 * Returns the name string of the host operating system
    11591163 *
    1160  * @returns COM status code
     1164 * @returns status code
    11611165 * @param   os address of result variable
    11621166 */
    … …  
    11761180 * Returns the version string of the host operating system
    11771181 *
    1178  * @returns COM status code
     1182 * @returns status code
    11791183 * @param   os address of result variable
    11801184 */
    … …  
    12111215 * Returns the current host time in milliseconds since 1970-01-01 UTC.
    12121216 *
    1213  * @returns COM status code
     1217 * @returns status code
    12141218 * @param   time address of result variable
    12151219 */
    … …  
    15201524    if (!aName.length())
    15211525        return E_INVALIDARG;
    1522     if (!aNetworkInterface)
    1523         return E_POINTER;
    15241526
    15251527    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    … …  
    15581560    if (!aId.isValid())
    15591561        return E_INVALIDARG;
    1560     if (!aNetworkInterface)
    1561         return E_POINTER;
    15621562
    15631563    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    … …  
    15921592                                              std::vector<ComPtr<IHostNetworkInterface> > &aNetworkInterfaces)
    15931593{
     1594    aNetworkInterfaces.resize(0);
    15941595#ifdef VBOX_WITH_HOSTNETIF_API
    15951596    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    1596 
    15971597    int rc = i_updateNetIfList();
    15981598    if (RT_FAILURE(rc))
    … …  
    16411641        if (address == aName)
    16421642        {
    1643             ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam());
    1644             return S_OK;
     1643            return (ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
    16451644        }
    16461645    }
    … …  
    16761675        if (Guid(id) == aId)
    16771676        {
    1678             ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam());
    1679             return rc;
     1677            return (ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
    16801678        }
    16811679    }
    … …  
    17011699 * Returns a list of host video capture devices (webcams, etc).
    17021700 *
    1703  * @returns COM status code
     1701 * @returns status code
    17041702 * @param aVideoInputDevices Array of interface pointers to be filled.
    17051703 */
    … …  
    17081706    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    17091707    HostVideoInputDeviceList list;
     1708    aVideoInputDevices.resize(0);
    17101709
    17111710    HRESULT hr = HostVideoInputDevice::queryHostDevices(m->pParent, &list);
    … …  
    17131712    if (SUCCEEDED(hr))
    17141713    {
     1714        aVideoInputDevices.resize(list.size());
    17151715        size_t i = 0;
    17161716        for (HostVideoInputDeviceList::const_iterator it = list.begin(); it != list.end(); ++it, ++i)
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette