VirtualBox

Changeset 42094 in vbox for trunk


Ignore:
Timestamp:
Jul 10, 2012 12:47:49 PM (13 years ago)
Author:
vboxsync
Message:

burn fix

Location:
trunk/src/VBox/Main
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r42090 r42094  
    5353    /** @name IGuestSession properties.
    5454     * @{ */
    55     STDMETHOD(COMGETTER(User))(IN_BSTR *aName);
    56     STDMETHOD(COMGETTER(Domain))(IN_BSTR *aDomain);
    57     STDMETHOD(COMGETTER(Name))(IN_BSTR *aName);
     55    STDMETHOD(COMGETTER(User))(BSTR *aName);
     56    STDMETHOD(COMGETTER(Domain))(BSTR *aDomain);
     57    STDMETHOD(COMGETTER(Name))(BSTR *aName);
    5858    STDMETHOD(COMGETTER(Id))(ULONG *aId);
    5959    STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout);
    60     STDMETHOD(COMGETTER(Environment))(ComSafeArrayOut(IN_BSTR, aEnvironment));
     60    STDMETHOD(COMGETTER(Environment))(ComSafeArrayOut(BSTR, aEnvironment));
    6161    STDMETHOD(COMGETTER(Processes))(ComSafeArrayOut(IGuestProcess *, aProcesses));
    6262    STDMETHOD(COMGETTER(Directories))(ComSafeArrayOut(IGuestDirectory *, aDirectories));
    … …  
    7575    STDMETHOD(DirectoryQueryInfo)(IN_BSTR aPath, IGuestFsObjInfo **aInfo);
    7676    STDMETHOD(DirectoryRemove)(IN_BSTR aPath);
    77     STDMETHOD(DirectoryRemoveRecursive)(IN_BSTR aPath, ComSafeArrayIn(DirectoryRemoveRecFlag, aFlags), IProgress **aProgress);
    78     STDMETHOD(DirectoryRename)(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag, aFlags));
     77    STDMETHOD(DirectoryRemoveRecursive)(IN_BSTR aPath, ComSafeArrayIn(DirectoryRemoveRecFlag_T, aFlags), IProgress **aProgress);
     78    STDMETHOD(DirectoryRename)(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag_T, aFlags));
    7979    STDMETHOD(DirectorySetACL)(IN_BSTR aPath, IN_BSTR aACL);
    8080    STDMETHOD(EnvironmentClear)(void);
    … …  
    8888    STDMETHOD(FileQuerySize)(IN_BSTR aPath, LONG64 *aSize);
    8989    STDMETHOD(FileRemove)(IN_BSTR aPath);
    90     STDMETHOD(FileRename)(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag, aFlags));
     90    STDMETHOD(FileRename)(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag_T, aFlags));
    9191    STDMETHOD(FileSetACL)(IN_BSTR aPath, IN_BSTR aACL);
    9292    STDMETHOD(ProcessCreate)(IN_BSTR aCommand, ComSafeArrayIn(IN_BSTR, aArguments), ComSafeArrayIn(IN_BSTR, aEnvironment),
    93                              ComSafeArrayIn(ProcessCreateFlag, aFlags), ULONG aTimeoutMS, IGuestProcess **IGuestProcess);
     93                             ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS, IGuestProcess **IGuestProcess);
    9494    STDMETHOD(ProcessCreateEx)(IN_BSTR aCommand, ComSafeArrayIn(IN_BSTR, aArguments), ComSafeArrayIn(IN_BSTR, aEnvironment),
    95                                ComSafeArrayIn(ProcessCreateFlag, aFlags), ULONG aTimeoutMS,
    96                                ProcessPriority aPriority, ComSafeArrayIn(ULONG, aAffinity),
     95                               ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
     96                               ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity),
    9797                               IGuestProcess **IGuestProcess);
    9898    STDMETHOD(ProcessGet)(ULONG aPID, IGuestProcess **IGuestProcess);
    9999    STDMETHOD(SetTimeout)(ULONG aTimeoutMS);
    100     STDMETHOD(SymlinkCreate)(IN_BSTR aSource, IN_BSTR aTarget, SymlinkType aType);
     100    STDMETHOD(SymlinkCreate)(IN_BSTR aSource, IN_BSTR aTarget, SymlinkType_T aType);
    101101    STDMETHOD(SymlinkExists)(IN_BSTR aSymlink, BOOL *aExists);
    102     STDMETHOD(SymlinkRead)(IN_BSTR aSymlink, ComSafeArrayIn(SymlinkReadFlag, aFlags), IN_BSTR *aTarget);
     102    STDMETHOD(SymlinkRead)(IN_BSTR aSymlink, ComSafeArrayIn(SymlinkReadFlag_T, aFlags), BSTR *aTarget);
    103103    STDMETHOD(SymlinkRemoveDirectory)(IN_BSTR aPath);
    104104    STDMETHOD(SymlinkRemoveFile)(IN_BSTR aFile);

  • trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

    r42090 r42094  
    109109/////////////////////////////////////////////////////////////////////////////
    110110
    111 STDMETHODIMP GuestSession::COMGETTER(User)(IN_BSTR *aUser)
     111STDMETHODIMP GuestSession::COMGETTER(User)(BSTR *aUser)
    112112{
    113113#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    127127}
    128128
    129 STDMETHODIMP GuestSession::COMGETTER(Domain)(IN_BSTR *aDomain)
     129STDMETHODIMP GuestSession::COMGETTER(Domain)(BSTR *aDomain)
    130130{
    131131#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    145145}
    146146
    147 STDMETHODIMP GuestSession::COMGETTER(Name)(IN_BSTR *aName)
     147STDMETHODIMP GuestSession::COMGETTER(Name)(BSTR *aName)
    148148{
    149149#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    199199}
    200200
    201 STDMETHODIMP GuestSession::COMGETTER(Environment)(ComSafeArrayOut(IN_BSTR, aEnvironment))
     201STDMETHODIMP GuestSession::COMGETTER(Environment)(ComSafeArrayOut(BSTR, aEnvironment))
    202202{
    203203#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    298298}
    299299
    300 STDMETHODIMP GuestSession::CopyFrom(IN_BSTR aSource, BSTR aDest, ComSafeArrayIn(ULONG, aFlags), IProgress **aProgress)
    301 {
    302 #ifndef VBOX_WITH_GUEST_CONTROL
    303     ReturnComNotImplemented();
    304 #else
    305     AutoCaller autoCaller(this);
    306     if (FAILED(autoCaller.rc())) return autoCaller.rc();
    307 
    308     ReturnComNotImplemented();
    309 #endif /* VBOX_WITH_GUEST_CONTROL */
    310 }
    311 
    312 STDMETHODIMP GuestSession::CopyTo(IN_BSTR aSource, BSTR aDest, ComSafeArrayIn(ULONG, aFlags), IProgress **aProgress)
     300STDMETHODIMP GuestSession::CopyFrom(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(ULONG, aFlags), IProgress **aProgress)
     301{
     302#ifndef VBOX_WITH_GUEST_CONTROL
     303    ReturnComNotImplemented();
     304#else
     305    AutoCaller autoCaller(this);
     306    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     307
     308    ReturnComNotImplemented();
     309#endif /* VBOX_WITH_GUEST_CONTROL */
     310}
     311
     312STDMETHODIMP GuestSession::CopyTo(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(ULONG, aFlags), IProgress **aProgress)
    313313{
    314314#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    334334}
    335335
    336 STDMETHODIMP GuestSession::DirectoryCreateTemp(IN_BSTR aTemplate, ULONG aMode, BSTR aName, IGuestDirectory **aDirectory)
     336STDMETHODIMP GuestSession::DirectoryCreateTemp(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aName, IGuestDirectory **aDirectory)
    337337{
    338338#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    358358}
    359359
    360 STDMETHODIMP GuestSession::DirectoryOpen(IN_BSTR aPath, BSTR aFilter, BSTR aFlags, IGuestDirectory **aDirectory)
     360STDMETHODIMP GuestSession::DirectoryOpen(IN_BSTR aPath, IN_BSTR aFilter, IN_BSTR aFlags, IGuestDirectory **aDirectory)
    361361{
    362362#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    394394}
    395395
    396 STDMETHODIMP GuestSession::DirectoryRemoveRecursive(IN_BSTR aPath, ComSafeArrayIn(DirectoryRemoveRecFlag, aFlags), IProgress **aProgress)
    397 {
    398 #ifndef VBOX_WITH_GUEST_CONTROL
    399     ReturnComNotImplemented();
    400 #else
    401     AutoCaller autoCaller(this);
    402     if (FAILED(autoCaller.rc())) return autoCaller.rc();
    403 
    404     ReturnComNotImplemented();
    405 #endif /* VBOX_WITH_GUEST_CONTROL */
    406 }
    407 
    408 STDMETHODIMP GuestSession::DirectoryRename(IN_BSTR aSource, BSTR aDest, ComSafeArrayIn(PathRenameFlag, aFlags))
    409 {
    410 #ifndef VBOX_WITH_GUEST_CONTROL
    411     ReturnComNotImplemented();
    412 #else
    413     AutoCaller autoCaller(this);
    414     if (FAILED(autoCaller.rc())) return autoCaller.rc();
    415 
    416     ReturnComNotImplemented();
    417 #endif /* VBOX_WITH_GUEST_CONTROL */
    418 }
    419 
    420 STDMETHODIMP GuestSession::DirectorySetACL(IN_BSTR aPath, BSTR aACL)
     396STDMETHODIMP GuestSession::DirectoryRemoveRecursive(IN_BSTR aPath, ComSafeArrayIn(DirectoryRemoveRecFlag_T, aFlags), IProgress **aProgress)
     397{
     398#ifndef VBOX_WITH_GUEST_CONTROL
     399    ReturnComNotImplemented();
     400#else
     401    AutoCaller autoCaller(this);
     402    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     403
     404    ReturnComNotImplemented();
     405#endif /* VBOX_WITH_GUEST_CONTROL */
     406}
     407
     408STDMETHODIMP GuestSession::DirectoryRename(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag_T, aFlags))
     409{
     410#ifndef VBOX_WITH_GUEST_CONTROL
     411    ReturnComNotImplemented();
     412#else
     413    AutoCaller autoCaller(this);
     414    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     415
     416    ReturnComNotImplemented();
     417#endif /* VBOX_WITH_GUEST_CONTROL */
     418}
     419
     420STDMETHODIMP GuestSession::DirectorySetACL(IN_BSTR aPath, IN_BSTR aACL)
    421421{
    422422#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    442442}
    443443
    444 STDMETHODIMP GuestSession::EnvironmentSet(IN_BSTR aName, BSTR aValue)
     444STDMETHODIMP GuestSession::EnvironmentSet(IN_BSTR aName, IN_BSTR aValue)
    445445{
    446446#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    478478}
    479479
    480 STDMETHODIMP GuestSession::FileCreateTemp(IN_BSTR aTemplate, ULONG aMode, BSTR aName, IGuestFile **aFile)
     480STDMETHODIMP GuestSession::FileCreateTemp(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aName, IGuestFile **aFile)
    481481{
    482482#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    502502}
    503503
    504 STDMETHODIMP GuestSession::FileOpen(IN_BSTR aPath, BSTR aOpenMode, BSTR aDisposition, ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile)
     504STDMETHODIMP GuestSession::FileOpen(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile)
    505505{
    506506#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    550550}
    551551
    552 STDMETHODIMP GuestSession::FileRename(IN_BSTR aSource, BSTR aDest, ComSafeArrayIn(PathRenameFlag, aFlags))
    553 {
    554 #ifndef VBOX_WITH_GUEST_CONTROL
    555     ReturnComNotImplemented();
    556 #else
    557     AutoCaller autoCaller(this);
    558     if (FAILED(autoCaller.rc())) return autoCaller.rc();
    559 
    560     ReturnComNotImplemented();
    561 #endif /* VBOX_WITH_GUEST_CONTROL */
    562 }
    563 
    564 STDMETHODIMP GuestSession::FileSetACL(IN_BSTR aPath, BSTR aACL)
     552STDMETHODIMP GuestSession::FileRename(IN_BSTR aSource, IN_BSTR aDest, ComSafeArrayIn(PathRenameFlag_T, aFlags))
     553{
     554#ifndef VBOX_WITH_GUEST_CONTROL
     555    ReturnComNotImplemented();
     556#else
     557    AutoCaller autoCaller(this);
     558    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     559
     560    ReturnComNotImplemented();
     561#endif /* VBOX_WITH_GUEST_CONTROL */
     562}
     563
     564STDMETHODIMP GuestSession::FileSetACL(IN_BSTR aPath, IN_BSTR aACL)
    565565{
    566566#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    575575
    576576STDMETHODIMP GuestSession::ProcessCreate(IN_BSTR aCommand, ComSafeArrayIn(IN_BSTR, aArguments), ComSafeArrayIn(IN_BSTR, aEnvironment),
    577                                          ComSafeArrayIn(ProcessCreateFlag, aFlags), ULONG aTimeoutMS, IGuestProcess **IGuestProcess)
     577                                         ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS, IGuestProcess **IGuestProcess)
    578578{
    579579#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    588588
    589589STDMETHODIMP GuestSession::ProcessCreateEx(IN_BSTR aCommand, ComSafeArrayIn(IN_BSTR, aArguments), ComSafeArrayIn(IN_BSTR, aEnvironment),
    590                                            ComSafeArrayIn(ProcessCreateFlag, aFlags), ULONG aTimeoutMS,
    591                                            ProcessPriority aPriority, ComSafeArrayIn(ULONG, aAffinity),
     590                                           ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
     591                                           ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity),
    592592                                           IGuestProcess **IGuestProcess)
    593593{
    … …  
    626626}
    627627
    628 STDMETHODIMP GuestSession::SymlinkCreate(IN_BSTR aSource, BSTR aTarget, SymlinkType aType)
     628STDMETHODIMP GuestSession::SymlinkCreate(IN_BSTR aSource, IN_BSTR aTarget, SymlinkType_T aType)
    629629{
    630630#ifndef VBOX_WITH_GUEST_CONTROL
    … …  
    650650}
    651651
    652 STDMETHODIMP GuestSession::SymlinkRead(IN_BSTR aSymlink, ComSafeArrayIn(SymlinkReadFlag, aFlags), BSTR *aTarget)
     652STDMETHODIMP GuestSession::SymlinkRead(IN_BSTR aSymlink, ComSafeArrayIn(SymlinkReadFlag_T, aFlags), BSTR *aTarget)
    653653{
    654654#ifndef VBOX_WITH_GUEST_CONTROL
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