VirtualBox

Changeset 19239 in vbox for trunk/src/VBox/Main/include


Ignore:
Timestamp:
Apr 28, 2009 1:19:14 PM (16 years ago)
Author:
vboxsync
Message:

Main: support for using VBox from Python on Windows (still certain limitation apply, such as enum visibility)

Location:
trunk/src/VBox/Main/include
Files:
39 edited

Legend:

Unmodified
Added
Removed

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

    r19134 r19239  
    5252        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    5353        COM_INTERFACE_ENTRY(IAppliance)
     54        COM_INTERFACE_ENTRY(IDispatch)
    5455    END_COM_MAP()
    5556

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

    r19134 r19239  
    6363        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    6464        COM_INTERFACE_ENTRY(IAudioAdapter)
     65        COM_INTERFACE_ENTRY(IDispatch)
    6566    END_COM_MAP()
    6667

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

    r19134 r19239  
    8484        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    8585        COM_INTERFACE_ENTRY(IBIOSSettings)
     86        COM_INTERFACE_ENTRY(IDispatch)
    8687    END_COM_MAP()
    8788

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

    r19134 r19239  
    9393        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    9494        COM_INTERFACE_ENTRY(IConsole)
     95        COM_INTERFACE_ENTRY(IDispatch)
    9596    END_COM_MAP()
    9697
    … …  
    137138    STDMETHOD(GetDeviceActivity) (DeviceType_T aDeviceType,
    138139                                 DeviceActivity_T *aDeviceActivity);
    139     STDMETHOD(AttachUSBDevice) (IN_GUID aId);
    140     STDMETHOD(DetachUSBDevice) (IN_GUID aId, IUSBDevice **aDevice);
     140    STDMETHOD(AttachUSBDevice) (IN_BSTR aId);
     141    STDMETHOD(DetachUSBDevice) (IN_BSTR aId, IUSBDevice **aDevice);
    141142    STDMETHOD(FindUSBDeviceByAddress) (IN_BSTR aAddress, IUSBDevice **aDevice);
    142     STDMETHOD(FindUSBDeviceById) (IN_GUID aId, IUSBDevice **aDevice);
     143    STDMETHOD(FindUSBDeviceById) (IN_BSTR aId, IUSBDevice **aDevice);
    143144    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
    144145    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
    145146    STDMETHOD(TakeSnapshot) (IN_BSTR aName, IN_BSTR aDescription,
    146147                             IProgress **aProgress);
    147     STDMETHOD(DiscardSnapshot) (IN_GUID aId, IProgress **aProgress);
     148    STDMETHOD(DiscardSnapshot) (IN_BSTR aId, IProgress **aProgress);
    148149    STDMETHOD(DiscardCurrentState) (IProgress **aProgress);
    149150    STDMETHOD(DiscardCurrentSnapshotAndState) (IProgress **aProgress);
    … …  
    184185    HRESULT onSharedFolderChange (BOOL aGlobal);
    185186    HRESULT onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
    186     HRESULT onUSBDeviceDetach (IN_GUID aId, IVirtualBoxErrorInfo *aError);
     187    HRESULT onUSBDeviceDetach (IN_BSTR aId, IVirtualBoxErrorInfo *aError);
    187188    HRESULT getGuestProperty (IN_BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
    188189    HRESULT setGuestProperty (IN_BSTR aKey, IN_BSTR aValue, IN_BSTR aFlags);

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

    r19134 r19239  
    249249        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    250250        COM_INTERFACE_ENTRY(IRemoteDisplayInfo)
     251        COM_INTERFACE_ENTRY(IDispatch)
    251252    END_COM_MAP()
    252253

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

    r19134 r19239  
    5151        COM_INTERFACE_ENTRY (ISupportErrorInfo)
    5252        COM_INTERFACE_ENTRY (IDHCPServer)
     53        COM_INTERFACE_ENTRY (IDispatch)
    5354    END_COM_MAP()
    5455

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

    r19134 r19239  
    7070        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    7171        COM_INTERFACE_ENTRY(IDVDDrive)
     72        COM_INTERFACE_ENTRY(IDispatch)
    7273    END_COM_MAP()
    7374
    … …  
    9192
    9293    // IDVDDrive methods
    93     STDMETHOD(MountImage) (IN_GUID aImageId);
     94    STDMETHOD(MountImage) (IN_BSTR aImageId);
    9495    STDMETHOD(CaptureHostDrive) (IHostDVDDrive *aHostDVDDrive);
    9596    STDMETHOD(Unmount)();

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

    r19134 r19239  
    101101        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    102102        COM_INTERFACE_ENTRY(IDisplay)
     103        COM_INTERFACE_ENTRY2(IDispatch,IDisplay)
    103104    END_COM_MAP()
    104105

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

    r19134 r19239  
    7070        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    7171        COM_INTERFACE_ENTRY(IFloppyDrive)
     72        COM_INTERFACE_ENTRY(IDispatch)
    7273    END_COM_MAP()
    7374
    … …  
    9192
    9293    // IFloppyDrive methods
    93     STDMETHOD(MountImage) (IN_GUID aImageId);
     94    STDMETHOD(MountImage) (IN_BSTR aImageId);
    9495    STDMETHOD(CaptureHostDrive) (IHostFloppyDrive *aHostFloppyDrive);
    9596    STDMETHOD(Unmount)();

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

    r19134 r19239  
    4040    BEGIN_COM_MAP(InternalFramebuffer)
    4141        COM_INTERFACE_ENTRY(IFramebuffer)
     42        COM_INTERFACE_ENTRY(IDispatch)
    4243    END_COM_MAP()
    4344

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

    r19134 r19239  
    4545        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    4646        COM_INTERFACE_ENTRY(IGuest)
     47        COM_INTERFACE_ENTRY(IDispatch)
    4748    END_COM_MAP()
    4849

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

    r19134 r19239  
    4545        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    4646        COM_INTERFACE_ENTRY(IGuestOSType)
     47        COM_INTERFACE_ENTRY(IDispatch)
    4748    END_COM_MAP()
    4849

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

    r19134 r19239  
    7474        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    7575        COM_INTERFACE_ENTRY(IHardDiskAttachment)
     76        COM_INTERFACE_ENTRY(IDispatch)
    7677    END_COM_MAP()
    7778

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

    r19134 r19239  
    8282        COM_INTERFACE_ENTRY (ISupportErrorInfo)
    8383        COM_INTERFACE_ENTRY (IHardDiskFormat)
     84        COM_INTERFACE_ENTRY (IDispatch)
    8485    END_COM_MAP()
    8586

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

    r19134 r19239  
    6565
    6666    BEGIN_COM_MAP (HardDisk)
    67         COM_INTERFACE_ENTRY (ISupportErrorInfo)
     67        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
    6868        COM_INTERFACE_ENTRY2 (IMedium, MediumBase)
    69         COM_INTERFACE_ENTRY (IHardDisk)
     69        COM_INTERFACE_ENTRY  (IHardDisk)
     70        COM_INTERFACE_ENTRY2 (IDispatch, IHardDisk)
     71        COM_INTERFACE_ENTRY2 (IDispatch, MediumBase)
    7072    END_COM_MAP()
    7173
    … …  
    124126                                  HardDiskVariant_T aVariant,
    125127                                  IProgress **aProgress);
    126     STDMETHOD(MergeTo) (IN_GUID aTargetId, IProgress **aProgress);
     128    STDMETHOD(MergeTo) (IN_BSTR aTargetId, IProgress **aProgress);
    127129    STDMETHOD(CloneTo) (IHardDisk *aTarget, HardDiskVariant_T aVariant,
    128130                        IHardDisk *aParent, IProgress **aProgress);

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

    r19134 r19239  
    4242        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    4343        COM_INTERFACE_ENTRY(IHostDVDDrive)
     44        COM_INTERFACE_ENTRY(IDispatch)
    4445    END_COM_MAP()
    4546

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

    r19134 r19239  
    4242        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    4343        COM_INTERFACE_ENTRY(IHostFloppyDrive)
     44        COM_INTERFACE_ENTRY(IDispatch)
    4445    END_COM_MAP()
    4546

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

    r19134 r19239  
    6565        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    6666        COM_INTERFACE_ENTRY(IHost)
     67        COM_INTERFACE_ENTRY(IDispatch)
    6768    END_COM_MAP()
    6869
    … …  
    9697    STDMETHOD(CreateHostOnlyNetworkInterface) (IHostNetworkInterface **aHostNetworkInterface,
    9798                                           IProgress **aProgress);
    98     STDMETHOD(RemoveHostOnlyNetworkInterface) (IN_GUID aId,
     99    STDMETHOD(RemoveHostOnlyNetworkInterface) (IN_BSTR aId,
    99100                                           IHostNetworkInterface **aHostNetworkInterface,
    100101                                           IProgress **aProgress);
    … …  
    106107    STDMETHOD(FindHostFloppyDrive) (IN_BSTR aName, IHostFloppyDrive **aDrive);
    107108    STDMETHOD(FindHostNetworkInterfaceByName) (IN_BSTR aName, IHostNetworkInterface **networkInterface);
    108     STDMETHOD(FindHostNetworkInterfaceById) (IN_GUID id, IHostNetworkInterface **networkInterface);
     109    STDMETHOD(FindHostNetworkInterfaceById) (IN_BSTR id, IHostNetworkInterface **networkInterface);
    109110    STDMETHOD(FindHostNetworkInterfacesOfType) (HostNetworkInterfaceType_T type, ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces));
    110111    STDMETHOD(FindUSBDeviceByAddress) (IN_BSTR aAddress, IHostUSBDevice **aDevice);
    111     STDMETHOD(FindUSBDeviceById) (IN_GUID aId, IHostUSBDevice **aDevice);
     112    STDMETHOD(FindUSBDeviceById) (IN_BSTR aId, IHostUSBDevice **aDevice);
    112113
    113114    // public methods only for internal purposes

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

    r19134 r19239  
    5151        COM_INTERFACE_ENTRY (ISupportErrorInfo)
    5252        COM_INTERFACE_ENTRY (IHostNetworkInterface)
     53        COM_INTERFACE_ENTRY (IDispatch)
    5354    END_COM_MAP()
    5455
    … …  
    6970    // IHostNetworkInterface properties
    7071    STDMETHOD(COMGETTER(Name)) (BSTR *aInterfaceName);
    71     STDMETHOD(COMGETTER(Id)) (OUT_GUID aGuid);
     72    STDMETHOD(COMGETTER(Id)) (BSTR *aGuid);
    7273    STDMETHOD(COMGETTER(DhcpEnabled)) (BOOL *aDhcpEnabled);
    7374    STDMETHOD(COMGETTER(IPAddress)) (BSTR *aIPAddress);

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

    r19134 r19239  
    6565        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    6666        COM_INTERFACE_ENTRY(IKeyboard)
     67        COM_INTERFACE_ENTRY(IDispatch)
    6768    END_COM_MAP()
    6869

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

    r19134 r19239  
    4646        COM_INTERFACE_ENTRY (ISupportErrorInfo)
    4747        COM_INTERFACE_ENTRY (IMachineDebugger)
     48        COM_INTERFACE_ENTRY (IDispatch)
    4849    END_COM_MAP()
    4950

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

    r19236 r19239  
    456456        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    457457        COM_INTERFACE_ENTRY(IMachine)
     458        COM_INTERFACE_ENTRY(IDispatch)
    458459    END_COM_MAP()
    459460
    … …  
    482483    STDMETHOD(COMGETTER(Description))(BSTR *aDescription);
    483484    STDMETHOD(COMSETTER(Description))(IN_BSTR aDescription);
    484     STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
     485    STDMETHOD(COMGETTER(Id))(BSTR *aId);
    485486    STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
    486487    STDMETHOD(COMSETTER(OSTypeId)) (IN_BSTR aOSTypeId);
    … …  
    541542    STDMETHOD(SetBootOrder)(ULONG aPosition, DeviceType_T aDevice);
    542543    STDMETHOD(GetBootOrder)(ULONG aPosition, DeviceType_T *aDevice);
    543     STDMETHOD(AttachHardDisk)(IN_GUID aId, IN_BSTR aControllerName,
     544    STDMETHOD(AttachHardDisk)(IN_BSTR aId, IN_BSTR aControllerName,
    544545                              LONG aControllerPort, LONG aDevice);
    545546    STDMETHOD(GetHardDisk)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice,
    … …  
    557558    STDMETHOD(DeleteSettings)();
    558559    STDMETHOD(Export)(IAppliance *aAppliance, IVirtualSystemDescription **aDescription);
    559     STDMETHOD(GetSnapshot) (IN_GUID aId, ISnapshot **aSnapshot);
     560    STDMETHOD(GetSnapshot) (IN_BSTR aId, ISnapshot **aSnapshot);
    560561    STDMETHOD(FindSnapshot) (IN_BSTR aName, ISnapshot **aSnapshot);
    561     STDMETHOD(SetCurrentSnapshot) (IN_GUID aId);
     562    STDMETHOD(SetCurrentSnapshot) (IN_BSTR aId);
    562563    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
    563564    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
    … …  
    906907    STDMETHOD(GetIPCId)(BSTR *id);
    907908    STDMETHOD(RunUSBDeviceFilters) (IUSBDevice *aUSBDevice, BOOL *aMatched, ULONG *aMaskedIfs);
    908     STDMETHOD(CaptureUSBDevice) (IN_GUID aId);
    909     STDMETHOD(DetachUSBDevice) (IN_GUID aId, BOOL aDone);
     909    STDMETHOD(CaptureUSBDevice) (IN_BSTR aId);
     910    STDMETHOD(DetachUSBDevice) (IN_BSTR aId, BOOL aDone);
    910911    STDMETHOD(AutoCaptureUSBDevices)();
    911912    STDMETHOD(DetachAllUSBDevices)(BOOL aDone);
    … …  
    919920                                    IProgress **aServerProgress);
    920921    STDMETHOD(EndTakingSnapshot) (BOOL aSuccess);
    921     STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, IN_GUID aId,
     922    STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, IN_BSTR aId,
    922923                               MachineState_T *aMachineState, IProgress **aProgress);
    923924    STDMETHOD(DiscardCurrentState) (
    … …  
    948949                               IVirtualBoxErrorInfo *aError,
    949950                               ULONG aMaskedIfs);
    950     HRESULT onUSBDeviceDetach (IN_GUID aId,
     951    HRESULT onUSBDeviceDetach (IN_BSTR aId,
    951952                               IVirtualBoxErrorInfo *aError);
    952953    HRESULT onSharedFolderChange();

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

    r19134 r19239  
    9292
    9393    // IMedium properties
    94     STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     94    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
    9595    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
    9696    STDMETHOD(COMSETTER(Description)) (IN_BSTR aDescription);
    … …  
    101101    STDMETHOD(COMGETTER(Size)) (ULONG64 *aSize);
    102102    STDMETHOD(COMGETTER(LastAccessError)) (BSTR *aLastAccessError);
    103     STDMETHOD(COMGETTER(MachineIds)) (ComSafeGUIDArrayOut (aMachineIds));
     103    STDMETHOD(COMGETTER(MachineIds)) (ComSafeArrayOut (BSTR, aMachineIds));
    104104
    105105    // IMedium methods
    106     STDMETHOD(GetSnapshotIds) (IN_GUID aMachineId,
    107                                ComSafeGUIDArrayOut (aSnapshotIds));
     106    STDMETHOD(GetSnapshotIds) (IN_BSTR aMachineId,
     107                               ComSafeArrayOut (BSTR, aSnapshotIds));
    108108    STDMETHOD(LockRead) (MediaState_T *aState);
    109109    STDMETHOD(UnlockRead) (MediaState_T *aState);
    … …  
    254254
    255255    BEGIN_COM_MAP (DVDImage)
    256         COM_INTERFACE_ENTRY (ISupportErrorInfo)
     256        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
    257257        COM_INTERFACE_ENTRY2 (IMedium, ImageMediumBase)
    258         COM_INTERFACE_ENTRY (IDVDImage)
     258        COM_INTERFACE_ENTRY  (IDVDImage)
     259        COM_INTERFACE_ENTRY2 (IDispatch, IDVDImage)
    259260    END_COM_MAP()
    260261
    … …  
    307308
    308309    BEGIN_COM_MAP (FloppyImage)
    309         COM_INTERFACE_ENTRY (ISupportErrorInfo)
     310        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
    310311        COM_INTERFACE_ENTRY2 (IMedium, ImageMediumBase)
    311         COM_INTERFACE_ENTRY (IFloppyImage)
     312        COM_INTERFACE_ENTRY  (IFloppyImage)
     313        COM_INTERFACE_ENTRY2 (IDispatch, IFloppyImage)
    312314    END_COM_MAP()
    313315

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

    r19134 r19239  
    6464
    6565    BEGIN_COM_MAP(Mouse)
    66         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    67         COM_INTERFACE_ENTRY(IMouse)
     66        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     67        COM_INTERFACE_ENTRY  (IMouse)
     68        COM_INTERFACE_ENTRY2 (IDispatch, IMouse)
    6869    END_COM_MAP()
    6970

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

    r19134 r19239  
    8383
    8484    BEGIN_COM_MAP(NetworkAdapter)
    85         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    86         COM_INTERFACE_ENTRY(INetworkAdapter)
     85        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     86        COM_INTERFACE_ENTRY  (INetworkAdapter)
     87        COM_INTERFACE_ENTRY2 (IDispatch, INetworkAdapter)
    8788    END_COM_MAP()
    8889

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

    r19134 r19239  
    6969
    7070    BEGIN_COM_MAP(ParallelPort)
    71         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    72         COM_INTERFACE_ENTRY(IParallelPort)
     71        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     72        COM_INTERFACE_ENTRY  (IParallelPort)
     73        COM_INTERFACE_ENTRY2 (IDispatch, IParallelPort)
    7374    END_COM_MAP()
    7475

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

    r19134 r19239  
    6464    BEGIN_COM_MAP (PerformanceMetric)
    6565        COM_INTERFACE_ENTRY (IPerformanceMetric)
     66        COM_INTERFACE_ENTRY (IDispatch)
    6667    END_COM_MAP()
    6768
    … …  
    136137        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    137138        COM_INTERFACE_ENTRY(IPerformanceCollector)
     139        COM_INTERFACE_ENTRY(IDispatch)
    138140    END_COM_MAP()
    139141

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

    r19134 r19239  
    6666
    6767    // IProgress properties
    68     STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     68    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
    6969    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
    7070    STDMETHOD(COMGETTER(Initiator)) (IUnknown **aInitiator);
    … …  
    146146
    147147    BEGIN_COM_MAP (Progress)
    148         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    149         COM_INTERFACE_ENTRY (IProgress)
     148        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     149        COM_INTERFACE_ENTRY  (IProgress)
     150        COM_INTERFACE_ENTRY2 (IDispatch, IProgress)
    150151    END_COM_MAP()
    151152
    … …  
    317318
    318319    BEGIN_COM_MAP (CombinedProgress)
    319         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    320         COM_INTERFACE_ENTRY (IProgress)
     320        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     321        COM_INTERFACE_ENTRY  (IProgress)
     322        COM_INTERFACE_ENTRY2 (IDispatch, IProgress)
    321323    END_COM_MAP()
    322324

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

    r19134 r19239  
    4646
    4747    BEGIN_COM_MAP (RemoteUSBDevice)
    48         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    49         COM_INTERFACE_ENTRY (IHostUSBDevice)
    50         COM_INTERFACE_ENTRY (IUSBDevice)
     48        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     49        COM_INTERFACE_ENTRY  (IHostUSBDevice)
     50        COM_INTERFACE_ENTRY  (IUSBDevice)
     51        COM_INTERFACE_ENTRY2 (IDispatch, IUSBDevice)
    5152    END_COM_MAP()
    5253
    … …  
    6364
    6465    // IUSBDevice properties
    65     STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     66    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
    6667    STDMETHOD(COMGETTER(VendorId)) (USHORT *aVendorId);
    6768    STDMETHOD(COMGETTER(ProductId)) (USHORT *aProductId);

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

    r19134 r19239  
    7676
    7777    BEGIN_COM_MAP(SerialPort)
    78         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    79         COM_INTERFACE_ENTRY(ISerialPort)
     78        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     79        COM_INTERFACE_ENTRY  (ISerialPort)
     80        COM_INTERFACE_ENTRY2 (IDispatch, ISerialPort)
    8081    END_COM_MAP()
    8182

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

    r19134 r19239  
    4646    public VirtualBoxSupportTranslation <Session>,
    4747#ifdef RT_OS_WINDOWS
    48     public IDispatchImpl<ISession, &IID_ISession, &LIBID_VirtualBox,
    49                          kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>,
    50     public IDispatchImpl<IInternalSessionControl, &IID_IInternalSessionControl, &LIBID_VirtualBox,
    51                          kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>,   
     48    VBOX_SCRIPTABLE_IMPL(ISession),
     49    VBOX_SCRIPTABLE_IMPL(IInternalSessionControl),
    5250    public CComCoClass<Session, &CLSID_Session>
    5351#else
    … …  
    6664
    6765    BEGIN_COM_MAP(Session)
    68         //COM_INTERFACE_ENTRY(IDispatch)
     66        COM_INTERFACE_ENTRY2(IDispatch, ISession)
     67        COM_INTERFACE_ENTRY2(IDispatch, IInternalSessionControl)       
    6968        COM_INTERFACE_ENTRY(IInternalSessionControl)
    7069        COM_INTERFACE_ENTRY(ISupportErrorInfo)
    … …  
    107106    STDMETHOD(OnSharedFolderChange) (BOOL aGlobal);
    108107    STDMETHOD(OnUSBDeviceAttach) (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
    109     STDMETHOD(OnUSBDeviceDetach) (IN_GUID aId, IVirtualBoxErrorInfo *aError);
     108    STDMETHOD(OnUSBDeviceDetach) (IN_BSTR aId, IVirtualBoxErrorInfo *aError);
    110109    STDMETHOD(OnShowWindow) (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);
    111110    STDMETHOD(AccessGuestProperty) (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,

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

    r19134 r19239  
    5555
    5656    BEGIN_COM_MAP(SharedFolder)
    57         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    58         COM_INTERFACE_ENTRY(ISharedFolder)
     57        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     58        COM_INTERFACE_ENTRY  (ISharedFolder)
     59        COM_INTERFACE_ENTRY2 (IDispatch, ISharedFolder)
    5960    END_COM_MAP()
    6061

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

    r19134 r19239  
    5959
    6060    BEGIN_COM_MAP(Snapshot)
    61         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    62         COM_INTERFACE_ENTRY(ISnapshot)
     61        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     62        COM_INTERFACE_ENTRY  (ISnapshot)
     63        COM_INTERFACE_ENTRY2 (IDispatch, ISnapshot)
    6364    END_COM_MAP()
    6465
    … …  
    7778
    7879    // ISnapshot properties
    79     STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     80    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
    8081    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
    8182    STDMETHOD(COMSETTER(Name)) (IN_BSTR aName);

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

    r19134 r19239  
    9090
    9191    BEGIN_COM_MAP(StorageController)
    92         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    93         COM_INTERFACE_ENTRY (IStorageController)
     92        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     93        COM_INTERFACE_ENTRY  (IStorageController)
     94        COM_INTERFACE_ENTRY2 (IDispatch, IStorageController)
    9495    END_COM_MAP()
    9596

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

    r19134 r19239  
    4949
    5050    BEGIN_COM_MAP(SystemProperties)
    51         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    52         COM_INTERFACE_ENTRY(ISystemProperties)
     51        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     52        COM_INTERFACE_ENTRY  (ISystemProperties)
     53        COM_INTERFACE_ENTRY2 (IDispatch, ISystemProperties)
    5354    END_COM_MAP()
    5455

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

    r19134 r19239  
    7676
    7777    BEGIN_COM_MAP(USBController)
    78         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    79         COM_INTERFACE_ENTRY (IUSBController)
     78        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     79        COM_INTERFACE_ENTRY  (IUSBController)
     80        COM_INTERFACE_ENTRY2 (IDispatch, IUSBController)
    8081    END_COM_MAP()
    8182

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

    r19134 r19239  
    4747
    4848    BEGIN_COM_MAP(OUSBDevice)
    49         COM_INTERFACE_ENTRY (ISupportErrorInfo)
    50         COM_INTERFACE_ENTRY (IUSBDevice)
     49        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     50        COM_INTERFACE_ENTRY  (IUSBDevice)
     51        COM_INTERFACE_ENTRY2 (IDispatch, IUSBDevice)
    5152    END_COM_MAP()
    5253
    … …  
    6364
    6465    // IUSBDevice properties
    65     STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
     66    STDMETHOD(COMGETTER(Id))(BSTR *aId);
    6667    STDMETHOD(COMGETTER(VendorId))(USHORT *aVendorId);
    6768    STDMETHOD(COMGETTER(ProductId))(USHORT *aProductId);

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

    r19134 r19239  
    6969
    7070    BEGIN_COM_MAP(VRDPServer)
    71         COM_INTERFACE_ENTRY(ISupportErrorInfo)
    72         COM_INTERFACE_ENTRY(IVRDPServer)
     71        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
     72        COM_INTERFACE_ENTRY  (IVRDPServer)
     73        COM_INTERFACE_ENTRY2 (IDispatch, IVRDPServer)
    7374    END_COM_MAP()
    7475

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

    r19236 r19239  
    139139
    140140    STDMETHOD(CreateMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aBaseFolder,
    141                               IN_GUID aId, IMachine **aMachine);
     141                              IN_BSTR aId, IMachine **aMachine);
    142142    STDMETHOD(CreateLegacyMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aSettingsFile,
    143                                     IN_GUID aId, IMachine **aMachine);
     143                                    IN_BSTR aId, IMachine **aMachine);
    144144    STDMETHOD(OpenMachine) (IN_BSTR aSettingsFile, IMachine **aMachine);
    145145    STDMETHOD(RegisterMachine) (IMachine *aMachine);
    146     STDMETHOD(GetMachine) (IN_GUID aId, IMachine **aMachine);
     146    STDMETHOD(GetMachine) (IN_BSTR aId, IMachine **aMachine);
    147147    STDMETHOD(FindMachine) (IN_BSTR aName, IMachine **aMachine);
    148     STDMETHOD(UnregisterMachine) (IN_GUID aId, IMachine **aMachine);
     148    STDMETHOD(UnregisterMachine) (IN_BSTR aId, IMachine **aMachine);
    149149    STDMETHOD(CreateAppliance) (IAppliance **anAppliance);
    150150
    … …  
    152152                               IHardDisk **aHardDisk);
    153153    STDMETHOD(OpenHardDisk) (IN_BSTR aLocation, AccessMode_T accessMode, IHardDisk **aHardDisk);
    154     STDMETHOD(GetHardDisk) (IN_GUID aId, IHardDisk **aHardDisk);
     154    STDMETHOD(GetHardDisk) (IN_BSTR aId, IHardDisk **aHardDisk);
    155155    STDMETHOD(FindHardDisk) (IN_BSTR aLocation, IHardDisk **aHardDisk);
    156156
    157     STDMETHOD(OpenDVDImage) (IN_BSTR aLocation, IN_GUID aId,
     157    STDMETHOD(OpenDVDImage) (IN_BSTR aLocation, IN_BSTR aId,
    158158                             IDVDImage **aDVDImage);
    159     STDMETHOD(GetDVDImage) (IN_GUID aId, IDVDImage **aDVDImage);
     159    STDMETHOD(GetDVDImage) (IN_BSTR aId, IDVDImage **aDVDImage);
    160160    STDMETHOD(FindDVDImage) (IN_BSTR aLocation, IDVDImage **aDVDImage);
    161161
    162     STDMETHOD(OpenFloppyImage) (IN_BSTR aLocation, IN_GUID aId,
     162    STDMETHOD(OpenFloppyImage) (IN_BSTR aLocation, IN_BSTR aId,
    163163                                IFloppyImage **aFloppyImage);
    164     STDMETHOD(GetFloppyImage) (IN_GUID aId, IFloppyImage **aFloppyImage);
     164    STDMETHOD(GetFloppyImage) (IN_BSTR aId, IFloppyImage **aFloppyImage);
    165165    STDMETHOD(FindFloppyImage) (IN_BSTR aLocation, IFloppyImage **aFloppyImage);
    166166
    … …  
    171171    STDMETHOD(GetExtraData) (IN_BSTR aKey, BSTR *aValue);
    172172    STDMETHOD(SetExtraData) (IN_BSTR aKey, IN_BSTR aValue);
    173     STDMETHOD(OpenSession) (ISession *aSession, IN_GUID aMachineId);
    174     STDMETHOD(OpenRemoteSession) (ISession *aSession, IN_GUID aMachineId,
     173    STDMETHOD(OpenSession) (ISession *aSession, IN_BSTR aMachineId);
     174    STDMETHOD(OpenRemoteSession) (ISession *aSession, IN_BSTR aMachineId,
    175175                                  IN_BSTR aType, IN_BSTR aEnvironment,
    176176                                  IProgress **aProgress);
    177     STDMETHOD(OpenExistingSession) (ISession *aSession, IN_GUID aMachineId);
     177    STDMETHOD(OpenExistingSession) (ISession *aSession, IN_BSTR aMachineId);
    178178
    179179    STDMETHOD(RegisterCallback) (IVirtualBoxCallback *aCallback);
Note: See TracChangeset for help on using the changeset viewer.

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