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

Timestamp:

Dec 5, 2008 5:20:00 PM (16 years ago)

Author:

vboxsync

Message:

Main: Cleaned up the long standing const BSTR = const (OLECHAR *) on WIn32 vs (const PRunichar) * on XPCOM clash. Cleaned up BSTR/GUID macros (IN_BSTR replaces INPTR BSTR, IN_GUID replaces INPTR GUIDPARAM, OUT_GUID replaces GUIDPARAMOUT).

Location:

trunk/src/VBox/Main/include

Files:

• BIOSSettingsImpl.h (modified) (1 diff)
• ConsoleImpl.h (modified) (5 diffs)
• DVDDriveImpl.h (modified) (1 diff)
• DisplayImpl.h (modified) (1 diff)
• FloppyDriveImpl.h (modified) (1 diff)
• GuestImpl.h (modified) (1 diff)
• HardDisk2Impl.h (modified) (3 diffs)
• HostDVDDriveImpl.h (modified) (2 diffs)
• HostFloppyDriveImpl.h (modified) (2 diffs)
• HostImpl.h (modified) (1 diff)
• HostNetworkInterfaceImpl.h (modified) (3 diffs)
• MachineDebuggerImpl.h (modified) (1 diff)
• MachineImpl.h (modified) (14 diffs)
• Matching.h (modified) (2 diffs)
• MediumImpl.h (modified) (6 diffs)
• NetworkAdapterImpl.h (modified) (2 diffs)
• ParallelPortImpl.h (modified) (2 diffs)
• Performance.h (modified) (2 diffs)
• PerformanceImpl.h (modified) (1 diff)
• ProgressImpl.h (modified) (8 diffs)
• RemoteUSBDeviceImpl.h (modified) (3 diffs)
• SerialPortImpl.h (modified) (2 diffs)
• SessionImpl.h (modified) (1 diff)
• SharedFolderImpl.h (modified) (3 diffs)
• SnapshotImpl.h (modified) (3 diffs)
• SystemPropertiesImpl.h (modified) (3 diffs)
• USBControllerImpl.h (modified) (1 diff)
• USBDeviceImpl.h (modified) (3 diffs)
• VRDPServerImpl.h (modified) (1 diff)
• VirtualBoxErrorInfoImpl.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (5 diffs)

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

@@ -107 +107 @@
     STDMETHOD(COMSETTER(LogoDisplayTime))(ULONG displayTime);
     STDMETHOD(COMGETTER(LogoImagePath))(BSTR *imagePath);
-    STDMETHOD(COMSETTER(LogoImagePath))(INPTR BSTR imagePath);
+    STDMETHOD(COMSETTER(LogoImagePath))(IN_BSTR imagePath);
     STDMETHOD(COMGETTER(BootMenuMode))(BIOSBootMenuMode_T *bootMenuMode);
     STDMETHOD(COMSETTER(BootMenuMode))(BIOSBootMenuMode_T bootMenuMode);

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

@@ -141 +141 @@
     STDMETHOD(GetGuestEnteredACPIMode)(BOOL *aEntered);
     STDMETHOD(SaveState) (IProgress **aProgress);
-    STDMETHOD(AdoptSavedState) (INPTR BSTR aSavedStateFile);
+    STDMETHOD(AdoptSavedState) (IN_BSTR aSavedStateFile);
     STDMETHOD(DiscardSavedState)();
     STDMETHOD(GetDeviceActivity) (DeviceType_T aDeviceType,
                                  DeviceActivity_T *aDeviceActivity);
