Index: /trunk/include/VBox/log.h
===================================================================
--- /trunk/include/VBox/log.h (revision 45490)
+++ /trunk/include/VBox/log.h (revision 45491)
@@ -4,5 +4,5 @@
/*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
@@ -240,4 +240,276 @@
/** Main group. */
LOG_GROUP_MAIN,
+ /** Main group, IAdditionsFacility. */
+ LOG_GROUP_MAIN_ADDITIONSFACILITY,
+ /** Main group, IAdditionsStateChangedEvent. */
+ LOG_GROUP_MAIN_ADDITIONSSTATECHANGEDEVENT,
+ /** Main group, IAppliance. */
+ LOG_GROUP_MAIN_APPLIANCE,
+ /** Main group, IAudioAdapter. */
+ LOG_GROUP_MAIN_AUDIOADAPTER,
+ /** Main group, IBandwidthControl. */
+ LOG_GROUP_MAIN_BANDWIDTHCONTROL,
+ /** Main group, IBandwidthGroup. */
+ LOG_GROUP_MAIN_BANDWIDTHGROUP,
+ /** Main group, IBandwidthGroupChangedEvent. */
+ LOG_GROUP_MAIN_BANDWIDTHGROUPCHANGEDEVENT,
+ /** Main group, IBIOSSettings. */
+ LOG_GROUP_MAIN_BIOSSETTINGS,
+ /** Main group, ICanShowWindowEvent. */
+ LOG_GROUP_MAIN_CANSHOWWINDOWEVENT,
+ /** Main group, IClipboardModeChangedEvent. */
+ LOG_GROUP_MAIN_CLIPBOARDMODECHANGEDEVENT,
+ /** Main group, IConsole. */
+ LOG_GROUP_MAIN_CONSOLE,
+ /** Main group, ICPUChangedEvent. */
+ LOG_GROUP_MAIN_CPUCHANGEDEVENT,
+ /** Main group, ICPUExecutionCapChangedEvent. */
+ LOG_GROUP_MAIN_CPUEXECUTIONCAPCHANGEDEVENT,
+ /** Main group, IDHCPServer. */
+ LOG_GROUP_MAIN_DHCPSERVER,
+ /** Main group, IDirectory. */
+ LOG_GROUP_MAIN_DIRECTORY,
+ /** Main group, IDisplay. */
+ LOG_GROUP_MAIN_DISPLAY,
+ /** Main group, IDragAndDropModeChangedEvent. */
+ LOG_GROUP_MAIN_DRAGANDDROPMODECHANGEDEVENT,
+ /** Main group, IEvent. */
+ LOG_GROUP_MAIN_EVENT,
+ /** Main group, IEventListener. */
+ LOG_GROUP_MAIN_EVENTLISTENER,
+ /** Main group, IEventSource. */
+ LOG_GROUP_MAIN_EVENTSOURCE,
+ /** Main group, IEventSourceChangedEvent. */
+ LOG_GROUP_MAIN_EVENTSOURCECHANGEDEVENT,
+ /** Main group, IExtPack. */
+ LOG_GROUP_MAIN_EXTPACK,
+ /** Main group, IExtPackBase. */
+ LOG_GROUP_MAIN_EXTPACKBASE,
+ /** Main group, IExtPackFile. */
+ LOG_GROUP_MAIN_EXTPACKFILE,
+ /** Main group, IExtPackManager. */
+ LOG_GROUP_MAIN_EXTPACKMANAGER,
+ /** Main group, IExtPackPlugIn. */
+ LOG_GROUP_MAIN_EXTPACKPLUGIN,
+ /** Main group, IExtraDataCanChangeEvent. */
+ LOG_GROUP_MAIN_EXTRADATACANCHANGEEVENT,
+ /** Main group, IExtraDataChangedEvent. */
+ LOG_GROUP_MAIN_EXTRADATACHANGEDEVENT,
+ /** Main group, IFile. */
+ LOG_GROUP_MAIN_FILE,
+ /** Main group, IFramebuffer. */
+ LOG_GROUP_MAIN_FRAMEBUFFER,
+ /** Main group, IFramebufferOverlay. */
+ LOG_GROUP_MAIN_FRAMEBUFFEROVERLAY,
+ /** Main group, IFsObjInfo. */
+ LOG_GROUP_MAIN_FSOBJINFO,
+ /** Main group, IGuest. */
+ LOG_GROUP_MAIN_GUEST,
+ /** Main group, IGuestDirectory. */
+ LOG_GROUP_MAIN_GUESTDIRECTORY,
+ /** Main group, IGuestErrorInfo. */
+ LOG_GROUP_MAIN_GUESTERRORINFO,
+ /** Main group, IGuestFile. */
+ LOG_GROUP_MAIN_GUESTFILE,
+ /** Main group, IGuestFileEvent. */
+ LOG_GROUP_MAIN_GUESTFILEEVENT,
+ /** Main group, IGuestFileIOEvent. */
+ LOG_GROUP_MAIN_GUESTFILEIOEVENT,
+ /** Main group, IGuestFileOffsetChangedEvent. */
+ LOG_GROUP_MAIN_GUESTFILEOFFSETCHANGEDEVENT,
+ /** Main group, IGuestFileReadEvent. */
+ LOG_GROUP_MAIN_GUESTFILEREADEVENT,
+ /** Main group, IGuestFileRegisteredEvent. */
+ LOG_GROUP_MAIN_GUESTFILEREGISTEREDEVENT,
+ /** Main group, IGuestFileStateChangedEvent. */
+ LOG_GROUP_MAIN_GUESTFILESTATECHANGEDEVENT,
+ /** Main group, IGuestFileWriteEvent. */
+ LOG_GROUP_MAIN_GUESTFILEWRITEEVENT,
+ /** Main group, IGuestFsObjInfo. */
+ LOG_GROUP_MAIN_GUESTFSOBJINFO,
+ /** Main group, IGuestKeyboardEvent. */
+ LOG_GROUP_MAIN_GUESTKEYBOARDEVENT,
+ /** Main group, IGuestMonitorChangedEvent. */
+ LOG_GROUP_MAIN_GUESTMONITORCHANGEDEVENT,
+ /** Main group, IGuestMouseEvent. */
+ LOG_GROUP_MAIN_GUESTMOUSEEVENT,
+ /** Main group, IGuestOSType. */
+ LOG_GROUP_MAIN_GUESTOSTYPE,
+ /** Main group, IGuestProcess. */
+ LOG_GROUP_MAIN_GUESTPROCESS,
+ /** Main group, IGuestProcessEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSEVENT,
+ /** Main group, IGuestProcessInputNotifyEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSINPUTNOTIFYEVENT,
+ /** Main group, IGuestProcessIOEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSIOEVENT,
+ /** Main group, IGuestProcessOutputEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSOUTPUTEVENT,
+ /** Main group, IGuestProcessRegisteredEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSREGISTEREDEVENT,
+ /** Main group, IGuestProcessStateChangedEvent. */
+ LOG_GROUP_MAIN_GUESTPROCESSSTATECHANGEDEVENT,
+ /** Main group, IGuestPropertyChangedEvent. */
+ LOG_GROUP_MAIN_GUESTPROPERTYCHANGEDEVENT,
+ /** Main group, IGuestSession. */
+ LOG_GROUP_MAIN_GUESTSESSION,
+ /** Main group, IGuestSessionEvent. */
+ LOG_GROUP_MAIN_GUESTSESSIONEVENT,
+ /** Main group, IGuestSessionRegisteredEvent. */
+ LOG_GROUP_MAIN_GUESTSESSIONREGISTEREDEVENT,
+ /** Main group, IGuestSessionStateChangedEvent. */
+ LOG_GROUP_MAIN_GUESTSESSIONSTATECHANGEDEVENT,
+ /** Main group, IHost. */
+ LOG_GROUP_MAIN_HOST,
+ /** Main group, IHostNetworkInterface. */
+ LOG_GROUP_MAIN_HOSTNETWORKINTERFACE,
+ /** Main group, IHostPCIDevicePlugEvent. */
+ LOG_GROUP_MAIN_HOSTPCIDEVICEPLUGEVENT,
+ /** Main group, IHostUSBDevice. */
+ LOG_GROUP_MAIN_HOSTUSBDEVICE,
+ /** Main group, IHostUSBDeviceFilter. */
+ LOG_GROUP_MAIN_HOSTUSBDEVICEFILTER,
+ /** Main group, IInternalMachineControl. */
+ LOG_GROUP_MAIN_INTERNALMACHINECONTROL,
+ /** Main group, IInternalSessionControl. */
+ LOG_GROUP_MAIN_INTERNALSESSIONCONTROL,
+ /** Main group, IKeyboard. */
+ LOG_GROUP_MAIN_KEYBOARD,
+ /** Main group, IKeyboardLedsChangedEvent. */
+ LOG_GROUP_MAIN_KEYBOARDLEDSCHANGEDEVENT,
+ /** Main group, IMachine. */
+ LOG_GROUP_MAIN_MACHINE,
+ /** Main group, IMachineDataChangedEvent. */
+ LOG_GROUP_MAIN_MACHINEDATACHANGEDEVENT,
+ /** Main group, IMachineDebugger. */
+ LOG_GROUP_MAIN_MACHINEDEBUGGER,
+ /** Main group, IMachineEvent. */
+ LOG_GROUP_MAIN_MACHINEEVENT,
+ /** Main group, IMachineRegisteredEvent. */
+ LOG_GROUP_MAIN_MACHINEREGISTEREDEVENT,
+ /** Main group, IMachineStateChangedEvent. */
+ LOG_GROUP_MAIN_MACHINESTATECHANGEDEVENT,
+ /** Main group, IMedium. */
+ LOG_GROUP_MAIN_MEDIUM,
+ /** Main group, IMediumAttachment. */
+ LOG_GROUP_MAIN_MEDIUMATTACHMENT,
+ /** Main group, IMediumChangedEvent. */
+ LOG_GROUP_MAIN_MEDIUMCHANGEDEVENT,
+ /** Main group, IMediumFormat. */
+ LOG_GROUP_MAIN_MEDIUMFORMAT,
+ /** Main group, IMediumRegisteredEvent. */
+ LOG_GROUP_MAIN_MEDIUMREGISTEREDEVENT,
+ /** Main group, IMouse. */
+ LOG_GROUP_MAIN_MOUSE,
+ /** Main group, IMouseCapabilityChangedEvent. */
+ LOG_GROUP_MAIN_MOUSECAPABILITYCHANGEDEVENT,
+ /** Main group, IMousePointerShapeChangedEvent. */
+ LOG_GROUP_MAIN_MOUSEPOINTERSHAPECHANGEDEVENT,
+ /** Main group, INATEngine. */
+ LOG_GROUP_MAIN_NATENGINE,
+ /** Main group, INATNetwork. */
+ LOG_GROUP_MAIN_NATNETWORK,
+ /** Main group, INATNetworkAlterEvent. */
+ LOG_GROUP_MAIN_NATNETWORKALTEREVENT,
+ /** Main group, INATNetworkChangedEvent. */
+ LOG_GROUP_MAIN_NATNETWORKCHANGEDEVENT,
+ /** Main group, INATNetworkCreationDeletionEvent. */
+ LOG_GROUP_MAIN_NATNETWORKCREATIONDELETIONEVENT,
+ /** Main group, INATNetworkPortForwardEvent. */
+ LOG_GROUP_MAIN_NATNETWORKPORTFORWARDEVENT,
+ /** Main group, INATNetworkSettingEvent. */
+ LOG_GROUP_MAIN_NATNETWORKSETTINGEVENT,
+ /** Main group, INATNetworkStartStopEvent. */
+ LOG_GROUP_MAIN_NATNETWORKSTARTSTOPEVENT,
+ /** Main group, INATRedirectEvent. */
+ LOG_GROUP_MAIN_NATREDIRECTEVENT,
+ /** Main group, INetworkAdapter. */
+ LOG_GROUP_MAIN_NETWORKADAPTER,
+ /** Main group, INetworkAdapterChangedEvent. */
+ LOG_GROUP_MAIN_NETWORKADAPTERCHANGEDEVENT,
+ /** Main group, IParallelPort. */
+ LOG_GROUP_MAIN_PARALLELPORT,
+ /** Main group, IParallelPortChangedEvent. */
+ LOG_GROUP_MAIN_PARALLELPORTCHANGEDEVENT,
+ /** Main group, IPCIAddress. */
+ LOG_GROUP_MAIN_PCIADDRESS,
+ /** Main group, IPCIDeviceAttachment. */
+ LOG_GROUP_MAIN_PCIDEVICEATTACHMENT,
+ /** Main group, IPerformanceCollector. */
+ LOG_GROUP_MAIN_PERFORMANCECOLLECTOR,
+ /** Main group, IPerformanceMetric. */
+ LOG_GROUP_MAIN_PERFORMANCEMETRIC,
+ /** Main group, IProcess. */
+ LOG_GROUP_MAIN_PROCESS,
+ /** Main group, IProgress. */
+ LOG_GROUP_MAIN_PROGRESS,
+ /** Main group, IReusableEvent. */
+ LOG_GROUP_MAIN_REUSABLEEVENT,
+ /** Main group, IRuntimeErrorEvent. */
+ LOG_GROUP_MAIN_RUNTIMEERROREVENT,
+ /** Main group, ISerialPort. */
+ LOG_GROUP_MAIN_SERIALPORT,
+ /** Main group, ISerialPortChangedEvent. */
+ LOG_GROUP_MAIN_SERIALPORTCHANGEDEVENT,
+ /** Main group, ISession. */
+ LOG_GROUP_MAIN_SESSION,
+ /** Main group, ISessionStateChangedEvent. */
+ LOG_GROUP_MAIN_SESSIONSTATECHANGEDEVENT,
+ /** Main group, ISharedFolder. */
+ LOG_GROUP_MAIN_SHAREDFOLDER,
+ /** Main group, ISharedFolderChangedEvent. */
+ LOG_GROUP_MAIN_SHAREDFOLDERCHANGEDEVENT,
+ /** Main group, IShowWindowEvent. */
+ LOG_GROUP_MAIN_SHOWWINDOWEVENT,
+ /** Main group, ISnapshot. */
+ LOG_GROUP_MAIN_SNAPSHOT,
+ /** Main group, ISnapshotChangedEvent. */
+ LOG_GROUP_MAIN_SNAPSHOTCHANGEDEVENT,
+ /** Main group, ISnapshotDeletedEvent. */
+ LOG_GROUP_MAIN_SNAPSHOTDELETEDEVENT,
+ /** Main group, ISnapshotEvent. */
+ LOG_GROUP_MAIN_SNAPSHOTEVENT,
+ /** Main group, ISnapshotTakenEvent. */
+ LOG_GROUP_MAIN_SNAPSHOTTAKENEVENT,
+ /** Main group, IStateChangedEvent. */
+ LOG_GROUP_MAIN_STATECHANGEDEVENT,
+ /** Main group, IStorageController. */
+ LOG_GROUP_MAIN_STORAGECONTROLLER,
+ /** Main group, IStorageControllerChangedEvent. */
+ LOG_GROUP_MAIN_STORAGECONTROLLERCHANGEDEVENT,
+ /** Main group, IStorageDeviceChangedEvent. */
+ LOG_GROUP_MAIN_STORAGEDEVICECHANGEDEVENT,
+ /** Main group, ISystemProperties. */
+ LOG_GROUP_MAIN_SYSTEMPROPERTIES,
+ /** Main group, IUSBController. */
+ LOG_GROUP_MAIN_USBCONTROLLER,
+ /** Main group, IUSBControllerChangedEvent. */
+ LOG_GROUP_MAIN_USBCONTROLLERCHANGEDEVENT,
+ /** Main group, IUSBDevice. */
+ LOG_GROUP_MAIN_USBDEVICE,
+ /** Main group, IUSBDeviceFilter. */
+ LOG_GROUP_MAIN_USBDEVICEFILTER,
+ /** Main group, IUSBDeviceStateChangedEvent. */
+ LOG_GROUP_MAIN_USBDEVICESTATECHANGEDEVENT,
+ /** Main group, IVBoxSVCAvailabilityChangedEvent. */
+ LOG_GROUP_MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT,
+ /** Main group, IVetoEvent. */
+ LOG_GROUP_MAIN_VETOEVENT,
+ /** Main group, IVFSExplorer. */
+ LOG_GROUP_MAIN_VFSEXPLORER,
+ /** Main group, IVirtualBox. */
+ LOG_GROUP_MAIN_VIRTUALBOX,
+ /** Main group, IVirtualBoxClient. */
+ LOG_GROUP_MAIN_VIRTUALBOXCLIENT,
+ /** Main group, IVirtualSystemDescription. */
+ LOG_GROUP_MAIN_VIRTUALSYSTEMDESCRIPTION,
+ /** Main group, IVRDEServer. */
+ LOG_GROUP_MAIN_VRDESERVER,
+ /** Main group, IVRDEServerChangedEvent. */
+ LOG_GROUP_MAIN_VRDESERVERCHANGEDEVENT,
+ /** Main group, IVRDEServerInfo. */
+ LOG_GROUP_MAIN_VRDESERVERINFO,
+ /** Main group, IVRDEServerInfoChangedEvent. */
+ LOG_GROUP_MAIN_VRDESERVERINFOCHANGEDEVENT,
/** Misc. group intended for external use only. */
LOG_GROUP_MISC,
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk (revision 45490)
+++ /trunk/src/VBox/Main/Makefile.kmk (revision 45491)
@@ -162,4 +162,28 @@
docs: $(PATH_TARGET)/docs.Main
endif
+
+
+#
+# Generate library with API class wrappers from the XIDL file.
+#
+LIBRARIES += VBoxAPIWrap
+VBoxAPIWrap_TEMPLATE = VBOXMAINLIB
+VBoxAPIWrap_SOURCES = $(VBoxAPIWrap_GENERATEDCPP)
+VBoxAPIWrap_GENERATEDCPP = $(filter %.cpp,$(VBoxAPIWrap_GENERATEDSOURCES))
+VBoxAPIWrap_GENERATEDSOURCES = $(addprefix $(VBoxAPIWrap_0_OUTDIR)/,$(VBoxAPIWrap_VBOX_APIWRAPPERFILES))
+VBoxAPIWrap_RAWSRC = \
+ $(VBoxAPIWrap_0_OUTDIR)/apiwrappers
+VBoxAPIWrap_XSLT = \
+ $(VBOX_PATH_MAIN_SRC)/idl/apiwrap-server.xsl
+VBoxAPIWrap_DEFS.win.x86 += _WIN32_WINNT=0x0500
+VBoxAPIWrap_DEFS.win.amd64 += _WIN32_WINNT=0x0510
+VBoxAPIWrap_INCS += \
+ include
+VBoxAPIWrap_CLEAN = \
+ $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.cpp) \
+ $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h) \
+ $(VBoxAPIWrap_RAWSRC)
+VBoxAPIWrap_KMK = $(PATH_OUT)/vboxapiwrap.kmk
+include $(VBoxAPIWrap_KMK)
@@ -256,8 +280,11 @@
VBoxSVC_CXXFLAGS = $(filter-out -Wno-unused,$(TEMPLATE_VBOXMAINEXE_CXXFLAGS))
+.PRECIOUS: C:/projects/vbox/out/win.x86/debug/obj/VBoxSVC/VBoxSVC.rsp
+
VBoxSVC_INCS = \
include \
$(VBoxSVC_0_OUTDIR) \
$(dir $(VBOX_XML_SCHEMADEFS_H)) \
+ $(VBoxAPIWrap_0_OUTDIR) \
.
VBoxSVC_INCS.win = \
@@ -269,4 +296,5 @@
VBoxSVC_LIBS += \
+ $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) \
$(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
$(LIB_DDU)
@@ -547,4 +575,5 @@
include \
$(VBoxC_0_OUTDIR) \
+ $(VBoxAPIWrap_0_OUTDIR) \
$(dir $(VBOX_XML_SCHEMADEFS_H))
VBoxC_INCS.win = \
@@ -866,5 +895,5 @@
| $(VBOX_JMSCOM_GEN)/java/
$(call MSG_L1,Generating Java MSCOM glue files from XIDL)
- $(QUIET)$(RM) -f $(wildcard $(VBOX_JMSCOM_GEN)/java/*.java)
+ $(QUIET)$(RM) -f $(VBOX_JMSCOM_GEN)/java/*.java
$(QUIET)$(VBOX_XSLTPROC) \
--stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \
@@ -900,4 +929,23 @@
$(VBOX_PATH_MAIN_SRC)/glue/tests/Makefile=>Makefile
+# moved those rules to the end so that VBoxAPIWrap_0_OUTDIR can be expanded without $$ trickery
+$(VBoxAPIWrap_RAWSRC) \
++| $(VBoxAPIWrap_GENERATEDSOURCES): \
+ $(VBOX_XIDL_FILE) \
+ $(VBoxAPIWrap_XSLT) \
+ $(VBOX_FILESPLIT) \
+ | $$(dir $$@)
+ $(call MSG_L1,Generating C++ Server API wrapper files from XIDL)
+ $(QUIET)$(RM) -f $(filter-out $(VBoxAPIWrap_GENERATEDSOURCES),$(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.cpp) $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h))
+ $(QUIET)$(VBOX_XSLTPROC) --stringparam filelistonly "" -o $@ $(VBoxAPIWrap_XSLT) $<
+ $(QUIET)$(VBOX_FILESPLIT) $@ $(VBoxAPIWrap_0_OUTDIR)
+
+$(VBoxAPIWrap_KMK).ts +| $(VBoxAPIWrap_KMK): $(VBOX_XIDL_FILE) $(VBoxAPIWrap_XSLT)
+ $(call MSG_GENERATE,,$(VBoxAPIWrap_KMK))
+ $(QUIET)$(RM) -f $@
+ $(QUIET)$(MKDIR) -p $(@D)
+ $(QUIET)$(VBOX_XSLTPROC) --stringparam filelistonly VBoxAPIWrap_VBOX_APIWRAPPERFILES -o $@ $(VBoxAPIWrap_XSLT) $<
+ $(QUIET)$(CP) --changed -fv $@ $(VBoxAPIWrap_KMK)
+
updatenls::
$(VBOX_LUPDATE) $(VBoxSVC_SOURCES) $(VBoxSVC_VBOX_HEADERS) -ts $(VBoxSVC_VBOX_TRANSLATIONS)
Index: /trunk/src/VBox/Main/idl/apiwrap-server.xsl
===================================================================
--- /trunk/src/VBox/Main/idl/apiwrap-server.xsl (revision 45491)
+++ /trunk/src/VBox/Main/idl/apiwrap-server.xsl (revision 45491)
@@ -0,0 +1,1256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /** @file
+ *
+
+
+
+ *
+ * DO NOT EDIT! This is a generated file.
+ * Generated from: src/VBox/Main/idl/VirtualBox.xidl
+ * Generator: src/VBox/Main/idl/apiwrap-server.xsl
+ */
+
+/**
+ * Copyright (C) 2011-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;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#include "VirtualBoxBase.h"
+#include "Wrapper.h"
+
+
+
+
+ public VirtualBoxBase,
+
+
+ {
+ Q_OBJECT
+
+public:
+
+
+
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+
+
+ COM_INTERFACE_ENTRY(ISupportErrorInfo)
+
+
+
+
+
+ END_COM_MAP()
+
+
+
+
+
+
+ };
+
+
+
+
+
+
+
+
+ #include "AutoCaller.h"
+#include "Logging.h"
+
+
+
+
+
+ #ifdef VBOX_WITH_XPCOM
+
+
+ #endif // VBOX_WITH_XPCOM
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IN_BSTR
+
+
+ BSTR
+
+
+
+
+
+
+
+
+
+
+ IUnknown *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ const
+
+ com::Utf8Str &
+
+
+
+ const
+
+ com::Guid &
+
+
+
+
+
+
+
+
+
+ const
+
+ ComPtr<IUnknown> &
+
+
+
+
+
+ const
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %p
+
+
+ %zu
+
+
+
+
+
+ %RU32
+
+
+ %p
+
+
+ %p
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ComSafeArrayIn(
+
+
+ ComSafeArrayOut(
+
+
+
+
+
+
+ ,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ const
+
+ std::vector<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ > &
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a
+
+
+
+
+
+
+
+
+
+
+ *
+
+ a
+
+
+
+ =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ComSafeArraySize(
+
+ *
+
+
+
+ *
+
+
+ a
+
+
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Array
+
+
+
+ ComTypeInConverter<IUnknown>(
+
+
+ ComTypeOutConverter<IUnknown>(
+
+
+
+
+
+ Array
+
+
+
+
+ ComTypeInConverter
+
+
+ ComTypeOutConverter
+
+
+
+
+
+
+ Array
+
+
+
+ BSTRInConverter(
+
+
+ BSTROutConverter(
+
+
+
+
+
+ Array
+
+
+
+ UuidInConverter(
+
+
+ UuidOutConverter(
+
+
+
+
+
+ Array
+
+
+ InConverter
+
+
+ OutConverter
+
+
+
+
+
+
+ a
+
+
+
+
+
+
+
+ ).array()
+
+
+ ).ptr()
+
+
+
+
+
+
+ ).array()
+
+
+ ).str()
+
+
+
+
+
+
+ ).array()
+
+
+ ).uuid()
+
+
+
+
+
+ ).array()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+
+
+
+
+
+
+
+ );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ) = 0;
+
+
+
+
+
+
+
+ ) = 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+{
+ LogRelFlow(("{%p} %s: enter
+
+
+
+
+ \n", this,
+
+
+
+
+
+ ));
+
+ VirtualBoxBase::clearError();
+
+ HRESULT hrc;
+
+ try
+ {
+ CheckComArgOutPointerValidThrow(a
+
+ );
+
+ AutoCaller autoCaller(this);
+ if (FAILED(autoCaller.rc()))
+ throw autoCaller.rc();
+
+
+
+
+
+
+ );
+ }
+ catch (HRESULT hrc2)
+ {
+ hrc = hrc2;
+ }
+ catch (...)
+ {
+ hrc = VirtualBoxBase::handleUnexpectedExceptions(this, RT_SRC_POS);
+ }
+
+ LogRelFlow(("{%p} %s: leave
+
+
+
+ hrc=%Rhrc\n", this,
+
+
+
+
+ , hrc));
+ return hrc;
+}
+
+
+
+
+
+
+
+
+ )
+{
+ LogRelFlow(("{%p} %s: enter
+
+
+
+ \n", this,
+
+
+
+
+ ));
+
+ VirtualBoxBase::clearError();
+
+ HRESULT hrc;
+
+ try
+ {
+ AutoCaller autoCaller(this);
+ if (FAILED(autoCaller.rc()))
+ throw autoCaller.rc();
+
+
+
+
+
+
+ );
+ }
+ catch (HRESULT hrc2)
+ {
+ hrc = hrc2;
+ }
+ catch (...)
+ {
+ hrc = VirtualBoxBase::handleUnexpectedExceptions(this, RT_SRC_POS);
+ }
+
+ LogRelFlow(("{%p} %s: leave hrc=%Rhrc\n", this,
+
+ hrc));
+ return hrc;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //
+
+
+
+//
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ STDMETHOD(
+
+
+
+ )(
+
+
+
+
+
+ ,
+
+
+
+
+ );
+
+
+
+
+
+
+
+
+
+
+ virtual HRESULT
+
+
+
+ (
+
+
+
+
+
+ ,
+
+
+
+
+ ) = 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ,
+
+
+
+
+ )
+{
+ LogRelFlow(("{%p} %s:enter
+
+
+
+
+
+
+
+ \n", this
+
+
+ ,
+
+
+
+
+
+ ));
+
+ VirtualBoxBase::clearError();
+
+ HRESULT hrc;
+
+ try
+ {
+
+
+
+
+ CheckComArgOutPointerValidThrow(a
+
+
+
+ );
+
+
+
+
+ AutoCaller autoCaller(this);
+ if (FAILED(autoCaller.rc()))
+ throw autoCaller.rc();
+
+
+
+
+
+
+
+
+ ,
+
+
+
+
+ );
+ }
+ catch (HRESULT hrc2)
+ {
+ hrc = hrc2;
+ }
+ catch (...)
+ {
+ hrc = VirtualBoxBase::handleUnexpectedExceptions(this, RT_SRC_POS);
+ }
+
+ LogRelFlow(("{%p} %s: leave
+
+
+
+
+
+
+
+
+ hrc=%Rhrc\n", this
+
+
+
+ ,
+
+
+
+
+
+ , hrc));
+ return hrc;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //
+
+
+
+//
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+private:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/src/VBox/Main/include/MediumFormatImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MediumFormatImpl.h (revision 45490)
+++ /trunk/src/VBox/Main/include/MediumFormatImpl.h (revision 45491)
@@ -3,5 +3,5 @@
/** @file
*
- * VirtualBox COM class implementation
+ * MediumFormat COM class implementation
*/
@@ -18,12 +18,9 @@
*/
-#ifndef ____H_MEDIUMFORMAT
-#define ____H_MEDIUMFORMAT
+#ifndef MEDIUMFORMAT_IMPL_H_
+#define MEDIUMFORMAT_IMPL_H_
-#include "VirtualBoxBase.h"
+#include "MediumFormatWrap.h"
-#include
-
-#include
struct VDBACKENDINFO;
@@ -39,6 +36,5 @@
*/
class ATL_NO_VTABLE MediumFormat :
- public VirtualBoxBase,
- VBOX_SCRIPTABLE_IMPL(IMediumFormat)
+ public MediumFormatWrap
{
public:
@@ -53,29 +49,6 @@
};
- typedef std::list StrList;
- typedef std::list DeviceTypeList;
- typedef std::list PropertyList;
-
- struct Data
- {
- Data() : capabilities((MediumFormatCapabilities_T)0) {}
-
- const Utf8Str strId;
- const Utf8Str strName;
- const StrList llFileExtensions;
- const DeviceTypeList llDeviceTypes;
- const MediumFormatCapabilities_T capabilities;
- const PropertyList llProperties;
- };
-
- VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(MediumFormat, IMediumFormat)
-
- DECLARE_NOT_AGGREGATABLE(MediumFormat)
-
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- BEGIN_COM_MAP(MediumFormat)
- VBOX_DEFAULT_INTERFACE_ENTRIES(IMediumFormat)
- END_COM_MAP()
+ typedef std::vector PropertyArray;
+ typedef std::vector StrArray;
DECLARE_EMPTY_CTOR_DTOR(MediumFormat)
@@ -88,38 +61,52 @@
void uninit();
- // IMediumFormat properties
- STDMETHOD(COMGETTER(Id))(BSTR *aId);
- STDMETHOD(COMGETTER(Name))(BSTR *aName);
- STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(MediumFormatCapabilities_T, aCaps));
-
- // IMediumFormat methods
- STDMETHOD(DescribeFileExtensions)(ComSafeArrayOut(BSTR, aFileExtensions),
- ComSafeArrayOut(DeviceType_T, aDeviceTypes));
- STDMETHOD(DescribeProperties)(ComSafeArrayOut(BSTR, aNames),
- ComSafeArrayOut(BSTR, aDescriptions),
- ComSafeArrayOut(DataType_T, aTypes),
- ComSafeArrayOut(ULONG, aFlags),
- ComSafeArrayOut(BSTR, aDefaults));
-
- // public methods only for internal purposes
-
// public methods for internal purposes only
// (ensure there is a caller and a read lock before calling them!)
/** Const, no need to lock */
- const Utf8Str& getId() const { return m.strId; }
+ const Utf8Str &i_getId() const { return m.strId; }
/** Const, no need to lock */
- const StrList& getFileExtensions() const { return m.llFileExtensions; }
+ const StrArray &i_getFileExtensions() const { return m.maFileExtensions; }
/** Const, no need to lock */
- MediumFormatCapabilities_T getCapabilities() const { return m.capabilities; }
+ MediumFormatCapabilities_T i_getCapabilities() const { return m.capabilities; }
/** Const, no need to lock */
- const PropertyList& getProperties() const { return m.llProperties; }
+ const PropertyArray &i_getProperties() const { return m.maProperties; }
private:
+
+ // wrapped IMediumFormat properties
+ HRESULT getId(com::Utf8Str &aId);
+ HRESULT getName(com::Utf8Str &aName);
+ HRESULT getCapabilities(std::vector &aCapabilities);
+
+ // wrapped IMediumFormat methods
+ HRESULT describeFileExtensions(std::vector &aExtensions,
+ std::vector &aTypes);
+ HRESULT describeProperties(std::vector &aNames,
+ std::vector &aDescriptions,
+ std::vector &aTypes,
+ std::vector &aFlags,
+ std::vector &aDefaults);
+
+ // types
+ typedef std::vector DeviceTypeArray;
+
+ // data
+ struct Data
+ {
+ Data() : capabilities((MediumFormatCapabilities_T)0) {}
+
+ const Utf8Str strId;
+ const Utf8Str strName;
+ const StrArray maFileExtensions;
+ const DeviceTypeArray maDeviceTypes;
+ const MediumFormatCapabilities_T capabilities;
+ const PropertyArray maProperties;
+ };
Data m;
};
-#endif // ____H_MEDIUMFORMAT
+#endif // MEDIUMFORMAT_IMPL_H_
/* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/include/Wrapper.h
===================================================================
--- /trunk/src/VBox/Main/include/Wrapper.h (revision 45491)
+++ /trunk/src/VBox/Main/include/Wrapper.h (revision 45491)
@@ -0,0 +1,481 @@
+/* $Id$ */
+
+/** @file
+ *
+ * VirtualBox COM: API wrapper helpers
+ */
+
+/*
+ * Copyright (C) 2012-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;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef ____H_WRAPPER
+#define ____H_WRAPPER
+
+#include
+#include
+#include
+
+/**
+ * Checks that the given pointer to an output argument is valid and throws
+ * E_POINTER + extended error info otherwise.
+ * @param arg Pointer argument.
+ */
+#define CheckComArgOutPointerValidThrow(arg) \
+ do { \
+ if (RT_UNLIKELY(!VALID_PTR(arg))) \
+ throw setError(E_POINTER, \
+ tr("Output argument %s points to invalid memory location (%p)"), \
+ #arg, (void *)(arg)); \
+ } while (0)
+
+
+class BSTROutConverter
+{
+public:
+ BSTROutConverter() : mDst(NULL)
+ {
+ }
+
+ BSTROutConverter(BSTR *aDst) : mDst(aDst)
+ {
+ }
+
+ ~BSTROutConverter()
+ {
+ if (mDst)
+ Bstr(mStr).detachTo(mDst);
+ }
+
+ com::Utf8Str &str()
+ {
+ return mStr;
+ }
+
+private:
+ com::Utf8Str mStr;
+ BSTR *mDst;
+};
+
+class BSTRInConverter
+{
+public:
+ BSTRInConverter() : mSrc()
+ {
+ }
+
+ BSTRInConverter(CBSTR aSrc) : mSrc(aSrc)
+ {
+ }
+
+ ~BSTRInConverter()
+ {
+ }
+
+ const com::Utf8Str &str()
+ {
+ return mSrc;
+ }
+
+private:
+ const com::Utf8Str mSrc;
+};
+
+class ArrayBSTROutConverter
+{
+public:
+ ArrayBSTROutConverter() :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(NULL),
+ mDst(NULL)
+#else // !VBOX_WITH_XPCOM
+ mDst(NULL)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ArrayBSTROutConverter(ComSafeArrayOut(BSTR, aDst)) :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(aDstSize),
+ mDst(aDst)
+#else // !VBOX_WITH_XPCOM
+ mDst(aDst)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ~ArrayBSTROutConverter()
+ {
+ if (mDst)
+ {
+ com::SafeArray outArray(mArray.size());
+ for (size_t i = 0; i < mArray.size(); i++)
+ Bstr(mArray[i]).detachTo(&outArray[i]);
+ outArray.detachTo(ComSafeArrayOutArg(mDst));
+ }
+ }
+
+ std::vector &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector mArray;
+#ifdef VBOX_WITH_XPCOM
+ PRUint32 *mDstSize;
+ BSTR **mDst;
+#else // !VBOX_WITH_XPCOM
+ SAFEARRAY **mDst;
+#endif // !VBOX_WITH_XPCOM
+};
+
+class ArrayBSTRInConverter
+{
+public:
+ ArrayBSTRInConverter()
+ {
+ }
+
+ ArrayBSTRInConverter(ComSafeArrayIn(IN_BSTR, aSrc))
+ {
+ com::SafeArray inArray(ComSafeArrayInArg(aSrc));
+ mArray.resize(inArray.size());
+ for (size_t i = 0; i < inArray.size(); i++)
+ mArray[i] = inArray[i];
+ }
+
+ ~ArrayBSTRInConverter()
+ {
+ }
+
+ const std::vector &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector mArray;
+};
+
+class UuidOutConverter
+{
+public:
+ UuidOutConverter() : mDst(NULL)
+ {
+ }
+
+ UuidOutConverter(BSTR *aDst) : mDst(aDst)
+ {
+ }
+
+ ~UuidOutConverter()
+ {
+ if (mDst)
+ mUuid.toUtf16().detachTo(mDst);
+ }
+
+ com::Guid &uuid()
+ {
+ return mUuid;
+ }
+
+private:
+ com::Guid mUuid;
+ BSTR *mDst;
+};
+
+class UuidInConverter
+{
+public:
+ UuidInConverter() : mSrc()
+ {
+ }
+
+ UuidInConverter(CBSTR aSrc) : mSrc(aSrc)
+ {
+ }
+
+ ~UuidInConverter()
+ {
+ }
+
+ const com::Guid &uuid()
+ {
+ return mSrc;
+ }
+
+private:
+ const com::Guid mSrc;
+};
+
+class ArrayUuidOutConverter
+{
+public:
+ ArrayUuidOutConverter() :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(NULL),
+ mDst(NULL)
+#else // !VBOX_WITH_XPCOM
+ mDst(NULL)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ArrayUuidOutConverter(ComSafeArrayOut(BSTR, aDst)) :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(aDstSize),
+ mDst(aDst)
+#else // !VBOX_WITH_XPCOM
+ mDst(aDst)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ~ArrayUuidOutConverter()
+ {
+ if (mDst)
+ {
+ com::SafeArray outArray(mArray.size());
+ for (size_t i = 0; i < mArray.size(); i++)
+ mArray[i].toUtf16().detachTo(&outArray[i]);
+ outArray.detachTo(ComSafeArrayOutArg(mDst));
+ }
+ }
+
+ std::vector &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector mArray;
+#ifdef VBOX_WITH_XPCOM
+ PRUint32 *mDstSize;
+ BSTR **mDst;
+#else // !VBOX_WITH_XPCOM
+ SAFEARRAY **mDst;
+#endif // !VBOX_WITH_XPCOM
+};
+
+template
+class ComTypeOutConverter
+{
+public:
+ ComTypeOutConverter() : mDst(NULL)
+ {
+ }
+
+ ComTypeOutConverter(A **aDst) : mDst(aDst)
+ {
+ }
+
+ ~ComTypeOutConverter()
+ {
+ if (mDst)
+ mPtr.queryInterfaceTo(mDst);
+ }
+
+ ComPtr &ptr()
+ {
+ return mPtr;
+ }
+
+private:
+ ComPtr mPtr;
+ A **mDst;
+};
+
+template
+class ComTypeInConverter
+{
+public:
+ ComTypeInConverter() : mSrc(NULL)
+ {
+ }
+
+ ComTypeInConverter(A *aSrc) : mSrc(mSrc)
+ {
+ }
+
+ ~ComTypeInConverter()
+ {
+ }
+
+ const ComPtr &ptr()
+ {
+ return mSrc;
+ }
+
+private:
+ const ComPtr mSrc;
+};
+
+template
+class ArrayComTypeOutConverter
+{
+public:
+ ArrayComTypeOutConverter() :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(NULL),
+ mDst(NULL)
+#else // !VBOX_WITH_XPCOM
+ mDst(NULL)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ArrayComTypeOutConverter(ComSafeArrayOut(A, aDst)) :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(aDstSize),
+ mDst(aDst)
+#else // !VBOX_WITH_XPCOM
+ mDst(aDst)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ~ArrayComTypeOutConverter()
+ {
+ if (mDst)
+ {
+ com::SafeIfaceArray outArray(mArray.size());
+ for (size_t i = 0; i < mArray.size(); i++)
+ outArray[i] = mArray[i];
+ outArray.detachTo(ComSafeArrayOutArg(mDst));
+ }
+ }
+
+ std::vector > &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector > mArray;
+#ifdef VBOX_WITH_XPCOM
+ PRUint32 *mDstSize;
+ A **mDst;
+#else // !VBOX_WITH_XPCOM
+ SAFEARRAY **mDst;
+#endif // !VBOX_WITH_XPCOM
+};
+
+template
+class ArrayComTypeInConverter
+{
+public:
+ ArrayComTypeInConverter()
+ {
+ }
+
+ ArrayComTypeInConverter(ComSafeArrayIn(A, aSrc))
+ {
+ com::SafeIfaceArray inArray(ComSafeArrayInArg(aSrc));
+ mArray.resize(inArray.size());
+ for (size_t i = 0; i < inArray.size(); i++)
+ mArray[i] = inArray[i];
+ }
+
+ ~ArrayComTypeInConverter()
+ {
+ }
+
+ const std::vector > &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector > mArray;
+};
+
+template
+class ArrayOutConverter
+{
+public:
+ ArrayOutConverter() :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(NULL),
+ mDst(NULL)
+#else // !VBOX_WITH_XPCOM
+ mDst(NULL)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ArrayOutConverter(ComSafeArrayOut(A, aDst)) :
+#ifdef VBOX_WITH_XPCOM
+ mDstSize(aDstSize),
+ mDst(aDst)
+#else // !VBOX_WITH_XPCOM
+ mDst(aDst)
+#endif // !VBOX_WITH_XPCOM
+ {
+ }
+
+ ~ArrayOutConverter()
+ {
+ if (mDst)
+ {
+ com::SafeArray outArray(mArray.size());
+ for (size_t i = 0; i < mArray.size(); i++)
+ outArray[i] = mArray[i];
+ outArray.detachTo(ComSafeArrayOutArg(mDst));
+ }
+ }
+
+ std::vector &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector mArray;
+#ifdef VBOX_WITH_XPCOM
+ PRUint32 *mDstSize;
+ A **mDst;
+#else // !VBOX_WITH_XPCOM
+ SAFEARRAY **mDst;
+#endif // !VBOX_WITH_XPCOM
+};
+
+template
+class ArrayInConverter
+{
+public:
+ ArrayInConverter()
+ {
+ }
+
+ ArrayInConverter(ComSafeArrayIn(A, aSrc))
+ {
+ com::SafeArray inArray(ComSafeArrayInArg(aSrc));
+ mArray.resize(inArray.size());
+ for (size_t i = 0; i < inArray.size(); i++)
+ mArray[i] = inArray[i];
+ }
+
+ ~ArrayInConverter()
+ {
+ }
+
+ const std::vector &array()
+ {
+ return mArray;
+ }
+
+private:
+ std::vector mArray;
+};
+
+#endif // ____H_WRAPPER
+/* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/src-server/MediumFormatImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumFormatImpl.cpp (revision 45490)
+++ /trunk/src/VBox/Main/src-server/MediumFormatImpl.cpp (revision 45491)
@@ -2,5 +2,5 @@
/** @file
*
- * VirtualBox COM class implementation
+ * MediumFormat COM class implementation
*/
@@ -76,5 +76,5 @@
DeviceType_T devType;
- unconst(m.llFileExtensions).push_back(papExtension->pszExtension);
+ unconst(m.maFileExtensions).push_back(papExtension->pszExtension);
switch(papExtension->enmType)
@@ -94,5 +94,5 @@
}
- unconst(m.llDeviceTypes).push_back(devType);
+ unconst(m.maDeviceTypes).push_back(devType);
++papExtension;
}
@@ -157,5 +157,5 @@
flags,
defaultValue };
- unconst(m.llProperties).push_back(prop);
+ unconst(m.maProperties).push_back(prop);
++pa;
}
@@ -181,7 +181,7 @@
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();
@@ -192,122 +192,34 @@
/////////////////////////////////////////////////////////////////////////////
-STDMETHODIMP MediumFormat::COMGETTER(Id)(BSTR *aId)
-{
- CheckComArgOutPointerValid(aId);
-
- AutoCaller autoCaller(this);
- if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
- /* this is const, no need to lock */
- m.strId.cloneTo(aId);
-
- return S_OK;
-}
-
-STDMETHODIMP MediumFormat::COMGETTER(Name)(BSTR *aName)
-{
- CheckComArgOutPointerValid(aName);
-
- AutoCaller autoCaller(this);
- if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
- /* this is const, no need to lock */
- m.strName.cloneTo(aName);
-
- return S_OK;
-}
-
-STDMETHODIMP MediumFormat::COMGETTER(Capabilities)(ComSafeArrayOut(MediumFormatCapabilities_T, aCaps))
-{
- CheckComArgOutSafeArrayPointerValid(aCaps);
-
- AutoCaller autoCaller(this);
- if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
- AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
- SafeArray capabilities(sizeof(MediumFormatCapabilities_T)*8);
-
- for (ULONG i = 0; i < capabilities.size(); ++i)
- {
- ULONG temp = m.capabilities;
- temp &= 1< 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 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));
-
- return S_OK;
-}
-
-STDMETHODIMP MediumFormat::DescribeProperties(ComSafeArrayOut(BSTR, aNames),
- ComSafeArrayOut(BSTR, aDescriptions),
- ComSafeArrayOut(DataType_T, aTypes),
- ComSafeArrayOut(ULONG, aFlags),
- ComSafeArrayOut(BSTR, 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 propertyNames(c);
- com::SafeArray propertyDescriptions(c);
- com::SafeArray propertyTypes(c);
- com::SafeArray propertyFlags(c);
- com::SafeArray propertyDefaults(c);
-
- int i = 0;
- for (PropertyList::const_iterator it = m.llProperties.begin();
- it != m.llProperties.end();
- ++it, ++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]);
- }
-
- propertyNames.detachTo(ComSafeArrayOutArg(aNames));
- propertyDescriptions.detachTo(ComSafeArrayOutArg(aDescriptions));
- propertyTypes.detachTo(ComSafeArrayOutArg(aTypes));
- propertyFlags.detachTo(ComSafeArrayOutArg(aFlags));
- propertyDefaults.detachTo(ComSafeArrayOutArg(aDefaults));
+HRESULT MediumFormat::getId(com::Utf8Str &aId)
+{
+ /* this is const, no need to lock */
+ aId = m.strId;
+
+ return S_OK;
+}
+
+HRESULT MediumFormat::getName(com::Utf8Str &aName)
+{
+ /* this is const, no need to lock */
+ aName = m.strName;
+
+ return S_OK;
+}
+
+HRESULT MediumFormat::getCapabilities(std::vector &aCapabilities)
+{
+ /* m.capabilities is const, no need to lock */
+
+ 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_MIN(cCapabilities, 1));
return S_OK;
@@ -317,4 +229,40 @@
/////////////////////////////////////////////////////////////////////////////
+HRESULT MediumFormat::describeFileExtensions(std::vector &aExtensions,
+ std::vector &aTypes)
+{
+ /* this is const, no need to lock */
+ aExtensions = m.maFileExtensions;
+ aTypes = m.maDeviceTypes;
+
+ return S_OK;
+}
+
+HRESULT MediumFormat::describeProperties(std::vector &aNames,
+ std::vector &aDescriptions,
+ std::vector &aTypes,
+ std::vector &aFlags,
+ std::vector &aDefaults)
+{
+ /* this is const, no need to lock */
+ 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 = m.maProperties[i];
+ aNames[i] = prop.strName;
+ aDescriptions[i] = prop.strDescription;
+ aTypes[i] = prop.type;
+ aFlags[i] = prop.flags;
+ aDefaults[i] = prop.strDefaultValue;
+ }
+
+ return S_OK;
+}
+
// public methods only for internal purposes
/////////////////////////////////////////////////////////////////////////////
Index: /trunk/src/VBox/Main/src-server/MediumImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 45490)
+++ /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 45491)
@@ -959,5 +959,5 @@
if (FAILED(rc)) return rc;
- if (!(m->formatObj->getCapabilities() & ( MediumFormatCapabilities_CreateFixed
+ if (!(m->formatObj->i_getCapabilities() & ( MediumFormatCapabilities_CreateFixed
| MediumFormatCapabilities_CreateDynamic))
)
@@ -1240,5 +1240,5 @@
Utf8Str strFull;
- if (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+ if (m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File)
{
// compose full path of the medium, if it's not fully qualified...
@@ -2517,5 +2517,5 @@
if ( !(mediumVariantFlags & MediumVariant_Fixed)
- && !(m->formatObj->getCapabilities() & MediumFormatCapabilities_CreateDynamic))
+ && !(m->formatObj->i_getCapabilities() & MediumFormatCapabilities_CreateDynamic))
throw setError(VBOX_E_NOT_SUPPORTED,
tr("Medium format '%s' does not support dynamic storage creation"),
@@ -2523,5 +2523,5 @@
if ( (mediumVariantFlags & MediumVariant_Fixed)
- && !(m->formatObj->getCapabilities() & MediumFormatCapabilities_CreateDynamic))
+ && !(m->formatObj->i_getCapabilities() & MediumFormatCapabilities_CreateDynamic))
throw setError(VBOX_E_NOT_SUPPORTED,
tr("Medium format '%s' does not support fixed storage creation"),
@@ -3194,5 +3194,5 @@
{
if ( m->formatObj
- && (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+ && (m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File)
)
return true;
@@ -4137,5 +4137,5 @@
/* check that our own format supports diffs */
- if (!(m->formatObj->getCapabilities() & MediumFormatCapabilities_Differencing))
+ if (!(m->formatObj->i_getCapabilities() & MediumFormatCapabilities_Differencing))
{
/* use the default format if not */
@@ -4270,5 +4270,5 @@
LogFlowThisFunc(("aWait=%RTbool locationFull=%s\n", aWait, getLocationFull().c_str() ));
- if ( !(m->formatObj->getCapabilities() & ( MediumFormatCapabilities_CreateDynamic
+ if ( !(m->formatObj->i_getCapabilities() & ( MediumFormatCapabilities_CreateDynamic
| MediumFormatCapabilities_CreateFixed)))
throw setError(VBOX_E_NOT_SUPPORTED,
@@ -5676,5 +5676,5 @@
}
- if (formatObj->getCapabilities() & MediumFormatCapabilities_Uuid)
+ if (formatObj->i_getCapabilities() & MediumFormatCapabilities_Uuid)
{
/* Modify the UUIDs if necessary. The associated fields are
@@ -6204,5 +6204,5 @@
if ( isImport
- || ( (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+ || ( (m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File)
&& !m->hostDrive))
{
@@ -6214,5 +6214,5 @@
{
/* must be a file (formatObj must be already known) */
- Assert(m->formatObj->getCapabilities() & MediumFormatCapabilities_File);
+ Assert(m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File);
if (RTPathFilename(aLocation.c_str()) == NULL)
@@ -6222,9 +6222,9 @@
* this */
- ComAssertMsgRet(!m->formatObj->getFileExtensions().empty(),
+ ComAssertMsgRet(!m->formatObj->i_getFileExtensions().empty(),
("Must be at least one extension if it is MediumFormatCapabilities_File\n"),
E_FAIL);
- Utf8Str strExt = m->formatObj->getFileExtensions().front();
+ Utf8Str strExt = m->formatObj->i_getFileExtensions().front();
ComAssertMsgRet(!strExt.isEmpty(),
("Default extension must not be empty\n"),
@@ -6240,5 +6240,5 @@
// we must always have full paths now (if it refers to a file)
if ( ( m->formatObj.isNull()
- || m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+ || m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File)
&& !RTPathStartsWithRoot(locationFull.c_str()))
return setError(VBOX_E_FILE_ERROR,
@@ -6326,5 +6326,5 @@
/* is it still a file? */
- if ( (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+ if ( (m->formatObj->i_getCapabilities() & MediumFormatCapabilities_File)
&& (m->state == MediumState_NotCreated)
)
@@ -6374,6 +6374,6 @@
Assert(m->mapProperties.empty());
- for (MediumFormat::PropertyList::const_iterator it = m->formatObj->getProperties().begin();
- it != m->formatObj->getProperties().end();
+ for (MediumFormat::PropertyArray::const_iterator it = m->formatObj->i_getProperties().begin();
+ it != m->formatObj->i_getProperties().end();
++it)
{
@@ -6764,5 +6764,5 @@
Utf8Str format(m->strFormat);
Utf8Str location(m->strLocationFull);
- uint64_t capabilities = m->formatObj->getCapabilities();
+ uint64_t capabilities = m->formatObj->i_getCapabilities();
ComAssertThrow(capabilities & ( MediumFormatCapabilities_CreateFixed
| MediumFormatCapabilities_CreateDynamic), E_FAIL);
@@ -6904,5 +6904,5 @@
Utf8Str targetFormat(pTarget->m->strFormat);
Utf8Str targetLocation(pTarget->m->strLocationFull);
- uint64_t capabilities = pTarget->m->formatObj->getCapabilities();
+ uint64_t capabilities = pTarget->m->formatObj->i_getCapabilities();
ComAssertThrow(capabilities & MediumFormatCapabilities_CreateDynamic, E_FAIL);
@@ -7442,5 +7442,5 @@
Utf8Str targetFormat(pTarget->m->strFormat);
Utf8Str targetLocation(pTarget->m->strLocationFull);
- uint64_t capabilities = pTarget->m->formatObj->getCapabilities();
+ uint64_t capabilities = pTarget->m->formatObj->i_getCapabilities();
Assert( pTarget->m->state == MediumState_Creating
@@ -8125,7 +8125,7 @@
}
- Utf8Str targetFormat(task.mFormat->getId());
+ Utf8Str targetFormat(task.mFormat->i_getId());
Utf8Str targetLocation(task.mFilename);
- uint64_t capabilities = task.mFormat->getCapabilities();
+ uint64_t capabilities = task.mFormat->i_getCapabilities();
Assert(m->state == MediumState_LockedRead);
@@ -8238,5 +8238,5 @@
/* Open source medium. */
vrc = VDOpen(hdd,
- task.mFormat->getId().c_str(),
+ task.mFormat->i_getId().c_str(),
task.mFilename.c_str(),
VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_SEQUENTIAL | m->uOpenFlagsDef,
@@ -8250,5 +8250,5 @@
Utf8Str targetFormat(m->strFormat);
Utf8Str targetLocation(m->strLocationFull);
- uint64_t capabilities = task.mFormat->getCapabilities();
+ uint64_t capabilities = task.mFormat->i_getCapabilities();
Assert( m->state == MediumState_Creating
Index: /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (revision 45490)
+++ /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (revision 45491)
@@ -1106,5 +1106,5 @@
/* MediumFormat is all const, no need to lock */
- if ((*it)->getId().compare(aFormat, Utf8Str::CaseInsensitive) == 0)
+ if ((*it)->i_getId().compare(aFormat, Utf8Str::CaseInsensitive) == 0)
{
format = *it;
@@ -1139,6 +1139,6 @@
{
/* MediumFormat is all const, no need to lock */
- MediumFormat::StrList aFileList = (*it)->getFileExtensions();
- for (MediumFormat::StrList::const_iterator it1 = aFileList.begin();
+ MediumFormat::StrArray aFileList = (*it)->i_getFileExtensions();
+ for (MediumFormat::StrArray::const_iterator it1 = aFileList.begin();
it1 != aFileList.end();
++it1)