Changeset 4540 in vbox for trunk/src/VBox

Timestamp:

Sep 5, 2007 7:06:21 PM (17 years ago)

Author:

vboxsync

Message:

Implemented notification for guest about an active VRDP connection.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Display/pointer.c (modified) (1 diff)
• Additions/WINNT/VBoxService/Makefile.kmk (modified) (1 diff)
• Additions/WINNT/VBoxService/VBoxService.cpp (modified) (2 diffs)
• Devices/VMMDev/VBoxDev.cpp (modified) (3 diffs)
• Devices/VMMDev/VMMDevState.h (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/pointer.c

@@ -535 +535 @@
                 }
                 
-                if (pjSrcAlpha[cx * 4 + 3] >= 0xF0)
+                if (pjSrcAlpha[cx * 4 + 3] > 0x7f)
                 {
                     pjDstAnd[cx / 8] &= ~bitmask;

trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk

@@ -31 +31 @@
         VBoxClipboard.cpp \
         VBoxDisplay.cpp \
+        VBoxVRDP.cpp \
         VBoxRestore.cpp \
         VBoxGuest.cpp \

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

@@ -20 +20 @@
 #include "VBoxDisplay.h"
 #include "VBoxRestore.h"
+#include "VBoxVRDP.h"
 #include "VBoxGuest.h"
 #include <VBoxHook.h>
@@ -113 +114 @@
     },
 #endif
+    {
+        "VRDP",
+        VBoxVRDPInit,
+        VBoxVRDPThread,
+        VBoxVRDPDestroy,
+    },
     {
         NULL

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1178 +1178 @@
         }
 
+        case VMMDevReq_GetVRDPChangeRequest:
+        {
+            if (requestHeader->size != sizeof(VMMDevVRDPChangeRequest))
+            {
+                requestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevVRDPChangeRequest *vrdpChangeRequest = (VMMDevVRDPChangeRequest*)requestHeader;
+                /* just pass on the information */
+                Log(("VMMDev: returning VRDP status %d level %d\n", pData->fVRDPEnabled, pData->u32VRDPExperienceLevel));
+                
+                vrdpChangeRequest->u8VRDPActive = pData->fVRDPEnabled;
+                vrdpChangeRequest->u32VRDPExperienceLevel = pData->u32VRDPExperienceLevel;
+                
+                requestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
 
         case VMMDevReq_GetMemBalloonChangeRequest:
@@ -1738 +1757 @@
         /* IRQ so the guest knows what's going on */
         VMMDevNotifyGuest (pData, VMMDEV_EVENT_BALLOON_CHANGE_REQUEST);
+    }
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) vmmdevVRDPChange(PPDMIVMMDEVPORT pInterface, bool fVRDPEnabled, uint32_t u32VRDPExperienceLevel)
+{
+    VMMDevState *pData = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+
+    bool fSame = (pData->fVRDPEnabled == fVRDPEnabled);
+
+    Log(("vmmdevVRDPChange: old=%d. new=%d\n", pData->fVRDPEnabled, fVRDPEnabled));
+
+    if (!fSame)
+    {
+        pData->fVRDPEnabled = fVRDPEnabled;
+        pData->u32VRDPExperienceLevel = u32VRDPExperienceLevel;
+
+        VMMDevNotifyGuest (pData, VMMDEV_EVENT_VRDP);
     }
 
@@ -2054 +2092 @@
     pData->Port.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
     pData->Port.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
+    pData->Port.pfnVRDPChange             = vmmdevVRDPChange;
 
     /* Shared folder LED */

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -141 +141 @@
     bool fLastSeamlessEnabled, fSeamlessEnabled;
 
+    bool fVRDPEnabled;
+    uint32_t u32VRDPExperienceLevel;
+        
 #ifdef TIMESYNC_BACKDOOR
     bool fTimesyncBackdoorLo;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -661 +661 @@
 
 #ifdef VBOX_VRDP
-    ASMAtomicIncU32(&console->mcVRDPClients);
+    uint32_t u32Clients = ASMAtomicIncU32(&console->mcVRDPClients);
+
+    if (u32Clients == 1)
+    {
+        console->getVMMDev()->getVMMDevPort()->
+            pfnVRDPChange (console->getVMMDev()->getVMMDevPort(),
+                           true, VRDP_EXPERIENCE_LEVEL_FULL); // @todo configurable
+    }
 
     NOREF(u32ClientId);
@@ -695 +702 @@
 
 #ifdef VBOX_VRDP
-    ASMAtomicDecU32(&console->mcVRDPClients);
+    uint32_t u32Clients = ASMAtomicDecU32(&console->mcVRDPClients);
+    
+    if (u32Clients == 0)
+    {
+        console->getVMMDev()->getVMMDevPort()->
+            pfnVRDPChange (console->getVMMDev()->getVMMDevPort(),
+                           false, 0);
+    }
 
     console->mDisplay->VideoAccelVRDP (false);