Changeset 16215 in vbox for trunk/src/VBox/Main/SharedFolderImpl.cpp

Timestamp:

Jan 24, 2009 11:11:56 AM (16 years ago)

Author:

vboxsync

Message:

Reapplied r41613.

File:

• trunk/src/VBox/Main/SharedFolderImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -104 +104 @@
     unconst (mMachine) = aMachine;
 
-    HRESULT rc = protectedInit (aMachine, aThat->mData.mName,
-                                aThat->mData.mHostPath, aThat->mData.mWritable);
+    HRESULT rc = protectedInit (aMachine, aThat->m.name,
+                                aThat->m.hostPath, aThat->m.writable);
 
     /* Confirm a successful initialization when it's the case */
@@ -222 +222 @@
     mParent->addDependentChild (this);
 
-    unconst (mData.mName) = aName;
-    unconst (mData.mHostPath) = hostPath;
-    mData.mWritable = aWritable;
+    unconst (m.name) = aName;
+    unconst (m.hostPath) = hostPath;
+    m.writable = aWritable;
 
     return S_OK;
@@ -263 +263 @@
 
     /* mName is constant during life time, no need to lock */
-    mData.mName.cloneTo (aName);
+    m.name.cloneTo (aName);
 
     return S_OK;
@@ -276 +276 @@
 
     /* mHostPath is constant during life time, no need to lock */
-    mData.mHostPath.cloneTo (aHostPath);
+    m.hostPath.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 (mData.mHostPath);
+    Utf8Str hostPath = Utf8Str (m.hostPath);
     char hostPathFull [RTPATH_MAX];
     int vrc = RTPathExists (hostPath) ? RTPathReal (hostPath, hostPathFull,
@@ -302 +302 @@
     }
 
-    LogWarningThisFunc (("'%s' is not accessible (%Rrc)\n", hostPath.raw(), vrc));
+    AutoWriteLock alock (this);
+
+    m.lastAccessError = BstrFmt (
+        tr ("'%s' is not accessible (%Rrc)"), hostPath.raw(), vrc);
+
+    LogWarningThisFunc (("m.lastAccessError=\"%ls\"\n", m.lastAccessError.raw()));
 
     *aAccessible = FALSE;
@@ -312 +317 @@
     CheckComArgOutPointerValid(aWritable);
 
-    *aWritable = mData.mWritable;
-
-    return S_OK;
-}
+    *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;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */