Changeset 46196 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

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

Author:

vboxsync

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

85913

Message:

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

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (7 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))
     {