Changeset 47764 in vbox

Timestamp:

Aug 15, 2013 1:19:36 PM (11 years ago)

Author:

vboxsync

Message:

Committed too much.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (5 diffs)

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)
@@ -1115 +1107 @@
     if (RT_SUCCESS(rc))
     {
-        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;
-        }
-    }
+        /* 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;
 
     LogFlowFuncLeaveRC(rc);
@@ -1643 +1629 @@
 
     /* Add the created process to our map. */
-    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;
-    }
+    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));
 
     return rc;
@@ -1841 +1820 @@
     uint32_t uVBoxMinor    = VBOX_FULL_VERSION_GET_MINOR(uVerAdditions);
 
-#if 1
+#if 0
     /* Hardcode the to-used protocol version; nice for testing side effects. */
     mData.mProtocolVersion = 2;
@@ -2775 +2754 @@
         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);