Changeset 74734 in vbox for trunk

Timestamp:

Oct 10, 2018 11:47:54 AM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Got rid of the "types" array in IGuestSession::copyFromGuest() and IGuestSession::copyToGuest(); the source type will now be resolved internally within those methods.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (3 diffs)
• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (8 diffs)

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

@@ -11969 +11969 @@
   <interface
     name="IGuestSession" extends="$unknown"
-    uuid="9880f6e3-c4c1-4031-8ec2-28ee088370e4"
+    uuid="07241827-f602-48c8-8511-4d933f3cf0bb"
     wsmap="managed"
     reservedMethods="8" reservedAttributes="8"
@@ -12147 +12147 @@
         <desc>Array of source filters. This uses the
           DOS/NT style wildcard characters '?' and '*'.</desc>
-      </param>
-      <param name="types" type="FsObjType" dir="in" safearray="yes">
-        <desc>Array of source <link to="FsObjType"/> types.</desc>
       </param>
       <param name="flags" type="wstring" dir="in" safearray="yes">
@@ -12205 +12202 @@
         <desc>Array of source filters. This uses the
           DOS/NT style wildcard characters '?' and '*'.</desc>
-      </param>
-      <param name="types" type="FsObjType" dir="in" safearray="yes">
-        <desc>Array of source <link to="FsObjType"/> types.</desc>
       </param>
       <param name="flags" type="wstring" dir="in" safearray="yes">

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

@@ -1118 +1118 @@
      *  extended director's cut version. */
     int signalWaitEventInternalEx(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int rc, int guestRc, const GuestWaitEventPayload *pPayload);
+
 public:
 
@@ -1129 +1130 @@
     int unregisterWaitEvent(GuestWaitEvent *pEvent);
     int waitForEvent(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, VBoxEventType_T *pType, IEvent **ppEvent);
+
+public:
+
+    static FsObjType_T fileModeToFsObjType(RTFMODE fMode);
 
 protected:

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