-    STDMETHOD(AttachUSBDevice) (INPTR GUIDPARAM aId);
-    STDMETHOD(DetachUSBDevice) (INPTR GUIDPARAM aId, IUSBDevice **aDevice);
-    STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
-    STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
-    STDMETHOD(TakeSnapshot) (INPTR BSTR aName, INPTR BSTR aDescription,
+    STDMETHOD(AttachUSBDevice) (IN_GUID aId);
+    STDMETHOD(DetachUSBDevice) (IN_GUID aId, IUSBDevice **aDevice);
+    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
+    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
+    STDMETHOD(TakeSnapshot) (IN_BSTR aName, IN_BSTR aDescription,
                              IProgress **aProgress);
-    STDMETHOD(DiscardSnapshot) (INPTR GUIDPARAM aId, IProgress **aProgress);
+    STDMETHOD(DiscardSnapshot) (IN_GUID aId, IProgress **aProgress);
     STDMETHOD(DiscardCurrentState) (IProgress **aProgress);
     STDMETHOD(DiscardCurrentSnapshotAndState) (IProgress **aProgress);
@@ -189 +189 @@
     HRESULT onSharedFolderChange (BOOL aGlobal);
     HRESULT onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
-    HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
-    HRESULT getGuestProperty (INPTR BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
-    HRESULT setGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue, INPTR BSTR aFlags);
-    HRESULT enumerateGuestProperties (INPTR BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
+    HRESULT onUSBDeviceDetach (IN_GUID aId, IVirtualBoxErrorInfo *aError);
+    HRESULT getGuestProperty (IN_BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
+    HRESULT setGuestProperty (IN_BSTR aKey, IN_BSTR aValue, IN_BSTR aFlags);
+    HRESULT enumerateGuestProperties (IN_BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
     VMMDev *getVMMDev() { return mVMMDev; }
     AudioSniffer *getAudioSniffer () { return mAudioSniffer; }
@@ -218 +218 @@
     void onUSBDeviceStateChange (IUSBDevice *aDevice, bool aAttached,
                                  IVirtualBoxErrorInfo *aError);
-    void onRuntimeError (BOOL aFatal, INPTR BSTR aErrorID, INPTR BSTR aMessage);
+    void onRuntimeError (BOOL aFatal, IN_BSTR aErrorID, IN_BSTR aMessage);
     HRESULT onShowWindow (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);
 
@@ -421 +421 @@
     }
 
-    HRESULT findSharedFolder (const BSTR aName,
+    HRESULT findSharedFolder (CBSTR aName,
                               ComObjPtr <SharedFolder> &aSharedFolder,
                               bool aSetError = false);
 
     HRESULT fetchSharedFolders (BOOL aGlobal);
-    bool findOtherSharedFolder (INPTR BSTR aName,
+    bool findOtherSharedFolder (IN_BSTR aName,
                                 SharedFolderDataMap::const_iterator &aIt);
 
-    HRESULT createSharedFolder (INPTR BSTR aName, SharedFolderData aData);
-    HRESULT removeSharedFolder (INPTR BSTR aName);
+    HRESULT createSharedFolder (CBSTR aName, SharedFolderData aData);
+    HRESULT removeSharedFolder (CBSTR aName);
 
     static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
@@ -494 +494 @@
     static DECLCALLBACK(int)    doGuestPropNotification (void *pvExtension, uint32_t,
                                                          void *pvParms, uint32_t cbParms);
-    HRESULT doEnumerateGuestProperties (INPTR BSTR aPatterns,
+    HRESULT doEnumerateGuestProperties (CBSTR aPatterns,
                                         ComSafeArrayOut(BSTR, aNames),
                                         ComSafeArrayOut(BSTR, aValues),

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

@@ -91 +91 @@
 
     // IDVDDrive methods
-    STDMETHOD(MountImage) (INPTR GUIDPARAM aImageId);
+    STDMETHOD(MountImage) (IN_GUID aImageId);
     STDMETHOD(CaptureHostDrive) (IHostDVDDrive *aHostDVDDrive);
     STDMETHOD(Unmount)();

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

@@ -191 +191 @@
     }
 
-    STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
+    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
     {
         return S_OK;

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

@@ -91 +91 @@
 
     // IFloppyDrive methods
-    STDMETHOD(MountImage) (INPTR GUIDPARAM aImageId);
+    STDMETHOD(MountImage) (IN_GUID aImageId);
     STDMETHOD(CaptureHostDrive) (IHostFloppyDrive *aHostFloppyDrive);
     STDMETHOD(Unmount)();

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

@@ -70 +70 @@
 
     // IGuest methods
-    STDMETHOD(SetCredentials)(INPTR BSTR aUserName, INPTR BSTR aPassword,
-                              INPTR BSTR aDomain, BOOL aAllowInteractiveLogon);
+    STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
+                              IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
     STDMETHOD(GetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal);
 

trunk/src/VBox/Main/include/HardDisk2Impl.h

@@ -77 +77 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (VirtualBox *aVirtualBox, const BSTR aFormat,
-                  const BSTR aLocation);
+    HRESULT init (VirtualBox *aVirtualBox, CBSTR aFormat,
+                  CBSTR aLocation);
     HRESULT init (VirtualBox *aVirtualBox,
-                  const BSTR aLocation);
+                  CBSTR aLocation);
     HRESULT init (VirtualBox *aVirtualBox, HardDisk2 *aParent,
                   const settings::Key &aNode);
@@ -99 +99 @@
 
     // IHardDisk2 methods
-    STDMETHOD(GetProperty) (INPTR BSTR aName, BSTR *aValue);
-    STDMETHOD(SetProperty) (INPTR BSTR aName, INPTR BSTR aValue);
-    STDMETHOD(GetProperties) (INPTR BSTR aNames,
+    STDMETHOD(GetProperty) (IN_BSTR aName, BSTR *aValue);
+    STDMETHOD(SetProperty) (IN_BSTR aName, IN_BSTR aValue);
+    STDMETHOD(GetProperties) (IN_BSTR aNames,
                               ComSafeArrayOut (BSTR, aReturnNames),
                               ComSafeArrayOut (BSTR, aReturnValues));
-    STDMETHOD(SetProperties) (ComSafeArrayIn (INPTR BSTR, aNames),
-                              ComSafeArrayIn (INPTR BSTR, aValues));
+    STDMETHOD(SetProperties) (ComSafeArrayIn (IN_BSTR, aNames),
+                              ComSafeArrayIn (IN_BSTR, aValues));
     STDMETHOD(CreateDynamicStorage) (ULONG64 aLogicalSize, IProgress **aProgress);
     STDMETHOD(CreateFixedStorage) (ULONG64 aLogicalSize, IProgress **aProgress);
     STDMETHOD(DeleteStorage) (IProgress **aProgress);
     STDMETHOD(CreateDiffStorage) (IHardDisk2 *aTarget, IProgress **aProgress);
-    STDMETHOD(MergeTo) (INPTR GUIDPARAM aTargetId, IProgress **aProgress);
+    STDMETHOD(MergeTo) (IN_GUID aTargetId, IProgress **aProgress);
     STDMETHOD(CloneTo) (IHardDisk2 *aTarget, IProgress **aProgress);
     STDMETHOD(FlattenTo) (IHardDisk2 *aTarget, IProgress **aProgress);
@@ -232 +232 @@
 private:
 
-    HRESULT setLocation (const BSTR aLocation);
-    HRESULT setFormat (const BSTR aFormat);
+    HRESULT setLocation (CBSTR aLocation);
+    HRESULT setFormat (CBSTR aFormat);
 
     HRESULT queryInfo();

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

@@ -53 +53 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL,
-                  INPTR BSTR aDescription = NULL);
+    HRESULT init (IN_BSTR aName, IN_BSTR aUdi = NULL,
+                  IN_BSTR aDescription = NULL);
     void uninit();
 
@@ -85 +85 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostDVDDrive)
 
-    STDMETHOD(FindByName) (INPTR BSTR aName, IHostDVDDrive **aDrive)
+    STDMETHOD(FindByName) (IN_BSTR aName, IHostDVDDrive **aDrive)
     {
         if (!aName)

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

@@ -53 +53 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL,
-                  INPTR BSTR aDescription = NULL);
+    HRESULT init (IN_BSTR aName, IN_BSTR aUdi = NULL,
+                  IN_BSTR aDescription = NULL);
     void uninit();
 
@@ -85 +85 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostFloppyDrive)
 
-    STDMETHOD(FindByName) (INPTR BSTR aName, IHostFloppyDrive **aDrive)
+    STDMETHOD(FindByName) (IN_BSTR aName, IHostFloppyDrive **aDrive)
     {
         if (!aName)

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

@@ -99 +99 @@
     // IHost methods
 #ifdef RT_OS_WINDOWS
-    STDMETHOD(CreateHostNetworkInterface) (INPTR BSTR aName,
+    STDMETHOD(CreateHostNetworkInterface) (IN_BSTR aName,
                                            IHostNetworkInterface **aHostNetworkInterface,
                                            IProgress **aProgress);
-    STDMETHOD(RemoveHostNetworkInterface) (INPTR GUIDPARAM aId,
+    STDMETHOD(RemoveHostNetworkInterface) (IN_GUID aId,
                                            IHostNetworkInterface **aHostNetworkInterface,
                                            IProgress **aProgress);
 #endif
-    STDMETHOD(CreateUSBDeviceFilter) (INPTR BSTR aName, IHostUSBDeviceFilter **aFilter);
+    STDMETHOD(CreateUSBDeviceFilter) (IN_BSTR aName, IHostUSBDeviceFilter **aFilter);
     STDMETHOD(InsertUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter *aFilter);
     STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);

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

@@ -59 +59 @@
     // IHostNetworkInterface properties
     STDMETHOD(COMGETTER(Name)) (BSTR *aInterfaceName);
-    STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aGuid);
+    STDMETHOD(COMGETTER(Id)) (OUT_GUID aGuid);
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -71 +71 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostNetworkInterface)
 
-    STDMETHOD(FindByName) (INPTR BSTR name, IHostNetworkInterface **networkInterface)
+    STDMETHOD(FindByName) (IN_BSTR name, IHostNetworkInterface **networkInterface)
     {
         if (!name)
@@ -97 +97 @@
     }
 
-    STDMETHOD(FindById) (INPTR GUIDPARAM id, IHostNetworkInterface **networkInterface)
+    STDMETHOD(FindById) (IN_GUID id, IHostNetworkInterface **networkInterface)
     {
         if (Guid(id).isEmpty())

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

@@ -82 +82 @@
 
     // IMachineDebugger methods
-    STDMETHOD(ResetStats (INPTR BSTR aPattern));
-    STDMETHOD(DumpStats (INPTR BSTR aPattern));
-    STDMETHOD(GetStats (INPTR BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats));
+    STDMETHOD(ResetStats (IN_BSTR aPattern));
+    STDMETHOD(DumpStats (IN_BSTR aPattern));
+    STDMETHOD(GetStats (IN_BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats));
 
 

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

@@ -458 +458 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (VirtualBox *aParent, const BSTR aConfigFile,
-                  InitMode aMode, const BSTR aName = NULL,
+    HRESULT init (VirtualBox *aParent, CBSTR aConfigFile,
+                  InitMode aMode, CBSTR aName = NULL,
                   GuestOSType *aOsType = NULL,
                   BOOL aNameSync = TRUE, const Guid *aId = NULL);
@@ -469 +469 @@
     STDMETHOD(COMGETTER(AccessError)) (IVirtualBoxErrorInfo **aAccessError);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMSETTER(Name))(INPTR BSTR aName);
+    STDMETHOD(COMSETTER(Name))(IN_BSTR aName);
     STDMETHOD(COMGETTER(Description))(BSTR *aDescription);
-    STDMETHOD(COMSETTER(Description))(INPTR BSTR aDescription);
-    STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT aId);
+    STDMETHOD(COMSETTER(Description))(IN_BSTR aDescription);
+    STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
     STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
-    STDMETHOD(COMSETTER(OSTypeId)) (INPTR BSTR aOSTypeId);
+    STDMETHOD(COMSETTER(OSTypeId)) (IN_BSTR aOSTypeId);
     STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);
@@ -499 +499 @@
     STDMETHOD(COMSETTER(PAEEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(SnapshotFolder))(BSTR *aSavedStateFolder);
-    STDMETHOD(COMSETTER(SnapshotFolder))(INPTR BSTR aSavedStateFolder);
+    STDMETHOD(COMSETTER(SnapshotFolder))(IN_BSTR aSavedStateFolder);
     STDMETHOD(COMGETTER(HardDisk2Attachments))(ComSafeArrayOut (IHardDisk2Attachment *, aAttachments));
     STDMETHOD(COMGETTER(VRDPServer))(IVRDPServer **vrdpServer);
@@ -524 +524 @@
     STDMETHOD(COMSETTER(ClipboardMode)) (ClipboardMode_T aClipboardMode);
     STDMETHOD(COMGETTER(GuestPropertyNotificationPatterns)) (BSTR *aPattern);
-    STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns)) (INPTR BSTR aPattern);
+    STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns)) (IN_BSTR aPattern);
 
     // IMachine methods
     STDMETHOD(SetBootOrder)(ULONG aPosition, DeviceType_T aDevice);
     STDMETHOD(GetBootOrder)(ULONG aPosition, DeviceType_T *aDevice);
