diff options
Diffstat (limited to 'src/VBox/Main/src-all/SharedFolderImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-all/SharedFolderImpl.cpp | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/src/VBox/Main/src-all/SharedFolderImpl.cpp b/src/VBox/Main/src-all/SharedFolderImpl.cpp index 2edf2a2e..9f4ad6c7 100644 --- a/src/VBox/Main/src-all/SharedFolderImpl.cpp +++ b/src/VBox/Main/src-all/SharedFolderImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -16,8 +16,10 @@ */ #include "SharedFolderImpl.h" -#include "VirtualBoxImpl.h" -#include "MachineImpl.h" +#if !defined(VBOX_COM_INPROC) +# include "VirtualBoxImpl.h" +# include "MachineImpl.h" +#endif #include "ConsoleImpl.h" #include "AutoCaller.h" @@ -50,9 +52,12 @@ struct SharedFolder::Data SharedFolder::SharedFolder() : mParent(NULL), +#if !defined(VBOX_COM_INPROC) mMachine(NULL), - mConsole(NULL), mVirtualBox(NULL) +#else + mConsole(NULL) +#endif { m = new Data; } @@ -77,6 +82,7 @@ void SharedFolder::FinalRelease() // public initializer/uninitializer for internal purposes only ///////////////////////////////////////////////////////////////////////////// +#if !defined(VBOX_COM_INPROC) /** * Initializes the shared folder object. * @@ -147,12 +153,14 @@ HRESULT SharedFolder::initCopy(Machine *aMachine, SharedFolder *aThat) return rc; } +# if 0 + /** * Initializes the shared folder object. * - * This variant initializes an instance that lives in the console address space. + * This variant initializes a global instance that lives in the server address space. It is not presently used. * - * @param aConsole Console parent object + * @param aVirtualBox VirtualBox parent object * @param aName logical name of the shared folder * @param aHostPath full path to the shared folder on the host * @param aWritable writable if true, readonly otherwise @@ -160,7 +168,7 @@ HRESULT SharedFolder::initCopy(Machine *aMachine, SharedFolder *aThat) * * @return COM result indicator */ -HRESULT SharedFolder::init(Console *aConsole, +HRESULT SharedFolder::init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, @@ -171,9 +179,9 @@ HRESULT SharedFolder::init(Console *aConsole, AutoInitSpan autoInitSpan(this); AssertReturn(autoInitSpan.isOk(), E_FAIL); - unconst(mConsole) = aConsole; + unconst(mVirtualBox) = aVirtualBox; - HRESULT rc = protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, fFailOnError); + HRESULT rc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount); /* Confirm a successful initialization when it's the case */ if (SUCCEEDED(rc)) @@ -182,14 +190,16 @@ HRESULT SharedFolder::init(Console *aConsole, return rc; } -#if 0 +# endif + +#else /** * Initializes the shared folder object. * - * This variant initializes a global instance that lives in the server address space. It is not presently used. + * This variant initializes an instance that lives in the console address space. * - * @param aVirtualBox VirtualBox parent object + * @param aConsole Console parent object * @param aName logical name of the shared folder * @param aHostPath full path to the shared folder on the host * @param aWritable writable if true, readonly otherwise @@ -197,7 +207,7 @@ HRESULT SharedFolder::init(Console *aConsole, * * @return COM result indicator */ -HRESULT SharedFolder::init(VirtualBox *aVirtualBox, +HRESULT SharedFolder::init(Console *aConsole, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, @@ -208,9 +218,9 @@ HRESULT SharedFolder::init(VirtualBox *aVirtualBox, AutoInitSpan autoInitSpan(this); AssertReturn(autoInitSpan.isOk(), E_FAIL); - unconst(mVirtualBox) = aVirtualBox; + unconst(mConsole) = aConsole; - HRESULT rc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount); + HRESULT rc = protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, fFailOnError); /* Confirm a successful initialization when it's the case */ if (SUCCEEDED(rc)) @@ -218,7 +228,6 @@ HRESULT SharedFolder::init(VirtualBox *aVirtualBox, return rc; } - #endif /** @@ -304,9 +313,12 @@ void SharedFolder::uninit() unconst(mParent) = NULL; +#if !defined(VBOX_COM_INPROC) unconst(mMachine) = NULL; - unconst(mConsole) = NULL; unconst(mVirtualBox) = NULL; +#else + unconst(mConsole) = NULL; +#endif } // ISharedFolder properties |