diff options
Diffstat (limited to 'src/VBox/Main/src-server/MediumFormatImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-server/MediumFormatImpl.cpp | 146 |
1 files changed, 48 insertions, 98 deletions
diff --git a/src/VBox/Main/src-server/MediumFormatImpl.cpp b/src/VBox/Main/src-server/MediumFormatImpl.cpp index 71080e43..bd07fbf1 100644 --- a/src/VBox/Main/src-server/MediumFormatImpl.cpp +++ b/src/VBox/Main/src-server/MediumFormatImpl.cpp @@ -1,11 +1,11 @@ /* $Id: MediumFormatImpl.cpp $ */ /** @file * - * VirtualBox COM class implementation + * MediumFormat COM class implementation */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -75,7 +75,7 @@ HRESULT MediumFormat::init(const VDBACKENDINFO *aVDInfo) { DeviceType_T devType; - unconst(m.llFileExtensions).push_back(papExtension->pszExtension); + unconst(m.maFileExtensions).push_back(papExtension->pszExtension); switch(papExtension->enmType) { @@ -93,7 +93,7 @@ HRESULT MediumFormat::init(const VDBACKENDINFO *aVDInfo) return E_INVALIDARG; } - unconst(m.llDeviceTypes).push_back(devType); + unconst(m.maDeviceTypes).push_back(devType); ++papExtension; } } @@ -156,7 +156,7 @@ HRESULT MediumFormat::init(const VDBACKENDINFO *aVDInfo) dt, flags, defaultValue }; - unconst(m.llProperties).push_back(prop); + unconst(m.maProperties).push_back(prop); ++pa; } } @@ -180,9 +180,9 @@ void MediumFormat::uninit() if (autoUninitSpan.uninitDone()) return; - unconst(m.llProperties).clear(); - unconst(m.llFileExtensions).clear(); - unconst(m.llDeviceTypes).clear(); + unconst(m.maProperties).clear(); + unconst(m.maFileExtensions).clear(); + unconst(m.maDeviceTypes).clear(); unconst(m.capabilities) = (MediumFormatCapabilities_T)0; unconst(m.strName).setNull(); unconst(m.strId).setNull(); @@ -191,129 +191,79 @@ void MediumFormat::uninit() // IMediumFormat properties ///////////////////////////////////////////////////////////////////////////// -STDMETHODIMP MediumFormat::COMGETTER(Id)(BSTR *aId) +HRESULT MediumFormat::getId(com::Utf8Str &aId) { - CheckComArgOutPointerValid(aId); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* this is const, no need to lock */ - m.strId.cloneTo(aId); + aId = m.strId; return S_OK; } -STDMETHODIMP MediumFormat::COMGETTER(Name)(BSTR *aName) +HRESULT MediumFormat::getName(com::Utf8Str &aName) { - CheckComArgOutPointerValid(aName); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* this is const, no need to lock */ - m.strName.cloneTo(aName); + aName = m.strName; return S_OK; } -STDMETHODIMP MediumFormat::COMGETTER(Capabilities)(ULONG *aCaps) +HRESULT MediumFormat::getCapabilities(std::vector<MediumFormatCapabilities_T> &aCapabilities) { - CheckComArgOutPointerValid(aCaps); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* m.capabilities is const, no need to lock */ - /// @todo add COMGETTER(ExtendedCapabilities) when we reach the 32 bit - /// limit (or make the argument ULONG64 after checking that COM is capable - /// of defining enums (used to represent bit flags) that contain 64-bit - /// values). Or go away from the enum/ulong hack for bit sets and use - /// a safearray like elsewhere. - ComAssertRet((uint64_t)m.capabilities == ((ULONG)m.capabilities), E_FAIL); - - *aCaps = (ULONG)m.capabilities; + aCapabilities.resize(sizeof(MediumFormatCapabilities_T) * 8); + size_t cCapabilities = 0; + for (size_t i = 0; i < aCapabilities.size(); i++) + { + uint64_t tmp = m.capabilities; + tmp &= 1ULL << i; + if (tmp) + aCapabilities[cCapabilities++] = (MediumFormatCapabilities_T)tmp; + } + aCapabilities.resize(RT_MAX(cCapabilities, 1)); return S_OK; } -STDMETHODIMP MediumFormat::DescribeFileExtensions(ComSafeArrayOut(BSTR, aFileExtensions), - ComSafeArrayOut(DeviceType_T, aDeviceTypes)) -{ - CheckComArgOutSafeArrayPointerValid(aFileExtensions); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); +// IMediumFormat methods +///////////////////////////////////////////////////////////////////////////// +HRESULT MediumFormat::describeFileExtensions(std::vector<com::Utf8Str> &aExtensions, + std::vector<DeviceType_T> &aTypes) +{ /* this is const, no need to lock */ - com::SafeArray<BSTR> fileExtentions(m.llFileExtensions.size()); - int i = 0; - for (StrList::const_iterator it = m.llFileExtensions.begin(); - it != m.llFileExtensions.end(); - ++it, ++i) - (*it).cloneTo(&fileExtentions[i]); - fileExtentions.detachTo(ComSafeArrayOutArg(aFileExtensions)); - - com::SafeArray<DeviceType_T> deviceTypes(m.llDeviceTypes.size()); - i = 0; - for (DeviceTypeList::const_iterator it = m.llDeviceTypes.begin(); - it != m.llDeviceTypes.end(); - ++it, ++i) - deviceTypes[i] = (*it); - deviceTypes.detachTo(ComSafeArrayOutArg(aDeviceTypes)); + aExtensions = m.maFileExtensions; + aTypes = m.maDeviceTypes; return S_OK; } -STDMETHODIMP MediumFormat::DescribeProperties(ComSafeArrayOut(BSTR, aNames), - ComSafeArrayOut(BSTR, aDescriptions), - ComSafeArrayOut(DataType_T, aTypes), - ComSafeArrayOut(ULONG, aFlags), - ComSafeArrayOut(BSTR, aDefaults)) +HRESULT MediumFormat::describeProperties(std::vector<com::Utf8Str> &aNames, + std::vector<com::Utf8Str> &aDescriptions, + std::vector<DataType_T> &aTypes, + std::vector<ULONG> &aFlags, + std::vector<com::Utf8Str> &aDefaults) { - CheckComArgOutSafeArrayPointerValid(aNames); - CheckComArgOutSafeArrayPointerValid(aDescriptions); - CheckComArgOutSafeArrayPointerValid(aTypes); - CheckComArgOutSafeArrayPointerValid(aFlags); - CheckComArgOutSafeArrayPointerValid(aDefaults); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* this is const, no need to lock */ - size_t c = m.llProperties.size(); - com::SafeArray<BSTR> propertyNames(c); - com::SafeArray<BSTR> propertyDescriptions(c); - com::SafeArray<DataType_T> propertyTypes(c); - com::SafeArray<ULONG> propertyFlags(c); - com::SafeArray<BSTR> propertyDefaults(c); - - int i = 0; - for (PropertyList::const_iterator it = m.llProperties.begin(); - it != m.llProperties.end(); - ++it, ++i) + size_t c = m.maProperties.size(); + aNames.resize(c); + aDescriptions.resize(c); + aTypes.resize(c); + aFlags.resize(c); + aDefaults.resize(c); + for (size_t i = 0; i < c; i++) { - const Property &prop = (*it); - prop.strName.cloneTo(&propertyNames[i]); - prop.strDescription.cloneTo(&propertyDescriptions[i]); - propertyTypes[i] = prop.type; - propertyFlags[i] = prop.flags; - prop.strDefaultValue.cloneTo(&propertyDefaults[i]); + const Property &prop = m.maProperties[i]; + aNames[i] = prop.strName; + aDescriptions[i] = prop.strDescription; + aTypes[i] = prop.type; + aFlags[i] = prop.flags; + aDefaults[i] = prop.strDefaultValue; } - propertyNames.detachTo(ComSafeArrayOutArg(aNames)); - propertyDescriptions.detachTo(ComSafeArrayOutArg(aDescriptions)); - propertyTypes.detachTo(ComSafeArrayOutArg(aTypes)); - propertyFlags.detachTo(ComSafeArrayOutArg(aFlags)); - propertyDefaults.detachTo(ComSafeArrayOutArg(aDefaults)); - return S_OK; } -// IMediumFormat methods -///////////////////////////////////////////////////////////////////////////// - // public methods only for internal purposes ///////////////////////////////////////////////////////////////////////////// /* vi: set tabstop=4 shiftwidth=4 expandtab: */ |