-    STDMETHOD(AttachHardDisk2) (INPTR GUIDPARAM aId, StorageBus_T aBus,
+    STDMETHOD(AttachHardDisk2) (IN_GUID aId, StorageBus_T aBus,
                                 LONG aChannel, LONG aDevice);
     STDMETHOD(GetHardDisk2) (StorageBus_T aBus, LONG aChannel, LONG aDevice,
@@ -537 +537 @@
     STDMETHOD(GetParallelPort) (ULONG slot, IParallelPort **port);
     STDMETHOD(GetNetworkAdapter) (ULONG slot, INetworkAdapter **adapter);
-    STDMETHOD(GetNextExtraDataKey)(INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
-    STDMETHOD(GetExtraData)(INPTR BSTR aKey, BSTR *aValue);
-    STDMETHOD(SetExtraData)(INPTR BSTR aKey, INPTR BSTR aValue);
+    STDMETHOD(GetNextExtraDataKey)(IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
+    STDMETHOD(GetExtraData)(IN_BSTR aKey, BSTR *aValue);
+    STDMETHOD(SetExtraData)(IN_BSTR aKey, IN_BSTR aValue);
     STDMETHOD(SaveSettings)();
     STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
     STDMETHOD(DiscardSettings)();
     STDMETHOD(DeleteSettings)();
-    STDMETHOD(GetSnapshot) (INPTR GUIDPARAM aId, ISnapshot **aSnapshot);
-    STDMETHOD(FindSnapshot) (INPTR BSTR aName, ISnapshot **aSnapshot);
-    STDMETHOD(SetCurrentSnapshot) (INPTR GUIDPARAM aId);
-    STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
-    STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
+    STDMETHOD(GetSnapshot) (IN_GUID aId, ISnapshot **aSnapshot);
+    STDMETHOD(FindSnapshot) (IN_BSTR aName, ISnapshot **aSnapshot);
+    STDMETHOD(SetCurrentSnapshot) (IN_GUID aId);
+    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
+    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
     STDMETHOD(CanShowConsoleWindow) (BOOL *aCanShow);
     STDMETHOD(ShowConsoleWindow) (ULONG64 *aWinId);
-    STDMETHOD(GetGuestProperty) (INPTR BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
-    STDMETHOD(GetGuestPropertyValue) (INPTR BSTR aName, BSTR *aValue);
-    STDMETHOD(GetGuestPropertyTimestamp) (INPTR BSTR aName, ULONG64 *aTimestamp);
-    STDMETHOD(SetGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags);
-    STDMETHOD(SetGuestPropertyValue) (INPTR BSTR aName, INPTR BSTR aValue);
-    STDMETHOD(EnumerateGuestProperties) (INPTR BSTR aPattern, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
+    STDMETHOD(GetGuestProperty) (IN_BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
+    STDMETHOD(GetGuestPropertyValue) (IN_BSTR aName, BSTR *aValue);
+    STDMETHOD(GetGuestPropertyTimestamp) (IN_BSTR aName, ULONG64 *aTimestamp);
+    STDMETHOD(SetGuestProperty) (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags);
+    STDMETHOD(SetGuestPropertyValue) (IN_BSTR aName, IN_BSTR aValue);
+    STDMETHOD(EnumerateGuestProperties) (IN_BSTR aPattern, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
 
     // public methods only for internal purposes
@@ -636 +636 @@
     HRESULT openSession (IInternalSessionControl *aControl);
     HRESULT openRemoteSession (IInternalSessionControl *aControl,
-                               INPTR BSTR aType, INPTR BSTR aEnvironment,
+                               IN_BSTR aType, IN_BSTR aEnvironment,
                                Progress *aProgress);
     HRESULT openExistingSession (IInternalSessionControl *aControl);
@@ -682 +682 @@
     HRESULT trySetRegistered (BOOL aRegistered);
 
-    HRESULT getSharedFolder (const BSTR aName,
+    HRESULT getSharedFolder (CBSTR aName,
                              ComObjPtr <SharedFolder> &aSharedFolder,
                              bool aSetError = false)
@@ -713 +713 @@
     virtual HRESULT setMachineState (MachineState_T aMachineState);
 
-    HRESULT findSharedFolder (const BSTR aName,
+    HRESULT findSharedFolder (CBSTR aName,
                               ComObjPtr <SharedFolder> &aSharedFolder,
                               bool aSetError = false);
@@ -730 +730 @@
     HRESULT findSnapshot (const Guid &aId, ComObjPtr <Snapshot> &aSnapshot,
                           bool aSetError = false);
-    HRESULT findSnapshot (const BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
+    HRESULT findSnapshot (IN_BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
                           bool aSetError = false);
 
@@ -875 +875 @@
     STDMETHOD(GetIPCId)(BSTR *id);
     STDMETHOD(RunUSBDeviceFilters) (IUSBDevice *aUSBDevice, BOOL *aMatched, ULONG *aMaskedIfs);
-    STDMETHOD(CaptureUSBDevice) (INPTR GUIDPARAM aId);
-    STDMETHOD(DetachUSBDevice) (INPTR GUIDPARAM aId, BOOL aDone);
+    STDMETHOD(CaptureUSBDevice) (IN_GUID aId);
+    STDMETHOD(DetachUSBDevice) (IN_GUID aId, BOOL aDone);
     STDMETHOD(AutoCaptureUSBDevices)();
     STDMETHOD(DetachAllUSBDevices)(BOOL aDone);
@@ -882 +882 @@
     STDMETHOD(BeginSavingState) (IProgress *aProgress, BSTR *aStateFilePath);
     STDMETHOD(EndSavingState) (BOOL aSuccess);
-    STDMETHOD(AdoptSavedState) (INPTR BSTR aSavedStateFile);
+    STDMETHOD(AdoptSavedState) (IN_BSTR aSavedStateFile);
     STDMETHOD(BeginTakingSnapshot) (IConsole *aInitiator,
-                                    INPTR BSTR aName, INPTR BSTR aDescription,
+                                    IN_BSTR aName, IN_BSTR aDescription,
                                     IProgress *aProgress, BSTR *aStateFilePath,
                                     IProgress **aServerProgress);
     STDMETHOD(EndTakingSnapshot) (BOOL aSuccess);
-    STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, INPTR GUIDPARAM aId,
+    STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, IN_GUID aId,
                                MachineState_T *aMachineState, IProgress **aProgress);
     STDMETHOD(DiscardCurrentState) (
@@ -896 +896 @@
     STDMETHOD(PullGuestProperties) (ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues),
               ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
-    STDMETHOD(PushGuestProperties) (ComSafeArrayIn(INPTR BSTR, aNames), ComSafeArrayIn(INPTR BSTR, aValues),
-              ComSafeArrayIn(ULONG64, aTimestamps), ComSafeArrayIn(INPTR BSTR, aFlags));
-    STDMETHOD(PushGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue,
-                                  ULONG64 aTimestamp, INPTR BSTR aFlags);
+    STDMETHOD(PushGuestProperties) (ComSafeArrayIn(IN_BSTR, aNames), ComSafeArrayIn(IN_BSTR, aValues),
+              ComSafeArrayIn(ULONG64, aTimestamps), ComSafeArrayIn(IN_BSTR, aFlags));
+    STDMETHOD(PushGuestProperty) (IN_BSTR aName, IN_BSTR aValue,
+                                  ULONG64 aTimestamp, IN_BSTR aFlags);
 
     // public methods only for internal purposes
@@ -915 +915 @@
                                IVirtualBoxErrorInfo *aError,
                                ULONG aMaskedIfs);
-    HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId,
+    HRESULT onUSBDeviceDetach (IN_GUID aId,
                                IVirtualBoxErrorInfo *aError);
     HRESULT onSharedFolderChange();
@@ -1028 +1028 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init (SessionMachine *aSessionMachine,
-                  INPTR GUIDPARAM aSnapshotId, INPTR BSTR aStateFilePath);
+                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
     HRESULT init (Machine *aMachine,
                   const settings::Key &aHWNode, const settings::Key &aHDAsNode,
-                  INPTR GUIDPARAM aSnapshotId, INPTR BSTR aStateFilePath);
+                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
     void uninit();
 

trunk/src/VBox/Main/include/Matching.h

@@ -486 +486 @@
         : F (aString), mString (aString) {}
 
-    Matchable (const BSTR aString)
+    Matchable (CBSTR aString)
         : F (Bstr (aString)), mString (aString) {}
 
@@ -500 +500 @@
     }
 
-    Matchable &operator= (const BSTR aString)
+    Matchable &operator= (CBSTR aString)
     {
         F::operator= (Bstr (aString));

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

@@ -92 +92 @@
 
     // IMedium properties
-    STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
+    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
-    STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
+    STDMETHOD(COMSETTER(Description)) (IN_BSTR aDescription);
     STDMETHOD(COMGETTER(State)) (MediaState_T *aState);
     STDMETHOD(COMGETTER(Location)) (BSTR *aLocation);
-    STDMETHOD(COMSETTER(Location)) (INPTR BSTR aLocation);
+    STDMETHOD(COMSETTER(Location)) (IN_BSTR aLocation);
     STDMETHOD(COMGETTER(Name)) (BSTR *aName);
     STDMETHOD(COMGETTER(Size)) (ULONG64 *aSize);
@@ -104 +104 @@
 
     // IMedium methods
-    STDMETHOD(GetSnapshotIds) (INPTR GUIDPARAM aMachineId,
+    STDMETHOD(GetSnapshotIds) (IN_GUID aMachineId,
                                ComSafeGUIDArrayOut (aSnapshotIds));
     STDMETHOD(LockRead) (MediaState_T *aState);
@@ -142 +142 @@
     virtual Utf8Str name();
 
-    virtual HRESULT setLocation (const BSTR aLocation);
+    virtual HRESULT setLocation (CBSTR aLocation);
     virtual HRESULT queryInfo();
 
@@ -222 +222 @@
 
     // protected initializer/uninitializer for internal purposes only
-    HRESULT protectedInit (VirtualBox *aVirtualBox, const BSTR aLocation,
+    HRESULT protectedInit (VirtualBox *aVirtualBox, CBSTR aLocation,
                            const Guid &aId);
     HRESULT protectedInit (VirtualBox *aVirtualBox, const settings::Key &aImageNode);
@@ -265 +265 @@
     // public initializer/uninitializer for internal purposes only
 
-    HRESULT init (VirtualBox *aParent, const BSTR aFilePath,
+    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
                   const Guid &aId)
     {
@@ -318 +318 @@
     // public initializer/uninitializer for internal purposes only
 
-    HRESULT init (VirtualBox *aParent, const BSTR aFilePath,
+    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
                   const Guid &aId)
     {

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

@@ -122 +122 @@
     STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
     STDMETHOD(COMGETTER(MACAddress)) (BSTR *aMACAddress);
-    STDMETHOD(COMSETTER(MACAddress)) (INPTR BSTR aMACAddress);
+    STDMETHOD(COMSETTER(MACAddress)) (IN_BSTR aMACAddress);
     STDMETHOD(COMGETTER(AttachmentType)) (NetworkAttachmentType_T *aAttachmentType);
     STDMETHOD(COMGETTER(HostInterface)) (BSTR *aHostInterface);
-    STDMETHOD(COMSETTER(HostInterface)) (INPTR BSTR aHostInterface);
+    STDMETHOD(COMSETTER(HostInterface)) (IN_BSTR aHostInterface);
 #ifndef RT_OS_WINDOWS /** @todo ifdef VBOX_WITH_UNIXY_TAP_NETWORKING: need to find a way to exclude this in the xidl... */
     STDMETHOD(COMGETTER(TAPFileDescriptor)) (LONG *aTAPFileDescriptor);
     STDMETHOD(COMSETTER(TAPFileDescriptor)) (LONG aTAPFileDescriptor);
     STDMETHOD(COMGETTER(TAPSetupApplication)) (BSTR *aTAPSetupApplication);
-    STDMETHOD(COMSETTER(TAPSetupApplication)) (INPTR BSTR aTAPSetupApplication);
+    STDMETHOD(COMSETTER(TAPSetupApplication)) (IN_BSTR aTAPSetupApplication);
     STDMETHOD(COMGETTER(TAPTerminateApplication)) (BSTR *aTAPTerminateApplication);
-    STDMETHOD(COMSETTER(TAPTerminateApplication)) (INPTR BSTR aTAPTerminateApplication);
+    STDMETHOD(COMSETTER(TAPTerminateApplication)) (IN_BSTR aTAPTerminateApplication);
 #endif
     STDMETHOD(COMGETTER(InternalNetwork)) (BSTR *aInternalNetwork);
-    STDMETHOD(COMSETTER(InternalNetwork)) (INPTR BSTR aInternalNetwork);
+    STDMETHOD(COMSETTER(InternalNetwork)) (IN_BSTR aInternalNetwork);
     STDMETHOD(COMGETTER(NATNetwork)) (BSTR *aNATNetwork);
-    STDMETHOD(COMSETTER(NATNetwork)) (INPTR BSTR aNATNetwork);
+    STDMETHOD(COMSETTER(NATNetwork)) (IN_BSTR aNATNetwork);
     STDMETHOD(COMGETTER(CableConnected)) (BOOL *aConnected);
     STDMETHOD(COMSETTER(CableConnected)) (BOOL aConnected);
@@ -145 +145 @@
     STDMETHOD(COMSETTER(LineSpeed)) (ULONG aSpeed);
     STDMETHOD(COMGETTER(TraceFile)) (BSTR *aTraceFile);
-    STDMETHOD(COMSETTER(TraceFile)) (INPTR BSTR aTraceFile);
+    STDMETHOD(COMSETTER(TraceFile)) (IN_BSTR aTraceFile);
 
     // INetworkAdapter methods

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

@@ -95 +95 @@
     STDMETHOD(COMSETTER(IOBase))  (ULONG      aIOBase);
     STDMETHOD(COMGETTER(Path))    (BSTR      *aPath);
-    STDMETHOD(COMSETTER(Path))    (INPTR BSTR aPath);
+    STDMETHOD(COMSETTER(Path))    (IN_BSTR aPath);
 
     // public methods only for internal purposes
@@ -116 +116 @@
 private:
 
-    HRESULT checkSetPath (const BSTR aPath);
+    HRESULT checkSetPath (CBSTR aPath);
 
     const ComObjPtr <Machine, ComWeakRef> mParent;

trunk/src/VBox/Main/include/Performance.h

@@ -386 +386 @@
     {
     public:
-        Filter(ComSafeArrayIn(INPTR BSTR, metricNames),
+        Filter(ComSafeArrayIn(IN_BSTR, metricNames),
                ComSafeArrayIn(IUnknown * , objects));
         static bool patternMatch(const char *pszPat, const char *pszName,
@@ -392 +392 @@
         bool match(const ComPtr<IUnknown> object, const std::string &name) const;
     private:
-        void init(ComSafeArrayIn(INPTR BSTR, metricNames),
+        void init(ComSafeArrayIn(IN_BSTR, metricNames),
                   ComSafeArrayIn(IUnknown * , objects));
 

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

@@ -143 +143 @@
 
     // IPerformanceCollector methods
-    STDMETHOD(GetMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
+    STDMETHOD(GetMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
                            ComSafeArrayIn (IUnknown *, objects),
                            ComSafeArrayOut (IPerformanceMetric *, outMetrics));
-    STDMETHOD(SetupMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
+    STDMETHOD(SetupMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
                              ComSafeArrayIn (IUnknown *, objects),
                              ULONG aPeriod, ULONG aCount,
                              ComSafeArrayOut (IPerformanceMetric *,
                                               outMetrics));
-    STDMETHOD(EnableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
+    STDMETHOD(EnableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
                               ComSafeArrayIn (IUnknown *, objects),
                               ComSafeArrayOut (IPerformanceMetric *,
                                                outMetrics));
-    STDMETHOD(DisableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
+    STDMETHOD(DisableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
                                ComSafeArrayIn (IUnknown *, objects),
                                ComSafeArrayOut (IPerformanceMetric *,
                                                 outMetrics));
-    STDMETHOD(QueryMetricsData) (ComSafeArrayIn (INPTR BSTR, metricNames),
+    STDMETHOD(QueryMetricsData) (ComSafeArrayIn (IN_BSTR, metricNames),
                                  ComSafeArrayIn (IUnknown *, objects),
                                  ComSafeArrayOut (BSTR, outMetricNames),

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

@@ -60 +60 @@
 #endif
                   IUnknown *aInitiator,
-                  const BSTR aDescription, GUIDPARAMOUT aId = NULL);
+                  CBSTR aDescription, OUT_GUID aId = NULL);
     HRESULT protectedInit (AutoInitSpan &aAutoInitSpan);
     void protectedUninit (AutoUninitSpan &aAutoUninitSpan);
@@ -67 +67 @@
 
     // IProgress properties
-    STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
+    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
     STDMETHOD(COMGETTER(Initiator)) (IUnknown **aInitiator);
@@ -154 +154 @@
 #endif
                   IUnknown *aInitiator,
-                  const BSTR aDescription, BOOL aCancelable,
-                  GUIDPARAMOUT aId = NULL)
+                  CBSTR aDescription, BOOL aCancelable,
+                  OUT_GUID aId = NULL)
     {
         return init (
@@ -169 +169 @@
 #endif
                   IUnknown *aInitiator,
-                  const BSTR aDescription, BOOL aCancelable,
-                  ULONG aOperationCount, const BSTR aOperationDescription,
-                  GUIDPARAMOUT aId = NULL);
+                  CBSTR aDescription, BOOL aCancelable,
+                  ULONG aOperationCount, CBSTR aOperationDescription,
+                  OUT_GUID aId = NULL);
 
     HRESULT init (BOOL aCancelable, ULONG aOperationCount,
-                  const BSTR aOperationDescription);
+                  CBSTR aOperationDescription);
 
     void uninit();
@@ -186 +186 @@
 
     HRESULT notifyProgress (LONG aPercent);
-    HRESULT advanceOperation (const BSTR aOperationDescription);
+    HRESULT advanceOperation (CBSTR aOperationDescription);
 
     HRESULT notifyComplete (HRESULT aResultCode);
@@ -271 +271 @@
 #endif
                   IUnknown *aInitiator,
-                  const BSTR aDescription,
+                  CBSTR aDescription,
                   IProgress *aProgress1, IProgress *aProgress2,
-                  GUIDPARAMOUT aId = NULL);
+                  OUT_GUID aId = NULL);
 
     /**
@@ -292 +292 @@
 #endif
                   IUnknown *aInitiator,
-                  const BSTR aDescription,
+                  CBSTR aDescription,
                   InputIterator aFirstProgress, InputIterator aLastProgress,
-                  GUIDPARAMOUT aId = NULL)
+                  OUT_GUID aId = NULL)
     {
         /* Enclose the state transition NotReady->InInit->Ready */
@@ -322 +322 @@
 #endif
                            IUnknown *aInitiator,
-                           const BSTR aDescription, GUIDPARAMOUT aId);
+                           CBSTR aDescription, OUT_GUID aId);
 
 public:

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

@@ -64 +64 @@
 
     // IUSBDevice properties
-    STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
+    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     STDMETHOD(COMGETTER(VendorId)) (USHORT *aVendorId);
     STDMETHOD(COMGETTER(ProductId)) (USHORT *aProductId);
@@ -140 +140 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <RemoteUSBDevice>, IHostUSBDevice, RemoteUSBDevice)
 
-    STDMETHOD(FindById) (INPTR GUIDPARAM aId, IHostUSBDevice **aDevice)
+    STDMETHOD(FindById) (IN_GUID aId, IHostUSBDevice **aDevice)
     {
         Guid idToFind = aId;
@@ -168 +168 @@
     }
 
-    STDMETHOD(FindByAddress) (INPTR BSTR aAddress, IHostUSBDevice **aDevice)
+    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IHostUSBDevice **aDevice)
     {
         if (!aAddress)

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

@@ -104 +104 @@
     STDMETHOD(COMSETTER(IOBase))   (ULONG      aIOBase);
     STDMETHOD(COMGETTER(Path))     (BSTR      *aPath);
-    STDMETHOD(COMSETTER(Path))     (INPTR BSTR aPath);
+    STDMETHOD(COMSETTER(Path))     (IN_BSTR aPath);
     STDMETHOD(COMGETTER(Server))   (BOOL      *aServer);
     STDMETHOD(COMSETTER(Server))   (BOOL       aServer);
@@ -127 +127 @@
 private:
 
-    HRESULT checkSetPath (const BSTR aPath);
+    HRESULT checkSetPath (CBSTR aPath);
 
     const ComObjPtr <Machine, ComWeakRef> mParent;

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

@@ -104 +104 @@
     STDMETHOD(OnSharedFolderChange) (BOOL aGlobal);
     STDMETHOD(OnUSBDeviceAttach) (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
-    STDMETHOD(OnUSBDeviceDetach) (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
+    STDMETHOD(OnUSBDeviceDetach) (IN_GUID aId, IVirtualBoxErrorInfo *aError);
     STDMETHOD(OnShowWindow) (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);
-    STDMETHOD(AccessGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags,
+    STDMETHOD(AccessGuestProperty) (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
                                     BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags);
-    STDMETHOD(EnumerateGuestProperties) (INPTR BSTR aPatterns,
+    STDMETHOD(EnumerateGuestProperties) (IN_BSTR aPatterns,
                                          ComSafeArrayOut(BSTR, aNames),
                                          ComSafeArrayOut(BSTR, aValues),

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

@@ -67 +67 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *aMachine, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
+    HRESULT init (Machine *aMachine, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
     HRESULT initCopy (Machine *aMachine, SharedFolder *aThat);
-    HRESULT init (Console *aConsole, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
-    HRESULT init (VirtualBox *aVirtualBox, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
+    HRESULT init (Console *aConsole, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
+    HRESULT init (VirtualBox *aVirtualBox, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
     void uninit();
 
@@ -95 +95 @@
 
     HRESULT protectedInit (VirtualBoxBaseWithChildrenNEXT *aParent,
-                           const BSTR aName, const BSTR aHostPath, BOOL aWritable);
+                           CBSTR aName, CBSTR aHostPath, BOOL aWritable);
 
 private:
@@ -111 +111 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (SharedFolder)
 
-    STDMETHOD(FindByName) (INPTR BSTR aName, ISharedFolder **aSharedFolder)
+    STDMETHOD(FindByName) (IN_BSTR aName, ISharedFolder **aSharedFolder)
     {
         if (!aName)

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

@@ -70 +70 @@
 
     // public initializer/uninitializer only for internal purposes
-    HRESULT init (const Guid &aId, INPTR BSTR aName, INPTR BSTR aDescription,
+    HRESULT init (const Guid &aId, IN_BSTR aName, IN_BSTR aDescription,
                   RTTIMESPEC aTimeStamp, SnapshotMachine *aMachine,
                   Snapshot *aParent);
@@ -78 +78 @@
 
     // ISnapshot properties
-    STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
+    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
     STDMETHOD(COMGETTER(Name)) (BSTR *aName);
-    STDMETHOD(COMSETTER(Name)) (INPTR BSTR aName);
+    STDMETHOD(COMSETTER(Name)) (IN_BSTR aName);
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
-    STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
+    STDMETHOD(COMSETTER(Description)) (IN_BSTR aDescription);
     STDMETHOD(COMGETTER(TimeStamp)) (LONG64 *aTimeStamp);
     STDMETHOD(COMGETTER(Online)) (BOOL *aOnline);
@@ -110 +110 @@
 
     ULONG descendantCount();
-    ComObjPtr <Snapshot> findChildOrSelf (INPTR GUIDPARAM aId);
-    ComObjPtr <Snapshot> findChildOrSelf (INPTR BSTR aName);
+    ComObjPtr <Snapshot> findChildOrSelf (IN_GUID aId);
+    ComObjPtr <Snapshot> findChildOrSelf (IN_BSTR aName);
 
     void updateSavedStatePaths (const char *aOldPath, const char *aNewPath);

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

@@ -76 +76 @@
     STDMETHOD(COMGETTER(MaxBootPosition) (ULONG *aMaxBootPosition));
     STDMETHOD(COMGETTER(DefaultMachineFolder)) (BSTR *aDefaultMachineFolder);
-    STDMETHOD(COMSETTER(DefaultMachineFolder)) (INPTR BSTR aDefaultMachineFolder);
+    STDMETHOD(COMSETTER(DefaultMachineFolder)) (IN_BSTR aDefaultMachineFolder);
     STDMETHOD(COMGETTER(DefaultHardDiskFolder)) (BSTR *aDefaultHardDiskFolder);
-    STDMETHOD(COMSETTER(DefaultHardDiskFolder)) (INPTR BSTR aDefaultHardDiskFolder);
+    STDMETHOD(COMSETTER(DefaultHardDiskFolder)) (IN_BSTR aDefaultHardDiskFolder);
     STDMETHOD(COMGETTER(HardDiskFormats)) (ComSafeArrayOut (IHardDiskFormat *, aHardDiskFormats));
     STDMETHOD(COMGETTER(DefaultHardDiskFormat)) (BSTR *aDefaultHardDiskFolder);
-    STDMETHOD(COMSETTER(DefaultHardDiskFormat)) (INPTR BSTR aDefaultHardDiskFolder);
+    STDMETHOD(COMSETTER(DefaultHardDiskFormat)) (IN_BSTR aDefaultHardDiskFolder);
     STDMETHOD(COMGETTER(RemoteDisplayAuthLibrary)) (BSTR *aRemoteDisplayAuthLibrary);
-    STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary)) (INPTR BSTR aRemoteDisplayAuthLibrary);
+    STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary)) (IN_BSTR aRemoteDisplayAuthLibrary);
     STDMETHOD(COMGETTER(WebServiceAuthLibrary)) (BSTR *aWebServiceAuthLibrary);
-    STDMETHOD(COMSETTER(WebServiceAuthLibrary)) (INPTR BSTR aWebServiceAuthLibrary);
+    STDMETHOD(COMSETTER(WebServiceAuthLibrary)) (IN_BSTR aWebServiceAuthLibrary);
     STDMETHOD(COMGETTER(HWVirtExEnabled)) (BOOL *enabled);
     STDMETHOD(COMSETTER(HWVirtExEnabled)) (BOOL enabled);
@@ -96 +96 @@
     HRESULT saveSettings (settings::Key &aGlobal);
 
-    ComObjPtr <HardDiskFormat> hardDiskFormat (const BSTR aFormat);
+    ComObjPtr <HardDiskFormat> hardDiskFormat (CBSTR aFormat);
 
     // public methods for internal purposes only
@@ -120 +120 @@
     typedef std::list <ComObjPtr <HardDiskFormat> > HardDiskFormatList;
 
-    HRESULT setDefaultMachineFolder (const BSTR aPath);
-    HRESULT setDefaultHardDiskFolder (const BSTR aPath);
-    HRESULT setDefaultHardDiskFormat (const BSTR aFormat);
+    HRESULT setDefaultMachineFolder (CBSTR aPath);
+    HRESULT setDefaultHardDiskFolder (CBSTR aPath);
+    HRESULT setDefaultHardDiskFormat (CBSTR aFormat);
 
-    HRESULT setRemoteDisplayAuthLibrary (const BSTR aPath);
-    HRESULT setWebServiceAuthLibrary (const BSTR aPath);
+    HRESULT setRemoteDisplayAuthLibrary (CBSTR aPath);
+    HRESULT setWebServiceAuthLibrary (CBSTR aPath);
 
     const ComObjPtr <VirtualBox, ComWeakRef> mParent;

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

@@ -102 +102 @@
 
     // IUSBController methods
-    STDMETHOD(CreateDeviceFilter) (INPTR BSTR aName, IUSBDeviceFilter **aFilter);
+    STDMETHOD(CreateDeviceFilter) (IN_BSTR aName, IUSBDeviceFilter **aFilter);
     STDMETHOD(InsertDeviceFilter) (ULONG aPosition, IUSBDeviceFilter *aFilter);
     STDMETHOD(RemoveDeviceFilter) (ULONG aPosition, IUSBDeviceFilter **aFilter);

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

@@ -64 +64 @@
 
     // IUSBDevice properties
-    STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT aId);
+    STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
     STDMETHOD(COMGETTER(VendorId))(USHORT *aVendorId);
     STDMETHOD(COMGETTER(ProductId))(USHORT *aProductId);
@@ -123 +123 @@
 COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <OUSBDevice>, IUSBDevice, OUSBDevice)
 
-    STDMETHOD(FindById) (INPTR GUIDPARAM aId, IUSBDevice **aDevice)
+    STDMETHOD(FindById) (IN_GUID aId, IUSBDevice **aDevice)
     {
         Guid idToFind = aId;
@@ -153 +153 @@
     }
 
-    STDMETHOD(FindByAddress) (INPTR BSTR aAddress, IUSBDevice **aDevice)
+    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IUSBDevice **aDevice)
     {
         if (!aAddress)

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

@@ -92 +92 @@
     STDMETHOD(COMSETTER(Port)) (ULONG aPort);
     STDMETHOD(COMGETTER(NetAddress)) (BSTR *aAddress);
-    STDMETHOD(COMSETTER(NetAddress)) (INPTR BSTR aAddress);
+    STDMETHOD(COMSETTER(NetAddress)) (IN_BSTR aAddress);
     STDMETHOD(COMGETTER(AuthType)) (VRDPAuthType_T *aType);
     STDMETHOD(COMSETTER(AuthType)) (VRDPAuthType_T aType);

trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h

@@ -70 +70 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init (HRESULT aResultCode, const GUID &aIID,
-                  const BSTR aComponent, const BSTR aText,
+                  CBSTR aComponent, CBSTR aText,
                   IVirtualBoxErrorInfo *aNext = NULL);
 
     // IVirtualBoxErrorInfo properties
     STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
-    STDMETHOD(COMGETTER(InterfaceID)) (GUIDPARAMOUT aIID);
+    STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
     STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);
     STDMETHOD(COMGETTER(Text)) (BSTR *aText);

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

@@ -137 +137 @@
     /* IVirtualBox methods */
 
-    STDMETHOD(CreateMachine) (INPTR BSTR aName, INPTR BSTR aOsTypeId, INPTR BSTR aBaseFolder,
-                              INPTR GUIDPARAM aId, IMachine **aMachine);
-    STDMETHOD(CreateLegacyMachine) (INPTR BSTR aName, INPTR BSTR aOsTypeId, INPTR BSTR aSettingsFile,
-                                    INPTR GUIDPARAM aId, IMachine **aMachine);
-    STDMETHOD(OpenMachine) (INPTR BSTR aSettingsFile, IMachine **aMachine);
+    STDMETHOD(CreateMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aBaseFolder,
+                              IN_GUID aId, IMachine **aMachine);
+    STDMETHOD(CreateLegacyMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aSettingsFile,
+                                    IN_GUID aId, IMachine **aMachine);
+    STDMETHOD(OpenMachine) (IN_BSTR aSettingsFile, IMachine **aMachine);
     STDMETHOD(RegisterMachine) (IMachine *aMachine);
-    STDMETHOD(GetMachine) (INPTR GUIDPARAM aId, IMachine **aMachine);
-    STDMETHOD(FindMachine) (INPTR BSTR aName, IMachine **aMachine);
-    STDMETHOD(UnregisterMachine) (INPTR GUIDPARAM aId, IMachine **aMachine);
-
-    STDMETHOD(CreateHardDisk2) (INPTR BSTR aFormat, INPTR BSTR aLocation,
+    STDMETHOD(GetMachine) (IN_GUID aId, IMachine **aMachine);
+    STDMETHOD(FindMachine) (IN_BSTR aName, IMachine **aMachine);
+    STDMETHOD(UnregisterMachine) (IN_GUID aId, IMachine **aMachine);
+
+    STDMETHOD(CreateHardDisk2) (IN_BSTR aFormat, IN_BSTR aLocation,
                                 IHardDisk2 **aHardDisk);
-    STDMETHOD(OpenHardDisk2) (INPTR BSTR aLocation, IHardDisk2 **aHardDisk);
-    STDMETHOD(GetHardDisk2) (INPTR GUIDPARAM aId, IHardDisk2 **aHardDisk);
-    STDMETHOD(FindHardDisk2) (INPTR BSTR aLocation, IHardDisk2 **aHardDisk);
-
-    STDMETHOD(OpenDVDImage) (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
+    STDMETHOD(OpenHardDisk2) (IN_BSTR aLocation, IHardDisk2 **aHardDisk);
+    STDMETHOD(GetHardDisk2) (IN_GUID aId, IHardDisk2 **aHardDisk);
+    STDMETHOD(FindHardDisk2) (IN_BSTR aLocation, IHardDisk2 **aHardDisk);
+
+    STDMETHOD(OpenDVDImage) (IN_BSTR aLocation, IN_GUID aId,
                              IDVDImage2 **aDVDImage);
-    STDMETHOD(GetDVDImage) (INPTR GUIDPARAM aId, IDVDImage2 **aDVDImage);
-    STDMETHOD(FindDVDImage) (INPTR BSTR aLocation, IDVDImage2 **aDVDImage);
-
-    STDMETHOD(OpenFloppyImage) (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
+    STDMETHOD(GetDVDImage) (IN_GUID aId, IDVDImage2 **aDVDImage);
+    STDMETHOD(FindDVDImage) (IN_BSTR aLocation, IDVDImage2 **aDVDImage);
+
+    STDMETHOD(OpenFloppyImage) (IN_BSTR aLocation, IN_GUID aId,
                                 IFloppyImage2 **aFloppyImage);
-    STDMETHOD(GetFloppyImage) (INPTR GUIDPARAM aId, IFloppyImage2 **aFloppyImage);
-    STDMETHOD(FindFloppyImage) (INPTR BSTR aLocation, IFloppyImage2 **aFloppyImage);
-
-    STDMETHOD(GetGuestOSType) (INPTR BSTR aId, IGuestOSType **aType);
-    STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
-    STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
-    STDMETHOD(GetNextExtraDataKey) (INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
-    STDMETHOD(GetExtraData) (INPTR BSTR aKey, BSTR *aValue);
-    STDMETHOD(SetExtraData) (INPTR BSTR aKey, INPTR BSTR aValue);
-    STDMETHOD(OpenSession) (ISession *aSession, INPTR GUIDPARAM aMachineId);
-    STDMETHOD(OpenRemoteSession) (ISession *aSession, INPTR GUIDPARAM aMachineId,
-                                  INPTR BSTR aType, INPTR BSTR aEnvironment,
+    STDMETHOD(GetFloppyImage) (IN_GUID aId, IFloppyImage2 **aFloppyImage);
+    STDMETHOD(FindFloppyImage) (IN_BSTR aLocation, IFloppyImage2 **aFloppyImage);
+
+    STDMETHOD(GetGuestOSType) (IN_BSTR aId, IGuestOSType **aType);
+    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
+    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
+    STDMETHOD(GetNextExtraDataKey) (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
+    STDMETHOD(GetExtraData) (IN_BSTR aKey, BSTR *aValue);
+    STDMETHOD(SetExtraData) (IN_BSTR aKey, IN_BSTR aValue);
+    STDMETHOD(OpenSession) (ISession *aSession, IN_GUID aMachineId);
+    STDMETHOD(OpenRemoteSession) (ISession *aSession, IN_GUID aMachineId,
+                                  IN_BSTR aType, IN_BSTR aEnvironment,
                                   IProgress **aProgress);
-    STDMETHOD(OpenExistingSession) (ISession *aSession, INPTR GUIDPARAM aMachineId);
+    STDMETHOD(OpenExistingSession) (ISession *aSession, IN_GUID aMachineId);
 
     STDMETHOD(RegisterCallback) (IVirtualBoxCallback *aCallback);
     STDMETHOD(UnregisterCallback) (IVirtualBoxCallback *aCallback);
 
-    STDMETHOD(WaitForPropertyChange) (INPTR BSTR aWhat, ULONG aTimeout,
+    STDMETHOD(WaitForPropertyChange) (IN_BSTR aWhat, ULONG aTimeout,
                                       BSTR *aChanged, BSTR *aValues);
 
@@ -189 +189 @@
 
     HRESULT addProgress (IProgress *aProgress);
-    HRESULT removeProgress (INPTR GUIDPARAM aId);
+    HRESULT removeProgress (IN_GUID aId);
 
 #ifdef RT_OS_WINDOWS
@@ -204 +204 @@
     void onMachineStateChange (const Guid &aId, MachineState_T aState);
     void onMachineDataChange (const Guid &aId);
-    BOOL onExtraDataCanChange(const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue,
+    BOOL onExtraDataCanChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue,
                               Bstr &aError);
-    void onExtraDataChange(const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue);
+    void onExtraDataChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue);
     void onMachineRegistered (const Guid &aId, BOOL aRegistered);
     void onSessionStateChange (const Guid &aId, SessionState_T aState);
@@ -213 +213 @@
     void onSnapshotDiscarded (const Guid &aMachineId, const Guid &aSnapshotId);
     void onSnapshotChange (const Guid &aMachineId, const Guid &aSnapshotId);
-    void onGuestPropertyChange (const Guid &aMachineId, INPTR BSTR aName, INPTR BSTR aValue,
-                                INPTR BSTR aFlags);
+    void onGuestPropertyChange (const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue,
+                                IN_BSTR aFlags);
 
     ComObjPtr <GuestOSType> getUnknownOSType();
@@ -234 +234 @@
                          ComObjPtr <Machine> *machine = NULL);
 
-    HRESULT findHardDisk2 (const Guid *aId, const BSTR aLocation,
+    HRESULT findHardDisk2 (const Guid *aId, CBSTR aLocation,
                            bool aSetError, ComObjPtr <HardDisk2> *aHardDisk = NULL);
-    HRESULT findDVDImage2 (const Guid *aId, const BSTR aLocation,
+    HRESULT findDVDImage2 (const Guid *aId, CBSTR aLocation,
                            bool aSetError, ComObjPtr <DVDImage2> *aImage = NULL);
-    HRESULT findFloppyImage2 (const Guid *aId, const BSTR aLocation,
+    HRESULT findFloppyImage2 (const Guid *aId, CBSTR aLocation,
                               bool aSetError, ComObjPtr <FloppyImage2> *aImage = NULL);