Changeset 46196 in vbox for trunk/src

Timestamp:

May 21, 2013 5:06:17 PM (12 years ago)

Author:

vboxsync

Message:

VBoxGuest/VBoxTray: allow enabling caps acquisition mode w/o acquiring caps

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxTray.cpp (modified) (7 diffs)
• common/VBoxGuest/VBoxGuest.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -127 +127 @@
 /*static int vboxTrayGlMsgShowBalloonMsg(WPARAM lParam, LPARAM wParam);*/
 
+static int VBoxAcquireGuestCaps(uint32_t fOr, uint32_t fNot, bool fCfg);
 
 /*******************************************************************************
@@ -845 +846 @@
             }
 
+            rc = VBoxAcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, true);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("VBoxAcquireGuestCaps cfg failed rc %d, ignoring..\n", rc));
+            }
+
             rc = vboxTraySetupSeamless();
             if (RT_SUCCESS(rc))
@@ -1426 +1433 @@
  * otherwise Acquisition mechanism will treat us as different client and will not propagate necessary requests
  * */
-static int VBoxAcquireGuestCaps(uint32_t fOr, uint32_t fNot)
+static int VBoxAcquireGuestCaps(uint32_t fOr, uint32_t fNot, bool fCfg)
 {
     DWORD cbReturned = 0;
     VBoxGuestCapsAquire Info;
+    Info.enmFlags = fCfg ? VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE : VBOXGUESTCAPSACQUIRE_FLAGS_NONE;
     Info.rc = VERR_NOT_IMPLEMENTED;
     Info.u32OrMask = fOr;
@@ -1571 +1579 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
-    int rc = VBoxAcquireGuestCaps(0, VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+    int rc = VBoxAcquireGuestCaps(0, VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, false);
     if (!RT_SUCCESS(rc))
     {
@@ -1627 +1635 @@
             continue;
 
-        int rc = VBoxAcquireGuestCaps(pCap->fCap, 0);
+        int rc = VBoxAcquireGuestCaps(pCap->fCap, 0, false);
         if (RT_SUCCESS(rc))
         {
@@ -1662 +1670 @@
     if (pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_ACQUIRED)
     {
-        int rc = VBoxAcquireGuestCaps(0, pCap->fCap);
+        int rc = VBoxAcquireGuestCaps(0, pCap->fCap, false);
         AssertRC(rc);
     }
@@ -1683 +1691 @@
 
     vboxCapsEntryAcStateSet(pCap, VBOXCAPS_ENTRY_ACSTATE_ACQUIRING);
-    int rc = VBoxAcquireGuestCaps(pCap->fCap, 0);
+    int rc = VBoxAcquireGuestCaps(pCap->fCap, 0, false);
     if (RT_SUCCESS(rc))
     {

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

@@ -71 +71 @@
 static int VBoxGuestCommonIOCtl_SetMouseStatus(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fFeatures);
 
-static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask);
+static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask, VBOXGUESTCAPSACQUIRE_FLAGS enmFlags);
 
 #define VBOXGUEST_ACQUIRE_STYLE_EVENTS (VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST)
@@ -1050 +1050 @@
          pSession, pSession->Process, (int)pSession->Process, (uintptr_t)pSession->R0Process)); /** @todo %RTr0proc */
 
-    VBoxGuestCommonGuestCapsAcquire(pDevExt, pSession, 0, UINT32_MAX);
+    VBoxGuestCommonGuestCapsAcquire(pDevExt, pSession, 0, UINT32_MAX, VBOXGUESTCAPSACQUIRE_FLAGS_NONE);
 
     VBoxGuestCommonIOCtl_CancelAllWaitEvents(pDevExt, pSession);
@@ -2540 +2540 @@
 }
 
-static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask)
+static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask, VBOXGUESTCAPSACQUIRE_FLAGS enmFlags)
 {
     uint32_t fSetCaps = 0;
+
+    if (!VBoxGuestCommonGuestCapsValidateValues(fOrMask))
+    {
+        LogRel(("invalid fOrMask 0x%x\n", fOrMask));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (enmFlags != VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE
+            && enmFlags != VBOXGUESTCAPSACQUIRE_FLAGS_NONE)
+    {
+        LogRel(("invalid enmFlags %d\n", enmFlags));
+        return VERR_INVALID_PARAMETER;
+    }
     if (!VBoxGuestCommonGuestCapsModeSet(pDevExt, fOrMask, true, &fSetCaps))
     {
-        Assert(0);
         LogRel(("calling caps acquire for set caps %d\n", fOrMask));
         return VERR_INVALID_STATE;
     }
 
-    if (!VBoxGuestCommonGuestCapsValidateValues(fOrMask))
-        return VERR_INVALID_PARAMETER;
+    if (enmFlags & VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE)
+    {
+        Log(("Configured Acquire caps: 0x%x\n", fOrMask));
+        return VINF_SUCCESS;
+    }
 
     /* the fNotMask no need to have all values valid,
@@ -2630 +2645 @@
 static int VBoxGuestCommonIOCTL_GuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestCapsAquire *pAcquire)
 {
-    int rc = VBoxGuestCommonGuestCapsAcquire(pDevExt, pSession, pAcquire->u32OrMask, pAcquire->u32NotMask);
+    int rc = VBoxGuestCommonGuestCapsAcquire(pDevExt, pSession, pAcquire->u32OrMask, pAcquire->u32NotMask, pAcquire->enmFlags);
     if (!RT_SUCCESS(rc))
         LogRel(("VBoxGuestCommonGuestCapsAcquire: failed rc %d\n", rc));