@@ -83 +83 @@
     HRESULT copyFromGuest(const std::vector<com::Utf8Str> &aSources,
                           const std::vector<com::Utf8Str> &aFilters,
-                          const std::vector<FsObjType_T> &aTypes,
                           const std::vector<com::Utf8Str> &aFlags,
                           const com::Utf8Str &aDestination,
@@ -89 +88 @@
     HRESULT copyToGuest(const std::vector<com::Utf8Str> &aSources,
                         const std::vector<com::Utf8Str> &aFilters,
-                        const std::vector<FsObjType_T> &aTypes,
                         const std::vector<com::Utf8Str> &aFlags,
                         const com::Utf8Str &aDestination,

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

@@ -1133 +1133 @@
 }
 
+/**
+ * Converts RTFMODE to FsObjType_T.
+ *
+ * @return  Converted FsObjType_T type.
+ * @param   enmType             RTFMODE to convert.
+ */
+/* static */
+FsObjType_T GuestBase::fileModeToFsObjType(RTFMODE fMode)
+{
+    if (RTFS_IS_FILE(fMode))           return FsObjType_File;
+    else if (RTFS_IS_DIRECTORY(fMode)) return FsObjType_Directory;
+    else if (RTFS_IS_SYMLINK(fMode))   return FsObjType_Symlink;
+
+    return FsObjType_Unknown;
+}
+
 GuestObject::GuestObject(void)
     : mSession(NULL),

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

@@ -2892 +2892 @@
 
 HRESULT GuestSession::copyFromGuest(const std::vector<com::Utf8Str> &aSources, const std::vector<com::Utf8Str> &aFilters,
-                                    const std::vector<FsObjType_T> &aTypes, const std::vector<com::Utf8Str> &aFlags,
-                                    const com::Utf8Str &aDestination, ComPtr<IProgress> &aProgress)
+                                    const std::vector<com::Utf8Str> &aFlags, const com::Utf8Str &aDestination,
+                                    ComPtr<IProgress> &aProgress)
 {
     AutoCaller autoCaller(this);
@@ -2900 +2900 @@
     const size_t cSources = aSources.size();
     if (   aFilters.size() != cSources
-        || aTypes.size()   != cSources
         || aFlags.size()   != cSources)
     {
@@ -2910 +2909 @@
     std::vector<com::Utf8Str>::const_iterator itSource = aSources.begin();
     std::vector<com::Utf8Str>::const_iterator itFilter = aFilters.begin();
-    std::vector<FsObjType_T>::const_iterator  itType   = aTypes.begin();
     std::vector<com::Utf8Str>::const_iterator itFlags  = aFlags.begin();
 
+    const bool fContinueOnErrors = false; /** @todo Do we want a flag for that? */
+    const bool fFollowSymlinks   = true;  /** @todo Ditto. */
+
     while (itSource != aSources.end())
     {
+        GuestFsObjData objData;
+        int rcGuest;
+        int vrc = i_fsQueryInfo(*(itSource), fFollowSymlinks, objData, &rcGuest);
+        if (   RT_FAILURE(vrc)
+            && !fContinueOnErrors)
+        {
+            if (GuestProcess::i_isGuestError(vrc))
+                return setError(E_FAIL, tr("Unable to query type for source '%s': %s"), (*itSource).c_str(),
+                                           GuestProcess::i_guestErrorToString(rcGuest).c_str());
+            else
+                return setError(E_FAIL, tr("Unable to query type for source '%s' (%Rrc)"), (*itSource).c_str(), vrc);
+        }
+
         GuestSessionFsSourceSpec source;
         source.strSource    = *itSource;
         source.strFilter    = *itFilter;
-        source.enmType      = *itType;
+        source.enmType      = objData.mType;
         source.enmPathStyle = i_getPathStyle();
 
@@ -2938 +2952 @@
         ++itSource;
         ++itFilter;
-        ++itType;
         ++itFlags;
     }
@@ -2946 +2959 @@
 
 HRESULT GuestSession::copyToGuest(const std::vector<com::Utf8Str> &aSources, const std::vector<com::Utf8Str> &aFilters,
-                                  const std::vector<FsObjType_T> &aTypes, const std::vector<com::Utf8Str> &aFlags,
-                                  const com::Utf8Str &aDestination, ComPtr<IProgress> &aProgress)
+                                  const std::vector<com::Utf8Str> &aFlags, const com::Utf8Str &aDestination,
+                                  ComPtr<IProgress> &aProgress)
 {
     AutoCaller autoCaller(this);
@@ -2954 +2967 @@
     const size_t cSources = aSources.size();
     if (   aFilters.size() != cSources
-        || aTypes.size()   != cSources
         || aFlags.size()   != cSources)
     {
@@ -2964 +2976 @@
     std::vector<com::Utf8Str>::const_iterator itSource = aSources.begin();
     std::vector<com::Utf8Str>::const_iterator itFilter = aFilters.begin();
-    std::vector<FsObjType_T>::const_iterator  itType   = aTypes.begin();
     std::vector<com::Utf8Str>::const_iterator itFlags  = aFlags.begin();
 
+    const bool fContinueOnErrors = false; /** @todo Do we want a flag for that? */
+
     while (itSource != aSources.end())
     {
+        RTFSOBJINFO objInfo;
+        int vrc = RTPathQueryInfo((*itSource).c_str(), &objInfo, RTFSOBJATTRADD_NOTHING);
+        if (   RT_FAILURE(vrc)
+            && !fContinueOnErrors)
+        {
+            return setError(E_FAIL, tr("Unable to query type for source '%s' (%Rrc)"), (*itSource).c_str(), vrc);
+        }
+
         GuestSessionFsSourceSpec source;
         source.strSource    = *itSource;
         source.strFilter    = *itFilter;
-        source.enmType      = *itType;
+        source.enmType      = GuestBase::fileModeToFsObjType(objInfo.Attr.fMode);
         source.enmPathStyle = i_getPathStyle();
 
@@ -2993 +3014 @@
         ++itSource;
         ++itFilter;
-        ++itType;
         ++itFlags;
     }