VirtualBox

Changeset 15051 in vbox for trunk


Ignore:
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
Files:
76 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/com/Guid.h

    r13624 r15051  
    119119    bool operator< (const GUID &guid) const { return ::RTUuidCompare (&uuid, (PRTUUID) &guid) < 0; }
    120120
    121     /* to pass instances as GUIDPARAM parameters to interface methods */
     121    /* to pass instances as IN_GUID parameters to interface methods */
    122122    operator const GUID &() const { return *(GUID *) &uuid; }
    123123
    … …  
    133133#if !defined (VBOX_WITH_XPCOM)
    134134
    135     /* to assign instances to GUIDPARAMOUT parameters from within the
     135    /* to assign instances to OUT_GUID parameters from within the
    136136     *  interface method */
    137137    const Guid &cloneTo (GUID *pguid) const
    … …  
    141141    }
    142142
    143     /* to pass instances as GUIDPARAMOUT parameters to interface methods */
     143    /* to pass instances as OUT_GUID parameters to interface methods */
    144144    GUID *asOutParam() { return (GUID *) &uuid; }
    145145
    146146#else
    147147
    148     /* to assign instances to GUIDPARAMOUT parameters from within the
     148    /* to assign instances to OUT_GUID parameters from within the
    149149     * interface method */
    150150    const Guid &cloneTo (nsID **ppguid) const
    … …  
    171171    };
    172172
    173     /* to pass instances as GUIDPARAMOUT parameters to interface methods */
     173    /* to pass instances as OUT_GUID parameters to interface methods */
    174174    GuidOutParam asOutParam() { return GuidOutParam (*this); }
    175175
    176176#endif
    177177
    178     /* to directly test GUIDPARAM interface method's parameters */
     178    /* to directly test IN_GUID interface method's parameters */
    179179    static bool isEmpty (const GUID &guid)
    180180    {

  • trunk/include/VBox/com/VirtualBoxErrorInfo.h

    r13580 r15051  
    8686    // IVirtualBoxErrorInfo properties
    8787    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
    88     STDMETHOD(COMGETTER(InterfaceID)) (GUIDPARAMOUT aIID);
     88    STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
    8989    STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);
    9090    STDMETHOD(COMGETTER(Text)) (BSTR *aText);

  • trunk/include/VBox/com/array.h

    r15048 r15051  
    155155 *
    156156 * Also note that in order to pass input BSTR array parameters declared
    157  * using the ComSafeArrayIn (INPTR BSTR, aParam) macro to the SafeArray<>
    158  * constructor using the ComSafeArrayInArg() macro, you should use INPTR BSTR
     157 * using the ComSafeArrayIn (IN_BSTR, aParam) macro to the SafeArray<>
     158 * constructor using the ComSafeArrayInArg() macro, you should use IN_BSTR
    159159 * as the SafeArray<> template argument, not just BSTR.
    160160 *

  • trunk/include/VBox/com/defs.h

    r13908 r15051  
    9191#define SUCCEEDED_WARNING(rc)   (SUCCEEDED (rc) && (rc) != S_OK)
    9292
    93 /** Input pointer argument prefix in the interface method declaration. */
    94 #define INPTR
     93/** Immutable BSTR string */
     94typedef const OLECHAR *CBSTR;
     95
     96/** Input BSTR argument the interface method declaration. */
     97#define IN_BSTR BSTR
     98
     99/** Input GUID argument the interface method declaration. */
     100#define IN_GUID GUID
     101/** Output GUID argument the interface method declaration. */
     102#define OUT_GUID GUID*
    95103
    96104/** Makes the name of the getter interface function (n must be capitalized). */
    … …  
    98106/** Makes the name of the setter interface function (n must be capitalized). */
    99107#define COMSETTER(n)    put_##n
    100 
    101 /** Type for an input GUID parameter in the interface method declaration. */
    102 #define GUIDPARAM           GUID
    103 /** Type for an output GUID parameter in the interface method declaration. */
    104 #define GUIDPARAMOUT        GUID*
    105108
    106109/**
    … …  
    265268#define ULONG64 PRUint64
    266269
    267 #define BSTR    PRUnichar *
    268 #define LPBSTR  BSTR *
     270#define FALSE   PR_FALSE
     271#define TRUE    PR_TRUE
     272
    269273#define OLECHAR wchar_t
    270274
    271 #define FALSE PR_FALSE
    272 #define TRUE PR_TRUE
    273 
    274 /** Input pointer argument prefix in the interface method declaration. */
    275 #define INPTR const
     275/* note: typedef to semantically match BSTR on Win32 */
     276typedef PRUnichar *BSTR;
     277typedef const PRUnichar *CBSTR;
     278typedef BSTR *LPBSTR;
     279
     280/** Input BSTR argument the interface method declaration. */
     281#define IN_BSTR CBSTR
     282
     283/**
     284 * Type to define a raw GUID variable (for members use the com::Guid class
     285 * instead).
     286 */
     287#define GUID        nsID
     288/** Input GUID argument the interface method declaration. */
     289#define IN_GUID     const nsID &
     290/** Output GUID argument the interface method declaration. */
     291#define OUT_GUID    nsID **
    276292
    277293/** Makes the name of the getter interface function (n must be capitalized). */
    … …  
    279295/** Makes the name of the setter interface function (n must be capitalized). */
    280296#define COMSETTER(n)    Set##n
    281 
    282 /**
    283  * Type to define a raw GUID variable (for members use the com::Guid class
    284  * instead).
    285  */
    286 #define GUID                nsID
    287 /** Type for an input GUID parameter in the interface method declaration. */
    288 #define GUIDPARAM           nsID &
    289 /** Type for an output GUID parameter in the interface method declaration.  */
    290 #define GUIDPARAMOUT        nsID **
    291297
    292298/* safearray input parameter macros */

  • trunk/include/VBox/com/string.h

    r13856 r15051  
    7676
    7777    typedef BSTR String;
    78     typedef const BSTR ConstString;
     78    typedef CBSTR ConstString;
    7979
    8080    Bstr () : bstr (NULL) {}
    8181
    8282    Bstr (const Bstr &that) : bstr (NULL) { raw_copy (bstr, that.bstr); }
    83     Bstr (const BSTR that) : bstr (NULL) { raw_copy (bstr, that); }
     83    Bstr (CBSTR that) : bstr (NULL) { raw_copy (bstr, that); }
     84
     85#if defined (VBOX_WITH_XPCOM)
    8486    Bstr (const wchar_t *that) : bstr (NULL)
    8587    {
    8688        AssertCompile (sizeof (wchar_t) == sizeof (OLECHAR));
    87         raw_copy (bstr, (const BSTR) that);
    88     }
     89        raw_copy (bstr, (CBSTR) that);
     90    }
     91#endif
    8992
    9093    Bstr (const Utf8Str &that);
    … …  
    97100
    98101    Bstr &operator = (const Bstr &that) { safe_assign (that.bstr); return *this; }
    99     Bstr &operator = (const BSTR that) { safe_assign (that); return *this; }
     102    Bstr &operator = (CBSTR that) { safe_assign (that); return *this; }
    100103
    101104    Bstr &operator = (const Utf8Str &that);
    … …  
    140143    }
    141144
    142     int compare (const BSTR str) const
     145    int compare (CBSTR str) const
     146    {
     147        return ::RTUtf16Cmp ((PRTUTF16) bstr, (PRTUTF16) str);
     148    }
     149
     150    int compare (BSTR str) const
    143151    {
    144152        return ::RTUtf16Cmp ((PRTUTF16) bstr, (PRTUTF16) str);
    … …  
    147155    bool operator == (const Bstr &that) const { return !compare (that.bstr); }
    148156    bool operator != (const Bstr &that) const { return !!compare (that.bstr); }
    149     bool operator == (const BSTR that) const { return !compare (that); }
     157    bool operator == (CBSTR that) const { return !compare (that); }
     158    bool operator == (BSTR that) const { return !compare (that); }
     159
     160#if defined (VBOX_WITH_XPCOM)
    150161    bool operator != (const wchar_t *that) const
    151162    {
    152163        AssertCompile (sizeof (wchar_t) == sizeof (OLECHAR));
    153         return !!compare ((const BSTR) that);
     164        return !!compare ((CBSTR) that);
    154165    }
    155166    bool operator == (const wchar_t *that) const
    156167    {
    157168        AssertCompile (sizeof (wchar_t) == sizeof (OLECHAR));
    158         return !compare ((const BSTR) that);
    159     }
    160     bool operator != (const BSTR that) const { return !!compare (that); }
     169        return !compare ((CBSTR) that);
     170    }
     171#endif
     172
     173    bool operator != (CBSTR that) const { return !!compare (that); }
     174    bool operator != (BSTR that) const { return !!compare (that); }
    161175    bool operator < (const Bstr &that) const { return compare (that.bstr) < 0; }
    162     bool operator < (const BSTR that) const { return compare (that) < 0; }
     176    bool operator < (CBSTR that) const { return compare (that) < 0; }
     177    bool operator < (BSTR that) const { return compare (that) < 0; }
     178#if defined (VBOX_WITH_XPCOM)
    163179    bool operator < (const wchar_t *that) const
    164180    {
    165181        AssertCompile (sizeof (wchar_t) == sizeof (OLECHAR));
    166         return compare ((const BSTR) that) < 0;
    167     }
    168 
    169     int compareIgnoreCase (const BSTR str) const
     182        return compare ((CBSTR) that) < 0;
     183    }
     184#endif
     185
     186    int compareIgnoreCase (CBSTR str) const
    170187    {
    171188        return ::RTUtf16LocaleICmp (bstr, str);
    … …  
    179196    size_t length() const { return isNull() ? 0 : ::RTUtf16Len ((PRTUTF16) bstr); }
    180197
    181     /** Intended to to pass instances as |BSTR| input parameters to methods. */
    182     operator const BSTR () const { return bstr; }
    183 
    184     /** The same as operator const BSTR(), but for situations where the compiler
    185         cannot typecast implicitly (for example, in printf() argument list). */
    186     const BSTR raw() const { return bstr; }
     198    /** Intended to to pass instances as |CBSTR| input parameters to methods. */
     199    operator CBSTR () const { return bstr; }
     200
     201    /**
     202     * Intended to to pass instances as |BSTR| input parameters to methods.
     203     * Note that we have to provide this mutable BSTR operator since in MS COM
     204     * input BSTR parameters of interface methods are not const.
     205     */
     206    operator BSTR () { return bstr; }
     207
     208    /**
     209     *  The same as operator CBSTR(), but for situations where the compiler
     210     *  cannot typecast implicitly (for example, in printf() argument list).
     211     */
     212    CBSTR raw() const { return bstr; }
    187213
    188214    /**
    … …  
    245271protected:
    246272
    247     void safe_assign (const BSTR str)
     273    void safe_assign (CBSTR str)
    248274    {
    249275        if (bstr != str)
    … …  
    254280    }
    255281
    256     inline static void raw_copy (BSTR &ls, const BSTR rs)
     282    inline static void raw_copy (BSTR &ls, CBSTR rs)
    257283    {
    258284        if (rs)
    … …  
    277303
    278304/* symmetric compare operators */
    279 inline bool operator== (const BSTR l, const Bstr &r) { return r.operator== (l); }
    280 inline bool operator!= (const BSTR l, const Bstr &r) { return r.operator!= (l); }
     305inline bool operator== (CBSTR l, const Bstr &r) { return r.operator== (l); }
     306inline bool operator!= (CBSTR l, const Bstr &r) { return r.operator!= (l); }
     307inline bool operator== (BSTR l, const Bstr &r) { return r.operator== (l); }
     308inline bool operator!= (BSTR l, const Bstr &r) { return r.operator!= (l); }
    281309
    282310////////////////////////////////////////////////////////////////////////////////
    … …  
    309337
    310338    Utf8Str (const Bstr &that) : str (NULL) { raw_copy (str, that); }
    311     Utf8Str (const BSTR that) : str (NULL) { raw_copy (str, that); }
     339    Utf8Str (CBSTR that) : str (NULL) { raw_copy (str, that); }
    312340
    313341    /** Shortcut that calls #alloc(aSize) right after object creation. */
    … …  
    325353        return *this;
    326354    }
    327     Utf8Str &operator = (const BSTR that)
     355    Utf8Str &operator = (CBSTR that)
    328356    {
    329357        setNull();
    … …  
    500528    }
    501529
    502     inline static void raw_copy (char *&ls, const BSTR rs)
     530    inline static void raw_copy (char *&ls, CBSTR rs)
    503531    {
    504532        if (rs)

  • trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

    r14831 r15051  
    237237    }
    238238
    239     STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
     239    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
    240240    {
    241241        return S_OK;

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r15044 r15051  
    121121    }
    122122
    123     STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT a_pId)                { return E_NOTIMPL; }
     123    STDMETHOD(COMGETTER(Id))(OUT_GUID a_pId)                    { return E_NOTIMPL; }
    124124    STDMETHOD(COMGETTER(VendorId))(USHORT *a_pusVendorId)       { *a_pusVendorId    = m_usVendorId;     return S_OK; }
    125125    STDMETHOD(COMGETTER(ProductId))(USHORT *a_pusProductId)     { *a_pusProductId   = m_usProductId;    return S_OK; }
    … …  
    53035303            {
    53045304                if (fReset)
    5305                     CHECK_ERROR(debugger, ResetStats(Bstr(pszPattern).raw()));
     5305                    CHECK_ERROR(debugger, ResetStats(Bstr(pszPattern)));
    53065306                else
    53075307                {
    53085308                    Bstr stats;
    5309                     CHECK_ERROR(debugger, GetStats(Bstr(pszPattern).raw(), fWithDescriptions, stats.asOutParam()));
     5309                    CHECK_ERROR(debugger, GetStats(Bstr(pszPattern), fWithDescriptions, stats.asOutParam()));
    53105310                    if (SUCCEEDED(rc))
    53115311                    {

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

    r14732 r15051  
    9494    NS_DECL_ISUPPORTS
    9595
    96     STDMETHOD(OnMachineStateChange)(INPTR GUIDPARAM machineId,
     96    STDMETHOD(OnMachineStateChange)(IN_GUID machineId,
    9797                                    MachineState_T state)
    9898    {
    … …  
    100100    }
    101101
    102     STDMETHOD(OnMachineDataChange)(INPTR GUIDPARAM machineId)
    103     {
    104         return S_OK;
    105     }
    106 
    107     STDMETHOD(OnExtraDataCanChange)(INPTR GUIDPARAM machineId, INPTR BSTR key,
    108                                     INPTR BSTR value, BSTR *error,
     102    STDMETHOD(OnMachineDataChange)(IN_GUID machineId)
     103    {
     104        return S_OK;
     105    }
     106
     107    STDMETHOD(OnExtraDataCanChange)(IN_GUID machineId, IN_BSTR key,
     108                                    IN_BSTR value, BSTR *error,
    109109                                    BOOL *changeAllowed)
    110110    {
    … …  
    116116    }
    117117
    118     STDMETHOD(OnExtraDataChange)(INPTR GUIDPARAM machineId, INPTR BSTR key,
    119                                  INPTR BSTR value)
    120     {
    121         return S_OK;
    122     }
    123 
    124     STDMETHOD(OnMediaRegistered) (INPTR GUIDPARAM mediaId,
     118    STDMETHOD(OnExtraDataChange)(IN_GUID machineId, IN_BSTR key,
     119                                 IN_BSTR value)
     120    {
     121        return S_OK;
     122    }
     123
     124    STDMETHOD(OnMediaRegistered) (IN_GUID mediaId,
    125125                                  DeviceType_T mediaType, BOOL registered)
    126126    {
    … …  
    131131    }
    132132
    133     STDMETHOD(OnMachineRegistered)(INPTR GUIDPARAM machineId, BOOL registered)
    134     {
    135         return S_OK;
    136     }
    137 
    138      STDMETHOD(OnSessionStateChange)(INPTR GUIDPARAM machineId,
     133    STDMETHOD(OnMachineRegistered)(IN_GUID machineId, BOOL registered)
     134    {
     135        return S_OK;
     136    }
     137
     138     STDMETHOD(OnSessionStateChange)(IN_GUID machineId,
    139139                                    SessionState_T state)
    140140    {
    … …  
    142142    }
    143143
    144     STDMETHOD(OnSnapshotTaken) (INPTR GUIDPARAM aMachineId,
    145                                 INPTR GUIDPARAM aSnapshotId)
    146     {
    147         return S_OK;
    148     }
    149 
    150     STDMETHOD(OnSnapshotDiscarded) (INPTR GUIDPARAM aMachineId,
    151                                     INPTR GUIDPARAM aSnapshotId)
    152     {
    153         return S_OK;
    154     }
    155 
    156     STDMETHOD(OnSnapshotChange) (INPTR GUIDPARAM aMachineId,
    157                                  INPTR GUIDPARAM aSnapshotId)
    158     {
    159         return S_OK;
    160     }
    161 
    162     STDMETHOD(OnGuestPropertyChange)(INPTR GUIDPARAM machineId,
    163                                      INPTR BSTR name, INPTR BSTR value,
    164                                      INPTR BSTR flags)
     144    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId,
     145                                IN_GUID aSnapshotId)
     146    {
     147        return S_OK;
     148    }
     149
     150    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId,
     151                                    IN_GUID aSnapshotId)
     152    {
     153        return S_OK;
     154    }
     155
     156    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId,
     157                                 IN_GUID aSnapshotId)
     158    {
     159        return S_OK;
     160    }
     161
     162    STDMETHOD(OnGuestPropertyChange)(IN_GUID machineId,
     163                                     IN_BSTR name, IN_BSTR value,
     164                                     IN_BSTR flags)
    165165    {
    166166        int rc = S_OK;

  • trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

    r14831 r15051  
    281281    NS_DECL_ISUPPORTS
    282282
    283     STDMETHOD(OnMachineStateChange)(INPTR GUIDPARAM machineId, MachineState_T state)
     283    STDMETHOD(OnMachineStateChange)(IN_GUID machineId, MachineState_T state)
    284284    {
    285285        return S_OK;
    286286    }
    287287
    288     STDMETHOD(OnMachineDataChange)(INPTR GUIDPARAM machineId)
     288    STDMETHOD(OnMachineDataChange)(IN_GUID machineId)
    289289    {
    290290        return S_OK;
    291291    }
    292292
    293     STDMETHOD(OnExtraDataCanChange)(INPTR GUIDPARAM machineId, INPTR BSTR key, INPTR BSTR value,
     293    STDMETHOD(OnExtraDataCanChange)(IN_GUID machineId, IN_BSTR key, IN_BSTR value,
    294294                                    BSTR *error, BOOL *changeAllowed)
    295295    {
    … …  
    301301    }
    302302
    303     STDMETHOD(OnExtraDataChange)(INPTR GUIDPARAM machineId, INPTR BSTR key, INPTR BSTR value)
     303    STDMETHOD(OnExtraDataChange)(IN_GUID machineId, IN_BSTR key, IN_BSTR value)
    304304    {
    305305#ifdef VBOX_SECURELABEL
    … …  
    332332    }
    333333
    334     STDMETHOD(OnMediaRegistered) (INPTR GUIDPARAM mediaId, DeviceType_T mediaType,
     334    STDMETHOD(OnMediaRegistered) (IN_GUID mediaId, DeviceType_T mediaType,
    335335                                  BOOL registered)
    336336    {
    … …  
    341341    }
    342342
    343     STDMETHOD(OnMachineRegistered)(INPTR GUIDPARAM machineId, BOOL registered)
     343    STDMETHOD(OnMachineRegistered)(IN_GUID machineId, BOOL registered)
    344344    {
    345345        return S_OK;
    346346    }
    347347
    348     STDMETHOD(OnSessionStateChange)(INPTR GUIDPARAM machineId, SessionState_T state)
     348    STDMETHOD(OnSessionStateChange)(IN_GUID machineId, SessionState_T state)
    349349    {
    350350        return S_OK;
    351351    }
    352352
    353     STDMETHOD(OnSnapshotTaken) (INPTR GUIDPARAM aMachineId, INPTR GUIDPARAM aSnapshotId)
     353    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    354354    {
    355355        return S_OK;
    356356    }
    357357
    358     STDMETHOD(OnSnapshotDiscarded) (INPTR GUIDPARAM aMachineId, INPTR GUIDPARAM aSnapshotId)
     358    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    359359    {
    360360        return S_OK;
    361361    }
    362362
    363     STDMETHOD(OnSnapshotChange) (INPTR GUIDPARAM aMachineId, INPTR GUIDPARAM aSnapshotId)
     363    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    364364    {
    365365        return S_OK;
    366366    }
    367367
    368     STDMETHOD(OnGuestPropertyChange)(INPTR GUIDPARAM machineId, INPTR BSTR key, INPTR BSTR value, INPTR BSTR flags)
     368    STDMETHOD(OnGuestPropertyChange)(IN_GUID machineId, IN_BSTR key, IN_BSTR value, IN_BSTR flags)
    369369    {
    370370        return S_OK;
    … …  
    560560    }
    561561
    562     STDMETHOD(OnRuntimeError)(BOOL fFatal, INPTR BSTR id, INPTR BSTR message)
     562    STDMETHOD(OnRuntimeError)(BOOL fFatal, IN_BSTR id, IN_BSTR message)
    563563    {
    564564        MachineState_T machineState;
    … …  
    727727}
    728728
    729 static void PrintError(const char *pszName, const BSTR pwszDescr, const BSTR pwszComponent=NULL)
     729static void PrintError(const char *pszName, CBSTR pwszDescr, CBSTR pwszComponent=NULL)
    730730{
    731731    const char *pszFile, *pszFunc, *pszStat;

  • trunk/src/VBox/Frontends/VirtualBox/include/COMDefs.h

    r13959 r15051  
    9090 * Additional COM / XPCOM defines and includes
    9191 */
    92 
    93 #define IN_BSTRPARAM    INPTR BSTR
    94 #define IN_GUIDPARAM    INPTR GUIDPARAM
    9592
    9693#if !defined (VBOX_WITH_XPCOM)

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

    r14295 r15051  
    529529    }
    530530
    531     STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTRPARAM id, IN_BSTRPARAM message)
     531    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
    532532    {
    533533        QApplication::postEvent (mView,

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

    r13836 r15051  
    696696    // a deadlock.
    697697
    698     STDMETHOD(OnMachineStateChange) (IN_GUIDPARAM id, MachineState_T state)
     698    STDMETHOD(OnMachineStateChange) (IN_GUID id, MachineState_T state)
    699699    {
    700700        postEvent (new VBoxMachineStateChangeEvent (COMBase::ToQUuid (id),
    … …  
    703703    }
    704704
    705     STDMETHOD(OnMachineDataChange) (IN_GUIDPARAM id)
     705    STDMETHOD(OnMachineDataChange) (IN_GUID id)
    706706    {
    707707        postEvent (new VBoxMachineDataChangeEvent (COMBase::ToQUuid (id)));
    … …  
    709709    }
    710710
    711     STDMETHOD(OnExtraDataCanChange)(IN_GUIDPARAM id,
    712                                     IN_BSTRPARAM key, IN_BSTRPARAM value,
     711    STDMETHOD(OnExtraDataCanChange)(IN_GUID id,
     712                                    IN_BSTR key, IN_BSTR value,
    713713                                    BSTR *error, BOOL *allowChange)
    714714    {
    … …  
    762762    }
    763763
    764     STDMETHOD(OnExtraDataChange) (IN_GUIDPARAM id,
    765                                   IN_BSTRPARAM key, IN_BSTRPARAM value)
     764    STDMETHOD(OnExtraDataChange) (IN_GUID id,
     765                                  IN_BSTR key, IN_BSTR value)
    766766    {
    767767        if (COMBase::ToQUuid (id).isNull())
    … …  
    796796    }
    797797
    798     STDMETHOD(OnMediaRegistered) (IN_GUIDPARAM id, DeviceType_T type,
     798    STDMETHOD(OnMediaRegistered) (IN_GUID id, DeviceType_T type,
    799799                                  BOOL registered)
    800800    {
    … …  
    806806    }
    807807
    808     STDMETHOD(OnMachineRegistered) (IN_GUIDPARAM id, BOOL registered)
     808    STDMETHOD(OnMachineRegistered) (IN_GUID id, BOOL registered)
    809809    {
    810810        postEvent (new VBoxMachineRegisteredEvent (COMBase::ToQUuid (id),
    … …  
    813813    }
    814814
    815     STDMETHOD(OnSessionStateChange) (IN_GUIDPARAM id, SessionState_T state)
     815    STDMETHOD(OnSessionStateChange) (IN_GUID id, SessionState_T state)
    816816    {
    817817        postEvent (new VBoxSessionStateChangeEvent (COMBase::ToQUuid (id),
    … …  
    820820    }
    821821
    822     STDMETHOD(OnSnapshotTaken) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     822    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    823823    {
    824824        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    828828    }
    829829
    830     STDMETHOD(OnSnapshotDiscarded) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     830    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    831831    {
    832832        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    836836    }
    837837
    838     STDMETHOD(OnSnapshotChange) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     838    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    839839    {
    840840        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    844844    }
    845845
    846     STDMETHOD(OnGuestPropertyChange) (IN_GUIDPARAM /* id */,
    847                                       IN_BSTRPARAM /* key */,
    848                                       IN_BSTRPARAM /* value */,
    849                                       IN_BSTRPARAM /* flags */)
     846    STDMETHOD(OnGuestPropertyChange) (IN_GUID /* id */,
     847                                      IN_BSTR /* key */,
     848                                      IN_BSTR /* value */,
     849                                      IN_BSTR /* flags */)
    850850    {
    851851        return S_OK;

  • trunk/src/VBox/Frontends/VirtualBox4/include/COMDefs.h

    r13956 r15051  
    9090 * Additional COM / XPCOM defines and includes
    9191 */
    92 
    93 #define IN_BSTRPARAM    INPTR BSTR
    94 #define IN_GUIDPARAM    INPTR GUIDPARAM
    9592
    9693#if !defined (VBOX_WITH_XPCOM)

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

    r14977 r15051  
    532532    }
    533533
    534     STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTRPARAM id, IN_BSTRPARAM message)
     534    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
    535535    {
    536536        QApplication::postEvent (mView,

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

    r15024 r15051  
    721721    // a deadlock.
    722722
    723     STDMETHOD(OnMachineStateChange) (IN_GUIDPARAM id, MachineState_T state)
     723    STDMETHOD(OnMachineStateChange) (IN_GUID id, MachineState_T state)
    724724    {
    725725        postEvent (new VBoxMachineStateChangeEvent (COMBase::ToQUuid (id),
    … …  
    728728    }
    729729
    730     STDMETHOD(OnMachineDataChange) (IN_GUIDPARAM id)
     730    STDMETHOD(OnMachineDataChange) (IN_GUID id)
    731731    {
    732732        postEvent (new VBoxMachineDataChangeEvent (COMBase::ToQUuid (id)));
    … …  
    734734    }
    735735
    736     STDMETHOD(OnExtraDataCanChange)(IN_GUIDPARAM id,
    737                                     IN_BSTRPARAM key, IN_BSTRPARAM value,
     736    STDMETHOD(OnExtraDataCanChange)(IN_GUID id,
     737                                    IN_BSTR key, IN_BSTR value,
    738738                                    BSTR *error, BOOL *allowChange)
    739739    {
    … …  
    820820    }
    821821
    822     STDMETHOD(OnExtraDataChange) (IN_GUIDPARAM id,
    823                                   IN_BSTRPARAM key, IN_BSTRPARAM value)
     822    STDMETHOD(OnExtraDataChange) (IN_GUID id,
     823                                  IN_BSTR key, IN_BSTR value)
    824824    {
    825825        if (COMBase::ToQUuid (id).isNull())
    … …  
    899899    }
    900900
    901     STDMETHOD(OnMediaRegistered) (IN_GUIDPARAM id, DeviceType_T type,
     901    STDMETHOD(OnMediaRegistered) (IN_GUID id, DeviceType_T type,
    902902                                  BOOL registered)
    903903    {
    … …  
    909909    }
    910910
    911     STDMETHOD(OnMachineRegistered) (IN_GUIDPARAM id, BOOL registered)
     911    STDMETHOD(OnMachineRegistered) (IN_GUID id, BOOL registered)
    912912    {
    913913        postEvent (new VBoxMachineRegisteredEvent (COMBase::ToQUuid (id),
    … …  
    916916    }
    917917
    918     STDMETHOD(OnSessionStateChange) (IN_GUIDPARAM id, SessionState_T state)
     918    STDMETHOD(OnSessionStateChange) (IN_GUID id, SessionState_T state)
    919919    {
    920920        postEvent (new VBoxSessionStateChangeEvent (COMBase::ToQUuid (id),
    … …  
    923923    }
    924924
    925     STDMETHOD(OnSnapshotTaken) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     925    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    926926    {
    927927        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    931931    }
    932932
    933     STDMETHOD(OnSnapshotDiscarded) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     933    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    934934    {
    935935        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    939939    }
    940940
    941     STDMETHOD(OnSnapshotChange) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
     941    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId, IN_GUID aSnapshotId)
    942942    {
    943943        postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
    … …  
    947947    }
    948948
    949     STDMETHOD(OnGuestPropertyChange) (IN_GUIDPARAM /* id */,
    950                                       IN_BSTRPARAM /* key */,
    951                                       IN_BSTRPARAM /* value */,
    952                                       IN_BSTRPARAM /* flags */)
     949    STDMETHOD(OnGuestPropertyChange) (IN_GUID /* id */,
     950                                      IN_BSTR /* key */,
     951                                      IN_BSTR /* value */,
     952                                      IN_BSTR /* flags */)
    953953    {
    954954        return S_OK;

  • trunk/src/VBox/Main/BIOSSettingsImpl.cpp

    r14972 r15051  
    262262}
    263263
    264 STDMETHODIMP BIOSSettings::COMSETTER(LogoImagePath)(INPTR BSTR imagePath)
     264STDMETHODIMP BIOSSettings::COMSETTER(LogoImagePath)(IN_BSTR imagePath)
    265265{
    266266    /* empty strings are not allowed as path names */

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r14972 r15051  
    10631063}
    10641064
    1065 HRESULT Console::doEnumerateGuestProperties (INPTR BSTR aPatterns,
     1065HRESULT Console::doEnumerateGuestProperties (CBSTR aPatterns,
    10661066                                             ComSafeArrayOut(BSTR, aNames),
    10671067                                             ComSafeArrayOut(BSTR, aValues),
    … …  
    18461846}
    18471847
    1848 STDMETHODIMP Console::AdoptSavedState (INPTR BSTR aSavedStateFile)
     1848STDMETHODIMP Console::AdoptSavedState (IN_BSTR aSavedStateFile)
    18491849{
    18501850    CheckComArgNotNull(aSavedStateFile);
    … …  
    19801980}
    19811981
    1982 STDMETHODIMP Console::AttachUSBDevice (INPTR GUIDPARAM aId)
     1982STDMETHODIMP Console::AttachUSBDevice (IN_GUID aId)
    19831983{
    19841984#ifdef VBOX_WITH_USB
    … …  
    20372037}
    20382038
    2039 STDMETHODIMP Console::DetachUSBDevice (INPTR GUIDPARAM aId, IUSBDevice **aDevice)
     2039STDMETHODIMP Console::DetachUSBDevice (IN_GUID aId, IUSBDevice **aDevice)
    20402040{
    20412041#ifdef VBOX_WITH_USB
    … …  
    20982098
    20992099STDMETHODIMP
    2100 Console::CreateSharedFolder (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable)
     2100Console::CreateSharedFolder (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
    21012101{
    21022102    CheckComArgNotNull(aName);
    … …  
    21702170}
    21712171
    2172 STDMETHODIMP Console::RemoveSharedFolder (INPTR BSTR aName)
     2172STDMETHODIMP Console::RemoveSharedFolder (IN_BSTR aName)
    21732173{
    21742174    CheckComArgNotNull(aName);
    … …  
    22282228}
    22292229
    2230 STDMETHODIMP Console::TakeSnapshot (INPTR BSTR aName, INPTR BSTR aDescription,
     2230STDMETHODIMP Console::TakeSnapshot (IN_BSTR aName, IN_BSTR aDescription,
    22312231                                    IProgress **aProgress)
    22322232{
    … …  
    24012401}
    24022402
    2403 STDMETHODIMP Console::DiscardSnapshot (INPTR GUIDPARAM aId, IProgress **aProgress)
     2403STDMETHODIMP Console::DiscardSnapshot (IN_GUID aId, IProgress **aProgress)
    24042404{
    24052405    CheckComArgExpr(aId, Guid (aId).isEmpty() == false);
    … …  
    34983498 *  @note Locks this object for writing.
    34993499 */
    3500 HRESULT Console::onUSBDeviceDetach (INPTR GUIDPARAM aId,
     3500HRESULT Console::onUSBDeviceDetach (IN_GUID aId,
    35013501                                    IVirtualBoxErrorInfo *aError)
    35023502{
    … …  
    35793579 * @note Temporarily locks this object for writing.
    35803580 */
    3581 HRESULT Console::getGuestProperty (INPTR BSTR aName, BSTR *aValue,
     3581HRESULT Console::getGuestProperty (IN_BSTR aName, BSTR *aValue,
    35823582                                   ULONG64 *aTimestamp, BSTR *aFlags)
    35833583{
    … …  
    36483648 * @note Temporarily locks this object for writing.
    36493649 */
    3650 HRESULT Console::setGuestProperty (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags)
     3650HRESULT Console::setGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
    36513651{
    36523652#if !defined (VBOX_WITH_GUEST_PROPS)
    … …  
    37223722 * @note Temporarily locks this object for writing.
    37233723 */
    3724 HRESULT Console::enumerateGuestProperties (INPTR BSTR aPatterns,
     3724HRESULT Console::enumerateGuestProperties (IN_BSTR aPatterns,
    37253725                                           ComSafeArrayOut(BSTR, aNames),
    37263726                                           ComSafeArrayOut(BSTR, aValues),
    … …  
    39703970 *  @note Locks this object for reading.
    39713971 */
    3972 void Console::onRuntimeError (BOOL aFatal, INPTR BSTR aErrorID, INPTR BSTR aMessage)
     3972void Console::onRuntimeError (BOOL aFatal, IN_BSTR aErrorID, IN_BSTR aMessage)
    39733973{
    39743974    AutoCaller autoCaller (this);
    … …  
    49354935 *  @note The caller must lock this object for writing.
    49364936 */
    4937 HRESULT Console::findSharedFolder (const BSTR aName,
     4937HRESULT Console::findSharedFolder (CBSTR aName,
    49384938                                   ComObjPtr <SharedFolder> &aSharedFolder,
    49394939                                   bool aSetError /* = false */)
    … …  
    50865086 *  @note The caller must lock this object for reading.
    50875087 */
    5088 bool Console::findOtherSharedFolder (INPTR BSTR aName,
     5088bool Console::findOtherSharedFolder (IN_BSTR aName,
    50895089                                     SharedFolderDataMap::const_iterator &aIt)
    50905090{
    … …  
    51145114 *  @note Doesn't lock anything.
    51155115 */
    5116 HRESULT Console::createSharedFolder (INPTR BSTR aName, SharedFolderData aData)
     5116HRESULT Console::createSharedFolder (CBSTR aName, SharedFolderData aData)
    51175117{
    51185118    ComAssertRet (aName && *aName, E_FAIL);
    … …  
    51865186 *  @note Doesn't lock anything.
    51875187 */
    5188 HRESULT Console::removeSharedFolder (INPTR BSTR aName)
     5188HRESULT Console::removeSharedFolder (CBSTR aName)
    51895189{
    51905190    ComAssertRet (aName && *aName, E_FAIL);

  • trunk/src/VBox/Main/ConsoleVRDPServer.cpp

    r14772 r15051  
    162162    }
    163163
    164     STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
     164    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
    165165    {
    166166        return S_OK;

  • trunk/src/VBox/Main/DVDDriveImpl.cpp

    r14972 r15051  
    243243////////////////////////////////////////////////////////////////////////////////
    244244
    245 STDMETHODIMP DVDDrive::MountImage (INPTR GUIDPARAM aImageId)
     245STDMETHODIMP DVDDrive::MountImage (IN_GUID aImageId)
    246246{
    247247    Guid imageId = aImageId;

  • trunk/src/VBox/Main/FloppyDriveImpl.cpp

    r14972 r15051  
    250250/////////////////////////////////////////////////////////////////////////////
    251251
    252 STDMETHODIMP FloppyDrive::MountImage (INPTR GUIDPARAM aImageId)
     252STDMETHODIMP FloppyDrive::MountImage (IN_GUID aImageId)
    253253{
    254254    Guid imageId = aImageId;

  • trunk/src/VBox/Main/GuestImpl.cpp

    r14972 r15051  
    258258}
    259259
    260 STDMETHODIMP Guest::SetCredentials(INPTR BSTR aUserName, INPTR BSTR aPassword,
    261                                    INPTR BSTR aDomain, BOOL aAllowInteractiveLogon)
     260STDMETHODIMP Guest::SetCredentials(IN_BSTR aUserName, IN_BSTR aPassword,
     261                                   IN_BSTR aDomain, BOOL aAllowInteractiveLogon)
    262262{
    263263    CheckComArgNotNull(aUserName);

  • trunk/src/VBox/Main/HardDisk2Impl.cpp

    r15044 r15051  
    507507 * @param aLocaiton     Storage unit location.
    508508 */
    509 HRESULT HardDisk2::init (VirtualBox *aVirtualBox, const BSTR aFormat,
    510                          const BSTR aLocation)
     509HRESULT HardDisk2::init (VirtualBox *aVirtualBox, CBSTR aFormat,
     510                         CBSTR aLocation)
    511511{
    512512    AssertReturn (aVirtualBox != NULL, E_FAIL);
    … …  
    587587 * @param aLocaiton     Storage unit location.
    588588 */
    589 HRESULT HardDisk2::init (VirtualBox *aVirtualBox, const BSTR aLocation)
     589HRESULT HardDisk2::init (VirtualBox *aVirtualBox, CBSTR aLocation)
    590590{
    591591    AssertReturn (aVirtualBox, E_INVALIDARG);
    … …  
    10041004////////////////////////////////////////////////////////////////////////////////
    10051005
    1006 STDMETHODIMP HardDisk2::GetProperty (INPTR BSTR aName, BSTR *aValue)
     1006STDMETHODIMP HardDisk2::GetProperty (IN_BSTR aName, BSTR *aValue)
    10071007{
    10081008    CheckComArgStrNotEmptyOrNull (aName);
    … …  
    10241024}
    10251025
    1026 STDMETHODIMP HardDisk2::SetProperty (INPTR BSTR aName, INPTR BSTR aValue)
     1026STDMETHODIMP HardDisk2::SetProperty (IN_BSTR aName, IN_BSTR aValue)
    10271027{
    10281028    CheckComArgStrNotEmptyOrNull (aName);
    … …  
    10551055}
    10561056
    1057 STDMETHODIMP HardDisk2::GetProperties (INPTR BSTR aNames,
     1057STDMETHODIMP HardDisk2::GetProperties (IN_BSTR aNames,
    10581058                                       ComSafeArrayOut (BSTR, aReturnNames),
    10591059                                       ComSafeArrayOut (BSTR, aReturnValues))
    … …  
    10881088}
    10891089
    1090 STDMETHODIMP HardDisk2::SetProperties (ComSafeArrayIn (INPTR BSTR, aNames),
    1091                                        ComSafeArrayIn (INPTR BSTR, aValues))
     1090STDMETHODIMP HardDisk2::SetProperties (ComSafeArrayIn (IN_BSTR, aNames),
     1091                                       ComSafeArrayIn (IN_BSTR, aValues))
    10921092{
    10931093    CheckComArgSafeArrayNotNull (aNames);
    … …  
    11001100    AutoMultiWriteLock2 alock (mVirtualBox, this);
    11011101
    1102     com::SafeArray <INPTR BSTR> names (ComSafeArrayInArg (aNames));
    1103     com::SafeArray <INPTR BSTR> values (ComSafeArrayInArg (aValues));
     1102    com::SafeArray <IN_BSTR> names (ComSafeArrayInArg (aNames));
     1103    com::SafeArray <IN_BSTR> values (ComSafeArrayInArg (aValues));
    11041104
    11051105    /* first pass: validate names */
    … …  
    12961296}
    12971297
    1298 STDMETHODIMP HardDisk2::MergeTo (INPTR GUIDPARAM aTargetId, IProgress **aProgress)
     1298STDMETHODIMP HardDisk2::MergeTo (IN_GUID aTargetId, IProgress **aProgress)
    12991299{
    13001300    AutoCaller autoCaller (this);
    … …  
    24322432 * @note Must be called from under this object's write lock.
    24332433 */
    2434 HRESULT HardDisk2::setLocation (const BSTR aLocation)
     2434HRESULT HardDisk2::setLocation (CBSTR aLocation)
    24352435{
    24362436    /// @todo so far, we assert but later it makes sense to support null
    … …  
    25842584 * @note Must be called from under this object's write lock.
    25852585 */
    2586 HRESULT HardDisk2::setFormat (const BSTR aFormat)
     2586HRESULT HardDisk2::setFormat (CBSTR aFormat)
    25872587{
    25882588    /* get the format object first */

  • trunk/src/VBox/Main/HostDVDDriveImpl.cpp

    r14972 r15051  
    5050 * @return COM result indicator.
    5151 */
    52 HRESULT HostDVDDrive::init (INPTR BSTR aName,
    53                             INPTR BSTR aUdi /* = NULL */,
    54                             INPTR BSTR aDescription /* = NULL */)
     52HRESULT HostDVDDrive::init (IN_BSTR aName,
     53                            IN_BSTR aUdi /* = NULL */,
     54                            IN_BSTR aDescription /* = NULL */)
    5555{
    5656    ComAssertRet (aName, E_INVALIDARG);

  • trunk/src/VBox/Main/HostFloppyDriveImpl.cpp

    r14972 r15051  
    5050 * @return COM result indicator.
    5151 */
    52 HRESULT HostFloppyDrive::init (INPTR BSTR aName,
    53                                INPTR BSTR aUdi /* = NULL */,
    54                                INPTR BSTR aDescription /* = NULL */)
     52HRESULT HostFloppyDrive::init (IN_BSTR aName,
     53                               IN_BSTR aUdi /* = NULL */,
     54                               IN_BSTR aDescription /* = NULL */)
    5555{
    5656    ComAssertRet (aName, E_INVALIDARG);

  • trunk/src/VBox/Main/HostImpl.cpp

    r14996 r15051  
    13521352
    13531353STDMETHODIMP
    1354 Host::CreateHostNetworkInterface (INPTR BSTR aName,
     1354Host::CreateHostNetworkInterface (IN_BSTR aName,
    13551355                                  IHostNetworkInterface **aHostNetworkInterface,
    13561356                                  IProgress **aProgress)
    … …  
    14151415
    14161416STDMETHODIMP
    1417 Host::RemoveHostNetworkInterface (INPTR GUIDPARAM aId,
     1417Host::RemoveHostNetworkInterface (IN_GUID aId,
    14181418                                  IHostNetworkInterface **aHostNetworkInterface,
    14191419                                  IProgress **aProgress)
    … …  
    14761476#endif /* RT_OS_WINDOWS */
    14771477
    1478 STDMETHODIMP Host::CreateUSBDeviceFilter (INPTR BSTR aName, IHostUSBDeviceFilter **aFilter)
     1478STDMETHODIMP Host::CreateUSBDeviceFilter (IN_BSTR aName, IHostUSBDeviceFilter **aFilter)
    14791479{
    14801480#ifdef VBOX_WITH_USB

  • trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

    r14972 r15051  
    9898 * @param   aGuid address of result pointer
    9999 */
    100 STDMETHODIMP HostNetworkInterface::COMGETTER(Id) (GUIDPARAMOUT aGuid)
     100STDMETHODIMP HostNetworkInterface::COMGETTER(Id) (OUT_GUID aGuid)
    101101{
    102102    CheckComArgOutPointerValid(aGuid);

  • trunk/src/VBox/Main/MachineDebuggerImpl.cpp

    r14972 r15051  
    688688 * @param   aPattern            The selection pattern. A bit similar to filename globbing.
    689689 */
    690 STDMETHODIMP MachineDebugger::ResetStats (INPTR BSTR aPattern)
     690STDMETHODIMP MachineDebugger::ResetStats (IN_BSTR aPattern)
    691691{
    692692    Console::SafeVMPtrQuiet pVM (mParent);
    … …  
    704704 * @param   aPattern            The selection pattern. A bit similar to filename globbing.
    705705 */
    706 STDMETHODIMP MachineDebugger::DumpStats (INPTR BSTR aPattern)
     706STDMETHODIMP MachineDebugger::DumpStats (IN_BSTR aPattern)
    707707{
    708708    Console::SafeVMPtrQuiet pVM (mParent);
    … …  
    722722 * @param   aStats              The XML document containing the statistics.
    723723 */
    724 STDMETHODIMP MachineDebugger::GetStats (INPTR BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats)
     724STDMETHODIMP MachineDebugger::GetStats (IN_BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats)
    725725{
    726726    Console::SafeVMPtrQuiet pVM (mParent);

  • trunk/src/VBox/Main/MachineImpl.cpp

    r15050 r15051  
    380380 *  @return  Success indicator. if not S_OK, the machine object is invalid
    381381 */
    382 HRESULT Machine::init (VirtualBox *aParent, const BSTR aConfigFile,
    383                        InitMode aMode, const BSTR aName /* = NULL */,
     382HRESULT Machine::init (VirtualBox *aParent, CBSTR aConfigFile,
     383                       InitMode aMode, CBSTR aName /* = NULL */,
    384384                       GuestOSType *aOsType /* = NULL */,
    385385                       BOOL aNameSync /* = TRUE */,
    … …  
    811811}
    812812
    813 STDMETHODIMP Machine::COMSETTER(Name) (INPTR BSTR aName)
     813STDMETHODIMP Machine::COMSETTER(Name) (IN_BSTR aName)
    814814{
    815815    CheckComArgNotNull(aName);
    … …  
    847847}
    848848
    849 STDMETHODIMP Machine::COMSETTER(Description) (INPTR BSTR aDescription)
     849STDMETHODIMP Machine::COMSETTER(Description) (IN_BSTR aDescription)
    850850{
    851851    AutoCaller autoCaller (this);
    … …  
    863863}
    864864
    865 STDMETHODIMP Machine::COMGETTER(Id) (GUIDPARAMOUT aId)
     865STDMETHODIMP Machine::COMGETTER(Id) (OUT_GUID aId)
    866866{
    867867    CheckComArgOutPointerValid(aId);
    … …  
    891891}
    892892
    893 STDMETHODIMP Machine::COMSETTER(OSTypeId) (INPTR BSTR aOSTypeId)
     893STDMETHODIMP Machine::COMSETTER(OSTypeId) (IN_BSTR aOSTypeId)
    894894{
    895895    CheckComArgNotNull(aOSTypeId);
    … …  
    13331333}
    13341334
    1335 STDMETHODIMP Machine::COMSETTER(SnapshotFolder) (INPTR BSTR aSnapshotFolder)
     1335STDMETHODIMP Machine::COMSETTER(SnapshotFolder) (IN_BSTR aSnapshotFolder)
    13361336{
    13371337    /* @todo (r=dmik):
    … …  
    17791779
    17801780STDMETHODIMP
    1781 Machine::COMSETTER(GuestPropertyNotificationPatterns) (INPTR BSTR aPatterns)
     1781Machine::COMSETTER(GuestPropertyNotificationPatterns) (IN_BSTR aPatterns)
    17821782{
    17831783    AssertLogRelReturn (VALID_PTR(aPatterns), E_POINTER);
    … …  
    18421842}
    18431843
    1844 STDMETHODIMP Machine::AttachHardDisk2 (INPTR GUIDPARAM aId,
     1844STDMETHODIMP Machine::AttachHardDisk2 (IN_GUID aId,
    18451845                                       StorageBus_T aBus, LONG aChannel,
    18461846                                       LONG aDevice)
    … …  
    23362336 *  @note Locks this object for reading.
    23372337 */
    2338 STDMETHODIMP Machine::GetNextExtraDataKey (INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
     2338STDMETHODIMP Machine::GetNextExtraDataKey (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
    23392339{
    23402340    CheckComArgOutPointerValid(aNextKey);
    … …  
    24392439 *  @note Locks this object for reading.
    24402440 */
    2441 STDMETHODIMP Machine::GetExtraData (INPTR BSTR aKey, BSTR *aValue)
     2441STDMETHODIMP Machine::GetExtraData (IN_BSTR aKey, BSTR *aValue)
    24422442{
    24432443    CheckComArgNotNull(aKey);
    … …  
    25052505 *  @note Locks mParent for writing + this object for writing.
    25062506 */
    2507 STDMETHODIMP Machine::SetExtraData (INPTR BSTR aKey, INPTR BSTR aValue)
     2507STDMETHODIMP Machine::SetExtraData (IN_BSTR aKey, IN_BSTR aValue)
    25082508{
    25092509    CheckComArgNotNull(aKey);
    … …  
    25762576            {
    25772577                const char *sep = error.isEmpty() ? "" : ": ";
    2578                 const BSTR err = error.isNull() ? (const BSTR) L"" : error.raw();
     2578                CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
    25792579                LogWarningFunc (("Someone vetoed! Change refused%s%ls\n",
    25802580                                 sep, err));
    … …  
    27732773}
    27742774
    2775 STDMETHODIMP Machine::GetSnapshot (INPTR GUIDPARAM aId, ISnapshot **aSnapshot)
     2775STDMETHODIMP Machine::GetSnapshot (IN_GUID aId, ISnapshot **aSnapshot)
    27762776{
    27772777    CheckComArgOutPointerValid(aSnapshot);
    … …  
    27912791}
    27922792
    2793 STDMETHODIMP Machine::FindSnapshot (INPTR BSTR aName, ISnapshot **aSnapshot)
     2793STDMETHODIMP Machine::FindSnapshot (IN_BSTR aName, ISnapshot **aSnapshot)
    27942794{
    27952795    CheckComArgNotNull(aName);
    … …  
    28092809}
    28102810
    2811 STDMETHODIMP Machine::SetCurrentSnapshot (INPTR GUIDPARAM aId)
     2811STDMETHODIMP Machine::SetCurrentSnapshot (IN_GUID aId)
    28122812{
    28132813    /// @todo (dmik) don't forget to set
    … …  
    28182818
    28192819STDMETHODIMP
    2820 Machine::CreateSharedFolder (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable)
     2820Machine::CreateSharedFolder (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
    28212821{
    28222822    CheckComArgNotNull(aName);
    … …  
    28592859}
    28602860
    2861 STDMETHODIMP Machine::RemoveSharedFolder (INPTR BSTR aName)
     2861STDMETHODIMP Machine::RemoveSharedFolder (IN_BSTR aName)
    28622862{
    28632863    CheckComArgNotNull(aName);
    … …  
    29422942}
    29432943
    2944 STDMETHODIMP Machine::GetGuestProperty (INPTR BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags)
     2944STDMETHODIMP Machine::GetGuestProperty (IN_BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags)
    29452945{
    29462946#if !defined (VBOX_WITH_GUEST_PROPS)
    … …  
    29982998}
    29992999
    3000 STDMETHODIMP Machine::GetGuestPropertyValue (INPTR BSTR aName, BSTR *aValue)
     3000STDMETHODIMP Machine::GetGuestPropertyValue (IN_BSTR aName, BSTR *aValue)
    30013001{
    30023002    ULONG64 dummyTimestamp;
    … …  
    30053005}
    30063006
    3007 STDMETHODIMP Machine::GetGuestPropertyTimestamp (INPTR BSTR aName, ULONG64 *aTimestamp)
     3007STDMETHODIMP Machine::GetGuestPropertyTimestamp (IN_BSTR aName, ULONG64 *aTimestamp)
    30083008{
    30093009    BSTR dummyValue;
    … …  
    30123012}
    30133013
    3014 STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags)
     3014STDMETHODIMP Machine::SetGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
    30153015{
    30163016#if !defined (VBOX_WITH_GUEST_PROPS)
    … …  
    31313131}
    31323132
    3133 STDMETHODIMP Machine::SetGuestPropertyValue (INPTR BSTR aName, INPTR BSTR aValue)
     3133STDMETHODIMP Machine::SetGuestPropertyValue (IN_BSTR aName, IN_BSTR aValue)
    31343134{
    31353135    return SetGuestProperty(aName, aValue, NULL);
    31363136}
    31373137
    3138 STDMETHODIMP Machine::EnumerateGuestProperties (INPTR BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags))
     3138STDMETHODIMP Machine::EnumerateGuestProperties (IN_BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags))
    31393139{
    31403140#if !defined (VBOX_WITH_GUEST_PROPS)
    … …  
    35513551 */
    35523552HRESULT Machine::openRemoteSession (IInternalSessionControl *aControl,
    3553                                     INPTR BSTR aType, INPTR BSTR aEnvironment,
     3553                                    IN_BSTR aType, IN_BSTR aEnvironment,
    35543554                                    Progress *aProgress)
    35553555{
    … …  
    46264626 *      must be called from under the object's lock!
    46274627 */
    4628 HRESULT Machine::findSharedFolder (const BSTR aName,
     4628HRESULT Machine::findSharedFolder (CBSTR aName,
    46294629                                   ComObjPtr <SharedFolder> &aSharedFolder,
    46304630                                   bool aSetError /* = false */)
    … …  
    55105510 *  @param aSetError    true to set extended error info on failure
    55115511 */
    5512 HRESULT Machine::findSnapshot (const BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
     5512HRESULT Machine::findSnapshot (IN_BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
    55135513                               bool aSetError /* = false */)
    55145514{
    … …  
    80988098 *  @note Locks the same as Host::captureUSBDevice() does.
    80998099 */
    8100 STDMETHODIMP SessionMachine::CaptureUSBDevice (INPTR GUIDPARAM aId)
     8100STDMETHODIMP SessionMachine::CaptureUSBDevice (IN_GUID aId)
    81018101{
    81028102    LogFlowThisFunc (("\n"));
    … …  
    81218121 *  @note Locks the same as Host::detachUSBDevice() does.
    81228122 */
    8123 STDMETHODIMP SessionMachine::DetachUSBDevice (INPTR GUIDPARAM aId, BOOL aDone)
     8123STDMETHODIMP SessionMachine::DetachUSBDevice (IN_GUID aId, BOOL aDone)
    81248124{
    81258125    LogFlowThisFunc (("\n"));
    … …  
    83558355 *  @note Locks this object for writing.
    83568356 */
    8357 STDMETHODIMP SessionMachine::AdoptSavedState (INPTR BSTR aSavedStateFile)
     8357STDMETHODIMP SessionMachine::AdoptSavedState (IN_BSTR aSavedStateFile)
    83588358{
    83598359    LogFlowThisFunc (("\n"));
    … …  
    83898389 */
    83908390STDMETHODIMP SessionMachine::BeginTakingSnapshot (
    8391     IConsole *aInitiator, INPTR BSTR aName, INPTR BSTR aDescription,
     8391    IConsole *aInitiator, IN_BSTR aName, IN_BSTR aDescription,
    83928392    IProgress *aProgress, BSTR *aStateFilePath,
    83938393    IProgress **aServerProgress)
    … …  
    85778577 */
    85788578STDMETHODIMP SessionMachine::DiscardSnapshot (
    8579     IConsole *aInitiator, INPTR GUIDPARAM aId,
     8579    IConsole *aInitiator, IN_GUID aId,
    85808580    MachineState_T *aMachineState, IProgress **aProgress)
    85818581{
    … …  
    88558855}
    88568856
    8857 STDMETHODIMP SessionMachine::PushGuestProperties (ComSafeArrayIn(INPTR BSTR, aNames),
    8858                                                   ComSafeArrayIn(INPTR BSTR, aValues),
     8857STDMETHODIMP SessionMachine::PushGuestProperties (ComSafeArrayIn(IN_BSTR, aNames),
     8858                                                  ComSafeArrayIn(IN_BSTR, aValues),
    88598859                                                  ComSafeArrayIn(ULONG64, aTimestamps),
    8860                                                   ComSafeArrayIn(INPTR BSTR, aFlags))
     8860                                                  ComSafeArrayIn(IN_BSTR, aFlags))
    88618861{
    88628862    LogFlowThisFunc (("\n"));
    … …  
    88878887    AssertReturn(!ComSafeArrayInIsNull (aFlags), E_POINTER);
    88888888
    8889     com::SafeArray <INPTR BSTR> names(ComSafeArrayInArg(aNames));
    8890     com::SafeArray <INPTR BSTR> values(ComSafeArrayInArg(aValues));
     8889    com::SafeArray <IN_BSTR> names(ComSafeArrayInArg(aNames));
     8890    com::SafeArray <IN_BSTR> values(ComSafeArrayInArg(aValues));
    88918891    com::SafeArray <ULONG64> timestamps(ComSafeArrayInArg(aTimestamps));
    8892     com::SafeArray <INPTR BSTR> flags(ComSafeArrayInArg(aFlags));
     8892    com::SafeArray <IN_BSTR> flags(ComSafeArrayInArg(aFlags));
    88938893    DiscardSettings();
    88948894    mHWData.backup();
    … …  
    89138913}
    89148914
    8915 STDMETHODIMP SessionMachine::PushGuestProperty (INPTR BSTR aName, INPTR BSTR aValue,
    8916                                                 ULONG64 aTimestamp, INPTR BSTR aFlags)
     8915STDMETHODIMP SessionMachine::PushGuestProperty (IN_BSTR aName, IN_BSTR aValue,
     8916                                                ULONG64 aTimestamp, IN_BSTR aFlags)
    89178917{
    89188918    LogFlowThisFunc (("\n"));
    … …  
    93179317 *  @note The calls shall hold no locks. Will temporarily lock this object for reading.
    93189318 */
    9319 HRESULT SessionMachine::onUSBDeviceDetach (INPTR GUIDPARAM aId,
     9319HRESULT SessionMachine::onUSBDeviceDetach (IN_GUID aId,
    93209320                                           IVirtualBoxErrorInfo *aError)
    93219321{
    … …  
    1050710507 */
    1050810508HRESULT SnapshotMachine::init (SessionMachine *aSessionMachine,
    10509                                INPTR GUIDPARAM aSnapshotId,
    10510                                INPTR BSTR aStateFilePath)
     10509                               IN_GUID aSnapshotId,
     10510                               IN_BSTR aStateFilePath)
    1051110511{
    1051210512    LogFlowThisFuncEnter();
    … …  
    1063410634                               const settings::Key &aHWNode,
    1063510635                               const settings::Key &aHDAsNode,
    10636                                INPTR GUIDPARAM aSnapshotId, INPTR BSTR aStateFilePath)
     10636                               IN_GUID aSnapshotId, IN_BSTR aStateFilePath)
    1063710637{
    1063810638    LogFlowThisFuncEnter();

  • trunk/src/VBox/Main/MediumImpl.cpp

    r14972 r15051  
    5151////////////////////////////////////////////////////////////////////////////////
    5252
    53 STDMETHODIMP MediumBase::COMGETTER(Id) (GUIDPARAMOUT aId)
     53STDMETHODIMP MediumBase::COMGETTER(Id) (OUT_GUID aId)
    5454{
    5555    CheckComArgOutPointerValid(aId);
    … …  
    7979}
    8080
    81 STDMETHODIMP MediumBase::COMSETTER(Description) (INPTR BSTR aDescription)
     81STDMETHODIMP MediumBase::COMSETTER(Description) (IN_BSTR aDescription)
    8282{
    8383    CheckComArgNotNull(aDescription);
    … …  
    140140}
    141141
    142 STDMETHODIMP MediumBase::COMSETTER(Location) (INPTR BSTR aLocation)
     142STDMETHODIMP MediumBase::COMSETTER(Location) (IN_BSTR aLocation)
    143143{
    144144    CheckComArgNotNull(aLocation);
    … …  
    235235////////////////////////////////////////////////////////////////////////////////
    236236
    237 STDMETHODIMP MediumBase::GetSnapshotIds (INPTR GUIDPARAM aMachineId,
     237STDMETHODIMP MediumBase::GetSnapshotIds (IN_GUID aMachineId,
    238238                                         ComSafeGUIDArrayOut (aSnapshotIds))
    239239{
    … …  
    694694 * @note Must be called from under this object's write lock.
    695695 */
    696 HRESULT MediumBase::setLocation (const BSTR aLocation)
     696HRESULT MediumBase::setLocation (CBSTR aLocation)
    697697{
    698698    /* get the full file name */
    … …  
    931931 * @param aId           UUID of the image.
    932932 */
    933 HRESULT ImageMediumBase::protectedInit (VirtualBox *aVirtualBox, const BSTR aLocation,
     933HRESULT ImageMediumBase::protectedInit (VirtualBox *aVirtualBox, CBSTR aLocation,
    934934                                        const Guid &aId)
    935935{

  • trunk/src/VBox/Main/NetworkAdapterImpl.cpp

    r14972 r15051  
    299299}
    300300
    301 STDMETHODIMP NetworkAdapter::COMSETTER(MACAddress)(INPTR BSTR aMACAddress)
     301STDMETHODIMP NetworkAdapter::COMSETTER(MACAddress)(IN_BSTR aMACAddress)
    302302{
    303303    AutoCaller autoCaller (this);
    … …  
    408408}
    409409
    410 STDMETHODIMP NetworkAdapter::COMSETTER(HostInterface)(INPTR BSTR aHostInterface)
     410STDMETHODIMP NetworkAdapter::COMSETTER(HostInterface)(IN_BSTR aHostInterface)
    411411{
    412412    /** @todo Validate input string length. r=dmik: do it in XML schema?*/
    … …  
    526526
    527527STDMETHODIMP NetworkAdapter::COMSETTER(TAPSetupApplication) (
    528     INPTR BSTR aTAPSetupApplication)
     528    IN_BSTR aTAPSetupApplication)
    529529{
    530530# ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
    … …  
    580580
    581581STDMETHODIMP NetworkAdapter::COMSETTER(TAPTerminateApplication) (
    582     INPTR BSTR aTAPTerminateApplication)
     582    IN_BSTR aTAPTerminateApplication)
    583583{
    584584# ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
    … …  
    629629}
    630630
    631 STDMETHODIMP NetworkAdapter::COMSETTER(InternalNetwork) (INPTR BSTR aInternalNetwork)
     631STDMETHODIMP NetworkAdapter::COMSETTER(InternalNetwork) (IN_BSTR aInternalNetwork)
    632632{
    633633    AutoCaller autoCaller (this);
    … …  
    677677}
    678678
    679 STDMETHODIMP NetworkAdapter::COMSETTER(NATNetwork) (INPTR BSTR aNATNetwork)
     679STDMETHODIMP NetworkAdapter::COMSETTER(NATNetwork) (IN_BSTR aNATNetwork)
    680680{
    681681    AutoCaller autoCaller (this);
    … …  
    832832}
    833833
    834 STDMETHODIMP NetworkAdapter::COMSETTER(TraceFile) (INPTR BSTR aTraceFile)
     834STDMETHODIMP NetworkAdapter::COMSETTER(TraceFile) (IN_BSTR aTraceFile)
    835835{
    836836    AutoCaller autoCaller (this);

  • trunk/src/VBox/Main/ParallelPortImpl.cpp

    r14972 r15051  
    508508 *  Validates COMSETTER(Path) arguments.
    509509 */
    510 HRESULT ParallelPort::checkSetPath (const BSTR aPath)
     510HRESULT ParallelPort::checkSetPath (CBSTR aPath)
    511511{
    512512    AssertReturn (isWriteLockOnCurrentThread(), E_FAIL);
    … …  
    522522}
    523523
    524 STDMETHODIMP ParallelPort::COMSETTER(Path) (INPTR BSTR aPath)
     524STDMETHODIMP ParallelPort::COMSETTER(Path) (IN_BSTR aPath)
    525525{
    526526    AutoCaller autoCaller (this);

  • trunk/src/VBox/Main/Performance.cpp

    r14950 r15051  
    418418}
    419419
    420 Filter::Filter(ComSafeArrayIn(INPTR BSTR, metricNames),
     420Filter::Filter(ComSafeArrayIn(IN_BSTR, metricNames),
    421421               ComSafeArrayIn(IUnknown *, objects))
    422422{
    … …  
    449449    else
    450450    {
    451         com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
     451        com::SafeArray <IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
    452452        if (ComSafeArrayInIsNull(objects))
    453453        {
    … …  
    466466}
    467467
    468 void Filter::init(ComSafeArrayIn(INPTR BSTR, metricNames),
     468void Filter::init(ComSafeArrayIn(IN_BSTR, metricNames),
    469469                  ComSafeArrayIn(IUnknown *, objects))
    470470{
    471     com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
     471    com::SafeArray <IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
    472472    com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));
    473473

  • trunk/src/VBox/Main/PerformanceImpl.cpp

    r14772 r15051  
    215215
    216216STDMETHODIMP
    217 PerformanceCollector::GetMetrics (ComSafeArrayIn (INPTR BSTR, metricNames),
     217PerformanceCollector::GetMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
    218218                                  ComSafeArrayIn (IUnknown *, objects),
    219219                                  ComSafeArrayOut (IPerformanceMetric *, outMetrics))
    … …  
    257257
    258258STDMETHODIMP
    259 PerformanceCollector::SetupMetrics (ComSafeArrayIn (INPTR BSTR, metricNames),
     259PerformanceCollector::SetupMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
    260260                                    ComSafeArrayIn (IUnknown *, objects),
    261261                                    ULONG aPeriod, ULONG aCount,
    … …  
    307307
    308308STDMETHODIMP
    309 PerformanceCollector::EnableMetrics (ComSafeArrayIn (INPTR BSTR, metricNames),
     309PerformanceCollector::EnableMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
    310310                                     ComSafeArrayIn (IUnknown *, objects),
    311311                                     ComSafeArrayOut (IPerformanceMetric *,
    … …  
    344344
    345345STDMETHODIMP
    346 PerformanceCollector::DisableMetrics (ComSafeArrayIn (INPTR BSTR, metricNames),
     346PerformanceCollector::DisableMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
    347347                                      ComSafeArrayIn (IUnknown *, objects),
    348348                                      ComSafeArrayOut (IPerformanceMetric *,
    … …  
    381381
    382382STDMETHODIMP
    383 PerformanceCollector::QueryMetricsData (ComSafeArrayIn (INPTR BSTR, metricNames),
     383PerformanceCollector::QueryMetricsData (ComSafeArrayIn (IN_BSTR, metricNames),
    384384                                        ComSafeArrayIn (IUnknown *, objects),
    385385                                        ComSafeArrayOut (BSTR, outMetricNames),

  • trunk/src/VBox/Main/ProgressImpl.cpp

    r14972 r15051  
    9090#endif
    9191                            IUnknown *aInitiator,
    92                             const BSTR aDescription, GUIDPARAMOUT aId /* = NULL */)
     92                            CBSTR aDescription, OUT_GUID aId /* = NULL */)
    9393{
    9494    /* Guarantees subclasses call this method at the proper time */
    … …  
    193193/////////////////////////////////////////////////////////////////////////////
    194194
    195 STDMETHODIMP ProgressBase::COMGETTER(Id) (GUIDPARAMOUT aId)
     195STDMETHODIMP ProgressBase::COMGETTER(Id) (OUT_GUID aId)
    196196{
    197197    CheckComArgOutPointerValid(aId);
    … …  
    480480#endif
    481481                        IUnknown *aInitiator,
    482                         const BSTR aDescription, BOOL aCancelable,
    483                         ULONG aOperationCount, const BSTR aOperationDescription,
    484                         GUIDPARAMOUT aId /* = NULL */)
     482                        CBSTR aDescription, BOOL aCancelable,
     483                        ULONG aOperationCount, CBSTR aOperationDescription,
     484                        OUT_GUID aId /* = NULL */)
    485485{
    486486    LogFlowThisFunc (("aDescription=\"%ls\"\n", aDescription));
    … …  
    536536 */
    537537HRESULT Progress::init (BOOL aCancelable, ULONG aOperationCount,
    538                         const BSTR aOperationDescription)
     538                        CBSTR aOperationDescription)
    539539{
    540540    LogFlowThisFunc (("aOperationDescription=\"%ls\"\n", aOperationDescription));
    … …  
    781781 * @note The current operation must not be the last one.
    782782 */
    783 HRESULT Progress::advanceOperation (const BSTR aOperationDescription)
     783HRESULT Progress::advanceOperation (CBSTR aOperationDescription)
    784784{
    785785    AssertReturn (aOperationDescription, E_INVALIDARG);
    … …  
    10051005#endif
    10061006                                         IUnknown *aInitiator,
    1007                                          const BSTR aDescription, GUIDPARAMOUT aId)
     1007                                         CBSTR aDescription, OUT_GUID aId)
    10081008{
    10091009    LogFlowThisFunc (("aDescription={%ls} mProgresses.size()=%d\n",
    … …  
    10761076#endif
    10771077                                IUnknown *aInitiator,
    1078                                 const BSTR aDescription,
     1078                                CBSTR aDescription,
    10791079                                IProgress *aProgress1, IProgress *aProgress2,
    1080                                 GUIDPARAMOUT aId /* = NULL */)
     1080                                OUT_GUID aId /* = NULL */)
    10811081{
    10821082    /* Enclose the state transition NotReady->InInit->Ready */

  • trunk/src/VBox/Main/RemoteUSBDeviceImpl.cpp

    r14972 r15051  
    132132/////////////////////////////////////////////////////////////////////////////
    133133
    134 STDMETHODIMP RemoteUSBDevice::COMGETTER(Id) (GUIDPARAMOUT aId)
     134STDMETHODIMP RemoteUSBDevice::COMGETTER(Id) (OUT_GUID aId)
    135135{
    136136    CheckComArgOutPointerValid(aId);

  • trunk/src/VBox/Main/SerialPortImpl.cpp

    r14972 r15051  
    604604 *  Validates COMSETTER(Path) arguments.
    605605 */
    606 HRESULT SerialPort::checkSetPath (const BSTR aPath)
     606HRESULT SerialPort::checkSetPath (CBSTR aPath)
    607607{
    608608    AssertReturn (isWriteLockOnCurrentThread(), E_FAIL);
    … …  
    619619}
    620620
    621 STDMETHODIMP SerialPort::COMSETTER(Path) (INPTR BSTR aPath)
     621STDMETHODIMP SerialPort::COMSETTER(Path) (IN_BSTR aPath)
    622622{
    623623    AutoCaller autoCaller (this);

  • trunk/src/VBox/Main/SessionImpl.cpp

    r14972 r15051  
    629629}
    630630
    631 STDMETHODIMP Session::OnUSBDeviceDetach (INPTR GUIDPARAM aId,
     631STDMETHODIMP Session::OnUSBDeviceDetach (IN_GUID aId,
    632632                                         IVirtualBoxErrorInfo *aError)
    633633{
    … …  
    667667}
    668668
    669 STDMETHODIMP Session::AccessGuestProperty (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags,
     669STDMETHODIMP Session::AccessGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
    670670                                           BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags)
    671671{
    … …  
    701701}
    702702
    703 STDMETHODIMP Session::EnumerateGuestProperties (INPTR BSTR aPatterns,
     703STDMETHODIMP Session::EnumerateGuestProperties (IN_BSTR aPatterns,
    704704                                                ComSafeArrayOut(BSTR, aNames),
    705705                                                ComSafeArrayOut(BSTR, aValues),

  • trunk/src/VBox/Main/SharedFolderImpl.cpp

    r14972 r15051  
    6767 */
    6868HRESULT SharedFolder::init (Machine *aMachine,
    69                             const BSTR aName, const BSTR aHostPath, BOOL aWritable)
     69                            CBSTR aName, CBSTR aHostPath, BOOL aWritable)
    7070{
    7171    /* Enclose the state transition NotReady->InInit->Ready */
    … …  
    125125 */
    126126HRESULT SharedFolder::init (Console *aConsole,
    127                             const BSTR aName, const BSTR aHostPath, BOOL aWritable)
     127                            CBSTR aName, CBSTR aHostPath, BOOL aWritable)
    128128{
    129129    /* Enclose the state transition NotReady->InInit->Ready */
    … …  
    153153 */
    154154HRESULT SharedFolder::init (VirtualBox *aVirtualBox,
    155                             const BSTR aName, const BSTR aHostPath, BOOL aWritable)
     155                            CBSTR aName, CBSTR aHostPath, BOOL aWritable)
    156156{
    157157    /* Enclose the state transition NotReady->InInit->Ready */
    … …  
    177177 */
    178178HRESULT SharedFolder::protectedInit (VirtualBoxBaseWithChildrenNEXT *aParent,
    179                                      const BSTR aName, const BSTR aHostPath, BOOL aWritable)
     179                                     CBSTR aName, CBSTR aHostPath, BOOL aWritable)
    180180{
    181181    LogFlowThisFunc (("aName={%ls}, aHostPath={%ls}, aWritable={%d}\n",

  • trunk/src/VBox/Main/SnapshotImpl.cpp

    r14972 r15051  
    6565 *  @param  aParent        parent snapshot (NULL if no parent)
    6666 */
    67 HRESULT Snapshot::init (const Guid &aId, INPTR BSTR aName, INPTR BSTR aDescription,
     67HRESULT Snapshot::init (const Guid &aId, IN_BSTR aName, IN_BSTR aDescription,
    6868                        RTTIMESPEC aTimeStamp, SnapshotMachine *aMachine,
    6969                        Snapshot *aParent)
    … …  
    165165////////////////////////////////////////////////////////////////////////////////
    166166
    167 STDMETHODIMP Snapshot::COMGETTER(Id) (GUIDPARAMOUT aId)
     167STDMETHODIMP Snapshot::COMGETTER(Id) (OUT_GUID aId)
    168168{
    169169    CheckComArgOutPointerValid(aId);
    … …  
    191191 *  (see its lock requirements).
    192192 */
    193 STDMETHODIMP Snapshot::COMSETTER(Name) (INPTR BSTR aName)
     193STDMETHODIMP Snapshot::COMSETTER(Name) (IN_BSTR aName)
    194194{
    195195    CheckComArgNotNull(aName);
    … …  
    221221}
    222222
    223 STDMETHODIMP Snapshot::COMSETTER(Description) (INPTR BSTR aDescription)
     223STDMETHODIMP Snapshot::COMSETTER(Description) (IN_BSTR aDescription)
    224224{
    225225    CheckComArgNotNull(aDescription);
    … …  
    339339 *  etc. of this snapshot. This snapshot itself is also included in the search.
    340340 */
    341 ComObjPtr <Snapshot> Snapshot::findChildOrSelf (INPTR GUIDPARAM aId)
     341ComObjPtr <Snapshot> Snapshot::findChildOrSelf (IN_GUID aId)
    342342{
    343343    ComObjPtr <Snapshot> child;
    … …  
    366366 *  in the search.
    367367 */
    368 ComObjPtr <Snapshot> Snapshot::findChildOrSelf (INPTR BSTR aName)
     368ComObjPtr <Snapshot> Snapshot::findChildOrSelf (IN_BSTR aName)
    369369{
    370370    ComObjPtr <Snapshot> child;

  • trunk/src/VBox/Main/SystemPropertiesImpl.cpp

    r14972 r15051  
    300300}
    301301
    302 STDMETHODIMP SystemProperties::COMSETTER(DefaultMachineFolder) (INPTR BSTR aDefaultMachineFolder)
     302STDMETHODIMP SystemProperties::COMSETTER(DefaultMachineFolder) (IN_BSTR aDefaultMachineFolder)
    303303{
    304304    AutoCaller autoCaller (this);
    … …  
    329329}
    330330
    331 STDMETHODIMP SystemProperties::COMSETTER(DefaultHardDiskFolder) (INPTR BSTR aDefaultHardDiskFolder)
     331STDMETHODIMP SystemProperties::COMSETTER(DefaultHardDiskFolder) (IN_BSTR aDefaultHardDiskFolder)
    332332{
    333333    AutoCaller autoCaller (this);
    … …  
    375375}
    376376
    377 STDMETHODIMP SystemProperties::COMSETTER(DefaultHardDiskFormat) (INPTR BSTR aDefaultHardDiskFormat)
     377STDMETHODIMP SystemProperties::COMSETTER(DefaultHardDiskFormat) (IN_BSTR aDefaultHardDiskFormat)
    378378{
    379379    AutoCaller autoCaller (this);
    … …  
    404404}
    405405
    406 STDMETHODIMP SystemProperties::COMSETTER(RemoteDisplayAuthLibrary) (INPTR BSTR aRemoteDisplayAuthLibrary)
     406STDMETHODIMP SystemProperties::COMSETTER(RemoteDisplayAuthLibrary) (IN_BSTR aRemoteDisplayAuthLibrary)
    407407{
    408408    AutoCaller autoCaller (this);
    … …  
    433433}
    434434
    435 STDMETHODIMP SystemProperties::COMSETTER(WebServiceAuthLibrary) (INPTR BSTR aWebServiceAuthLibrary)
     435STDMETHODIMP SystemProperties::COMSETTER(WebServiceAuthLibrary) (IN_BSTR aWebServiceAuthLibrary)
    436436{
    437437    AutoCaller autoCaller (this);
    … …  
    604604 * @return ComObjPtr<HardDiskFormat>
    605605 */
    606 ComObjPtr <HardDiskFormat> SystemProperties::hardDiskFormat (const BSTR aFormat)
     606ComObjPtr <HardDiskFormat> SystemProperties::hardDiskFormat (CBSTR aFormat)
    607607{
    608608    ComObjPtr <HardDiskFormat> format;
    … …  
    631631/////////////////////////////////////////////////////////////////////////////
    632632
    633 HRESULT SystemProperties::setDefaultMachineFolder (const BSTR aPath)
     633HRESULT SystemProperties::setDefaultMachineFolder (CBSTR aPath)
    634634{
    635635    Utf8Str path;
    … …  
    653653}
    654654
    655 HRESULT SystemProperties::setDefaultHardDiskFolder (const BSTR aPath)
     655HRESULT SystemProperties::setDefaultHardDiskFolder (CBSTR aPath)
    656656{
    657657    Utf8Str path;
    … …  
    675675}
    676676
    677 HRESULT SystemProperties::setDefaultHardDiskFormat (const BSTR aFormat)
     677HRESULT SystemProperties::setDefaultHardDiskFormat (CBSTR aFormat)
    678678{
    679679    if (aFormat && *aFormat)
    … …  
    685685}
    686686
    687 HRESULT SystemProperties::setRemoteDisplayAuthLibrary (const BSTR aPath)
     687HRESULT SystemProperties::setRemoteDisplayAuthLibrary (CBSTR aPath)
    688688{
    689689    if (aPath && *aPath)
    … …  
    695695}
    696696
    697 HRESULT SystemProperties::setWebServiceAuthLibrary (const BSTR aPath)
     697HRESULT SystemProperties::setWebServiceAuthLibrary (CBSTR aPath)
    698698{
    699699    if (aPath && *aPath)

  • trunk/src/VBox/Main/USBControllerImpl.cpp

    r14972 r15051  
    335335    // IUSBDeviceFilter properties
    336336    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
    337     STDMETHOD(COMSETTER(Name)) (INPTR BSTR aName);
     337    STDMETHOD(COMSETTER(Name)) (IN_BSTR aName);
    338338    STDMETHOD(COMGETTER(Active)) (BOOL *aActive);
    339339    STDMETHOD(COMSETTER(Active)) (BOOL aActive);
    340340    STDMETHOD(COMGETTER(VendorId)) (BSTR *aVendorId);
    341     STDMETHOD(COMSETTER(VendorId)) (INPTR BSTR aVendorId);
     341    STDMETHOD(COMSETTER(VendorId)) (IN_BSTR aVendorId);
    342342    STDMETHOD(COMGETTER(ProductId)) (BSTR *aProductId);
    343     STDMETHOD(COMSETTER(ProductId)) (INPTR BSTR aProductId);
     343    STDMETHOD(COMSETTER(ProductId)) (IN_BSTR aProductId);
    344344    STDMETHOD(COMGETTER(Revision)) (BSTR *aRevision);
    345     STDMETHOD(COMSETTER(Revision)) (INPTR BSTR aRevision);
     345    STDMETHOD(COMSETTER(Revision)) (IN_BSTR aRevision);
    346346    STDMETHOD(COMGETTER(Manufacturer)) (BSTR *aManufacturer);
    347     STDMETHOD(COMSETTER(Manufacturer)) (INPTR BSTR aManufacturer);
     347    STDMETHOD(COMSETTER(Manufacturer)) (IN_BSTR aManufacturer);
    348348    STDMETHOD(COMGETTER(Product)) (BSTR *aProduct);
    349     STDMETHOD(COMSETTER(Product)) (INPTR BSTR aProduct);
     349    STDMETHOD(COMSETTER(Product)) (IN_BSTR aProduct);
    350350    STDMETHOD(COMGETTER(SerialNumber)) (BSTR *aSerialNumber);
    351     STDMETHOD(COMSETTER(SerialNumber)) (INPTR BSTR aSerialNumber);
     351    STDMETHOD(COMSETTER(SerialNumber)) (IN_BSTR aSerialNumber);
    352352    STDMETHOD(COMGETTER(Port)) (BSTR *aPort);
    353     STDMETHOD(COMSETTER(Port)) (INPTR BSTR aPort);
     353    STDMETHOD(COMSETTER(Port)) (IN_BSTR aPort);
    354354    STDMETHOD(COMGETTER(Remote)) (BSTR *aRemote);
    355     STDMETHOD(COMSETTER(Remote)) (INPTR BSTR aRemote);
     355    STDMETHOD(COMSETTER(Remote)) (IN_BSTR aRemote);
    356356    STDMETHOD(COMGETTER(MaskedInterfaces)) (ULONG *aMaskedIfs);
    357357    STDMETHOD(COMSETTER(MaskedInterfaces)) (ULONG aMaskedIfs);
    … …  
    384384/////////////////////////////////////////////////////////////////////////////
    385385
    386 STDMETHODIMP USBController::CreateDeviceFilter (INPTR BSTR aName,
     386STDMETHODIMP USBController::CreateDeviceFilter (IN_BSTR aName,
    387387                                                IUSBDeviceFilter **aFilter)
    388388{

  • trunk/src/VBox/Main/USBDeviceImpl.cpp

    r14972 r15051  
    144144 * @param   aId   Address of result variable.
    145145 */
    146 STDMETHODIMP OUSBDevice::COMGETTER(Id)(GUIDPARAMOUT aId)
     146STDMETHODIMP OUSBDevice::COMGETTER(Id)(OUT_GUID aId)
    147147{
    148148    CheckComArgOutPointerValid(aId);

  • trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

    r14972 r15051  
    2727
    2828HRESULT VirtualBoxErrorInfo::init (HRESULT aResultCode, const GUID &aIID,
    29                                    const BSTR aComponent, const BSTR aText,
     29                                   CBSTR aComponent, CBSTR aText,
    3030                                   IVirtualBoxErrorInfo *aNext)
    3131{
    … …  
    5050}
    5151
    52 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (GUIDPARAMOUT aIID)
     52STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (OUT_GUID aIID)
    5353{
    5454    CheckComArgOutPointerValid(aIID);

  • trunk/src/VBox/Main/VirtualBoxImpl.cpp

    r14959 r15051  
    745745
    746746/** @note Locks mSystemProperties object for reading. */
    747 STDMETHODIMP VirtualBox::CreateMachine (INPTR BSTR aName,
    748                                         INPTR BSTR aOsTypeId,
    749                                         INPTR BSTR aBaseFolder,
    750                                         INPTR GUIDPARAM aId,
     747STDMETHODIMP VirtualBox::CreateMachine (IN_BSTR aName,
     748                                        IN_BSTR aOsTypeId,
     749                                        IN_BSTR aBaseFolder,
     750                                        IN_GUID aId,
    751751                                        IMachine **aMachine)
    752752{
    … …  
    826826}
    827827
    828 STDMETHODIMP VirtualBox::CreateLegacyMachine (INPTR BSTR aName,
    829                                               INPTR BSTR aOsTypeId,
    830                                               INPTR BSTR aSettingsFile,
    831                                               INPTR GUIDPARAM aId,
     828STDMETHODIMP VirtualBox::CreateLegacyMachine (IN_BSTR aName,
     829                                              IN_BSTR aOsTypeId,
     830                                              IN_BSTR aSettingsFile,
     831                                              IN_GUID aId,
    832832                                              IMachine **aMachine)
    833833{
    … …  
    891891}
    892892
    893 STDMETHODIMP VirtualBox::OpenMachine (INPTR BSTR aSettingsFile,
     893STDMETHODIMP VirtualBox::OpenMachine (IN_BSTR aSettingsFile,
    894894                                      IMachine **aMachine)
    895895{
    … …  
    963963
    964964/** @note Locks objects! */
    965 STDMETHODIMP VirtualBox::GetMachine (INPTR GUIDPARAM aId, IMachine **aMachine)
     965STDMETHODIMP VirtualBox::GetMachine (IN_GUID aId, IMachine **aMachine)
    966966{
    967967    CheckComArgOutSafeArrayPointerValid(aMachine);
    … …  
    980980
    981981/** @note Locks this object for reading, then some machine objects for reading. */
    982 STDMETHODIMP VirtualBox::FindMachine (INPTR BSTR aName, IMachine **aMachine)
     982STDMETHODIMP VirtualBox::FindMachine (IN_BSTR aName, IMachine **aMachine)
    983983{
    984984    LogFlowThisFuncEnter();
    … …  
    10311031
    10321032/** @note Locks objects! */
    1033 STDMETHODIMP VirtualBox::UnregisterMachine (INPTR GUIDPARAM aId,
     1033STDMETHODIMP VirtualBox::UnregisterMachine (IN_GUID aId,
    10341034                                            IMachine **aMachine)
    10351035{
    … …  
    10661066}
    10671067
    1068 STDMETHODIMP VirtualBox::CreateHardDisk2 (INPTR BSTR aFormat,
    1069                                           INPTR BSTR aLocation,
     1068STDMETHODIMP VirtualBox::CreateHardDisk2 (IN_BSTR aFormat,
     1069                                          IN_BSTR aLocation,
    10701070                                          IHardDisk2 **aHardDisk)
    10711071{
    … …  
    10971097}
    10981098
    1099 STDMETHODIMP VirtualBox::OpenHardDisk2 (INPTR BSTR aLocation,
     1099STDMETHODIMP VirtualBox::OpenHardDisk2 (IN_BSTR aLocation,
    11001100                                        IHardDisk2 **aHardDisk)
    11011101{
    … …  
    11311131}
    11321132
    1133 STDMETHODIMP VirtualBox::GetHardDisk2 (INPTR GUIDPARAM aId,
     1133STDMETHODIMP VirtualBox::GetHardDisk2 (IN_GUID aId,
    11341134                                       IHardDisk2 **aHardDisk)
    11351135{
    … …  
    11491149}
    11501150
    1151 STDMETHODIMP VirtualBox::FindHardDisk2 (INPTR BSTR aLocation,
     1151STDMETHODIMP VirtualBox::FindHardDisk2 (IN_BSTR aLocation,
    11521152                                        IHardDisk2 **aHardDisk)
    11531153{
    … …  
    11681168
    11691169/** @note Doesn't lock anything. */
    1170 STDMETHODIMP VirtualBox::OpenDVDImage (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
     1170STDMETHODIMP VirtualBox::OpenDVDImage (IN_BSTR aLocation, IN_GUID aId,
    11711171                                       IDVDImage2 **aDVDImage)
    11721172{
    … …  
    11991199
    12001200/** @note Locks objects! */
    1201 STDMETHODIMP VirtualBox::GetDVDImage (INPTR GUIDPARAM aId, IDVDImage2 **aDVDImage)
     1201STDMETHODIMP VirtualBox::GetDVDImage (IN_GUID aId, IDVDImage2 **aDVDImage)
    12021202{
    12031203    CheckComArgOutSafeArrayPointerValid(aDVDImage);
    … …  
    12171217
    12181218/** @note Locks objects! */
    1219 STDMETHODIMP VirtualBox::FindDVDImage (INPTR BSTR aLocation, IDVDImage2 **aDVDImage)
     1219STDMETHODIMP VirtualBox::FindDVDImage (IN_BSTR aLocation, IDVDImage2 **aDVDImage)
    12201220{
    12211221    CheckComArgNotNull(aLocation);
    … …  
    12351235
    12361236/** @note Doesn't lock anything. */
    1237 STDMETHODIMP VirtualBox::OpenFloppyImage (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
     1237STDMETHODIMP VirtualBox::OpenFloppyImage (IN_BSTR aLocation, IN_GUID aId,
    12381238                                          IFloppyImage2 **aFloppyImage)
    12391239{
    … …  
    12661266
    12671267/** @note Locks objects! */
    1268 STDMETHODIMP VirtualBox::GetFloppyImage (INPTR GUIDPARAM aId,
     1268STDMETHODIMP VirtualBox::GetFloppyImage (IN_GUID aId,
    12691269                                         IFloppyImage2 **aFloppyImage)
    12701270
    … …  
    12861286
    12871287/** @note Locks objects! */
    1288 STDMETHODIMP VirtualBox::FindFloppyImage (INPTR BSTR aLocation,
     1288STDMETHODIMP VirtualBox::FindFloppyImage (IN_BSTR aLocation,
    12891289                                          IFloppyImage2 **aFloppyImage)
    12901290{
    … …  
    13051305
    13061306/** @note Locks this object for reading. */
    1307 STDMETHODIMP VirtualBox::GetGuestOSType (INPTR BSTR aId, IGuestOSType **aType)
     1307STDMETHODIMP VirtualBox::GetGuestOSType (IN_BSTR aId, IGuestOSType **aType)
    13081308{
    13091309    CheckComArgNotNull(aType);
    … …  
    13361336
    13371337STDMETHODIMP
    1338 VirtualBox::CreateSharedFolder (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable)
     1338VirtualBox::CreateSharedFolder (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
    13391339{
    13401340    CheckComArgNotNull(aName);
    … …  
    13471347}
    13481348
    1349 STDMETHODIMP VirtualBox::RemoveSharedFolder (INPTR BSTR aName)
     1349STDMETHODIMP VirtualBox::RemoveSharedFolder (IN_BSTR aName)
    13501350{
    13511351    CheckComArgNotNull(aName);
    … …  
    13611361 */
    13621362STDMETHODIMP VirtualBox::
    1363 GetNextExtraDataKey (INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
     1363GetNextExtraDataKey (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
    13641364{
    13651365    CheckComArgNotNull(aNextKey);
    … …  
    14591459 *  @note Locks this object for reading.
    14601460 */
    1461 STDMETHODIMP VirtualBox::GetExtraData (INPTR BSTR aKey, BSTR *aValue)
     1461STDMETHODIMP VirtualBox::GetExtraData (IN_BSTR aKey, BSTR *aValue)
    14621462{
    14631463    CheckComArgNotNull(aKey);
    … …  
    15201520 *  @note Locks this object for writing.
    15211521 */
    1522 STDMETHODIMP VirtualBox::SetExtraData (INPTR BSTR aKey, INPTR BSTR aValue)
     1522STDMETHODIMP VirtualBox::SetExtraData (IN_BSTR aKey, IN_BSTR aValue)
    15231523{
    15241524    CheckComArgNotNull(aKey);
    … …  
    15761576            {
    15771577                const char *sep = error.isEmpty() ? "" : ": ";
    1578                 const BSTR err = error.isNull() ? (const BSTR) L"" : error.raw();
     1578                CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
    15791579                LogWarningFunc (("Someone vetoed! Change refused%s%ls\n",
    15801580                                 sep, err));
    … …  
    16241624 *  @note Locks objects!
    16251625 */
    1626 STDMETHODIMP VirtualBox::OpenSession (ISession *aSession, INPTR GUIDPARAM aMachineId)
     1626STDMETHODIMP VirtualBox::OpenSession (ISession *aSession, IN_GUID aMachineId)
    16271627{
    16281628    CheckComArgNotNull(aSession);
    … …  
    16721672 */
    16731673STDMETHODIMP VirtualBox::OpenRemoteSession (ISession *aSession,
    1674                                             INPTR GUIDPARAM aMachineId,
    1675                                             INPTR BSTR aType,
    1676                                             INPTR BSTR aEnvironment,
     1674                                            IN_GUID aMachineId,
     1675                                            IN_BSTR aType,
     1676                                            IN_BSTR aEnvironment,
    16771677                                            IProgress **aProgress)
    16781678{
    … …  
    17311731 */
    17321732STDMETHODIMP VirtualBox::OpenExistingSession (ISession *aSession,
    1733                                               INPTR GUIDPARAM aMachineId)
     1733                                              IN_GUID aMachineId)
    17341734{
    17351735    CheckComArgNotNull(aSession);
    … …  
    18081808}
    18091809
    1810 STDMETHODIMP VirtualBox::WaitForPropertyChange (INPTR BSTR aWhat, ULONG aTimeout,
     1810STDMETHODIMP VirtualBox::WaitForPropertyChange (IN_BSTR aWhat, ULONG aTimeout,
    18111811                                                BSTR *aChanged, BSTR *aValues)
    18121812{
    … …  
    19221922 * @note Doesn't lock objects.
    19231923 */
    1924 HRESULT VirtualBox::removeProgress (INPTR GUIDPARAM aId)
     1924HRESULT VirtualBox::removeProgress (IN_GUID aId)
    19251925{
    19261926    AutoCaller autoCaller (this);
    … …  
    22832283 *  @note Locks this object for reading.
    22842284 */
    2285 BOOL VirtualBox::onExtraDataCanChange (const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue,
     2285BOOL VirtualBox::onExtraDataCanChange (const Guid &aId, IN_BSTR aKey, IN_BSTR aValue,
    22862286                                       Bstr &aError)
    22872287{
    … …  
    23232323{
    23242324    ExtraDataEvent (VirtualBox *aVB, const Guid &aMachineId,
    2325                     INPTR BSTR aKey, INPTR BSTR aVal)
     2325                    IN_BSTR aKey, IN_BSTR aVal)
    23262326        : CallbackEvent (aVB), machineId (aMachineId)
    23272327        , key (aKey), val (aVal)
    … …  
    23422342 *  @note Doesn't lock any object.
    23432343 */
    2344 void VirtualBox::onExtraDataChange (const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue)
     2344void VirtualBox::onExtraDataChange (const Guid &aId, IN_BSTR aKey, IN_BSTR aValue)
    23452345{
    23462346    postEvent (new ExtraDataEvent (this, aId, aKey, aValue));
    … …  
    24512451{
    24522452    GuestPropertyEvent (VirtualBox *aVBox, const Guid &aMachineId,
    2453                         INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags)
     2453                        IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
    24542454        : CallbackEvent (aVBox), machineId (aMachineId)
    24552455        , name (aName), value (aValue), flags(aFlags)
    … …  
    24702470 *  @note Doesn't lock any object.
    24712471 */
    2472 void VirtualBox::onGuestPropertyChange (const Guid &aMachineId, INPTR BSTR aName,
    2473                                         INPTR BSTR aValue, INPTR BSTR aFlags)
     2472void VirtualBox::onGuestPropertyChange (const Guid &aMachineId, IN_BSTR aName,
     2473                                        IN_BSTR aValue, IN_BSTR aFlags)
    24742474{
    24752475    postEvent (new GuestPropertyEvent (this, aMachineId, aName, aValue, aFlags));
    … …  
    26082608 */
    26092609HRESULT VirtualBox::
    2610 findHardDisk2 (const Guid *aId, const BSTR aLocation,
     2610findHardDisk2 (const Guid *aId, CBSTR aLocation,
    26112611               bool aSetError, ComObjPtr <HardDisk2> *aHardDisk /*= NULL*/)
    26122612{
    … …  
    26832683 * @note Locks this object and image objects for reading.
    26842684 */
    2685 HRESULT VirtualBox::findDVDImage2 (const Guid *aId, const BSTR aLocation,
     2685HRESULT VirtualBox::findDVDImage2 (const Guid *aId, CBSTR aLocation,
    26862686                                   bool aSetError,
    26872687                                   ComObjPtr <DVDImage2> *aImage /* = NULL */)
    … …  
    27552755 * @note Locks this object and image objects for reading.
    27562756 */
    2757 HRESULT VirtualBox::findFloppyImage2 (const Guid *aId, const BSTR aLocation,
     2757HRESULT VirtualBox::findFloppyImage2 (const Guid *aId, CBSTR aLocation,
    27582758                                      bool aSetError,
    27592759                                      ComObjPtr <FloppyImage2> *aImage /* = NULL */)

  • trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

    r13580 r15051  
    6969}
    7070
    71 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (GUIDPARAMOUT aIID)
     71STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (OUT_GUID aIID)
    7272{
    7373    if (!aIID)

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

    r14949 r15051  
    107107    STDMETHOD(COMSETTER(LogoDisplayTime))(ULONG displayTime);
    108108    STDMETHOD(COMGETTER(LogoImagePath))(BSTR *imagePath);
    109     STDMETHOD(COMSETTER(LogoImagePath))(INPTR BSTR imagePath);
     109    STDMETHOD(COMSETTER(LogoImagePath))(IN_BSTR imagePath);
    110110    STDMETHOD(COMGETTER(BootMenuMode))(BIOSBootMenuMode_T *bootMenuMode);
    111111    STDMETHOD(COMSETTER(BootMenuMode))(BIOSBootMenuMode_T bootMenuMode);

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

    r14949 r15051  
    141141    STDMETHOD(GetGuestEnteredACPIMode)(BOOL *aEntered);
    142142    STDMETHOD(SaveState) (IProgress **aProgress);
    143     STDMETHOD(AdoptSavedState) (INPTR BSTR aSavedStateFile);
     143    STDMETHOD(AdoptSavedState) (IN_BSTR aSavedStateFile);
    144144    STDMETHOD(DiscardSavedState)();
    145145    STDMETHOD(GetDeviceActivity) (DeviceType_T aDeviceType,
    146146                                 DeviceActivity_T *aDeviceActivity);
    147     STDMETHOD(AttachUSBDevice) (INPTR GUIDPARAM aId);
    148     STDMETHOD(DetachUSBDevice) (INPTR GUIDPARAM aId, IUSBDevice **aDevice);
    149     STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
    150     STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
    151     STDMETHOD(TakeSnapshot) (INPTR BSTR aName, INPTR BSTR aDescription,
     147    STDMETHOD(AttachUSBDevice) (IN_GUID aId);
     148    STDMETHOD(DetachUSBDevice) (IN_GUID aId, IUSBDevice **aDevice);
     149    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
     150    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
     151    STDMETHOD(TakeSnapshot) (IN_BSTR aName, IN_BSTR aDescription,
    152152                             IProgress **aProgress);
    153     STDMETHOD(DiscardSnapshot) (INPTR GUIDPARAM aId, IProgress **aProgress);
     153    STDMETHOD(DiscardSnapshot) (IN_GUID aId, IProgress **aProgress);
    154154    STDMETHOD(DiscardCurrentState) (IProgress **aProgress);
    155155    STDMETHOD(DiscardCurrentSnapshotAndState) (IProgress **aProgress);
    … …  
    189189    HRESULT onSharedFolderChange (BOOL aGlobal);
    190190    HRESULT onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
    191     HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
    192     HRESULT getGuestProperty (INPTR BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
    193     HRESULT setGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue, INPTR BSTR aFlags);
    194     HRESULT enumerateGuestProperties (INPTR BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
     191    HRESULT onUSBDeviceDetach (IN_GUID aId, IVirtualBoxErrorInfo *aError);
     192    HRESULT getGuestProperty (IN_BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
     193    HRESULT setGuestProperty (IN_BSTR aKey, IN_BSTR aValue, IN_BSTR aFlags);
     194    HRESULT enumerateGuestProperties (IN_BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
    195195    VMMDev *getVMMDev() { return mVMMDev; }
    196196    AudioSniffer *getAudioSniffer () { return mAudioSniffer; }
    … …  
    218218    void onUSBDeviceStateChange (IUSBDevice *aDevice, bool aAttached,
    219219                                 IVirtualBoxErrorInfo *aError);
    220     void onRuntimeError (BOOL aFatal, INPTR BSTR aErrorID, INPTR BSTR aMessage);
     220    void onRuntimeError (BOOL aFatal, IN_BSTR aErrorID, IN_BSTR aMessage);
    221221    HRESULT onShowWindow (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);
    222222
    … …  
    421421    }
    422422
    423     HRESULT findSharedFolder (const BSTR aName,
     423    HRESULT findSharedFolder (CBSTR aName,
    424424                              ComObjPtr <SharedFolder> &aSharedFolder,
    425425                              bool aSetError = false);
    426426
    427427    HRESULT fetchSharedFolders (BOOL aGlobal);
    428     bool findOtherSharedFolder (INPTR BSTR aName,
     428    bool findOtherSharedFolder (IN_BSTR aName,
    429429                                SharedFolderDataMap::const_iterator &aIt);
    430430
    431     HRESULT createSharedFolder (INPTR BSTR aName, SharedFolderData aData);
    432     HRESULT removeSharedFolder (INPTR BSTR aName);
     431    HRESULT createSharedFolder (CBSTR aName, SharedFolderData aData);
     432    HRESULT removeSharedFolder (CBSTR aName);
    433433
    434434    static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
    … …  
    494494    static DECLCALLBACK(int)    doGuestPropNotification (void *pvExtension, uint32_t,
    495495                                                         void *pvParms, uint32_t cbParms);
    496     HRESULT doEnumerateGuestProperties (INPTR BSTR aPatterns,
     496    HRESULT doEnumerateGuestProperties (CBSTR aPatterns,
    497497                                        ComSafeArrayOut(BSTR, aNames),
    498498                                        ComSafeArrayOut(BSTR, aValues),

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

    r14949 r15051  
    9191
    9292    // IDVDDrive methods
    93     STDMETHOD(MountImage) (INPTR GUIDPARAM aImageId);
     93    STDMETHOD(MountImage) (IN_GUID aImageId);
    9494    STDMETHOD(CaptureHostDrive) (IHostDVDDrive *aHostDVDDrive);
    9595    STDMETHOD(Unmount)();

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

    r14949 r15051  
    191191    }
    192192
    193     STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
     193    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
    194194    {
    195195        return S_OK;

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

    r14949 r15051  
    9191
    9292    // IFloppyDrive methods
    93     STDMETHOD(MountImage) (INPTR GUIDPARAM aImageId);
     93    STDMETHOD(MountImage) (IN_GUID aImageId);
    9494    STDMETHOD(CaptureHostDrive) (IHostFloppyDrive *aHostFloppyDrive);
    9595    STDMETHOD(Unmount)();

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

    r14949 r15051  
    7070
    7171    // IGuest methods
    72     STDMETHOD(SetCredentials)(INPTR BSTR aUserName, INPTR BSTR aPassword,
    73                               INPTR BSTR aDomain, BOOL aAllowInteractiveLogon);
     72    STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
     73                              IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
    7474    STDMETHOD(GetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal);
    7575

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

    r15044 r15051  
    7777
    7878    // public initializer/uninitializer for internal purposes only
    79     HRESULT init (VirtualBox *aVirtualBox, const BSTR aFormat,
    80                   const BSTR aLocation);
     79    HRESULT init (VirtualBox *aVirtualBox, CBSTR aFormat,
     80                  CBSTR aLocation);
    8181    HRESULT init (VirtualBox *aVirtualBox,
    82                   const BSTR aLocation);
     82                  CBSTR aLocation);
    8383    HRESULT init (VirtualBox *aVirtualBox, HardDisk2 *aParent,
    8484                  const settings::Key &aNode);
    … …  
    9999
    100100    // IHardDisk2 methods
    101     STDMETHOD(GetProperty) (INPTR BSTR aName, BSTR *aValue);
    102     STDMETHOD(SetProperty) (INPTR BSTR aName, INPTR BSTR aValue);
    103     STDMETHOD(GetProperties) (INPTR BSTR aNames,
     101    STDMETHOD(GetProperty) (IN_BSTR aName, BSTR *aValue);
     102    STDMETHOD(SetProperty) (IN_BSTR aName, IN_BSTR aValue);
     103    STDMETHOD(GetProperties) (IN_BSTR aNames,
    104104                              ComSafeArrayOut (BSTR, aReturnNames),
    105105                              ComSafeArrayOut (BSTR, aReturnValues));
    106     STDMETHOD(SetProperties) (ComSafeArrayIn (INPTR BSTR, aNames),
    107                               ComSafeArrayIn (INPTR BSTR, aValues));
     106    STDMETHOD(SetProperties) (ComSafeArrayIn (IN_BSTR, aNames),
     107                              ComSafeArrayIn (IN_BSTR, aValues));
    108108    STDMETHOD(CreateDynamicStorage) (ULONG64 aLogicalSize, IProgress **aProgress);
    109109    STDMETHOD(CreateFixedStorage) (ULONG64 aLogicalSize, IProgress **aProgress);
    110110    STDMETHOD(DeleteStorage) (IProgress **aProgress);
    111111    STDMETHOD(CreateDiffStorage) (IHardDisk2 *aTarget, IProgress **aProgress);
    112     STDMETHOD(MergeTo) (INPTR GUIDPARAM aTargetId, IProgress **aProgress);
     112    STDMETHOD(MergeTo) (IN_GUID aTargetId, IProgress **aProgress);
    113113    STDMETHOD(CloneTo) (IHardDisk2 *aTarget, IProgress **aProgress);
    114114    STDMETHOD(FlattenTo) (IHardDisk2 *aTarget, IProgress **aProgress);
    … …  
    232232private:
    233233
    234     HRESULT setLocation (const BSTR aLocation);
    235     HRESULT setFormat (const BSTR aFormat);
     234    HRESULT setLocation (CBSTR aLocation);
     235    HRESULT setFormat (CBSTR aFormat);
    236236
    237237    HRESULT queryInfo();

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

    r14949 r15051  
    5353
    5454    // public initializer/uninitializer for internal purposes only
    55     HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL,
    56                   INPTR BSTR aDescription = NULL);
     55    HRESULT init (IN_BSTR aName, IN_BSTR aUdi = NULL,
     56                  IN_BSTR aDescription = NULL);
    5757    void uninit();
    5858
    … …  
    8585COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostDVDDrive)
    8686
    87     STDMETHOD(FindByName) (INPTR BSTR aName, IHostDVDDrive **aDrive)
     87    STDMETHOD(FindByName) (IN_BSTR aName, IHostDVDDrive **aDrive)
    8888    {
    8989        if (!aName)

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

    r14949 r15051  
    5353
    5454    // public initializer/uninitializer for internal purposes only
    55     HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL,
    56                   INPTR BSTR aDescription = NULL);
     55    HRESULT init (IN_BSTR aName, IN_BSTR aUdi = NULL,
     56                  IN_BSTR aDescription = NULL);
    5757    void uninit();
    5858
    … …  
    8585COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostFloppyDrive)
    8686
    87     STDMETHOD(FindByName) (INPTR BSTR aName, IHostFloppyDrive **aDrive)
     87    STDMETHOD(FindByName) (IN_BSTR aName, IHostFloppyDrive **aDrive)
    8888    {
    8989        if (!aName)

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

    r14991 r15051  
    9999    // IHost methods
    100100#ifdef RT_OS_WINDOWS
    101     STDMETHOD(CreateHostNetworkInterface) (INPTR BSTR aName,
     101    STDMETHOD(CreateHostNetworkInterface) (IN_BSTR aName,
    102102                                           IHostNetworkInterface **aHostNetworkInterface,
    103103                                           IProgress **aProgress);
    104     STDMETHOD(RemoveHostNetworkInterface) (INPTR GUIDPARAM aId,
     104    STDMETHOD(RemoveHostNetworkInterface) (IN_GUID aId,
    105105                                           IHostNetworkInterface **aHostNetworkInterface,
    106106                                           IProgress **aProgress);
    107107#endif
    108     STDMETHOD(CreateUSBDeviceFilter) (INPTR BSTR aName, IHostUSBDeviceFilter **aFilter);
     108    STDMETHOD(CreateUSBDeviceFilter) (IN_BSTR aName, IHostUSBDeviceFilter **aFilter);
    109109    STDMETHOD(InsertUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter *aFilter);
    110110    STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);

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

    r14949 r15051  
    5959    // IHostNetworkInterface properties
    6060    STDMETHOD(COMGETTER(Name)) (BSTR *aInterfaceName);
    61     STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aGuid);
     61    STDMETHOD(COMGETTER(Id)) (OUT_GUID aGuid);
    6262
    6363    // for VirtualBoxSupportErrorInfoImpl
    … …  
    7171COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostNetworkInterface)
    7272
    73     STDMETHOD(FindByName) (INPTR BSTR name, IHostNetworkInterface **networkInterface)
     73    STDMETHOD(FindByName) (IN_BSTR name, IHostNetworkInterface **networkInterface)
    7474    {
    7575        if (!name)
    … …  
    9797    }
    9898
    99     STDMETHOD(FindById) (INPTR GUIDPARAM id, IHostNetworkInterface **networkInterface)
     99    STDMETHOD(FindById) (IN_GUID id, IHostNetworkInterface **networkInterface)
    100100    {
    101101        if (Guid(id).isEmpty())

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

    r14949 r15051  
    8282
    8383    // IMachineDebugger methods
    84     STDMETHOD(ResetStats (INPTR BSTR aPattern));
    85     STDMETHOD(DumpStats (INPTR BSTR aPattern));
    86     STDMETHOD(GetStats (INPTR BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats));
     84    STDMETHOD(ResetStats (IN_BSTR aPattern));
     85    STDMETHOD(DumpStats (IN_BSTR aPattern));
     86    STDMETHOD(GetStats (IN_BSTR aPattern, BOOL aWithDescriptions, BSTR *aStats));
    8787
    8888

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

    r14949 r15051  
    458458
    459459    // public initializer/uninitializer for internal purposes only
    460     HRESULT init (VirtualBox *aParent, const BSTR aConfigFile,
    461                   InitMode aMode, const BSTR aName = NULL,
     460    HRESULT init (VirtualBox *aParent, CBSTR aConfigFile,
     461                  InitMode aMode, CBSTR aName = NULL,
    462462                  GuestOSType *aOsType = NULL,
    463463                  BOOL aNameSync = TRUE, const Guid *aId = NULL);
    … …  
    469469    STDMETHOD(COMGETTER(AccessError)) (IVirtualBoxErrorInfo **aAccessError);
    470470    STDMETHOD(COMGETTER(Name))(BSTR *aName);
    471     STDMETHOD(COMSETTER(Name))(INPTR BSTR aName);
     471    STDMETHOD(COMSETTER(Name))(IN_BSTR aName);
    472472    STDMETHOD(COMGETTER(Description))(BSTR *aDescription);
    473     STDMETHOD(COMSETTER(Description))(INPTR BSTR aDescription);
    474     STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT aId);
     473    STDMETHOD(COMSETTER(Description))(IN_BSTR aDescription);
     474    STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
    475475    STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
    476     STDMETHOD(COMSETTER(OSTypeId)) (INPTR BSTR aOSTypeId);
     476    STDMETHOD(COMSETTER(OSTypeId)) (IN_BSTR aOSTypeId);
    477477    STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
    478478    STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);
    … …  
    499499    STDMETHOD(COMSETTER(PAEEnabled))(BOOL enabled);
    500500    STDMETHOD(COMGETTER(SnapshotFolder))(BSTR *aSavedStateFolder);
    501     STDMETHOD(COMSETTER(SnapshotFolder))(INPTR BSTR aSavedStateFolder);
     501    STDMETHOD(COMSETTER(SnapshotFolder))(IN_BSTR aSavedStateFolder);
    502502    STDMETHOD(COMGETTER(HardDisk2Attachments))(ComSafeArrayOut (IHardDisk2Attachment *, aAttachments));
    503503    STDMETHOD(COMGETTER(VRDPServer))(IVRDPServer **vrdpServer);
    … …  
    524524    STDMETHOD(COMSETTER(ClipboardMode)) (ClipboardMode_T aClipboardMode);
    525525    STDMETHOD(COMGETTER(GuestPropertyNotificationPatterns)) (BSTR *aPattern);
    526     STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns)) (INPTR BSTR aPattern);
     526    STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns)) (IN_BSTR aPattern);
    527527
    528528    // IMachine methods
    529529    STDMETHOD(SetBootOrder)(ULONG aPosition, DeviceType_T aDevice);
    530530    STDMETHOD(GetBootOrder)(ULONG aPosition, DeviceType_T *aDevice);
    531     STDMETHOD(AttachHardDisk2) (INPTR GUIDPARAM aId, StorageBus_T aBus,
     531    STDMETHOD(AttachHardDisk2) (IN_GUID aId, StorageBus_T aBus,
    532532                                LONG aChannel, LONG aDevice);
    533533    STDMETHOD(GetHardDisk2) (StorageBus_T aBus, LONG aChannel, LONG aDevice,
    … …  
    537537    STDMETHOD(GetParallelPort) (ULONG slot, IParallelPort **port);
    538538    STDMETHOD(GetNetworkAdapter) (ULONG slot, INetworkAdapter **adapter);
    539     STDMETHOD(GetNextExtraDataKey)(INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
    540     STDMETHOD(GetExtraData)(INPTR BSTR aKey, BSTR *aValue);
    541     STDMETHOD(SetExtraData)(INPTR BSTR aKey, INPTR BSTR aValue);
     539    STDMETHOD(GetNextExtraDataKey)(IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
     540    STDMETHOD(GetExtraData)(IN_BSTR aKey, BSTR *aValue);
     541    STDMETHOD(SetExtraData)(IN_BSTR aKey, IN_BSTR aValue);
    542542    STDMETHOD(SaveSettings)();
    543543    STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
    544544    STDMETHOD(DiscardSettings)();
    545545    STDMETHOD(DeleteSettings)();
    546     STDMETHOD(GetSnapshot) (INPTR GUIDPARAM aId, ISnapshot **aSnapshot);
    547     STDMETHOD(FindSnapshot) (INPTR BSTR aName, ISnapshot **aSnapshot);
    548     STDMETHOD(SetCurrentSnapshot) (INPTR GUIDPARAM aId);
    549     STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
    550     STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
     546    STDMETHOD(GetSnapshot) (IN_GUID aId, ISnapshot **aSnapshot);
     547    STDMETHOD(FindSnapshot) (IN_BSTR aName, ISnapshot **aSnapshot);
     548    STDMETHOD(SetCurrentSnapshot) (IN_GUID aId);
     549    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
     550    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
    551551    STDMETHOD(CanShowConsoleWindow) (BOOL *aCanShow);
    552552    STDMETHOD(ShowConsoleWindow) (ULONG64 *aWinId);
    553     STDMETHOD(GetGuestProperty) (INPTR BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
    554     STDMETHOD(GetGuestPropertyValue) (INPTR BSTR aName, BSTR *aValue);
    555     STDMETHOD(GetGuestPropertyTimestamp) (INPTR BSTR aName, ULONG64 *aTimestamp);
    556     STDMETHOD(SetGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags);
    557     STDMETHOD(SetGuestPropertyValue) (INPTR BSTR aName, INPTR BSTR aValue);
    558     STDMETHOD(EnumerateGuestProperties) (INPTR BSTR aPattern, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
     553    STDMETHOD(GetGuestProperty) (IN_BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags);
     554    STDMETHOD(GetGuestPropertyValue) (IN_BSTR aName, BSTR *aValue);
     555    STDMETHOD(GetGuestPropertyTimestamp) (IN_BSTR aName, ULONG64 *aTimestamp);
     556    STDMETHOD(SetGuestProperty) (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags);
     557    STDMETHOD(SetGuestPropertyValue) (IN_BSTR aName, IN_BSTR aValue);
     558    STDMETHOD(EnumerateGuestProperties) (IN_BSTR aPattern, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
    559559
    560560    // public methods only for internal purposes
    … …  
    636636    HRESULT openSession (IInternalSessionControl *aControl);
    637637    HRESULT openRemoteSession (IInternalSessionControl *aControl,
    638                                INPTR BSTR aType, INPTR BSTR aEnvironment,
     638                               IN_BSTR aType, IN_BSTR aEnvironment,
    639639                               Progress *aProgress);
    640640    HRESULT openExistingSession (IInternalSessionControl *aControl);
    … …  
    682682    HRESULT trySetRegistered (BOOL aRegistered);
    683683
    684     HRESULT getSharedFolder (const BSTR aName,
     684    HRESULT getSharedFolder (CBSTR aName,
    685685                             ComObjPtr <SharedFolder> &aSharedFolder,
    686686                             bool aSetError = false)
    … …  
    713713    virtual HRESULT setMachineState (MachineState_T aMachineState);
    714714
    715     HRESULT findSharedFolder (const BSTR aName,
     715    HRESULT findSharedFolder (CBSTR aName,
    716716                              ComObjPtr <SharedFolder> &aSharedFolder,
    717717                              bool aSetError = false);
    … …  
    730730    HRESULT findSnapshot (const Guid &aId, ComObjPtr <Snapshot> &aSnapshot,
    731731                          bool aSetError = false);
    732     HRESULT findSnapshot (const BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
     732    HRESULT findSnapshot (IN_BSTR aName, ComObjPtr <Snapshot> &aSnapshot,
    733733                          bool aSetError = false);
    734734
    … …  
    875875    STDMETHOD(GetIPCId)(BSTR *id);
    876876    STDMETHOD(RunUSBDeviceFilters) (IUSBDevice *aUSBDevice, BOOL *aMatched, ULONG *aMaskedIfs);
    877     STDMETHOD(CaptureUSBDevice) (INPTR GUIDPARAM aId);
    878     STDMETHOD(DetachUSBDevice) (INPTR GUIDPARAM aId, BOOL aDone);
     877    STDMETHOD(CaptureUSBDevice) (IN_GUID aId);
     878    STDMETHOD(DetachUSBDevice) (IN_GUID aId, BOOL aDone);
    879879    STDMETHOD(AutoCaptureUSBDevices)();
    880880    STDMETHOD(DetachAllUSBDevices)(BOOL aDone);
    … …  
    882882    STDMETHOD(BeginSavingState) (IProgress *aProgress, BSTR *aStateFilePath);
    883883    STDMETHOD(EndSavingState) (BOOL aSuccess);
    884     STDMETHOD(AdoptSavedState) (INPTR BSTR aSavedStateFile);
     884    STDMETHOD(AdoptSavedState) (IN_BSTR aSavedStateFile);
    885885    STDMETHOD(BeginTakingSnapshot) (IConsole *aInitiator,
    886                                     INPTR BSTR aName, INPTR BSTR aDescription,
     886                                    IN_BSTR aName, IN_BSTR aDescription,
    887887                                    IProgress *aProgress, BSTR *aStateFilePath,
    888888                                    IProgress **aServerProgress);
    889889    STDMETHOD(EndTakingSnapshot) (BOOL aSuccess);
    890     STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, INPTR GUIDPARAM aId,
     890    STDMETHOD(DiscardSnapshot) (IConsole *aInitiator, IN_GUID aId,
    891891                               MachineState_T *aMachineState, IProgress **aProgress);
    892892    STDMETHOD(DiscardCurrentState) (
    … …  
    896896    STDMETHOD(PullGuestProperties) (ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues),
    897897              ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
    898     STDMETHOD(PushGuestProperties) (ComSafeArrayIn(INPTR BSTR, aNames), ComSafeArrayIn(INPTR BSTR, aValues),
    899               ComSafeArrayIn(ULONG64, aTimestamps), ComSafeArrayIn(INPTR BSTR, aFlags));
    900     STDMETHOD(PushGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue,
    901                                   ULONG64 aTimestamp, INPTR BSTR aFlags);
     898    STDMETHOD(PushGuestProperties) (ComSafeArrayIn(IN_BSTR, aNames), ComSafeArrayIn(IN_BSTR, aValues),
     899              ComSafeArrayIn(ULONG64, aTimestamps), ComSafeArrayIn(IN_BSTR, aFlags));
     900    STDMETHOD(PushGuestProperty) (IN_BSTR aName, IN_BSTR aValue,
     901                                  ULONG64 aTimestamp, IN_BSTR aFlags);
    902902
    903903    // public methods only for internal purposes
    … …  
    915915                               IVirtualBoxErrorInfo *aError,
    916916                               ULONG aMaskedIfs);
    917     HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId,
     917    HRESULT onUSBDeviceDetach (IN_GUID aId,
    918918                               IVirtualBoxErrorInfo *aError);
    919919    HRESULT onSharedFolderChange();
    … …  
    10281028    // public initializer/uninitializer for internal purposes only
    10291029    HRESULT init (SessionMachine *aSessionMachine,
    1030                   INPTR GUIDPARAM aSnapshotId, INPTR BSTR aStateFilePath);
     1030                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
    10311031    HRESULT init (Machine *aMachine,
    10321032                  const settings::Key &aHWNode, const settings::Key &aHDAsNode,
    1033                   INPTR GUIDPARAM aSnapshotId, INPTR BSTR aStateFilePath);
     1033                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
    10341034    void uninit();
    10351035

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

    r14949 r15051  
    486486        : F (aString), mString (aString) {}
    487487
    488     Matchable (const BSTR aString)
     488    Matchable (CBSTR aString)
    489489        : F (Bstr (aString)), mString (aString) {}
    490490
    … …  
    500500    }
    501501
    502     Matchable &operator= (const BSTR aString)
     502    Matchable &operator= (CBSTR aString)
    503503    {
    504504        F::operator= (Bstr (aString));

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

    r14949 r15051  
    9292
    9393    // IMedium properties
    94     STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
     94    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
    9595    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
    96     STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
     96    STDMETHOD(COMSETTER(Description)) (IN_BSTR aDescription);
    9797    STDMETHOD(COMGETTER(State)) (MediaState_T *aState);
    9898    STDMETHOD(COMGETTER(Location)) (BSTR *aLocation);
    99     STDMETHOD(COMSETTER(Location)) (INPTR BSTR aLocation);
     99    STDMETHOD(COMSETTER(Location)) (IN_BSTR aLocation);
    100100    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
    101101    STDMETHOD(COMGETTER(Size)) (ULONG64 *aSize);
    … …  
    104104
    105105    // IMedium methods
    106     STDMETHOD(GetSnapshotIds) (INPTR GUIDPARAM aMachineId,
     106    STDMETHOD(GetSnapshotIds) (IN_GUID aMachineId,
    107107                               ComSafeGUIDArrayOut (aSnapshotIds));
    108108    STDMETHOD(LockRead) (MediaState_T *aState);
    … …  
    142142    virtual Utf8Str name();
    143143
    144     virtual HRESULT setLocation (const BSTR aLocation);
     144    virtual HRESULT setLocation (CBSTR aLocation);
    145145    virtual HRESULT queryInfo();
    146146
    … …  
    222222
    223223    // protected initializer/uninitializer for internal purposes only
    224     HRESULT protectedInit (VirtualBox *aVirtualBox, const BSTR aLocation,
     224    HRESULT protectedInit (VirtualBox *aVirtualBox, CBSTR aLocation,
    225225                           const Guid &aId);
    226226    HRESULT protectedInit (VirtualBox *aVirtualBox, const settings::Key &aImageNode);
    … …  
    265265    // public initializer/uninitializer for internal purposes only
    266266
    267     HRESULT init (VirtualBox *aParent, const BSTR aFilePath,
     267    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
    268268                  const Guid &aId)
    269269    {
    … …  
    318318    // public initializer/uninitializer for internal purposes only
    319319
    320     HRESULT init (VirtualBox *aParent, const BSTR aFilePath,
     320    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
    321321                  const Guid &aId)
    322322    {

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

    r14949 r15051  
    122122    STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
    123123    STDMETHOD(COMGETTER(MACAddress)) (BSTR *aMACAddress);
    124     STDMETHOD(COMSETTER(MACAddress)) (INPTR BSTR aMACAddress);
     124    STDMETHOD(COMSETTER(MACAddress)) (IN_BSTR aMACAddress);
    125125    STDMETHOD(COMGETTER(AttachmentType)) (NetworkAttachmentType_T *aAttachmentType);
    126126    STDMETHOD(COMGETTER(HostInterface)) (BSTR *aHostInterface);
    127     STDMETHOD(COMSETTER(HostInterface)) (INPTR BSTR aHostInterface);
     127    STDMETHOD(COMSETTER(HostInterface)) (IN_BSTR aHostInterface);
    128128#ifndef RT_OS_WINDOWS /** @todo ifdef VBOX_WITH_UNIXY_TAP_NETWORKING: need to find a way to exclude this in the xidl... */
    129129    STDMETHOD(COMGETTER(TAPFileDescriptor)) (LONG *aTAPFileDescriptor);
    130130    STDMETHOD(COMSETTER(TAPFileDescriptor)) (LONG aTAPFileDescriptor);
    131131    STDMETHOD(COMGETTER(TAPSetupApplication)) (BSTR *aTAPSetupApplication);
    132     STDMETHOD(COMSETTER(TAPSetupApplication)) (INPTR BSTR aTAPSetupApplication);
     132    STDMETHOD(COMSETTER(TAPSetupApplication)) (IN_BSTR aTAPSetupApplication);
    133133    STDMETHOD(COMGETTER(TAPTerminateApplication)) (BSTR *aTAPTerminateApplication);
    134     STDMETHOD(COMSETTER(TAPTerminateApplication)) (INPTR BSTR aTAPTerminateApplication);
     134    STDMETHOD(COMSETTER(TAPTerminateApplication)) (IN_BSTR aTAPTerminateApplication);
    135135#endif
    136136    STDMETHOD(COMGETTER(InternalNetwork)) (BSTR *aInternalNetwork);
    137     STDMETHOD(COMSETTER(InternalNetwork)) (INPTR BSTR aInternalNetwork);
     137    STDMETHOD(COMSETTER(InternalNetwork)) (IN_BSTR aInternalNetwork);
    138138    STDMETHOD(COMGETTER(NATNetwork)) (BSTR *aNATNetwork);
    139     STDMETHOD(COMSETTER(NATNetwork)) (INPTR BSTR aNATNetwork);
     139    STDMETHOD(COMSETTER(NATNetwork)) (IN_BSTR aNATNetwork);
    140140    STDMETHOD(COMGETTER(CableConnected)) (BOOL *aConnected);
    141141    STDMETHOD(COMSETTER(CableConnected)) (BOOL aConnected);
    … …  
    145145    STDMETHOD(COMSETTER(LineSpeed)) (ULONG aSpeed);
    146146    STDMETHOD(COMGETTER(TraceFile)) (BSTR *aTraceFile);
    147     STDMETHOD(COMSETTER(TraceFile)) (INPTR BSTR aTraceFile);
     147    STDMETHOD(COMSETTER(TraceFile)) (IN_BSTR aTraceFile);
    148148
    149149    // INetworkAdapter methods

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

    r14949 r15051  
    9595    STDMETHOD(COMSETTER(IOBase))  (ULONG      aIOBase);
    9696    STDMETHOD(COMGETTER(Path))    (BSTR      *aPath);
    97     STDMETHOD(COMSETTER(Path))    (INPTR BSTR aPath);
     97    STDMETHOD(COMSETTER(Path))    (IN_BSTR aPath);
    9898
    9999    // public methods only for internal purposes
    … …  
    116116private:
    117117
    118     HRESULT checkSetPath (const BSTR aPath);
     118    HRESULT checkSetPath (CBSTR aPath);
    119119
    120120    const ComObjPtr <Machine, ComWeakRef> mParent;

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

    r14949 r15051  
    386386    {
    387387    public:
    388         Filter(ComSafeArrayIn(INPTR BSTR, metricNames),
     388        Filter(ComSafeArrayIn(IN_BSTR, metricNames),
    389389               ComSafeArrayIn(IUnknown * , objects));
    390390        static bool patternMatch(const char *pszPat, const char *pszName,
    … …  
    392392        bool match(const ComPtr<IUnknown> object, const std::string &name) const;
    393393    private:
    394         void init(ComSafeArrayIn(INPTR BSTR, metricNames),
     394        void init(ComSafeArrayIn(IN_BSTR, metricNames),
    395395                  ComSafeArrayIn(IUnknown * , objects));
    396396

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

    r14949 r15051  
    143143
    144144    // IPerformanceCollector methods
    145     STDMETHOD(GetMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
     145    STDMETHOD(GetMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
    146146                           ComSafeArrayIn (IUnknown *, objects),
    147147                           ComSafeArrayOut (IPerformanceMetric *, outMetrics));
    148     STDMETHOD(SetupMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
     148    STDMETHOD(SetupMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
    149149                             ComSafeArrayIn (IUnknown *, objects),
    150150                             ULONG aPeriod, ULONG aCount,
    151151                             ComSafeArrayOut (IPerformanceMetric *,
    152152                                              outMetrics));
    153     STDMETHOD(EnableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
     153    STDMETHOD(EnableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
    154154                              ComSafeArrayIn (IUnknown *, objects),
    155155                              ComSafeArrayOut (IPerformanceMetric *,
    156156                                               outMetrics));
    157     STDMETHOD(DisableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
     157    STDMETHOD(DisableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
    158158                               ComSafeArrayIn (IUnknown *, objects),
    159159                               ComSafeArrayOut (IPerformanceMetric *,
    160160                                                outMetrics));
    161     STDMETHOD(QueryMetricsData) (ComSafeArrayIn (INPTR BSTR, metricNames),
     161    STDMETHOD(QueryMetricsData) (ComSafeArrayIn (IN_BSTR, metricNames),
    162162                                 ComSafeArrayIn (IUnknown *, objects),
    163163                                 ComSafeArrayOut (BSTR, outMetricNames),

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

    r14949 r15051  
    6060#endif
    6161                  IUnknown *aInitiator,
    62                   const BSTR aDescription, GUIDPARAMOUT aId = NULL);
     62                  CBSTR aDescription, OUT_GUID aId = NULL);
    6363    HRESULT protectedInit (AutoInitSpan &aAutoInitSpan);
    6464    void protectedUninit (AutoUninitSpan &aAutoUninitSpan);
    … …  
    6767
    6868    // IProgress properties
    69     STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
     69    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
    7070    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
    7171    STDMETHOD(COMGETTER(Initiator)) (IUnknown **aInitiator);
    … …  
    154154#endif
    155155                  IUnknown *aInitiator,
    156                   const BSTR aDescription, BOOL aCancelable,
    157                   GUIDPARAMOUT aId = NULL)
     156                  CBSTR aDescription, BOOL aCancelable,
     157                  OUT_GUID aId = NULL)
    158158    {
    159159        return init (
    … …  
    169169#endif
    170170                  IUnknown *aInitiator,
    171                   const BSTR aDescription, BOOL aCancelable,
    172                   ULONG aOperationCount, const BSTR aOperationDescription,
    173                   GUIDPARAMOUT aId = NULL);
     171                  CBSTR aDescription, BOOL aCancelable,
     172                  ULONG aOperationCount, CBSTR aOperationDescription,
     173                  OUT_GUID aId = NULL);
    174174
    175175    HRESULT init (BOOL aCancelable, ULONG aOperationCount,
    176                   const BSTR aOperationDescription);
     176                  CBSTR aOperationDescription);
    177177
    178178    void uninit();
    … …  
    186186
    187187    HRESULT notifyProgress (LONG aPercent);
    188     HRESULT advanceOperation (const BSTR aOperationDescription);
     188    HRESULT advanceOperation (CBSTR aOperationDescription);
    189189
    190190    HRESULT notifyComplete (HRESULT aResultCode);
    … …  
    271271#endif
    272272                  IUnknown *aInitiator,
    273                   const BSTR aDescription,
     273                  CBSTR aDescription,
    274274                  IProgress *aProgress1, IProgress *aProgress2,
    275                   GUIDPARAMOUT aId = NULL);
     275                  OUT_GUID aId = NULL);
    276276
    277277    /**
    … …  
    292292#endif
    293293                  IUnknown *aInitiator,
    294                   const BSTR aDescription,
     294                  CBSTR aDescription,
    295295                  InputIterator aFirstProgress, InputIterator aLastProgress,
    296                   GUIDPARAMOUT aId = NULL)
     296                  OUT_GUID aId = NULL)
    297297    {
    298298        /* Enclose the state transition NotReady->InInit->Ready */
    … …  
    322322#endif
    323323                           IUnknown *aInitiator,
    324                            const BSTR aDescription, GUIDPARAMOUT aId);
     324                           CBSTR aDescription, OUT_GUID aId);
    325325
    326326public:

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

    r14949 r15051  
    6464
    6565    // IUSBDevice properties
    66     STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
     66    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
    6767    STDMETHOD(COMGETTER(VendorId)) (USHORT *aVendorId);
    6868    STDMETHOD(COMGETTER(ProductId)) (USHORT *aProductId);
    … …  
    140140COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <RemoteUSBDevice>, IHostUSBDevice, RemoteUSBDevice)
    141141
    142     STDMETHOD(FindById) (INPTR GUIDPARAM aId, IHostUSBDevice **aDevice)
     142    STDMETHOD(FindById) (IN_GUID aId, IHostUSBDevice **aDevice)
    143143    {
    144144        Guid idToFind = aId;
    … …  
    168168    }
    169169
    170     STDMETHOD(FindByAddress) (INPTR BSTR aAddress, IHostUSBDevice **aDevice)
     170    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IHostUSBDevice **aDevice)
    171171    {
    172172        if (!aAddress)

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

    r14949 r15051  
    104104    STDMETHOD(COMSETTER(IOBase))   (ULONG      aIOBase);
    105105    STDMETHOD(COMGETTER(Path))     (BSTR      *aPath);
    106     STDMETHOD(COMSETTER(Path))     (INPTR BSTR aPath);
     106    STDMETHOD(COMSETTER(Path))     (IN_BSTR aPath);
    107107    STDMETHOD(COMGETTER(Server))   (BOOL      *aServer);
    108108    STDMETHOD(COMSETTER(Server))   (BOOL       aServer);
    … …  
    127127private:
    128128
    129     HRESULT checkSetPath (const BSTR aPath);
     129    HRESULT checkSetPath (CBSTR aPath);
    130130
    131131    const ComObjPtr <Machine, ComWeakRef> mParent;

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

    r14949 r15051  
    104104    STDMETHOD(OnSharedFolderChange) (BOOL aGlobal);
    105105    STDMETHOD(OnUSBDeviceAttach) (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
    106     STDMETHOD(OnUSBDeviceDetach) (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
     106    STDMETHOD(OnUSBDeviceDetach) (IN_GUID aId, IVirtualBoxErrorInfo *aError);
    107107    STDMETHOD(OnShowWindow) (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);
    108     STDMETHOD(AccessGuestProperty) (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags,
     108    STDMETHOD(AccessGuestProperty) (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
    109109                                    BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags);
    110     STDMETHOD(EnumerateGuestProperties) (INPTR BSTR aPatterns,
     110    STDMETHOD(EnumerateGuestProperties) (IN_BSTR aPatterns,
    111111                                         ComSafeArrayOut(BSTR, aNames),
    112112                                         ComSafeArrayOut(BSTR, aValues),

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

    r14949 r15051  
    6767
    6868    // public initializer/uninitializer for internal purposes only
    69     HRESULT init (Machine *aMachine, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
     69    HRESULT init (Machine *aMachine, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
    7070    HRESULT initCopy (Machine *aMachine, SharedFolder *aThat);
    71     HRESULT init (Console *aConsole, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
    72     HRESULT init (VirtualBox *aVirtualBox, const BSTR aName, const BSTR aHostPath, BOOL aWritable);
     71    HRESULT init (Console *aConsole, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
     72    HRESULT init (VirtualBox *aVirtualBox, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
    7373    void uninit();
    7474
    … …  
    9595
    9696    HRESULT protectedInit (VirtualBoxBaseWithChildrenNEXT *aParent,
    97                            const BSTR aName, const BSTR aHostPath, BOOL aWritable);
     97                           CBSTR aName, CBSTR aHostPath, BOOL aWritable);
    9898
    9999private:
    … …  
    111111COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (SharedFolder)
    112112
    113     STDMETHOD(FindByName) (INPTR BSTR aName, ISharedFolder **aSharedFolder)
     113    STDMETHOD(FindByName) (IN_BSTR aName, ISharedFolder **aSharedFolder)
    114114    {
    115115        if (!aName)

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

    r14949 r15051  
    7070
    7171    // public initializer/uninitializer only for internal purposes
    72     HRESULT init (const Guid &aId, INPTR BSTR aName, INPTR BSTR aDescription,
     72    HRESULT init (const Guid &aId, IN_BSTR aName, IN_BSTR aDescription,
    7373                  RTTIMESPEC aTimeStamp, SnapshotMachine *aMachine,
    7474                  Snapshot *aParent);
    … …  
    7878
    7979    // ISnapshot properties
    80     STDMETHOD(COMGETTER(Id)) (GUIDPARAMOUT aId);
     80    STDMETHOD(COMGETTER(Id)) (OUT_GUID aId);
    8181    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
    82     STDMETHOD(COMSETTER(Name)) (INPTR BSTR aName);
     82    STDMETHOD(COMSETTER(Name)) (IN_BSTR aName);
    8383    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
    84     STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
     84    STDMETHOD(COMSETTER(Description)) (IN_BSTR aDescription);
    8585    STDMETHOD(COMGETTER(TimeStamp)) (LONG64 *aTimeStamp);
    8686    STDMETHOD(COMGETTER(Online)) (BOOL *aOnline);
    … …  
    110110
    111111    ULONG descendantCount();
    112     ComObjPtr <Snapshot> findChildOrSelf (INPTR GUIDPARAM aId);
    113     ComObjPtr <Snapshot> findChildOrSelf (INPTR BSTR aName);
     112    ComObjPtr <Snapshot> findChildOrSelf (IN_GUID aId);
     113    ComObjPtr <Snapshot> findChildOrSelf (IN_BSTR aName);
    114114
    115115    void updateSavedStatePaths (const char *aOldPath, const char *aNewPath);

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

    r14949 r15051  
    7676    STDMETHOD(COMGETTER(MaxBootPosition) (ULONG *aMaxBootPosition));
    7777    STDMETHOD(COMGETTER(DefaultMachineFolder)) (BSTR *aDefaultMachineFolder);
    78     STDMETHOD(COMSETTER(DefaultMachineFolder)) (INPTR BSTR aDefaultMachineFolder);
     78    STDMETHOD(COMSETTER(DefaultMachineFolder)) (IN_BSTR aDefaultMachineFolder);
    7979    STDMETHOD(COMGETTER(DefaultHardDiskFolder)) (BSTR *aDefaultHardDiskFolder);
    80     STDMETHOD(COMSETTER(DefaultHardDiskFolder)) (INPTR BSTR aDefaultHardDiskFolder);
     80    STDMETHOD(COMSETTER(DefaultHardDiskFolder)) (IN_BSTR aDefaultHardDiskFolder);
    8181    STDMETHOD(COMGETTER(HardDiskFormats)) (ComSafeArrayOut (IHardDiskFormat *, aHardDiskFormats));
    8282    STDMETHOD(COMGETTER(DefaultHardDiskFormat)) (BSTR *aDefaultHardDiskFolder);
    83     STDMETHOD(COMSETTER(DefaultHardDiskFormat)) (INPTR BSTR aDefaultHardDiskFolder);
     83    STDMETHOD(COMSETTER(DefaultHardDiskFormat)) (IN_BSTR aDefaultHardDiskFolder);
    8484    STDMETHOD(COMGETTER(RemoteDisplayAuthLibrary)) (BSTR *aRemoteDisplayAuthLibrary);
    85     STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary)) (INPTR BSTR aRemoteDisplayAuthLibrary);
     85    STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary)) (IN_BSTR aRemoteDisplayAuthLibrary);
    8686    STDMETHOD(COMGETTER(WebServiceAuthLibrary)) (BSTR *aWebServiceAuthLibrary);
    87     STDMETHOD(COMSETTER(WebServiceAuthLibrary)) (INPTR BSTR aWebServiceAuthLibrary);
     87    STDMETHOD(COMSETTER(WebServiceAuthLibrary)) (IN_BSTR aWebServiceAuthLibrary);
    8888    STDMETHOD(COMGETTER(HWVirtExEnabled)) (BOOL *enabled);
    8989    STDMETHOD(COMSETTER(HWVirtExEnabled)) (BOOL enabled);
    … …  
    9696    HRESULT saveSettings (settings::Key &aGlobal);
    9797
    98     ComObjPtr <HardDiskFormat> hardDiskFormat (const BSTR aFormat);
     98    ComObjPtr <HardDiskFormat> hardDiskFormat (CBSTR aFormat);
    9999
    100100    // public methods for internal purposes only
    … …  
    120120    typedef std::list <ComObjPtr <HardDiskFormat> > HardDiskFormatList;
    121121
    122     HRESULT setDefaultMachineFolder (const BSTR aPath);
    123     HRESULT setDefaultHardDiskFolder (const BSTR aPath);
    124     HRESULT setDefaultHardDiskFormat (const BSTR aFormat);
     122    HRESULT setDefaultMachineFolder (CBSTR aPath);
     123    HRESULT setDefaultHardDiskFolder (CBSTR aPath);
     124    HRESULT setDefaultHardDiskFormat (CBSTR aFormat);
    125125
    126     HRESULT setRemoteDisplayAuthLibrary (const BSTR aPath);
    127     HRESULT setWebServiceAuthLibrary (const BSTR aPath);
     126    HRESULT setRemoteDisplayAuthLibrary (CBSTR aPath);
     127    HRESULT setWebServiceAuthLibrary (CBSTR aPath);
    128128
    129129    const ComObjPtr <VirtualBox, ComWeakRef> mParent;

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

    r14949 r15051  
    102102
    103103    // IUSBController methods
    104     STDMETHOD(CreateDeviceFilter) (INPTR BSTR aName, IUSBDeviceFilter **aFilter);
     104    STDMETHOD(CreateDeviceFilter) (IN_BSTR aName, IUSBDeviceFilter **aFilter);
    105105    STDMETHOD(InsertDeviceFilter) (ULONG aPosition, IUSBDeviceFilter *aFilter);
    106106    STDMETHOD(RemoveDeviceFilter) (ULONG aPosition, IUSBDeviceFilter **aFilter);

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

    r14949 r15051  
    6464
    6565    // IUSBDevice properties
    66     STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT aId);
     66    STDMETHOD(COMGETTER(Id))(OUT_GUID aId);
    6767    STDMETHOD(COMGETTER(VendorId))(USHORT *aVendorId);
    6868    STDMETHOD(COMGETTER(ProductId))(USHORT *aProductId);
    … …  
    123123COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <OUSBDevice>, IUSBDevice, OUSBDevice)
    124124
    125     STDMETHOD(FindById) (INPTR GUIDPARAM aId, IUSBDevice **aDevice)
     125    STDMETHOD(FindById) (IN_GUID aId, IUSBDevice **aDevice)
    126126    {
    127127        Guid idToFind = aId;
    … …  
    153153    }
    154154
    155     STDMETHOD(FindByAddress) (INPTR BSTR aAddress, IUSBDevice **aDevice)
     155    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IUSBDevice **aDevice)
    156156    {
    157157        if (!aAddress)

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

    r14949 r15051  
    9292    STDMETHOD(COMSETTER(Port)) (ULONG aPort);
    9393    STDMETHOD(COMGETTER(NetAddress)) (BSTR *aAddress);
    94     STDMETHOD(COMSETTER(NetAddress)) (INPTR BSTR aAddress);
     94    STDMETHOD(COMSETTER(NetAddress)) (IN_BSTR aAddress);
    9595    STDMETHOD(COMGETTER(AuthType)) (VRDPAuthType_T *aType);
    9696    STDMETHOD(COMSETTER(AuthType)) (VRDPAuthType_T aType);

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

    r14972 r15051  
    7070    // public initializer/uninitializer for internal purposes only
    7171    HRESULT init (HRESULT aResultCode, const GUID &aIID,
    72                   const BSTR aComponent, const BSTR aText,
     72                  CBSTR aComponent, CBSTR aText,
    7373                  IVirtualBoxErrorInfo *aNext = NULL);
    7474
    7575    // IVirtualBoxErrorInfo properties
    7676    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
    77     STDMETHOD(COMGETTER(InterfaceID)) (GUIDPARAMOUT aIID);
     77    STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
    7878    STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);
    7979    STDMETHOD(COMGETTER(Text)) (BSTR *aText);

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

    r14949 r15051  
    137137    /* IVirtualBox methods */
    138138
    139     STDMETHOD(CreateMachine) (INPTR BSTR aName, INPTR BSTR aOsTypeId, INPTR BSTR aBaseFolder,
    140                               INPTR GUIDPARAM aId, IMachine **aMachine);
    141     STDMETHOD(CreateLegacyMachine) (INPTR BSTR aName, INPTR BSTR aOsTypeId, INPTR BSTR aSettingsFile,
    142                                     INPTR GUIDPARAM aId, IMachine **aMachine);
    143     STDMETHOD(OpenMachine) (INPTR BSTR aSettingsFile, IMachine **aMachine);
     139    STDMETHOD(CreateMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aBaseFolder,
     140                              IN_GUID aId, IMachine **aMachine);
     141    STDMETHOD(CreateLegacyMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aSettingsFile,
     142                                    IN_GUID aId, IMachine **aMachine);
     143    STDMETHOD(OpenMachine) (IN_BSTR aSettingsFile, IMachine **aMachine);
    144144    STDMETHOD(RegisterMachine) (IMachine *aMachine);
    145     STDMETHOD(GetMachine) (INPTR GUIDPARAM aId, IMachine **aMachine);
    146     STDMETHOD(FindMachine) (INPTR BSTR aName, IMachine **aMachine);
    147     STDMETHOD(UnregisterMachine) (INPTR GUIDPARAM aId, IMachine **aMachine);
    148 
    149     STDMETHOD(CreateHardDisk2) (INPTR BSTR aFormat, INPTR BSTR aLocation,
     145    STDMETHOD(GetMachine) (IN_GUID aId, IMachine **aMachine);
     146    STDMETHOD(FindMachine) (IN_BSTR aName, IMachine **aMachine);
     147    STDMETHOD(UnregisterMachine) (IN_GUID aId, IMachine **aMachine);
     148
     149    STDMETHOD(CreateHardDisk2) (IN_BSTR aFormat, IN_BSTR aLocation,
    150150                                IHardDisk2 **aHardDisk);
    151     STDMETHOD(OpenHardDisk2) (INPTR BSTR aLocation, IHardDisk2 **aHardDisk);
    152     STDMETHOD(GetHardDisk2) (INPTR GUIDPARAM aId, IHardDisk2 **aHardDisk);
    153     STDMETHOD(FindHardDisk2) (INPTR BSTR aLocation, IHardDisk2 **aHardDisk);
    154 
    155     STDMETHOD(OpenDVDImage) (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
     151    STDMETHOD(OpenHardDisk2) (IN_BSTR aLocation, IHardDisk2 **aHardDisk);
     152    STDMETHOD(GetHardDisk2) (IN_GUID aId, IHardDisk2 **aHardDisk);
     153    STDMETHOD(FindHardDisk2) (IN_BSTR aLocation, IHardDisk2 **aHardDisk);
     154
     155    STDMETHOD(OpenDVDImage) (IN_BSTR aLocation, IN_GUID aId,
    156156                             IDVDImage2 **aDVDImage);
    157     STDMETHOD(GetDVDImage) (INPTR GUIDPARAM aId, IDVDImage2 **aDVDImage);
    158     STDMETHOD(FindDVDImage) (INPTR BSTR aLocation, IDVDImage2 **aDVDImage);
    159 
    160     STDMETHOD(OpenFloppyImage) (INPTR BSTR aLocation, INPTR GUIDPARAM aId,
     157    STDMETHOD(GetDVDImage) (IN_GUID aId, IDVDImage2 **aDVDImage);
     158    STDMETHOD(FindDVDImage) (IN_BSTR aLocation, IDVDImage2 **aDVDImage);
     159
     160    STDMETHOD(OpenFloppyImage) (IN_BSTR aLocation, IN_GUID aId,
    161161                                IFloppyImage2 **aFloppyImage);
    162     STDMETHOD(GetFloppyImage) (INPTR GUIDPARAM aId, IFloppyImage2 **aFloppyImage);
    163     STDMETHOD(FindFloppyImage) (INPTR BSTR aLocation, IFloppyImage2 **aFloppyImage);
    164 
    165     STDMETHOD(GetGuestOSType) (INPTR BSTR aId, IGuestOSType **aType);
    166     STDMETHOD(CreateSharedFolder) (INPTR BSTR aName, INPTR BSTR aHostPath, BOOL aWritable);
    167     STDMETHOD(RemoveSharedFolder) (INPTR BSTR aName);
    168     STDMETHOD(GetNextExtraDataKey) (INPTR BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
    169     STDMETHOD(GetExtraData) (INPTR BSTR aKey, BSTR *aValue);
    170     STDMETHOD(SetExtraData) (INPTR BSTR aKey, INPTR BSTR aValue);
    171     STDMETHOD(OpenSession) (ISession *aSession, INPTR GUIDPARAM aMachineId);
    172     STDMETHOD(OpenRemoteSession) (ISession *aSession, INPTR GUIDPARAM aMachineId,
    173                                   INPTR BSTR aType, INPTR BSTR aEnvironment,
     162    STDMETHOD(GetFloppyImage) (IN_GUID aId, IFloppyImage2 **aFloppyImage);
     163    STDMETHOD(FindFloppyImage) (IN_BSTR aLocation, IFloppyImage2 **aFloppyImage);
     164
     165    STDMETHOD(GetGuestOSType) (IN_BSTR aId, IGuestOSType **aType);
     166    STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
     167    STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
     168    STDMETHOD(GetNextExtraDataKey) (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
     169    STDMETHOD(GetExtraData) (IN_BSTR aKey, BSTR *aValue);
     170    STDMETHOD(SetExtraData) (IN_BSTR aKey, IN_BSTR aValue);
     171    STDMETHOD(OpenSession) (ISession *aSession, IN_GUID aMachineId);
     172    STDMETHOD(OpenRemoteSession) (ISession *aSession, IN_GUID aMachineId,
     173                                  IN_BSTR aType, IN_BSTR aEnvironment,
    174174                                  IProgress **aProgress);
    175     STDMETHOD(OpenExistingSession) (ISession *aSession, INPTR GUIDPARAM aMachineId);
     175    STDMETHOD(OpenExistingSession) (ISession *aSession, IN_GUID aMachineId);
    176176
    177177    STDMETHOD(RegisterCallback) (IVirtualBoxCallback *aCallback);
    178178    STDMETHOD(UnregisterCallback) (IVirtualBoxCallback *aCallback);
    179179
    180     STDMETHOD(WaitForPropertyChange) (INPTR BSTR aWhat, ULONG aTimeout,
     180    STDMETHOD(WaitForPropertyChange) (IN_BSTR aWhat, ULONG aTimeout,
    181181                                      BSTR *aChanged, BSTR *aValues);
    182182
    … …  
    189189
    190190    HRESULT addProgress (IProgress *aProgress);
    191     HRESULT removeProgress (INPTR GUIDPARAM aId);
     191    HRESULT removeProgress (IN_GUID aId);
    192192
    193193#ifdef RT_OS_WINDOWS
    … …  
    204204    void onMachineStateChange (const Guid &aId, MachineState_T aState);
    205205    void onMachineDataChange (const Guid &aId);
    206     BOOL onExtraDataCanChange(const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue,
     206    BOOL onExtraDataCanChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue,
    207207                              Bstr &aError);
    208     void onExtraDataChange(const Guid &aId, INPTR BSTR aKey, INPTR BSTR aValue);
     208    void onExtraDataChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue);
    209209    void onMachineRegistered (const Guid &aId, BOOL aRegistered);
    210210    void onSessionStateChange (const Guid &aId, SessionState_T aState);
    … …  
    213213    void onSnapshotDiscarded (const Guid &aMachineId, const Guid &aSnapshotId);
    214214    void onSnapshotChange (const Guid &aMachineId, const Guid &aSnapshotId);
    215     void onGuestPropertyChange (const Guid &aMachineId, INPTR BSTR aName, INPTR BSTR aValue,
    216                                 INPTR BSTR aFlags);
     215    void onGuestPropertyChange (const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue,
     216                                IN_BSTR aFlags);
    217217
    218218    ComObjPtr <GuestOSType> getUnknownOSType();
    … …  
    234234                         ComObjPtr <Machine> *machine = NULL);
    235235
    236     HRESULT findHardDisk2 (const Guid *aId, const BSTR aLocation,
     236    HRESULT findHardDisk2 (const Guid *aId, CBSTR aLocation,
    237237                           bool aSetError, ComObjPtr <HardDisk2> *aHardDisk = NULL);
    238     HRESULT findDVDImage2 (const Guid *aId, const BSTR aLocation,
     238    HRESULT findDVDImage2 (const Guid *aId, CBSTR aLocation,
    239239                           bool aSetError, ComObjPtr <DVDImage2> *aImage = NULL);
    240     HRESULT findFloppyImage2 (const Guid *aId, const BSTR aLocation,
     240    HRESULT findFloppyImage2 (const Guid *aId, CBSTR aLocation,
    241241                              bool aSetError, ComObjPtr <FloppyImage2> *aImage = NULL);
    242242
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