Changeset 45778 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 26, 2013 1:44:22 PM (12 years ago)

Author:

vboxsync

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

85345

Message:

VBoxGuest/VBoxTray: bugfixes & proper handling for multiuser Seamles & Autoresize

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxTray.cpp (modified) (5 diffs)
• common/VBoxGuest/VBoxGuest.cpp (modified) (10 diffs)
• common/VBoxGuest/VBoxGuestInternal.h (modified) (2 diffs)

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

@@ -1006 +1006 @@
 static VBOXST gVBoxSt;
 
+static int vboxStCheckState()
+{
+    int rc = VINF_SUCCESS;
+    WTS_CONNECTSTATE_CLASS *penmConnectState = NULL;
+    USHORT *pProtocolType = NULL;
+    DWORD cbBuf = 0;
+    Assert(0);
+    if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState, (LPTSTR *)&penmConnectState, &cbBuf))
+    {
+        if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType, (LPTSTR *)&pProtocolType, &cbBuf))
+        {
+            gVBoxSt.fIsConsole = (*pProtocolType == 0);
+            gVBoxSt.enmConnectState = *penmConnectState;
+        }
+        else
+        {
+            DWORD dwErr = GetLastError();
+            WARN(("VBoxTray: WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
+            rc = RTErrConvertFromWin32(dwErr);
+        }
+    }
+    else
+    {
+        DWORD dwErr = GetLastError();
+        WARN(("VBoxTray: WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
+        rc = RTErrConvertFromWin32(dwErr);
+    }
+    return rc;
+}
+
 static int vboxStInit(HWND hWnd)
 {
@@ -1034 +1064 @@
         }
 
+        Assert(0);
+
+
         if (rc == VINF_SUCCESS)
         {
@@ -1039 +1072 @@
             if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
             {
-                WTS_CONNECTSTATE_CLASS *penmConnectState = NULL;
-                USHORT *pProtocolType = NULL;
-                DWORD cbBuf = 0;
-                if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState, (LPTSTR *)&penmConnectState, &cbBuf))
-                {
-                    if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType, (LPTSTR *)&pProtocolType, &cbBuf))
-                    {
-                        gVBoxSt.fIsConsole = (*pProtocolType == 0);
-                        gVBoxSt.enmConnectState = *penmConnectState;
-                    }
-                    else
-                    {
-                        DWORD dwErr = GetLastError();
-                        WARN(("VBoxTray: WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
-                        rc = RTErrConvertFromWin32(dwErr);
-                    }
-                }
-                else
-                {
-                    DWORD dwErr = GetLastError();
-                    WARN(("VBoxTray: WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
-                    rc = RTErrConvertFromWin32(dwErr);
-                }
+                vboxStCheckState();
                 return VINF_SUCCESS;
             }
@@ -1130 +1141 @@
     WARN(("VBoxTray: WTS Event: %s\n", vboxStDbgGetString(wEvent)));
     BOOL fOldIsActiveConsole = vboxStIsActiveConsole();
-    switch (wEvent)
-    {
-        case WTS_CONSOLE_CONNECT:
-            gVBoxSt.enmConnectState = WTSConnected;
-            gVBoxSt.fIsConsole = TRUE;
-            break;
-        case WTS_CONSOLE_DISCONNECT:
-            gVBoxSt.enmConnectState = WTSDisconnected;
-            break;
-        case WTS_REMOTE_CONNECT:
-            gVBoxSt.enmConnectState = WTSConnected;
-            gVBoxSt.fIsConsole = FALSE;
-            break;
-        case WTS_REMOTE_DISCONNECT:
-            gVBoxSt.enmConnectState = WTSDisconnected;
-            break;
-        case WTS_SESSION_LOGON:
-            Assert(gVBoxSt.enmConnectState == WTSConnected);
-            gVBoxSt.enmConnectState = WTSActive;
-            break;
-        case WTS_SESSION_LOGOFF:
-            Assert(gVBoxSt.enmConnectState == WTSActive);
-            gVBoxSt.enmConnectState = WTSConnected;
-            break;
-        case WTS_SESSION_LOCK:
-            Assert(gVBoxSt.enmConnectState == WTSActive);
-            gVBoxSt.enmConnectState = WTSConnected;
-            break;
-        case WTS_SESSION_UNLOCK:
-            Assert(gVBoxSt.enmConnectState == WTSConnected);
-            gVBoxSt.enmConnectState = WTSActive;
-            break;
-        case WTS_SESSION_REMOTE_CONTROL:
-            /* todo */
-            WARN(("WTS_SESSION_REMOTE_CONTROL handling not implemented!"));
-            break;
-        default:
-            WARN(("unexpected session change notification %d", (DWORD)wEvent));
-            break;
-    }
+
+    vboxStCheckState();
 
     return !vboxStIsActiveConsole() != !fOldIsActiveConsole;
@@ -1405 +1378 @@
     uint32_t fCap;
     uint32_t iCap;
-    /* the functionality is supported by the guest */
-    BOOL fIsSupported;
-    /* */
-    BOOL fIsOn;
     VBOXCAPS_ENTRY_FUNCSTATE enmFuncState;
     VBOXCAPS_ENTRY_ACSTATE enmAcState;

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

@@ -73 +73 @@
 static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask);
 
+#define VBOXGUEST_ACQUIRE_STYLE_CAPS (VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST)
+
 DECLINLINE(uint32_t) VBoxGuestCommonGetHandledEventsLocked(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
 {
-    if(!pDevExt->u32GuestCapsAcquireMode)
+    if(pDevExt->enmGuestCapsAcquireMode != VBOXGUUESTCAPS_MODE_ACQUIRE)
         return VMMDEV_EVENT_VALID_EVENT_MASK;
 
     uint32_t u32AquiredGuestCaps = pSession->u32AquiredGuestCaps;
-    /* only VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST is filtered,
-     * for now we allow VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST to come through
-     * to make it still be propagated to r3 client and let clients deal with seamless validity on their own for simplicity */
-    uint32_t u32CleanupEvents = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
+    uint32_t u32CleanupEvents = VBOXGUEST_ACQUIRE_STYLE_CAPS;
     if (u32AquiredGuestCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS)
         u32CleanupEvents &= ~VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
@@ -97 +96 @@
         ASMAtomicAndU32(&pDevExt->f32PendingEvents, ~fMatches);
     return fMatches;
+}
+
+DECLINLINE(bool) VBoxGuestCommonGuestCapsModeSet(PVBOXGUESTDEVEXT pDevExt, VBOXGUUESTCAPS_MODE enmMode)
+{
+    VBOXGUUESTCAPS_MODE enmOldMode;
+    if (ASMAtomicCmpXchgExU32((volatile uint32_t*)&pDevExt->enmGuestCapsAcquireMode, enmMode, VBOXGUUESTCAPS_MODE_UNDEFINED, (uint32_t*)&enmOldMode))
+        return true;
+    return enmOldMode == enmMode;
 }
 
@@ -796 +803 @@
     }
 
-    pDevExt->u32GuestCapsAcquireMode = 0;
+    pDevExt->enmGuestCapsAcquireMode = VBOXGUUESTCAPS_MODE_UNDEFINED;
     pDevExt->u32GuestCaps = 0;
 
@@ -1509 +1516 @@
  * @param   pReqHdr             The request.
  */
-static int VBoxGuestCheckIfVMMReqAllowed(PVBOXGUESTSESSION pSession, VMMDevRequestType enmType,
+static int VBoxGuestCheckIfVMMReqAllowed(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VMMDevRequestType enmType,
                                          VMMDevRequestHeader const *pReqHdr)
 {
@@ -1575 +1582 @@
 
         /*
+         * Anyone. But not for CapsAcquire mode
+         */
+        case VMMDevReq_SetGuestCapabilities:
+#if 0
+            /* @todo: currently windows clients use both Set and Acquire for different caps
+             * this should not lead to any problem, however, better switch to consistent behavior */
+            if (!VBoxGuestCommonGuestCapsModeSet(pDevExt, VBOXGUUESTCAPS_MODE_SET))
+            {
+                Assert(0);
+                LogRel(("calling caps set for invalid caps mode %d\n", pDevExt->enmGuestCapsAcquireMode));
+                enmRequired = kLevel_NoOne;
+                break;
+            }
+#endif
+            /* do not break, make it fall through to the below enmRequired setting */
+        /*
          * Anyone.
          */
@@ -1591 +1614 @@
         case VMMDevReq_GetHeightReduction:
         case VMMDevReq_GetDisplayChangeRequest2:
-        case VMMDevReq_SetGuestCapabilities:
         case VMMDevReq_VideoModeSupported2:
         case VMMDevReq_VideoAccelEnable:
@@ -1688 +1710 @@
     }
 
-    rc = VBoxGuestCheckIfVMMReqAllowed(pSession, enmType, pReqHdr);
+    rc = VBoxGuestCheckIfVMMReqAllowed(pDevExt, pSession, enmType, pReqHdr);
     if (RT_FAILURE(rc))
     {
@@ -2459 +2481 @@
 }
 
+static void VBoxGuestCommonCheckEvents(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fGenFakeEvents)
+{
+    RTSpinlockAcquire(pDevExt->EventSpinlock);
+    uint32_t fEvents = fGenFakeEvents | pDevExt->f32PendingEvents;
+    PVBOXGUESTWAIT  pWait;
+    PVBOXGUESTWAIT  pSafe;
+
+    RTListForEachSafe(&pDevExt->WaitList, pWait, pSafe, VBOXGUESTWAIT, ListNode)
+    {
+        uint32_t fHandledEvents = VBoxGuestCommonGetHandledEventsLocked(pDevExt, pWait->pSession);
+        if (    (pWait->fReqEvents & fEvents & fHandledEvents)
+                    &&  !pWait->fResEvents)
+        {
+            pWait->fResEvents = pWait->fReqEvents & fEvents & fHandledEvents;
+            Assert(!(fGenFakeEvents & pWait->fResEvents) || pSession == pWait->pSession);
+            fEvents &= ~pWait->fResEvents;
+            RTListNodeRemove(&pWait->ListNode);
+#ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
+            RTListAppend(&pDevExt->WakeUpList, &pWait->ListNode);
+#else
+            RTListAppend(&pDevExt->WokenUpList, &pWait->ListNode);
+            rc |= RTSemEventMultiSignal(pWait->Event);
+#endif
+            if (!fEvents)
+                break;
+        }
+    }
+    ASMAtomicWriteU32(&pDevExt->f32PendingEvents, fEvents);
+
+    RTSpinlockRelease(pDevExt->EventSpinlock);
+
+#ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
+    VBoxGuestWaitDoWakeUps(pDevExt);
+#endif
+}
+
 static int VBoxGuestCommonGuestCapsAcquire(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fOrMask, uint32_t fNotMask)
 {
+    if (!VBoxGuestCommonGuestCapsModeSet(pDevExt, VBOXGUUESTCAPS_MODE_ACQUIRE))
+    {
+        Assert(0);
+        LogRel(("calling caps acquire for invalid caps mode %d\n", pDevExt->enmGuestCapsAcquireMode));
+        return VERR_INVALID_STATE;
+    }
     if (!VBoxGuestCommonGuestCapsValidateValues(fOrMask))
         return VERR_INVALID_PARAMETER;
@@ -2475 +2539 @@
     RTSpinlockAcquire(pDevExt->EventSpinlock);
 
-    pDevExt->u32GuestCapsAcquireMode = 1;
     fCurrentOwnedCaps      = pSession->u32AquiredGuestCaps;
     fSessionNotCaps        = fCurrentOwnedCaps & fNotMask;
@@ -2513 +2576 @@
 
     int rc = VBoxGuestSetGuestCapabilities(fSessionOrCaps, fSessionNotCaps);
-    if (RT_SUCCESS(rc))
-    {
-        /* success! return */
-        return VINF_SUCCESS;
-    }
-
-    /* Failure branch
-     * this is generally bad since e.g. failure to release the caps may result in other sessions not being able to use it
-     * so we are not trying to restore the caps back to their values before the VBoxGuestCommonGuestCapsAcquire call,
-     * but just pretend everithing is OK.
-     * @todo: better failure handling mechanism? */
+    if (!RT_SUCCESS(rc))
+    {
+        /* Failure branch
+         * this is generally bad since e.g. failure to release the caps may result in other sessions not being able to use it
+         * so we are not trying to restore the caps back to their values before the VBoxGuestCommonGuestCapsAcquire call,
+         * but just pretend everithing is OK.
+         * @todo: better failure handling mechanism? */
+    }
+
+    /* success! */
+    uint32_t fGenFakeEvents = 0;
+
+    if (fSessionOrCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS)
+    {
+        /* generate the seamless change event so that the r3 app could synch with the seamless state
+         * although this introduces a false alarming of r3 client, it still solve the problem of
+         * client state inconsistency in multiuser environment */
+        fGenFakeEvents |= VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
+    }
+
+    /* since the acquire filter mask has changed, we need to process events in any way to ensure they go from pending events field
+     * to the proper (un-filtered) entries */
+    VBoxGuestCommonCheckEvents(pDevExt, pSession, fGenFakeEvents);
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -108 +108 @@
 typedef VBOXGUESTMEMBALLOON *PVBOXGUESTMEMBALLOON;
 
+typedef enum VBOXGUUESTCAPS_MODE
+{
+    VBOXGUUESTCAPS_MODE_UNDEFINED = 0,
+    /* uncomment when/if guests have consistent Acquire/Set behavior,
+     * i.e. only either of those should be used, while at leats on win they are used interchangeably */
+    /*VBOXGUUESTCAPS_MODE_SET,*/
+    VBOXGUUESTCAPS_MODE_ACQUIRE,
+    VBOXGUUESTCAPS_MODE_Make32bit = 0x7fffffff,
+} VBOXGUUESTCAPS_MODE;
 
 /**
@@ -183 +192 @@
     /* true if the driver is in caps acquire mode,
      * i.e. no seamless of resize events are reported unless the driver has acquired the corresponding guest caps */
-    uint32_t                    u32GuestCapsAcquireMode;
+    volatile VBOXGUUESTCAPS_MODE enmGuestCapsAcquireMode;
     /* currently acquired (and reported) guest caps */
     uint32_t                    u32GuestCaps;