Changeset 50919 in vbox

Timestamp:

Mar 28, 2014 3:21:43 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93053

Message:

6183 src-all/SharedFolderImpl.cpp

Location:

trunk/src/VBox/Main

Files:

• include/SharedFolderImpl.h (modified) (7 diffs)
• src-all/SharedFolderImpl.cpp (modified) (8 diffs)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/xpcom/module.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (2 diffs)
• src-server/xpcom/server.cpp (modified) (1 diff)

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

@@ -19 +19 @@
 #define ____H_SHAREDFOLDERIMPL
 
-#include "VirtualBoxBase.h"
+#include "SharedFolderWrap.h"
 #include <VBox/shflsvc.h>
 
@@ -25 +25 @@
 
 class ATL_NO_VTABLE SharedFolder :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(ISharedFolder)
+    public SharedFolderWrap
 {
 public:
-
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(SharedFolder, ISharedFolder)
-
-    DECLARE_NOT_AGGREGATABLE(SharedFolder)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(SharedFolder)
-        VBOX_DEFAULT_INTERFACE_ENTRIES  (ISharedFolder)
-    END_COM_MAP()
 
     DECLARE_EMPTY_CTOR_DTOR (SharedFolder)
@@ -52 +41 @@
     void uninit();
 
-    // ISharedFolder properties
-    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
-    STDMETHOD(COMGETTER(HostPath)) (BSTR *aHostPath);
-    STDMETHOD(COMGETTER(Accessible)) (BOOL *aAccessible);
-    STDMETHOD(COMGETTER(Writable)) (BOOL *aWritable);
-    STDMETHOD(COMGETTER(AutoMount)) (BOOL *aAutoMount);
-    STDMETHOD(COMGETTER(LastAccessError)) (BSTR *aLastAccessError);
-
     // public methods for internal purposes only
     // (ensure there is a caller and a read lock before calling them!)
@@ -67 +48 @@
      * @return
      */
-    const Utf8Str& getName() const;
+    const Utf8Str& i_getName() const;
 
     /**
@@ -73 +54 @@
      * @return
      */
-    const Utf8Str& getHostPath() const;
+    const Utf8Str& i_getHostPath() const;
 
     /**
@@ -79 +60 @@
      * @return
      */
-    bool isWritable() const;
+    bool i_isWritable() const;
 
     /**
@@ -85 +66 @@
      * @return
      */
-    bool isAutoMounted() const;
+    bool i_isAutoMounted() const;
 
 protected:
 
-    HRESULT protectedInit(VirtualBoxBase *aParent,
-                          const Utf8Str &aName,
-                          const Utf8Str &aHostPath,
-                          bool aWritable,
-                          bool aAutoMount,
-                          bool fFailOnError);
+    HRESULT i_protectedInit(VirtualBoxBase *aParent,
+                            const Utf8Str &aName,
+                            const Utf8Str &aHostPath,
+                            bool aWritable,
+                            bool aAutoMount,
+                            bool fFailOnError);
 private:
+
+    // wrapped ISharedFolder properies.
+    HRESULT getName(com::Utf8Str &aName);
+    HRESULT getHostPath(com::Utf8Str &aHostPath);
+    HRESULT getAccessible(BOOL *aAccessible);
+    HRESULT getWritable(BOOL *aWritable);
+    HRESULT getAutoMount(BOOL *aAutoMount);
+    HRESULT getLastAccessError(com::Utf8Str &aLastAccessError);
 
     VirtualBoxBase * const mParent;

trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp

@@ -111 +111 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT rc = protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
+    HRESULT rc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -140 +140 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT rc = protectedInit(aMachine,
-                               aThat->m->strName,
-                               aThat->m->strHostPath,
-                               aThat->m->fWritable,
-                               aThat->m->fAutoMount,
-                               false /* fFailOnError */ );
+    HRESULT rc = i_protectedInit(aMachine,
+                                 aThat->m->strName,
+                                 aThat->m->strHostPath,
+                                 aThat->m->fWritable,
+                                 aThat->m->fAutoMount,
+                                 false /* fFailOnError */ );
 
     /* Confirm a successful initialization when it's the case */
@@ -221 +221 @@
     unconst(mConsole) = aConsole;
 
-    HRESULT rc = protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
+    HRESULT rc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -237 +237 @@
  *      Must be called from under the object's lock!
  */
-HRESULT SharedFolder::protectedInit(VirtualBoxBase *aParent,
-                                    const Utf8Str &aName,
-                                    const Utf8Str &aHostPath,
-                                    bool aWritable,
-                                    bool aAutoMount,
-                                    bool fFailOnError)
+HRESULT SharedFolder::i_protectedInit(VirtualBoxBase *aParent,
+                                      const Utf8Str &aName,
+                                      const Utf8Str &aHostPath,
+                                      bool aWritable,
+                                      bool aAutoMount,
+                                      bool fFailOnError)
 {
     LogFlowThisFunc(("aName={%s}, aHostPath={%s}, aWritable={%d}, aAutoMount={%d}\n",
@@ -322 +322 @@
 }
 
-// ISharedFolder properties
+// wrapped ISharedFolder properties
 /////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP SharedFolder::COMGETTER(Name) (BSTR *aName)
-{
-    CheckComArgOutPointerValid(aName);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT SharedFolder::getName(com::Utf8Str &aName)
+{
     /* mName is constant during life time, no need to lock */
-    m->strName.cloneTo(aName);
-
-    return S_OK;
-}
-
-STDMETHODIMP SharedFolder::COMGETTER(HostPath) (BSTR *aHostPath)
-{
-    CheckComArgOutPointerValid(aHostPath);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+    aName = m->strName;
+
+    return S_OK;
+}
+
+HRESULT SharedFolder::getHostPath(com::Utf8Str &aHostPath)
+{
     /* mHostPath is constant during life time, no need to lock */
-    m->strHostPath.cloneTo(aHostPath);
-
-    return S_OK;
-}
-
-STDMETHODIMP SharedFolder::COMGETTER(Accessible) (BOOL *aAccessible)
-{
-    CheckComArgOutPointerValid(aAccessible);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+    aHostPath = m->strHostPath;
+
+    return S_OK;
+}
+
+HRESULT SharedFolder::getAccessible(BOOL *aAccessible)
+{
     /* mName and mHostPath are constant during life time, no need to lock */
 
@@ -382 +366 @@
 
     *aAccessible = FALSE;
-    return S_OK;
-}
-
-STDMETHODIMP SharedFolder::COMGETTER(Writable) (BOOL *aWritable)
-{
-    CheckComArgOutPointerValid(aWritable);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+
+    return S_OK;
+}
+
+HRESULT SharedFolder::getWritable(BOOL *aWritable)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -399 +379 @@
 }
 
-STDMETHODIMP SharedFolder::COMGETTER(AutoMount) (BOOL *aAutoMount)
-{
-    CheckComArgOutPointerValid(aAutoMount);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT SharedFolder::getAutoMount(BOOL *aAutoMount)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -413 +388 @@
 }
 
-STDMETHODIMP SharedFolder::COMGETTER(LastAccessError) (BSTR *aLastAccessError)
-{
-    CheckComArgOutPointerValid(aLastAccessError);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT SharedFolder::getLastAccessError(com::Utf8Str &aLastAccessError)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->strLastAccessError.cloneTo(aLastAccessError);
-
-    return S_OK;
-}
-
-const Utf8Str& SharedFolder::getName() const
+    aLastAccessError = m->strLastAccessError;
+
+    return S_OK;
+}
+
+
+const Utf8Str& SharedFolder::i_getName() const
 {
     return m->strName;
 }
 
-const Utf8Str& SharedFolder::getHostPath() const
+const Utf8Str& SharedFolder::i_getHostPath() const
 {
     return m->strHostPath;
 }
 
-bool SharedFolder::isWritable() const
+bool SharedFolder::i_isWritable() const
 {
     return m->fWritable;
 }
 
-bool SharedFolder::isAutoMounted() const
+bool SharedFolder::i_isAutoMounted() const
 {
     return m->fAutoMount;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1612 +1612 @@
         AutoReadLock sfLock(pSF COMMA_LOCKVAL_SRC_POS);
 
-        Utf8Str name = pSF->getName();
+        Utf8Str name = pSF->i_getName();
         vrc = SSMR3PutU32(pSSM, (uint32_t)name.length() + 1 /* term. 0 */);
         AssertRC(vrc);
@@ -1618 +1618 @@
         AssertRC(vrc);
 
-        Utf8Str hostPath = pSF->getHostPath();
+        Utf8Str hostPath = pSF->i_getHostPath();
         vrc = SSMR3PutU32(pSSM, (uint32_t)hostPath.length() + 1 /* term. 0 */);
         AssertRC(vrc);
@@ -1624 +1624 @@
         AssertRC(vrc);
 
-        vrc = SSMR3PutBool(pSSM, !!pSF->isWritable());
+        vrc = SSMR3PutBool(pSSM, !!pSF->i_isWritable());
         AssertRC(vrc);
 
-        vrc = SSMR3PutBool(pSSM, !!pSF->isAutoMounted());
+        vrc = SSMR3PutBool(pSSM, !!pSF->i_isAutoMounted());
         AssertRC(vrc);
     }
@@ -6604 +6604 @@
                 AutoCaller sfCaller(pSF);
                 AutoReadLock sfLock(pSF COMMA_LOCKVAL_SRC_POS);
-                sharedFolders[it->first] = SharedFolderData(pSF->getHostPath(),
-                                                            pSF->isWritable(),
-                                                            pSF->isAutoMounted());
+                sharedFolders[it->first] = SharedFolderData(pSF->i_getHostPath(),
+                                                            pSF->i_isWritable(),
+                                                            pSF->i_isAutoMounted());
             }
         }

