Changeset 50548 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 21, 2014 7:53:11 PM (11 years ago)

Author:

vboxsync

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

92401

Message:

6813 - src-client/GuestDirectoryImpl.cpp - changes backed out due to error on winrel clbr 92400

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (5 diffs)
• GuestSessionImpl.cpp (modified) (2 diffs)
• xpcom/module.cpp (modified) (1 diff)

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

@@ -143 +143 @@
 }
 
-// implementation of private wrapped getters/setters for attributes
+// implementation of public getters/setters for attributes
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT GuestDirectory::getDirectoryName(com::Utf8Str &aDirectoryName)
-{
-    LogFlowThisFuncEnter();
+STDMETHODIMP GuestDirectory::COMGETTER(DirectoryName)(BSTR *aName)
+{
+    LogFlowThisFuncEnter();
+
+    CheckComArgOutPointerValid(aName);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    aDirectoryName = mData.mOpenInfo.mPath;
+    mData.mOpenInfo.mPath.cloneTo(aName);
 
     return S_OK;
 }
 
-HRESULT GuestDirectory::getFilter(com::Utf8Str &aFilter)
-{
-    LogFlowThisFuncEnter();
+STDMETHODIMP GuestDirectory::COMGETTER(Filter)(BSTR *aFilter)
+{
+    LogFlowThisFuncEnter();
+
+    CheckComArgOutPointerValid(aFilter);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    aFilter = mData.mOpenInfo.mFilter;
+    mData.mOpenInfo.mFilter.cloneTo(aFilter);
 
     return S_OK;
@@ -219 +229 @@
 
 /* static */
-Utf8Str GuestDirectory::i_guestErrorToString(int guestRc)
+Utf8Str GuestDirectory::guestErrorToString(int guestRc)
 {
     Utf8Str strError;
@@ -253 +263 @@
 
 /* static */
-HRESULT GuestDirectory::i_setErrorExternal(VirtualBoxBase *pInterface, int guestRc)
+HRESULT GuestDirectory::setErrorExternal(VirtualBoxBase *pInterface, int guestRc)
 {
     AssertPtr(pInterface);
     AssertMsg(RT_FAILURE(guestRc), ("Guest rc does not indicate a failure when setting error\n"));
 
-    return pInterface->setError(VBOX_E_IPRT_ERROR, GuestDirectory::i_guestErrorToString(guestRc).c_str());
+    return pInterface->setError(VBOX_E_IPRT_ERROR, GuestDirectory::guestErrorToString(guestRc).c_str());
 }
 
 // implementation of public methods
 /////////////////////////////////////////////////////////////////////////////
-HRESULT GuestDirectory::close()
+
+STDMETHODIMP GuestDirectory::Close(void)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -308 +319 @@
 }
 
-HRESULT GuestDirectory::read(ComPtr<IFsObjInfo> &aObjInfo)
+STDMETHODIMP GuestDirectory::Read(IFsObjInfo **aInfo)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -359 +370 @@
                 {
                     /* Return info object to the caller. */
-                    hr2 = pFsObjInfo.queryInterfaceTo(aObjInfo.asOutParam());
+                    hr2 = pFsObjInfo.queryInterfaceTo(aInfo);
                     if (FAILED(hr2))
                         rc = VERR_COM_UNEXPECTED;

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

@@ -2780 +2780 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = GuestDirectory::i_setErrorExternal(this, guestRc);
+                hr = GuestDirectory::setErrorExternal(this, guestRc);
                 break;
 
@@ -2885 +2885 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = GuestDirectory::i_setErrorExternal(this, guestRc);
+                hr = GuestDirectory::setErrorExternal(this, guestRc);
                 break;
 

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

@@ -69 +69 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Guest, IGuest)
  #ifdef VBOX_WITH_GUEST_CONTROL
+NS_DECL_CLASSINFO(GuestDirectory)
+NS_IMPL_THREADSAFE_ISUPPORTS2_CI(GuestDirectory, IGuestDirectory, IDirectory)
 NS_DECL_CLASSINFO(GuestFile)
 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(GuestFile, IGuestFile, IFile)