Changeset 47762 in vbox for trunk/src

Timestamp:

Aug 15, 2013 1:04:51 PM (12 years ago)

Author:

vboxsync

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

88020

Message:

IPRT: Added RTFileModeToFlags* APIs + testcase.

Location:

trunk/src/VBox

Files:

• Main/src-client/GuestSessionImpl.cpp (modified) (5 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/common/misc/RTFileModeToFlags.cpp (added)
• Runtime/testcase/Makefile.kmk (modified) (2 diffs)
• Runtime/testcase/tstFileModeStringToFlags.cpp (added)

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

@@ -1060 +1060 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    /* Guest Additions < 4.3 don't support handling
+       guest files, skip. */
+    if (mData.mProtocolVersion < 2)
+    {
+        LogFlowThisFunc(("Installed Guest Additions don't support handling guest files, skipping\n"));
+        return VERR_NOT_SUPPORTED;
+    }
+
     int rc = VERR_MAX_PROCS_REACHED;
     if (mData.mNumObjects >= VBOX_GUESTCTRL_MAX_OBJECTS)
@@ -1107 +1115 @@
     if (RT_SUCCESS(rc))
     {
-        /* Add the created file to our vector. */
-        mData.mFiles[uNewFileID] = pFile;
-        mData.mNumObjects++;
-        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-        LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %ld files, %ld objects)\n",
-                     openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
-
-        alock.release(); /* Release lock before firing off event. */
-
-        fireGuestFileRegisteredEvent(mEventSource, this, pFile,
-                                     true /* Registered */);
-    }
-
-    if (pGuestRc)
-        *pGuestRc = guestRc;
+        try
+        {
+            /* Add the created file to our vector. */
+            mData.mFiles[uNewFileID] = pFile;
+            mData.mNumObjects++;
+            Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
+
+            LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %ld files, %ld objects)\n",
+                         openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
+
+            alock.release(); /* Release lock before firing off event. */
+
+            fireGuestFileRegisteredEvent(mEventSource, this, pFile,
+                                         true /* Registered */);
+            if (pGuestRc)
+                *pGuestRc = guestRc;
+        }
+        catch (std::bad_alloc &)
+        {
+            rc = VERR_NO_MEMORY;
+        }
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -1629 +1643 @@
 
     /* Add the created process to our map. */
-    mData.mProcesses[uNewProcessID] = pProcess;
-    mData.mNumObjects++;
-    Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-    fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProcess,
-                                    0 /* PID */, true /* Process registered */);
-
-    LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %ld processes, %ld objects)\n",
-                 mData.mSession.mID, uNewProcessID, mData.mProcesses.size(), mData.mNumObjects));
+    try
+    {
+        mData.mProcesses[uNewProcessID] = pProcess;
+        mData.mNumObjects++;
+        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
+
+        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %ld processes, %ld objects)\n",
+                     mData.mSession.mID, uNewProcessID, mData.mProcesses.size(), mData.mNumObjects));
+
+        fireGuestProcessRegisteredEvent(mEventSource, this /* Session */, pProcess,
+                                        0 /* PID */, true /* Process registered */);
+    }
+    catch (std::bad_alloc &)
+    {
+        rc = VERR_NO_MEMORY;
+    }
 
     return rc;
@@ -1820 +1841 @@
     uint32_t uVBoxMinor    = VBOX_FULL_VERSION_GET_MINOR(uVerAdditions);
 
-#if 0
+#if 1
     /* Hardcode the to-used protocol version; nice for testing side effects. */
     mData.mProtocolVersion = 2;
@@ -2754 +2775 @@
         switch (vrc)
         {
+            case VERR_NOT_SUPPORTED:
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              tr("Handling guest files not supported by installed Guest Additions"));
+                break;
+
             case VERR_GSTCTL_GUEST_ERROR:
                 hr = GuestFile::setErrorExternal(this, guestRc);

trunk/src/VBox/Runtime/Makefile.kmk

@@ -330 +330 @@
         common/misc/RTAssertMsg2Weak.cpp \
         common/misc/RTAssertMsg2WeakV.cpp \
+        common/misc/RTFileModeToFlags.cpp \
         common/misc/RTFileOpenF.cpp \
         common/misc/RTFileOpenV.cpp \

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -65 +65 @@
         tstRTFileGetSize-1 \
         tstFileLock \
+        tstFileModeStringToFlags \
         tstFork \
         tstRTHttp \
@@ -272 +273 @@
 tstFileLock_SOURCES = tstFileLock.cpp
 
+tstFileModeStringToFlags_TEMPLATE = VBOXR3TSTEXE
+tstFileModeStringToFlags_SOURCES = tstFileModeStringToFlags.cpp
+
 tstFork_TEMPLATE = VBOXR3TSTEXE
 tstFork_SOURCES = tstFork.cpp