trunk/src/VBox/Main/src-client/xpcom/module.cpp

@@ -76 +76 @@
 NS_DECL_CLASSINFO(RemoteUSBDevice)
 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(RemoteUSBDevice, IHostUSBDevice, IUSBDevice)
-NS_DECL_CLASSINFO(SharedFolder)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SharedFolder, ISharedFolder)
 NS_DECL_CLASSINFO(VRDEServerInfo)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDEServerInfo, IVRDEServerInfo)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8988 +8988 @@
         SharedFolder *pSF = *it;
         AutoCaller autoCaller(pSF);
-        if (pSF->getName() == aName)
+        if (pSF->i_getName() == aName)
         {
             aSharedFolder = pSF;
@@ -10758 +10758 @@
             AutoReadLock sfLock(pSF COMMA_LOCKVAL_SRC_POS);
             settings::SharedFolder sf;
-            sf.strName = pSF->getName();
-            sf.strHostPath = pSF->getHostPath();
-            sf.fWritable = !!pSF->isWritable();
-            sf.fAutoMount = !!pSF->isAutoMounted();
+            sf.strName = pSF->i_getName();
+            sf.strHostPath = pSF->i_getHostPath();
+            sf.fWritable = !!pSF->i_isWritable();
+            sf.fAutoMount = !!pSF->i_isAutoMounted();
 
             data.llSharedFolders.push_back(sf);

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -117 +117 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)
 
-NS_DECL_CLASSINFO(SharedFolder)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SharedFolder, ISharedFolder)
-
 #ifdef VBOX_WITH_USB