Changeset 75803 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Nov 29, 2018 2:22:10 AM (6 years ago)

Author:

vboxsync

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

127006

Message:

VBoxService: Started using the new PEEK and GET message functions. bugref:9313

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -195 +195 @@
     } while (rc == VERR_INTERRUPTED);
 
-    LogRel2(("vbglR3GuestCtrlDetectPeekGetCancelSupport: rc=%Rrc %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x\n",
+    LogRel(("vbglR3GuestCtrlDetectPeekGetCancelSupport: rc=%Rrc %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x %#x\n",
              rc, PeekCall.idMsg.u.value32,     PeekCall.cParams.u.value32,
              PeekCall.acbParams[ 0].u.value32, PeekCall.acbParams[ 1].u.value32,
@@ -205 +205 @@
              PeekCall.acbParams[12].u.value32, PeekCall.acbParams[13].u.value32));
 
-#if 0 /* enable after testing. */
     /*
      * VERR_TRY_AGAIN is likely and easy.
@@ -241 +240 @@
         return true;
     }
-#endif
 
     /*
-     * If we get an invalid handle status, we can't really tell.
+     * Okay, pretty sure it's not supported then.
      */
-    if (rc != VERR_INVALID_HANDLE)
-    {
-        LogRel(("vbglR3GuestCtrlDetectPeekGetCancelSupport: Not supported (#3)\n"));
-        g_fVbglR3GuestCtrlHavePeekGetCancel = 0;
-    }
-    else
-        LogRel(("vbglR3GuestCtrlDetectPeekGetCancelSupport: Jury is still out (#4)\n"));
+    LogRel(("vbglR3GuestCtrlDetectPeekGetCancelSupport: Not supported (#3)\n"));
+    g_fVbglR3GuestCtrlHavePeekGetCancel = 0;
     return false;
 }
@@ -336 +329 @@
      * Fallback if host < v6.0.
      */
-    return vbglR3GuestCtrlMsgWaitFor(idClient, pidMsg, pcParameters);
+    rc = vbglR3GuestCtrlMsgWaitFor(idClient, pidMsg, pcParameters);
+    if (rc == VERR_TOO_MUCH_DATA)
+        rc = VINF_SUCCESS;
+    return rc;
 }