Changeset 47836 in vbox

Timestamp:

Aug 19, 2013 9:16:40 AM (12 years ago)

Author:

vboxsync

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

88106

Message:

Main/IGuestFile: Changed disposition and openMode parameters being wstrings instead of ulongs (related to r88105), matching the IGuestSession::openFile / openFileEx calls.

Location:

trunk/src/VBox/Main

Files:

• include/GuestFileImpl.h (modified) (1 diff)
• src-client/GuestFileImpl.cpp (modified) (5 diffs)

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

@@ -59 +59 @@
      * @{ */
     STDMETHOD(COMGETTER(CreationMode))(ULONG *aCreationMode);
-    STDMETHOD(COMGETTER(Disposition))(ULONG *aDisposition);
+    STDMETHOD(COMGETTER(Disposition))(BSTR *aDisposition);
     STDMETHOD(COMGETTER(EventSource))(IEventSource ** aEventSource);
     STDMETHOD(COMGETTER(FileName))(BSTR *aFileName);
     STDMETHOD(COMGETTER(InitialSize))(LONG64 *aInitialSize);
     STDMETHOD(COMGETTER(Offset))(LONG64 *aOffset);
-    STDMETHOD(COMGETTER(OpenMode))(ULONG *aOpenMode);
+    STDMETHOD(COMGETTER(OpenMode))(BSTR *aOpenMode);
     STDMETHOD(COMGETTER(Status))(FileStatus_T *aStatus);
 

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

@@ -263 +263 @@
 }
 
-/** @todo For 4.3: Change ULONG* to BSTR* ?*/
-STDMETHODIMP GuestFile::COMGETTER(Disposition)(ULONG *aDisposition)
+STDMETHODIMP GuestFile::COMGETTER(Disposition)(BSTR *aDisposition)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -276 +275 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    uint32_t uDisposition = 0;
-    /** @todo Fix me! */
-    *aDisposition = uDisposition;
+    mData.mOpenInfo.mDisposition.cloneTo(aDisposition);
 
     return S_OK;
@@ -294 +291 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    // no need to lock - lifetime constant
+    /* No need to lock - lifetime constant. */
     mEventSource.queryInterfaceTo(aEventSource);
 
@@ -355 +352 @@
 }
 
-/** @todo For 4.3: Change ULONG* to BSTR* ?*/
-STDMETHODIMP GuestFile::COMGETTER(OpenMode)(ULONG *aOpenMode)
+STDMETHODIMP GuestFile::COMGETTER(OpenMode)(BSTR *aOpenMode)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -368 +364 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    uint32_t uOpenMode = 0;
-    /** @todo Fix me! */
-    *aOpenMode = uOpenMode;
+    mData.mOpenInfo.mOpenMode.cloneTo(aOpenMode);
 
     return S_OK;