Changeset 15978 in vbox

Timestamp:

Jan 15, 2009 9:15:35 PM (16 years ago)

Author:

vboxsync

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

41635

Message:

Main: Backed out r41613.

Location:

trunk/src/VBox/Main

Files:

• SharedFolderImpl.cpp (modified) (8 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/SharedFolderImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -104 +104 @@
     unconst (mMachine) = aMachine;
 
-    HRESULT rc = protectedInit (aMachine, aThat->m.name,
-                                aThat->m.hostPath, aThat->m.writable);
+    HRESULT rc = protectedInit (aMachine, aThat->mData.mName,
+                                aThat->mData.mHostPath, aThat->mData.mWritable);
 
     /* Confirm a successful initialization when it's the case */
@@ -222 +222 @@
     mParent->addDependentChild (this);
 
-    unconst (m.name) = aName;
-    unconst (m.hostPath) = hostPath;
-    m.writable = aWritable;
+    unconst (mData.mName) = aName;
+    unconst (mData.mHostPath) = hostPath;
+    mData.mWritable = aWritable;
 
     return S_OK;
@@ -263 +263 @@
 
     /* mName is constant during life time, no need to lock */
-    m.name.cloneTo (aName);
+    mData.mName.cloneTo (aName);
 
     return S_OK;
@@ -276 +276 @@
 
     /* mHostPath is constant during life time, no need to lock */
-    m.hostPath.cloneTo (aHostPath);
+    mData.mHostPath.cloneTo (aHostPath);
 
     return S_OK;
@@ -283 +283 @@
 STDMETHODIMP SharedFolder::COMGETTER(Accessible) (BOOL *aAccessible)
 {
-    CheckComArgOutPointerValid (aAccessible);
+    CheckComArgOutPointerValid(aAccessible);
 
     AutoCaller autoCaller (this);
@@ -291 +291 @@
 
     /* check whether the host path exists */
-    Utf8Str hostPath = Utf8Str (m.hostPath);
+    Utf8Str hostPath = Utf8Str (mData.mHostPath);
     char hostPathFull [RTPATH_MAX];
     int vrc = RTPathExists (hostPath) ? RTPathReal (hostPath, hostPathFull,
@@ -302 +302 @@
     }
 
-    AutoWriteLock alock (this);
-
-    m.lastAccessError = BstrFmt (
-        tr ("'%s' is not accessible (%Rrc)"), hostPath.raw(), vrc);
-
-    LogWarningThisFunc (("m.lastAccessError=\"%ls\"\n", m.lastAccessError.raw()));
+    LogWarningThisFunc (("'%s' is not accessible (%Rrc)\n", hostPath.raw(), vrc));
 
     *aAccessible = FALSE;
@@ -317 +312 @@
     CheckComArgOutPointerValid(aWritable);
 
-    *aWritable = m.writable;
-
-    return S_OK;
-}
-
-STDMETHODIMP SharedFolder::COMGETTER(LastAccessError) (BSTR *aLastAccessError)
-{
-    CheckComArgOutPointerValid (aLastAccessError);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReadLock alock (this);
-
-    m.lastAccessError.cloneTo (aLastAccessError);
-
-    return S_OK;
-}
-
+    *aWritable = mData.mWritable;
+
+    return S_OK;
+}
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11046 +11046 @@
   <interface
      name="ISharedFolder" extends="$unknown"
-     uuid="ef41869b-ef31-4b30-8e8f-95af35c0e378"
+     uuid="8b0c5f70-9139-4f97-a421-64d5e9c335d5"
      wsmap="struct"
      >
@@ -11121 +11121 @@
         Whether the folder defined by the host path is writable or
         not.
-      </desc>
-    </attribute>
-
-    <attribute name="lastAccessError" type="wstring" readonly="yes">
-      <desc>
-        Text message that represents the result of the last accessibility
-        check.
-
-        Accessibility checks are performed each time the <link to="#accessible"/>
-        attribute is read. A @c null string is returned if the last
-        accessibility check was successful. A non-null string indicates a
-        failure and should normally describe a reason of the failure (for
-        example, a file read error).
       </desc>
     </attribute>

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

@@ -43 +43 @@
         Data() {}
 
-        const Bstr name;
-        const Bstr hostPath;
-        BOOL       writable;
-        Bstr       lastAccessError;
+        const Bstr mName;
+        const Bstr mHostPath;
+        BOOL       mWritable;
     };
 
@@ -79 +78 @@
     STDMETHOD(COMGETTER(Accessible)) (BOOL *aAccessible);
     STDMETHOD(COMGETTER(Writable)) (BOOL *aWritable);
-    STDMETHOD(COMGETTER(LastAccessError)) (BSTR *aLastAccessError);
 
     // public methods for internal purposes only
@@ -87 +85 @@
     // (ensure there is a caller added before calling them!)
 
-    const Bstr &name() const { return m.name; }
-    const Bstr &hostPath() const { return m.hostPath; }
-    BOOL writable() const { return m.writable; }
+    const Bstr &name() const { return mData.mName; }
+    const Bstr &hostPath() const { return mData.mHostPath; }
+    BOOL writable() const { return mData.mWritable; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -108 +106 @@
     const ComObjPtr <VirtualBox, ComWeakRef> mVirtualBox;
 
-    Data m;
+    Data mData;
 };