VirtualBox

Ignore:
Timestamp:
Feb 20, 2009 9:14:28 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
43132
Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted SharedFolderCollection. Approved by dmik. Tested with GUI.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

    r16867 r16966  
    14381438    /* now VM mappings */
    14391439    {
    1440         ComPtr<ISharedFolderCollection> sfColl;
    1441         ComPtr<ISharedFolderEnumerator> sfEnum;
    1442         CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
    1443         CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
     1440        com::SafeIfaceArray <ISharedFolder> folders;
     1441
     1442        CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
    14441443        ULONG index = 0;
    1445         BOOL fMore;
    1446         sfEnum->HasMore(&fMore);
    1447         while (fMore)
    1448         {
    1449             ComPtr<ISharedFolder> sf;
    1450             CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
     1444
     1445        for (size_t i = 0; i < folders.size(); ++i)
     1446        {
     1447            ComPtr <ISharedFolder> sf = folders[i];
     1448
    14511449            Bstr name, hostPath;
    14521450            BOOL writable;
     
    14671465                         name.raw(), hostPath.raw(), writable ? "writable" : "readonly");
    14681466            ++numSharedFolders;
    1469             CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
    14701467        }
    14711468    }
     
    14731470    if (console)
    14741471    {
    1475         ComPtr<ISharedFolderCollection> sfColl;
    1476         ComPtr<ISharedFolderEnumerator> sfEnum;
    1477         CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
    1478         CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
     1472        com::SafeIfaceArray <ISharedFolder> folders;
     1473
     1474        CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
    14791475        ULONG index = 0;
    1480         BOOL fMore;
    1481         sfEnum->HasMore(&fMore);
    1482         while (fMore)
    1483         {
    1484             ComPtr<ISharedFolder> sf;
    1485             CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
     1476
     1477        for (size_t i = 0; i < folders.size(); ++i)
     1478        {
     1479            ComPtr <ISharedFolder> sf = folders[i];
     1480
    14861481            Bstr name, hostPath;
    14871482            sf->COMGETTER(Name)(name.asOutParam());
     
    14991494                RTPrintf("Name: '%lS', Host path: '%lS' (transient mapping)\n", name.raw(), hostPath.raw());
    15001495            ++numSharedFolders;
    1501             CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
    15021496        }
    15031497    }
Note: See TracChangeset for help on using the changeset viewer.

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