VirtualBox

Changeset 55645 in vbox


Ignore:
Timestamp:
May 4, 2015 1:39:18 PM (9 years ago)
Author:
vboxsync
Message:

Removed 106 #ifdef/#ifndef VBOX_WITH_GUEST_CONTROL statements that was never really necessary.

Location:
trunk/src/VBox/Main/src-client
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r55644 r55645  
    5151#include <VBox/log.h>
    5252
     53
     54/*
     55 * This #ifdef goes almost to the end of the file where there are a couple of
     56 * IGuest method implementations.
     57 */
    5358#ifdef VBOX_WITH_GUEST_CONTROL
     59
    5460
    5561// public methods only for internal purposes

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

    r55535 r55645  
    1 
    21/* $Id$ */
    32/** @file
    … …  
    65
    76/*
    8  * Copyright (C) 2012-2013 Oracle Corporation
     7 * Copyright (C) 2012-2015 Oracle Corporation
    98 *
    109 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2120*   Header Files                                                               *
    2221*******************************************************************************/
     22#ifndef VBOX_WITH_GUEST_CONTROL
     23# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
     24#endif
    2325#include "GuestDirectoryImpl.h"
    2426#include "GuestSessionImpl.h"
    … …  
    7375    AssertReturn(autoInitSpan.isOk(), E_FAIL);
    7476
    75 #ifndef VBOX_WITH_GUEST_CONTROL
    76     autoInitSpan.setSucceeded();
    77     return VINF_SUCCESS;
    78 #else
    7977    int vrc = bindToSession(pConsole, pSession, uDirID /* Object ID */);
    8078    if (RT_SUCCESS(vrc))
    … …  
    124122
    125123    return vrc;
    126 #endif /* VBOX_WITH_GUEST_CONTROL */
    127124}
    128125
    … …  
    265262HRESULT GuestDirectory::close()
    266263{
    267 #ifndef VBOX_WITH_GUEST_CONTROL
    268     ReturnComNotImplemented();
    269 #else
    270264    LogFlowThisFuncEnter();
    271265
    … …  
    305299    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
    306300    return hr;
    307 #endif /* VBOX_WITH_GUEST_CONTROL */
    308301}
    309302
    310303HRESULT GuestDirectory::read(ComPtr<IFsObjInfo> &aObjInfo)
    311304{
    312 #ifndef VBOX_WITH_GUEST_CONTROL
    313     ReturnComNotImplemented();
    314 #else
    315305    LogFlowThisFuncEnter();
    316306
    … …  
    407397    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
    408398    return hr;
    409 #endif /* VBOX_WITH_GUEST_CONTROL */
    410 }
    411 
     399}
     400

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

    r55631 r55645  
    55
    66/*
    7  * Copyright (C) 2012-2013 Oracle Corporation
     7 * Copyright (C) 2012-2015 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
     22#ifndef VBOX_WITH_GUEST_CONTROL
     23# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
     24#endif
    2225#include "GuestFileImpl.h"
    2326#include "GuestSessionImpl.h"
    … …  
    146149    AssertReturn(autoInitSpan.isOk(), VERR_OBJECT_DESTROYED);
    147150
    148 #ifndef VBOX_WITH_GUEST_CONTROL
    149     autoInitSpan.setSucceeded();
    150     return VINF_SUCCESS;
    151 #else
    152151    int vrc = bindToSession(pConsole, pSession, uFileID /* Object ID */);
    153152    if (RT_SUCCESS(vrc))
    … …  
    216215    LogFlowFuncLeaveRC(vrc);
    217216    return vrc;
    218 #endif /* VBOX_WITH_GUEST_CONTROL */
    219217}
    220218
    … …  
    232230    LogFlowThisFuncEnter();
    233231
    234 #ifdef VBOX_WITH_GUEST_CONTROL
    235232    baseUninit();
    236 #endif
    237233    LogFlowThisFuncLeave();
    238234}
    … …  
    243239HRESULT GuestFile::getCreationMode(ULONG *aCreationMode)
    244240{
    245 #ifndef VBOX_WITH_GUEST_CONTROL
    246     ReturnComNotImplemented();
    247 #else
    248241    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    249242
    … …  
    251244
    252245    return S_OK;
    253 #endif /* VBOX_WITH_GUEST_CONTROL */
    254246}
    255247
    256248HRESULT GuestFile::getOpenAction(FileOpenAction_T *aOpenAction)
    257249{
    258 #ifndef VBOX_WITH_GUEST_CONTROL
    259     ReturnComNotImplemented();
    260 #else
    261250    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    262251
    … …  
    264253
    265254    return S_OK;
    266 #endif /* VBOX_WITH_GUEST_CONTROL */
    267255}
    268256
    269257HRESULT GuestFile::getEventSource(ComPtr<IEventSource> &aEventSource)
    270258{
    271 #ifndef VBOX_WITH_GUEST_CONTROL
    272     ReturnComNotImplemented();
    273 #else
    274259    /* No need to lock - lifetime constant. */
    275260    mEventSource.queryInterfaceTo(aEventSource.asOutParam());
    276261
    277262    return S_OK;
    278 #endif /* VBOX_WITH_GUEST_CONTROL */
    279263}
    280264
    281265HRESULT GuestFile::getFileName(com::Utf8Str &aFileName)
    282266{
    283 #ifndef VBOX_WITH_GUEST_CONTROL
    284     ReturnComNotImplemented();
    285 #else
    286267    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    287268
    … …  
    289270
    290271    return S_OK;
    291 #endif /* VBOX_WITH_GUEST_CONTROL */
    292272}
    293273
    294274HRESULT GuestFile::getId(ULONG *aId)
    295275{
    296 #ifndef VBOX_WITH_GUEST_CONTROL
    297     ReturnComNotImplemented();
    298 #else
    299276    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    300277
    … …  
    302279
    303280    return S_OK;
    304 #endif /* VBOX_WITH_GUEST_CONTROL */
    305281}
    306282
    307283HRESULT GuestFile::getInitialSize(LONG64 *aInitialSize)
    308284{
    309 #ifndef VBOX_WITH_GUEST_CONTROL
    310     ReturnComNotImplemented();
    311 #else
    312285    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    313286
    … …  
    315288
    316289    return S_OK;
    317 #endif /* VBOX_WITH_GUEST_CONTROL */
    318290}
    319291
    320292HRESULT GuestFile::getOffset(LONG64 *aOffset)
    321293{
    322 #ifndef VBOX_WITH_GUEST_CONTROL
    323     ReturnComNotImplemented();
    324 #else
    325294    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    326295
    … …  
    328297
    329298    return S_OK;
    330 #endif /* VBOX_WITH_GUEST_CONTROL */
    331299}
    332300
    333301HRESULT GuestFile::getAccessMode(FileAccessMode_T *aAccessMode)
    334302{
    335 #ifndef VBOX_WITH_GUEST_CONTROL
    336     ReturnComNotImplemented();
    337 #else
    338303    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    339304
    … …  
    341306
    342307    return S_OK;
    343 #endif /* VBOX_WITH_GUEST_CONTROL */
    344308}
    345309
    346310HRESULT GuestFile::getStatus(FileStatus_T *aStatus)
    347311{
    348 #ifndef VBOX_WITH_GUEST_CONTROL
    349     ReturnComNotImplemented();
    350 #else
    351312    LogFlowThisFuncEnter();
    352313
    … …  
    356317
    357318    return S_OK;
    358 #endif /* VBOX_WITH_GUEST_CONTROL */
    359319}
    360320
    … …  
    12241184HRESULT GuestFile::close()
    12251185{
    1226 #ifndef VBOX_WITH_GUEST_CONTROL
    1227     ReturnComNotImplemented();
    1228 #else
    12291186    LogFlowThisFuncEnter();
    12301187
    … …  
    12511208    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
    12521209    return S_OK;
    1253 #endif /* VBOX_WITH_GUEST_CONTROL */
    12541210}
    12551211
    12561212HRESULT GuestFile::queryInfo(ComPtr<IFsObjInfo> &aObjInfo)
    12571213{
    1258 #ifndef VBOX_WITH_GUEST_CONTROL
    12591214    ReturnComNotImplemented();
    1260 #else
     1215}
     1216
     1217HRESULT GuestFile::querySize(LONG64 *aSize)
     1218{
    12611219    ReturnComNotImplemented();
    1262 #endif /* VBOX_WITH_GUEST_CONTROL */
    1263 }
    1264 
    1265 HRESULT GuestFile::querySize(LONG64 *aSize)
    1266 {
    1267 #ifndef VBOX_WITH_GUEST_CONTROL
    1268     ReturnComNotImplemented();
    1269 #else
    1270     ReturnComNotImplemented();
    1271 #endif /* VBOX_WITH_GUEST_CONTROL */
    12721220}
    12731221
    12741222HRESULT GuestFile::read(ULONG aToRead, ULONG aTimeoutMS, std::vector<BYTE> &aData)
    12751223{
    1276 #ifndef VBOX_WITH_GUEST_CONTROL
    1277     ReturnComNotImplemented();
    1278 #else
    12791224    if (aToRead == 0)
    12801225        return setError(E_INVALIDARG, tr("The size to read is zero"));
    … …  
    13091254    LogFlowFuncLeaveRC(vrc);
    13101255    return hr;
    1311 #endif /* VBOX_WITH_GUEST_CONTROL */
    13121256}
    13131257HRESULT GuestFile::readAt(LONG64 aOffset, ULONG aToRead, ULONG aTimeoutMS, std::vector<BYTE> &aData)
    13141258
    13151259{
    1316 #ifndef VBOX_WITH_GUEST_CONTROL
    1317     ReturnComNotImplemented();
    1318 #else
    13191260    if (aToRead == 0)
    13201261        return setError(E_INVALIDARG, tr("The size to read is zero"));
    … …  
    13481289    LogFlowFuncLeaveRC(vrc);
    13491290    return hr;
    1350 #endif /* VBOX_WITH_GUEST_CONTROL */
    13511291}
    13521292
    13531293HRESULT GuestFile::seek(LONG64 aOffset, FileSeekOrigin_T aWhence, LONG64 *aNewOffset)
    13541294{
    1355 #ifndef VBOX_WITH_GUEST_CONTROL
    1356     ReturnComNotImplemented();
    1357 #else
    13581295    LogFlowThisFuncEnter();
    13591296
    … …  
    13991336    LogFlowFuncLeaveRC(vrc);
    14001337    return hr;
    1401 #endif /* VBOX_WITH_GUEST_CONTROL */
    14021338}
    14031339
    14041340HRESULT GuestFile::setACL(const com::Utf8Str &aAcl, ULONG aMode)
    14051341{
    1406 #ifndef VBOX_WITH_GUEST_CONTROL
    14071342    ReturnComNotImplemented();
    1408 #else
     1343}
     1344
     1345HRESULT GuestFile::setSize(LONG64 aSize)
     1346{
    14091347    ReturnComNotImplemented();
    1410 #endif /* VBOX_WITH_GUEST_CONTROL */
    1411 }
    1412 
    1413 HRESULT GuestFile::setSize(LONG64 aSize)
    1414 {
    1415 #ifndef VBOX_WITH_GUEST_CONTROL
    1416     ReturnComNotImplemented();
    1417 #else
    1418     ReturnComNotImplemented();
    1419 #endif /* VBOX_WITH_GUEST_CONTROL */
    14201348}
    14211349
    14221350HRESULT GuestFile::write(const std::vector<BYTE> &aData, ULONG aTimeoutMS, ULONG *aWritten)
    14231351{
    1424 #ifndef VBOX_WITH_GUEST_CONTROL
    1425     ReturnComNotImplemented();
    1426 #else
    14271352    LogFlowThisFuncEnter();
    14281353
    … …  
    14471372    LogFlowFuncLeaveRC(vrc);
    14481373    return hr;
    1449 #endif /* VBOX_WITH_GUEST_CONTROL */
    14501374}
    14511375
    … …  
    14531377
    14541378{
    1455 #ifndef VBOX_WITH_GUEST_CONTROL
    1456     ReturnComNotImplemented();
    1457 #else
    14581379    LogFlowThisFuncEnter();
    14591380
    … …  
    14781399    LogFlowFuncLeaveRC(vrc);
    14791400    return hr;
    1480 #endif /* VBOX_WITH_GUEST_CONTROL */
    1481 }
    1482 
     1401}
     1402

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

    r55613 r55645  
    55
    66/*
    7  * Copyright (C) 2012-2014 Oracle Corporation
     7 * Copyright (C) 2012-2015 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
     22#ifndef VBOX_WITH_GUEST_CONTROL
     23# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
     24#endif
    2225#include "GuestFsObjInfoImpl.h"
    2326#include "GuestCtrlImplPrivate.h"
    … …  
    9295HRESULT GuestFsObjInfo::getAccessTime(LONG64 *aAccessTime)
    9396{
    94 #ifndef VBOX_WITH_GUEST_CONTROL
    95     ReturnComNotImplemented();
    96 #else
    97 
    9897    *aAccessTime = mData.mAccessTime;
    9998
    10099    return S_OK;
    101 #endif /* VBOX_WITH_GUEST_CONTROL */
    102100}
    103101
    104102HRESULT GuestFsObjInfo::getAllocatedSize(LONG64 *aAllocatedSize)
    105103{
    106 #ifndef VBOX_WITH_GUEST_CONTROL
    107     ReturnComNotImplemented();
    108 #else
    109 
    110104    *aAllocatedSize = mData.mAllocatedSize;
    111105
    112106    return S_OK;
    113 #endif /* VBOX_WITH_GUEST_CONTROL */
    114107}
    115108
    116109HRESULT GuestFsObjInfo::getBirthTime(LONG64 *aBirthTime)
    117110{
    118 #ifndef VBOX_WITH_GUEST_CONTROL
    119     ReturnComNotImplemented();
    120 #else
    121 
    122111    *aBirthTime = mData.mBirthTime;
    123112
    124113    return S_OK;
    125 #endif /* VBOX_WITH_GUEST_CONTROL */
    126114}
    127115
    128116HRESULT GuestFsObjInfo::getChangeTime(LONG64 *aChangeTime)
    129117{
    130 #ifndef VBOX_WITH_GUEST_CONTROL
    131     ReturnComNotImplemented();
    132 #else
    133 
    134118    *aChangeTime = mData.mChangeTime;
    135119
    136120    return S_OK;
    137 #endif /* VBOX_WITH_GUEST_CONTROL */
    138121}
    139122
    … …  
    142125HRESULT GuestFsObjInfo::getDeviceNumber(ULONG *aDeviceNumber)
    143126{
    144 #ifndef VBOX_WITH_GUEST_CONTROL
    145     ReturnComNotImplemented();
    146 #else
    147 
    148127    *aDeviceNumber = mData.mDeviceNumber;
    149128
    150129    return S_OK;
    151 #endif /* VBOX_WITH_GUEST_CONTROL */
    152130}
    153131
    154132HRESULT GuestFsObjInfo::getFileAttributes(com::Utf8Str &aFileAttributes)
    155133{
    156 #ifndef VBOX_WITH_GUEST_CONTROL
    157     ReturnComNotImplemented();
    158 #else
    159 
    160134    aFileAttributes = mData.mFileAttrs;
    161135
    162136    return S_OK;
    163 #endif /* VBOX_WITH_GUEST_CONTROL */
    164137}
    165138
    166139HRESULT GuestFsObjInfo::getGenerationId(ULONG *aGenerationId)
    167140{
    168 #ifndef VBOX_WITH_GUEST_CONTROL
    169     ReturnComNotImplemented();
    170 #else
    171 
    172141    *aGenerationId = mData.mGenerationID;
    173142
    174143    return S_OK;
    175 #endif /* VBOX_WITH_GUEST_CONTROL */
    176144}
    177145
    178146HRESULT GuestFsObjInfo::getGID(ULONG *aGID)
    179147{
    180 #ifndef VBOX_WITH_GUEST_CONTROL
    181     ReturnComNotImplemented();
    182 #else
    183 
    184148    *aGID = mData.mGID;
    185149
    186150    return S_OK;
    187 #endif /* VBOX_WITH_GUEST_CONTROL */
    188151}
    189152
    190153HRESULT GuestFsObjInfo::getGroupName(com::Utf8Str &aGroupName)
    191154{
    192 #ifndef VBOX_WITH_GUEST_CONTROL
    193     ReturnComNotImplemented();
    194 #else
    195 
    196155    aGroupName = mData.mGroupName;
    197156
    198157    return S_OK;
    199 #endif /* VBOX_WITH_GUEST_CONTROL */
    200158}
    201159
    202160HRESULT GuestFsObjInfo::getHardLinks(ULONG *aHardLinks)
    203161{
    204 #ifndef VBOX_WITH_GUEST_CONTROL
    205     ReturnComNotImplemented();
    206 #else
    207 
    208162    *aHardLinks = mData.mNumHardLinks;
    209163
    210164    return S_OK;
    211 #endif /* VBOX_WITH_GUEST_CONTROL */
    212165}
    213166
    214167HRESULT GuestFsObjInfo::getModificationTime(LONG64 *aModificationTime)
    215168{
    216 #ifndef VBOX_WITH_GUEST_CONTROL
    217     ReturnComNotImplemented();
    218 #else
    219 
    220169    *aModificationTime = mData.mModificationTime;
    221170
    222171    return S_OK;
    223 #endif /* VBOX_WITH_GUEST_CONTROL */
    224172}
    225173
    226174HRESULT GuestFsObjInfo::getName(com::Utf8Str &aName)
    227175{
    228 #ifndef VBOX_WITH_GUEST_CONTROL
    229     ReturnComNotImplemented();
    230 #else
    231 
    232176    aName = mData.mName;
    233177
    234178    return S_OK;
    235 #endif /* VBOX_WITH_GUEST_CONTROL */
    236179}
    237180
    238181HRESULT GuestFsObjInfo::getNodeId(LONG64 *aNodeId)
    239182{
    240 #ifndef VBOX_WITH_GUEST_CONTROL
    241     ReturnComNotImplemented();
    242 #else
    243 
    244183    *aNodeId = mData.mNodeID;
    245184
    246185    return S_OK;
    247 #endif /* VBOX_WITH_GUEST_CONTROL */
    248186}
    249187
    250188HRESULT GuestFsObjInfo::getNodeIdDevice(ULONG *aNodeIdDevice)
    251189{
    252 #ifndef VBOX_WITH_GUEST_CONTROL
    253     ReturnComNotImplemented();
    254 #else
    255 
    256190    *aNodeIdDevice = mData.mNodeIDDevice;
    257191
    258192    return S_OK;
    259 #endif /* VBOX_WITH_GUEST_CONTROL */
    260193}
    261194
    262195HRESULT GuestFsObjInfo::getObjectSize(LONG64 *aObjectSize)
    263196{
    264 #ifndef VBOX_WITH_GUEST_CONTROL
    265     ReturnComNotImplemented();
    266 #else
    267 
    268197    *aObjectSize = mData.mObjectSize;
    269198
    270199    return S_OK;
    271 #endif /* VBOX_WITH_GUEST_CONTROL */
    272200}
    273201
    274202HRESULT GuestFsObjInfo::getType(FsObjType_T *aType)
    275203{
    276 #ifndef VBOX_WITH_GUEST_CONTROL
    277     ReturnComNotImplemented();
    278 #else
    279 
    280204    *aType = mData.mType;
    281205
    282206    return S_OK;
    283 #endif /* VBOX_WITH_GUEST_CONTROL */
    284207}
    285208
    286209HRESULT GuestFsObjInfo::getUID(ULONG *aUID)
    287210{
    288 #ifndef VBOX_WITH_GUEST_CONTROL
    289     ReturnComNotImplemented();
    290 #else
    291 
    292211    *aUID = mData.mUID;
    293212
    294213    return S_OK;
    295 #endif /* VBOX_WITH_GUEST_CONTROL */
    296214}
    297215
    298216HRESULT GuestFsObjInfo::getUserFlags(ULONG *aUserFlags)
    299217{
    300 #ifndef VBOX_WITH_GUEST_CONTROL
    301     ReturnComNotImplemented();
    302 #else
    303 
    304218    *aUserFlags = mData.mUserFlags;
    305219
    306220    return S_OK;
    307 #endif /* VBOX_WITH_GUEST_CONTROL */
    308221}
    309222
    310223HRESULT GuestFsObjInfo::getUserName(com::Utf8Str &aUserName)
    311224{
    312 #ifndef VBOX_WITH_GUEST_CONTROL
    313     ReturnComNotImplemented();
    314 #else
    315 
    316225    aUserName = mData.mUserName;
    317226
    318227    return S_OK;
    319 #endif /* VBOX_WITH_GUEST_CONTROL */
    320 }
     228}
     229

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

    r55613 r55645  
    55
    66/*
    7  * Copyright (C) 2012-2013 Oracle Corporation
     7 * Copyright (C) 2012-2015 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2828*   Header Files                                                               *
    2929*******************************************************************************/
     30#ifndef VBOX_WITH_GUEST_CONTROL
     31# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
     32#endif
    3033#include "GuestProcessImpl.h"
    3134#include "GuestSessionImpl.h"
    … …  
    175178    AssertReturn(autoInitSpan.isOk(), VERR_OBJECT_DESTROYED);
    176179
    177 #ifndef VBOX_WITH_GUEST_CONTROL
    178     autoInitSpan.setSucceeded();
    179     return VINF_SUCCESS;
    180 #else
    181180    HRESULT hr;
    182181
    … …  
    254253    autoInitSpan.setFailed();
    255254    return vrc;
    256 #endif
    257255}
    258256
    … …  
    268266        return;
    269267
    270 #ifdef VBOX_WITH_GUEST_CONTROL
    271268    LogFlowThisFunc(("mExe=%s, PID=%RU32\n", mData.mProcess.mExecutable.c_str(), mData.mPID));
    272269
    … …  
    287284    LogFlowThisFunc(("Returning rc=%Rrc, guestRc=%Rrc\n",
    288285                     vrc, guestRc));
    289 #endif
    290286}
    291287
    … …  
    294290HRESULT GuestProcess::getArguments(std::vector<com::Utf8Str> &aArguments)
    295291{
    296 #ifndef VBOX_WITH_GUEST_CONTROL
    297     ReturnComNotImplemented();
    298 #else
    299292    LogFlowThisFuncEnter();
    300293
    … …  
    302295    aArguments = mData.mProcess.mArguments;
    303296    return S_OK;
    304 #endif /* VBOX_WITH_GUEST_CONTROL */
    305297}
    306298
    … …  
    339331HRESULT GuestProcess::getEventSource(ComPtr<IEventSource> &aEventSource)
    340332{
    341 #ifndef VBOX_WITH_GUEST_CONTROL
    342     ReturnComNotImplemented();
    343 #else
    344333    LogFlowThisFuncEnter();
    345334
    … …  
    349338    LogFlowThisFuncLeave();
    350339    return S_OK;
    351 #endif /* VBOX_WITH_GUEST_CONTROL */
    352340}
    353341
    354342HRESULT GuestProcess::getExecutablePath(com::Utf8Str &aExecutablePath)
    355343{
    356 #ifndef VBOX_WITH_GUEST_CONTROL
    357     ReturnComNotImplemented();
    358 #else
    359344    LogFlowThisFuncEnter();
    360345
    … …  
    364349
    365350    return S_OK;
    366 #endif /* VBOX_WITH_GUEST_CONTROL */
    367351}
    368352
    369353HRESULT GuestProcess::getExitCode(LONG *aExitCode)
    370354{
    371 #ifndef VBOX_WITH_GUEST_CONTROL
    372     ReturnComNotImplemented();
    373 #else
    374355    LogFlowThisFuncEnter();
    375356
    … …  
    379360
    380361    return S_OK;
    381 #endif /* VBOX_WITH_GUEST_CONTROL */
    382362}
    383363
    384364HRESULT GuestProcess::getName(com::Utf8Str &aName)
    385365{
    386 #ifndef VBOX_WITH_GUEST_CONTROL
    387     ReturnComNotImplemented();
    388 #else
    389366    LogFlowThisFuncEnter();
    390367
    … …  
    394371
    395372    return S_OK;
    396 #endif /* VBOX_WITH_GUEST_CONTROL */
    397373}
    398374
    399375HRESULT GuestProcess::getPID(ULONG *aPID)
    400376{
    401 #ifndef VBOX_WITH_GUEST_CONTROL
    402     ReturnComNotImplemented();
    403 #else
    404377    LogFlowThisFuncEnter();
    405378
    … …  
    409382
    410383    return S_OK;
    411 #endif /* VBOX_WITH_GUEST_CONTROL */
    412384}
    413385
    414386HRESULT GuestProcess::getStatus(ProcessStatus_T *aStatus)
    415387{
    416 #ifndef VBOX_WITH_GUEST_CONTROL
    417     ReturnComNotImplemented();
    418 #else
    419388    LogFlowThisFuncEnter();
    420389
    … …  
    424393
    425394    return S_OK;
    426 #endif /* VBOX_WITH_GUEST_CONTROL */
    427395}
    428396
    … …  
    17561724HRESULT GuestProcess::read(ULONG aHandle, ULONG aToRead, ULONG aTimeoutMS, std::vector<BYTE> &aData)
    17571725{
    1758 #ifndef VBOX_WITH_GUEST_CONTROL
    1759     ReturnComNotImplemented();
    1760 #else
    17611726    LogFlowThisFuncEnter();
    17621727
    … …  
    17971762    LogFlowFuncLeaveRC(vrc);
    17981763    return hr;
    1799 #endif /* VBOX_WITH_GUEST_CONTROL */
    18001764}
    18011765
    18021766HRESULT GuestProcess::terminate()
    18031767{
    1804 #ifndef VBOX_WITH_GUEST_CONTROL
    1805     ReturnComNotImplemented();
    1806 #else
    1807 
    18081768    HRESULT hr = S_OK;
    18091769
    … …  
    18421802    LogFlowFuncLeaveRC(vrc);
    18431803    return hr;
    1844 #endif /* VBOX_WITH_GUEST_CONTROL */
    18451804}
    18461805
    … …  
    18491808                              ProcessWaitResult_T *aReason)
    18501809{
    1851 #ifndef VBOX_WITH_GUEST_CONTROL
    1852     ReturnComNotImplemented();
    1853 #else
    1854 
    18551810    /*
    18561811     * Note: Do not hold any locks here while waiting!
    … …  
    18871842    LogFlowFuncLeaveRC(vrc);
    18881843    return hr;
    1889 #endif /* VBOX_WITH_GUEST_CONTROL */
    18901844}
    18911845
    … …  
    18931847                                   ULONG aTimeoutMS, ProcessWaitResult_T *aReason)
    18941848{
    1895 #ifndef VBOX_WITH_GUEST_CONTROL
    1896     ReturnComNotImplemented();
    1897 #else
    18981849    /*
    18991850     * Note: Do not hold any locks here while waiting!
    … …  
    19041855
    19051856    return WaitFor(fWaitFor, aTimeoutMS, aReason);
    1906 #endif /* VBOX_WITH_GUEST_CONTROL */
    19071857}
    19081858
    … …  
    19101860                            ULONG aTimeoutMS, ULONG *aWritten)
    19111861{
    1912 #ifndef VBOX_WITH_GUEST_CONTROL
    1913     ReturnComNotImplemented();
    1914 #else
    19151862    LogFlowThisFuncEnter();
    19161863
    … …  
    19431890    LogFlowFuncLeaveRC(vrc);
    19441891    return hr;
    1945 #endif /* VBOX_WITH_GUEST_CONTROL */
    19461892}
    19471893
    … …  
    19491895                                 const std::vector<BYTE> &aData, ULONG aTimeoutMS, ULONG *aWritten)
    19501896{
    1951 #ifndef VBOX_WITH_GUEST_CONTROL
    1952     ReturnComNotImplemented();
    1953 #else
    19541897    LogFlowThisFuncEnter();
    19551898
    … …  
    19621905
    19631906    return write(aHandle, fWrite, aData, aTimeoutMS, aWritten);
    1964 #endif /* VBOX_WITH_GUEST_CONTROL */
    19651907}
    19661908

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

    r55633 r55645  
    55
    66/*
    7  * Copyright (C) 2012-2014 Oracle Corporation
     7 * Copyright (C) 2012-2015 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2121*******************************************************************************/
    2222#include "GuestImpl.h"
     23#ifndef VBOX_WITH_GUEST_CONTROL
     24# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
     25#endif
    2326#include "GuestSessionImpl.h"
    2427#include "GuestCtrlImplPrivate.h"
    … …  
    177180    AssertReturn(autoInitSpan.isOk(), VERR_OBJECT_DESTROYED);
    178181
    179 #ifndef VBOX_WITH_GUEST_CONTROL
    180     autoInitSpan.setSucceeded();
    181     return VINF_SUCCESS;
    182 #else
    183182    AssertPtrReturn(pGuest, VERR_INVALID_POINTER);
    184183
    … …  
    264263                 mData.mSession.mName.c_str(), mData.mSession.mID, mData.mSession.mIsInternal, rc));
    265264    return rc;
    266 #endif /* VBOX_WITH_GUEST_CONTROL */
    267265}
    268266
    … …  
    282280    int rc = VINF_SUCCESS;
    283281
    284 #ifdef VBOX_WITH_GUEST_CONTROL
    285282    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    286283
    … …  
    333330
    334331    baseUninit();
    335 #endif /* VBOX_WITH_GUEST_CONTROL */
     332
    336333    LogFlowFuncLeaveRC(rc);
    337334}
    … …  
    342339HRESULT GuestSession::getUser(com::Utf8Str &aUser)
    343340{
    344 #ifndef VBOX_WITH_GUEST_CONTROL
    345     ReturnComNotImplemented();
    346 #else
    347 
    348341    LogFlowThisFuncEnter();
    349342
    … …  
    354347    LogFlowThisFuncLeave();
    355348    return S_OK;
    356 #endif /* VBOX_WITH_GUEST_CONTROL */
    357349}
    358350
    359351HRESULT GuestSession::getDomain(com::Utf8Str &aDomain)
    360352{
    361 #ifndef VBOX_WITH_GUEST_CONTROL
    362     ReturnComNotImplemented();
    363 #else
    364353    LogFlowThisFuncEnter();
    365354
    … …  
    370359    LogFlowThisFuncLeave();
    371360    return S_OK;
    372 #endif /* VBOX_WITH_GUEST_CONTROL */
    373361}
    374362
    375363HRESULT GuestSession::getName(com::Utf8Str &aName)
    376364{
    377 #ifndef VBOX_WITH_GUEST_CONTROL
    378     ReturnComNotImplemented();
    379 #else
    380365    LogFlowThisFuncEnter();
    381366
    … …  
    386371    LogFlowThisFuncLeave();
    387372    return S_OK;
    388 #endif /* VBOX_WITH_GUEST_CONTROL */
    389373}
    390374
    391375HRESULT GuestSession::getId(ULONG *aId)
    392376{
    393 #ifndef VBOX_WITH_GUEST_CONTROL
    394     ReturnComNotImplemented();
    395 #else
    396377    LogFlowThisFuncEnter();
    397378
    … …  
    402383    LogFlowThisFuncLeave();
    403384    return S_OK;
    404 #endif /* VBOX_WITH_GUEST_CONTROL */
    405385}
    406386
    407387HRESULT GuestSession::getStatus(GuestSessionStatus_T *aStatus)
    408388{
    409 #ifndef VBOX_WITH_GUEST_CONTROL
    410     ReturnComNotImplemented();
    411 #else
    412389    LogFlowThisFuncEnter();
    413390
    … …  
    418395    LogFlowThisFuncLeave();
    419396    return S_OK;
    420 #endif /* VBOX_WITH_GUEST_CONTROL */
    421397}
    422398
    423399HRESULT GuestSession::getTimeout(ULONG *aTimeout)
    424400{
    425 #ifndef VBOX_WITH_GUEST_CONTROL
    426     ReturnComNotImplemented();
    427 #else
    428401    LogFlowThisFuncEnter();
    429402
    … …  
    434407    LogFlowThisFuncLeave();
    435408    return S_OK;
    436 #endif /* VBOX_WITH_GUEST_CONTROL */
    437409}
    438410
    439411HRESULT GuestSession::setTimeout(ULONG aTimeout)
    440412{
    441 #ifndef VBOX_WITH_GUEST_CONTROL
    442     ReturnComNotImplemented();
    443 #else
    444413    LogFlowThisFuncEnter();
    445414
    … …  
    450419    LogFlowThisFuncLeave();
    451420    return S_OK;
    452 #endif /* VBOX_WITH_GUEST_CONTROL */
    453421}
    454422
    455423HRESULT GuestSession::getProtocolVersion(ULONG *aProtocolVersion)
    456424{
    457 #ifndef VBOX_WITH_GUEST_CONTROL
    458     ReturnComNotImplemented();
    459 #else
    460425    LogFlowThisFuncEnter();
    461426
    … …  
    466431    LogFlowThisFuncLeave();
    467432    return S_OK;
    468 #endif /* VBOX_WITH_GUEST_CONTROL */
    469433}
    470434
    471435HRESULT GuestSession::getEnvironmentChanges(std::vector<com::Utf8Str> &aEnvironmentChanges)
    472436{
    473 #ifndef VBOX_WITH_GUEST_CONTROL
    474     ReturnComNotImplemented();
    475 #else
    476437    LogFlowThisFuncEnter();
    477438
    … …  
    482443    LogFlowFuncLeaveRC(vrc);
    483444    return Global::vboxStatusCodeToCOM(vrc);
    484 #endif /* VBOX_WITH_GUEST_CONTROL */
    485445}
    486446
    487447HRESULT GuestSession::setEnvironmentChanges(const std::vector<com::Utf8Str> &aEnvironmentChanges)
    488448{
    489 #ifndef VBOX_WITH_GUEST_CONTROL
    490     ReturnComNotImplemented();
    491 #else
    492449    LogFlowThisFuncEnter();
    493450
    … …  
    499456    LogFlowFuncLeaveRC(vrc);
    500457    return Global::vboxStatusCodeToCOM(vrc);
    501 #endif /* VBOX_WITH_GUEST_CONTROL */
    502458}
    503459
    504460HRESULT GuestSession::getEnvironmentBase(std::vector<com::Utf8Str> &aEnvironmentBase)
    505461{
    506 #ifndef VBOX_WITH_GUEST_CONTROL
    507     ReturnComNotImplemented();
    508 #else
    509462    LogFlowThisFuncEnter();
    510463
    … …  
    523476    LogFlowFuncLeave();
    524477    return hrc;
    525 #endif /* VBOX_WITH_GUEST_CONTROL */
    526478}
    527479
    528480HRESULT GuestSession::getProcesses(std::vector<ComPtr<IGuestProcess> > &aProcesses)
    529481{
    530 #ifndef VBOX_WITH_GUEST_CONTROL
    531     ReturnComNotImplemented();
    532 #else
    533482    LogFlowThisFuncEnter();
    534483
    … …  
    546495    LogFlowFunc(("mProcesses=%zu\n", aProcesses.size()));
    547496    return S_OK;
    548 #endif /* VBOX_WITH_GUEST_CONTROL */
    549497}
    550498
    551499HRESULT GuestSession::getPathStyle(PathStyle_T *aPathStyle)
    552500{
    553 #ifndef VBOX_WITH_GUEST_CONTROL
    554     ReturnComNotImplemented();
    555 #else
    556501    VBOXOSTYPE enmOsType = mParent->i_getGuestOSType();
    557502    if (    enmOsType < VBOXOSTYPE_DOS)
    … …  
    571516    }
    572517    return S_OK;
    573 #endif
    574518}
    575519
    … …  
    586530HRESULT GuestSession::getDirectories(std::vector<ComPtr<IGuestDirectory> > &aDirectories)
    587531{
    588 #ifndef VBOX_WITH_GUEST_CONTROL
    589     ReturnComNotImplemented();
    590 #else
    591532    LogFlowThisFuncEnter();
    592533
    … …  
    604545    LogFlowFunc(("mDirectories=%zu\n", aDirectories.size()));
    605546    return S_OK;
    606 #endif /* VBOX_WITH_GUEST_CONTROL */
    607547}
    608548
    609549HRESULT GuestSession::getFiles(std::vector<ComPtr<IGuestFile> > &aFiles)
    610550{
    611 #ifndef VBOX_WITH_GUEST_CONTROL
    612     ReturnComNotImplemented();
    613 #else
    614551    LogFlowThisFuncEnter();
    615552
    … …  
    624561
    625562    return S_OK;
    626 #endif /* VBOX_WITH_GUEST_CONTROL */
    627563}
    628564
    629565HRESULT GuestSession::getEventSource(ComPtr<IEventSource> &aEventSource)
    630566{
    631 #ifndef VBOX_WITH_GUEST_CONTROL
    632     ReturnComNotImplemented();
    633 #else
    634567    LogFlowThisFuncEnter();
    635568
    … …  
    639572    LogFlowThisFuncLeave();
    640573    return S_OK;
    641 #endif /* VBOX_WITH_GUEST_CONTROL */
    642574}
    643575
    … …  
    24582390HRESULT GuestSession::close()
    24592391{
    2460 #ifndef VBOX_WITH_GUEST_CONTROL
    2461     ReturnComNotImplemented();
    2462 #else
    24632392    LogFlowThisFuncEnter();
    24642393
    … …  
    24932422
    24942423    return S_OK;
    2495 #endif /* VBOX_WITH_GUEST_CONTROL */
    24962424}
    24972425
    … …  
    25062434                                        ComPtr<IProgress> &aProgress)
    25072435{
    2508 #ifndef VBOX_WITH_GUEST_CONTROL
    2509     ReturnComNotImplemented();
    2510 #else
    2511 
    25122436    LogFlowThisFuncEnter();
    25132437
    … …  
    25492473
    25502474    return hr;
    2551 #endif /* VBOX_WITH_GUEST_CONTROL */
    25522475}
    25532476
    … …  
    25552478                                      const std::vector<FileCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
    25562479{
    2557 #ifndef VBOX_WITH_GUEST_CONTROL
    2558     ReturnComNotImplemented();
    2559 #else
    2560 
    25612480    LogFlowThisFuncEnter();
    25622481
    … …  
    26012520
    26022521    return hr;
    2603 #endif /* VBOX_WITH_GUEST_CONTROL */
    26042522}
    26052523
    … …  
    26252543                                      const std::vector<DirectoryCreateFlag_T> &aFlags)
    26262544{
    2627 #ifndef VBOX_WITH_GUEST_CONTROL
    2628     ReturnComNotImplemented();
    2629 #else
    26302545    LogFlowThisFuncEnter();
    26312546
    … …  
    26722587
    26732588    return hr;
    2674 #endif /* VBOX_WITH_GUEST_CONTROL */
    26752589}
    26762590
    … …  
    26782592                                          BOOL aSecure, com::Utf8Str &aDirectory)
    26792593{
    2680 #ifndef VBOX_WITH_GUEST_CONTROL
    2681     ReturnComNotImplemented();
    2682 #else
    26832594    LogFlowThisFuncEnter();
    26842595
    … …  
    27102621
    27112622    return hr;
    2712 #endif /* VBOX_WITH_GUEST_CONTROL */
    27132623}
    27142624
    27152625HRESULT GuestSession::directoryExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists)
    27162626{
    2717 #ifndef VBOX_WITH_GUEST_CONTROL
    2718     ReturnComNotImplemented();
    2719 #else
    27202627    LogFlowThisFuncEnter();
    27212628
    … …  
    27472654
    27482655    return hr;
    2749 #endif /* VBOX_WITH_GUEST_CONTROL */
    27502656}
    27512657
    … …  
    27532659                                    const std::vector<DirectoryOpenFlag_T> &aFlags, ComPtr<IGuestDirectory> &aDirectory)
    27542660{
    2755 #ifndef VBOX_WITH_GUEST_CONTROL
    2756     ReturnComNotImplemented();
    2757 #else
    27582661    LogFlowThisFuncEnter();
    27592662
    … …  
    28082711
    28092712    return hr;
    2810 #endif /* VBOX_WITH_GUEST_CONTROL */
    28112713}
    28122714
    28132715HRESULT GuestSession::directoryRemove(const com::Utf8Str &aPath)
    28142716{
    2815 #ifndef VBOX_WITH_GUEST_CONTROL
    2816     ReturnComNotImplemented();
    2817 #else
    28182717    LogFlowThisFuncEnter();
    28192718
    … …  
    28512750
    28522751    return hr;
    2853 #endif /* VBOX_WITH_GUEST_CONTROL */
    28542752}
    28552753
    … …  
    28572755                                               ComPtr<IProgress> &aProgress)
    28582756{
    2859 #ifndef VBOX_WITH_GUEST_CONTROL
    2860     ReturnComNotImplemented();
    2861 #else
    28622757    LogFlowThisFuncEnter();
    28632758
    … …  
    29192814
    29202815    return hr;
    2921 #endif /* VBOX_WITH_GUEST_CONTROL */
    29222816}
    29232817
    29242818HRESULT GuestSession::environmentScheduleSet(const com::Utf8Str &aName, const com::Utf8Str &aValue)
    29252819{
    2926 #ifndef VBOX_WITH_GUEST_CONTROL
    2927     ReturnComNotImplemented();
    2928 #else
    29292820    LogFlowThisFuncEnter();
    29302821
    … …  
    29492840    LogFlowThisFuncLeave();
    29502841    return hrc;
    2951 #endif /* VBOX_WITH_GUEST_CONTROL */
    29522842}
    29532843
    29542844HRESULT GuestSession::environmentScheduleUnset(const com::Utf8Str &aName)
    29552845{
    2956 #ifndef VBOX_WITH_GUEST_CONTROL
    2957     ReturnComNotImplemented();
    2958 #else
    29592846    LogFlowThisFuncEnter();
    29602847    HRESULT hrc;
    … …  
    29782865    LogFlowThisFuncLeave();
    29792866    return hrc;
    2980 #endif /* VBOX_WITH_GUEST_CONTROL */
    29812867}
    29822868
    29832869HRESULT GuestSession::environmentGetBaseVariable(const com::Utf8Str &aName, com::Utf8Str &aValue)
    29842870{
    2985 #ifndef VBOX_WITH_GUEST_CONTROL
    2986     ReturnComNotImplemented();
    2987 #else
    29882871    LogFlowThisFuncEnter();
    29892872    HRESULT hrc;
    … …  
    30142897    LogFlowThisFuncLeave();
    30152898    return hrc;
    3016 #endif /* VBOX_WITH_GUEST_CONTROL */
    30172899}
    30182900
    30192901HRESULT GuestSession::environmentDoesBaseVariableExist(const com::Utf8Str &aName, BOOL *aExists)
    30202902{
    3021 #ifndef VBOX_WITH_GUEST_CONTROL
    3022     ReturnComNotImplemented();
    3023 #else
    30242903    LogFlowThisFuncEnter();
    30252904    *aExists = FALSE;
    … …  
    30482927    LogFlowThisFuncLeave();
    30492928    return hrc;
    3050 #endif /* VBOX_WITH_GUEST_CONTROL */
    30512929}
    30522930
    … …  
    30542932                                     ComPtr<IGuestFile> &aFile)
    30552933{
    3056 #ifndef VBOX_WITH_GUEST_CONTROL
    30572934    ReturnComNotImplemented();
    3058 #else
    3059     LogFlowThisFuncEnter();
    3060 
    3061 
    3062     ReturnComNotImplemented();
    3063 #endif /* VBOX_WITH_GUEST_CONTROL */
    30642935}
    30652936
    30662937HRESULT GuestSession::fileExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists)
    30672938{
    3068 #ifndef VBOX_WITH_GUEST_CONTROL
    3069     ReturnComNotImplemented();
    3070 #else
    30712939    LogFlowThisFuncEnter();
    30722940
    … …  
    31042972
    31052973    return hr;
    3106 #endif /* VBOX_WITH_GUEST_CONTROL */
    31072974}
    31082975
    … …  
    31102977                               ULONG aCreationMode, ComPtr<IGuestFile> &aFile)
    31112978{
    3112 #ifndef VBOX_WITH_GUEST_CONTROL
    3113     ReturnComNotImplemented();
    3114 #else
    31152979    LogFlowThisFuncEnter();
    31162980    return fileOpenEx(aPath, aAccessMode, aOpenAction, FileSharingMode_All, aCreationMode, 0 /* aOffset */, aFile);
    3117 #endif /* VBOX_WITH_GUEST_CONTROL */
    31182981}
    31192982
    … …  
    31212984                                 FileSharingMode_T aSharingMode, ULONG aCreationMode, LONG64 aOffset, ComPtr<IGuestFile> &aFile)
    31222985{
    3123 #ifndef VBOX_WITH_GUEST_CONTROL
    3124     ReturnComNotImplemented();
    3125 #else
    31262986    LogFlowThisFuncEnter();
    31272987
    … …  
    32133073
    32143074    return hr;
    3215 #endif /* VBOX_WITH_GUEST_CONTROL */
    32163075}
    32173076
    32183077HRESULT GuestSession::fileQuerySize(const com::Utf8Str &aPath, BOOL aFollowSymlinks, LONG64 *aSize)
    32193078{
    3220 #ifndef VBOX_WITH_GUEST_CONTROL
    3221     ReturnComNotImplemented();
    3222 #else
    32233079    LogFlowThisFuncEnter();
    32243080
    … …  
    32473103
    32483104    return hr;
    3249 #endif /* VBOX_WITH_GUEST_CONTROL */
    32503105}
    32513106
    32523107HRESULT GuestSession::fsObjExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists)
    32533108{
    3254 #ifndef VBOX_WITH_GUEST_CONTROL
    3255     ReturnComNotImplemented();
    3256 #else
    32573109    LogFlowThisFuncEnter();
    32583110
    … …  
    32803132    LogFlowThisFuncLeave();
    32813133    return hrc;
    3282 #endif /* VBOX_WITH_GUEST_CONTROL */
    32833134}
    32843135
    32853136HRESULT GuestSession::fsObjQueryInfo(const com::Utf8Str &aPath, BOOL aFollowSymlinks, ComPtr<IGuestFsObjInfo> &aInfo)
    32863137{
    3287 #ifndef VBOX_WITH_GUEST_CONTROL
    3288     ReturnComNotImplemented();
    3289 #else
    32903138    LogFlowThisFuncEnter();
    32913139
    … …  
    33183166    LogFlowThisFuncLeave();
    33193167    return hrc;
    3320 #endif /* VBOX_WITH_GUEST_CONTROL */
    33213168}
    33223169
    33233170HRESULT GuestSession::fsObjRemove(const com::Utf8Str &aPath)
    33243171{
    3325 #ifndef VBOX_WITH_GUEST_CONTROL
    3326     ReturnComNotImplemented();
    3327 #else
    33283172    LogFlowThisFuncEnter();
    33293173
    … …  
    33513195
    33523196    return hr;
    3353 #endif /* VBOX_WITH_GUEST_CONTROL */
    33543197}
    33553198
    … …  
    33583201                                  const std::vector<FsObjRenameFlag_T> &aFlags)
    33593202{
    3360 #ifndef VBOX_WITH_GUEST_CONTROL
    3361     ReturnComNotImplemented();
    3362 #else
    33633203    LogFlowThisFuncEnter();
    33643204
    … …  
    34133253
    34143254    return hr;
    3415 #endif /* VBOX_WITH_GUEST_CONTROL */
    34163255}
    34173256
    … …  
    34333272                                    ULONG aTimeoutMS, ComPtr<IGuestProcess> &aGuestProcess)
    34343273{
    3435 #ifndef VBOX_WITH_GUEST_CONTROL
    3436     ReturnComNotImplemented();
    3437 #else
    34383274    LogFlowThisFuncEnter();
    34393275
    … …  
    34423278    return processCreateEx(aExecutable, aArguments, aEnvironment, aFlags, aTimeoutMS, ProcessPriority_Default,
    34433279                           affinityIgnored, aGuestProcess);
    3444 #endif /* VBOX_WITH_GUEST_CONTROL */
    34453280}
    34463281
    … …  
    34513286                                      ComPtr<IGuestProcess> &aGuestProcess)
    34523287{
    3453 #ifndef VBOX_WITH_GUEST_CONTROL
    3454     ReturnComNotImplemented();
    3455 #else
    34563288    LogFlowThisFuncEnter();
    34573289
    … …  
    35523384    LogFlowFuncLeaveRC(vrc);
    35533385    return hr;
    3554 #endif /* VBOX_WITH_GUEST_CONTROL */
    35553386}
    35563387
    … …  
    35583389
    35593390{
    3560 #ifndef VBOX_WITH_GUEST_CONTROL
    3561     ReturnComNotImplemented();
    3562 #else
    35633391    LogFlowThisFunc(("PID=%RU32\n", aPid));
    35643392
    … …  
    35823410    LogFlowThisFunc(("aProcess=%p, hr=%Rhrc\n", (IGuestProcess*)aGuestProcess, hr));
    35833411    return hr;
    3584 #endif /* VBOX_WITH_GUEST_CONTROL */
    35853412}
    35863413
    35873414HRESULT GuestSession::symlinkCreate(const com::Utf8Str &aSource, const com::Utf8Str &aTarget, SymlinkType_T aType)
    35883415{
    3589 #ifndef VBOX_WITH_GUEST_CONTROL
    35903416    ReturnComNotImplemented();
    3591 #else
    3592     LogFlowThisFuncEnter();
    3593 
     3417}
     3418
     3419HRESULT GuestSession::symlinkExists(const com::Utf8Str &aSymlink, BOOL *aExists)
     3420
     3421{
    35943422    ReturnComNotImplemented();
    3595 #endif /* VBOX_WITH_GUEST_CONTROL */
    3596 }
    3597 
    3598 HRESULT GuestSession::symlinkExists(const com::Utf8Str &aSymlink, BOOL *aExists)
    3599 
    3600 {
    3601 #ifndef VBOX_WITH_GUEST_CONTROL
    3602     ReturnComNotImplemented();
    3603 #else
    3604     LogFlowThisFuncEnter();
    3605 
    3606     ReturnComNotImplemented();
    3607 #endif /* VBOX_WITH_GUEST_CONTROL */
    36083423}
    36093424
    … …  
    36113426                                  com::Utf8Str &aTarget)
    36123427{
    3613 #ifndef VBOX_WITH_GUEST_CONTROL
    36143428    ReturnComNotImplemented();
    3615 #else
    3616     LogFlowThisFuncEnter();
    3617 
    3618     ReturnComNotImplemented();
    3619 #endif /* VBOX_WITH_GUEST_CONTROL */
    36203429}
    36213430
    36223431HRESULT GuestSession::waitFor(ULONG aWaitFor, ULONG aTimeoutMS, GuestSessionWaitResult_T *aReason)
    36233432{
    3624 #ifndef VBOX_WITH_GUEST_CONTROL
    3625     ReturnComNotImplemented();
    3626 #else
    36273433    LogFlowThisFuncEnter();
    36283434
    … …  
    36613467    LogFlowFuncLeaveRC(vrc);
    36623468    return hr;
    3663 #endif /* VBOX_WITH_GUEST_CONTROL */
    36643469}
    36653470
    … …  
    36673472                                   GuestSessionWaitResult_T *aReason)
    36683473{
    3669 #ifndef VBOX_WITH_GUEST_CONTROL
    3670     ReturnComNotImplemented();
    3671 #else
    36723474    LogFlowThisFuncEnter();
    36733475
    … …  
    36803482
    36813483    return WaitFor(fWaitFor, aTimeoutMS, aReason);
    3682 #endif /* VBOX_WITH_GUEST_CONTROL */
    3683 }
    3684 
     3484}
     3485
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