Changeset 49948 in vbox

Timestamp:

Dec 17, 2013 9:51:45 AM (11 years ago)

Author:

vboxsync

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

91358

Message:

GuestCtrl/Main: Report back temporary name when calling IGuestSession::DirectoryCreateTemp().

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)
• src-client/GuestSessionImpl.cpp (modified) (2 diffs)

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

@@ -150 +150 @@
      *  a certin VBoxService tool's guest stream block. */
     int FromLs(const GuestProcessStreamBlock &strmBlk);
+    int FromMkTemp(const GuestProcessStreamBlock &strmBlk);
     int FromStat(const GuestProcessStreamBlock &strmBlk);
 
@@ -285 +286 @@
     size_t GetCount(void) const;
 
+    int GetRc(void) const;
+
     const char* GetString(const char *pszKey) const;
 

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

@@ -343 +343 @@
     int                     directoryRemoveInternal(const Utf8Str &strPath, uint32_t uFlags, int *pGuestRc);
     int                     directoryCreateInternal(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pGuestRc);
-    int                     objectCreateTempInternal(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, const Utf8Str &strName, int *pGuestRc);
+    int                     objectCreateTempInternal(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, Utf8Str &strName, int *pGuestRc);
     int                     directoryOpenInternal(const GuestDirectoryOpenInfo &openInfo, ComObjPtr<GuestDirectory> &pDirectory, int *pGuestRc);
     int                     directoryQueryInfoInternal(const Utf8Str &strPath, GuestFsObjData &objData, int *pGuestRc);

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

@@ -317 +317 @@
         if (RT_FAILURE(rc)) throw rc;
         /** @todo Add complete ls info! */
+    }
+    catch (int rc2)
+    {
+        rc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int GuestFsObjData::FromMkTemp(const GuestProcessStreamBlock &strmBlk)
+{
+    LogFlowFunc(("\n"));
+
+    int rc;
+
+    try
+    {
+#ifdef DEBUG
+        strmBlk.DumpToLog();
+#endif
+        /* Object name. */
+        mName = strmBlk.GetString("name");
+        if (mName.isEmpty()) throw VERR_NOT_FOUND;
+        /* Assign the stream block's rc. */
+        rc = strmBlk.GetRc();
     }
     catch (int rc2)
@@ -466 +492 @@
 
 /**
+ * Gets the return code (name = "rc") of this stream block.
+ *
+ * @return  IPRT status code.
+ */
+int GuestProcessStreamBlock::GetRc(void) const
+{
+    const char *pszValue = GetString("rc");
+    if (pszValue)
+    {
+        return RTStrToInt16(pszValue);
+    }
+    return VERR_NOT_FOUND;
+}
+
+/**
  * Returns a string value of a specified key.
  *

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

@@ -866 +866 @@
 
 int GuestSession::objectCreateTempInternal(const Utf8Str &strTemplate, const Utf8Str &strPath,
-                                           bool fDirectory, const Utf8Str &strName, int *pGuestRc)
-{
-    LogFlowThisFunc(("strTemplate=%s, strPath=%s, fDirectory=%RTbool, strName=%s\n",
-                     strTemplate.c_str(), strPath.c_str(), fDirectory, strName.c_str()));
+                                           bool fDirectory, Utf8Str &strName, int *pGuestRc)
+{
+    LogFlowThisFunc(("strTemplate=%s, strPath=%s, fDirectory=%RTbool\n",
+                     strTemplate.c_str(), strPath.c_str(), fDirectory));
 
     int vrc = VINF_SUCCESS;
@@ -894 +894 @@
     }
 
+    /** @todo Use an internal HGCM command for this operation, since
+     *        we now can run in a user-dedicated session. */
+    int guestRc; GuestCtrlStreamObjects stdOut;
     if (RT_SUCCESS(vrc))
-        vrc = GuestProcessTool::Run(this, procInfo, pGuestRc);
+        vrc = GuestProcessTool::RunEx(this, procInfo,
+                                      &stdOut, 1 /* cStrmOutObjects */,
+                                      &guestRc);
+    if (   RT_SUCCESS(vrc)
+        && RT_SUCCESS(guestRc))
+    {
+        GuestFsObjData objData;
+        if (!stdOut.empty())
+        {
+            vrc = objData.FromMkTemp(stdOut.at(0));
+            if (RT_FAILURE(vrc))
+            {
+                guestRc = vrc;
+                vrc = VERR_GSTCTL_GUEST_ERROR;
+            }
+        }
+        else
+            vrc = VERR_NO_DATA;
+
+        if (RT_SUCCESS(vrc))
+            strName = objData.mName;
+    }
+
+    if (pGuestRc)
+        *pGuestRc = guestRc;
 
     LogFlowFuncLeaveRC(vrc);