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

Timestamp:

Mar 3, 2015 9:36:04 PM (10 years ago)

Author:

vboxsync

Message:

VBoxGuest: Call vbgdResetMouseStatusOnHost at init too. Removed internal flipping of VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR since nobody is actually using the internal state for anything at present.

File:

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

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

@@ -1073 +1073 @@
             {
                 /*
-                 * Set the fixed event and make sure guest capabilities are cleared.
+                 * Set the fixed event and make sure the host doesn't have any lingering
+                 * the guest capabilities or mouse status bits set.
                  */
                 rc = vbgdResetEventFilterOnHost(pDevExt, pDevExt->fFixedEvents);
@@ -1081 +1082 @@
                     if (RT_SUCCESS(rc))
                     {
-                        /*
-                         * Initialize stuff which may fail without requiring the driver init to fail.
-                         */
-                        vbgdInitFixateGuestMappings(pDevExt);
-                        vbgdHeartbeatInit(pDevExt);
-
-                        /*
-                         * Done!
-                         */
-                        rc = vbgdReportDriverStatus(true /* Driver is active */);
-                        if (RT_FAILURE(rc))
-                            LogRel(("VbgdCommonInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc));
-
-                        LogFlowFunc(("VbgdCommonInitDevExt: returns success\n"));
-                        return VINF_SUCCESS;
+                        rc = vbgdResetMouseStatusOnHost(pDevExt);
+                        if (RT_SUCCESS(rc))
+                        {
+                            /*
+                             * Initialize stuff which may fail without requiring the driver init to fail.
+                             */
+                            vbgdInitFixateGuestMappings(pDevExt);
+                            vbgdHeartbeatInit(pDevExt);
+
+                            /*
+                             * Done!
+                             */
+                            rc = vbgdReportDriverStatus(true /* Driver is active */);
+                            if (RT_FAILURE(rc))
+                                LogRel(("VbgdCommonInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc));
+
+                            LogFlowFunc(("VbgdCommonInitDevExt: returns success\n"));
+                            return VINF_SUCCESS;
+                        }
+                        LogRel(("VbgdCommonInitDevExt: failed to clear mouse status: rc=%Rrc\n", rc));
                     }
+                    else
+                        LogRel(("VbgdCommonInitDevExt: failed to clear guest capabilities: rc=%Rrc\n", rc));
                 }
-
-                LogRel(("VbgdCommonInitDevExt: failed to set host flags, rc=%Rrc\n", rc));
+                else
+                    LogRel(("VbgdCommonInitDevExt: failed to set fixed event filter: rc=%Rrc\n", rc));
             }
             else
-                LogRel(("VbgdCommonInitDevExt: VBoxReportGuestInfo failed, rc=%Rrc\n", rc));
+                LogRel(("VbgdCommonInitDevExt: VBoxReportGuestInfo failed: rc=%Rrc\n", rc));
             VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
         }
         else
-            LogRel(("VbgdCommonInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc));
+            LogRel(("VbgdCommonInitDevExt: VBoxGRAlloc failed: rc=%Rrc\n", rc));
 
         VbglTerminate();
     }
     else
-        LogRel(("VbgdCommonInitDevExt: VbglInit failed, rc=%Rrc\n", rc));
+        LogRel(("VbgdCommonInitDevExt: VbglInit failed: rc=%Rrc\n", rc));
 
     rc2 = RTSemFastMutexDestroy(pDevExt->MemBalloon.hMtx); AssertRC(rc2);
@@ -2809 +2817 @@
             if (pReq)
             {
-                /* Since VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR is inverted in the session
-                 * capabilities we invert it again here before sending it to the host. */
-                pReq->mouseFeatures = pDevExt->MouseStatusTracker.fMask ^ VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
+                pReq->mouseFeatures = pDevExt->MouseStatusTracker.fMask;
                 if (pReq->mouseFeatures == pDevExt->fMouseStatusHost)
                     rc = VINF_SUCCESS;
@@ -2863 +2869 @@
     if (fFeatures & ~VMMDEV_MOUSE_GUEST_MASK)
         return VERR_INVALID_PARAMETER;
-
-    /* Since this is more of a negative feature we invert it to get the real
-     * feature (when the guest does not need the host cursor). */
-    fFeatures ^= VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
 
     return vbgdSetSessionMouseStatus(pDevExt, pSession, fFeatures, ~fFeatures, false /*fSessionTermination*/);