Changeset 40482 in vbox for trunk

Timestamp:

Mar 15, 2012 2:20:01 PM (13 years ago)

Author:

vboxsync

Message:

Console: define VRDP/ActiveClient guest property.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -677 +677 @@
     bool guestPropertiesVRDPEnabled(void);
     void guestPropertiesVRDPUpdateLogon(uint32_t u32ClientId, const char *pszUser, const char *pszDomain);
+    void Console::guestPropertiesVRDPUpdateActiveClient(uint32_t u32ClientId);
     void guestPropertiesVRDPUpdateClientAttach(uint32_t u32ClientId, bool fAttached);
     void guestPropertiesVRDPUpdateNameChange(uint32_t u32ClientId, const char *pszName);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -764 +764 @@
         return;
 
+    LogFlowFunc(("\n"));
+
     char szPropNm[256];
     Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
@@ -786 +788 @@
 
     char szClientId[64];
-    RTStrPrintf(szClientId, sizeof(szClientId), "%d", u32ClientId);
+    RTStrPrintf(szClientId, sizeof(szClientId), "%u", u32ClientId);
     mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastConnectedClient").raw(),
                                Bstr(szClientId).raw(),
@@ -794 +796 @@
 }
 
-void Console::guestPropertiesVRDPUpdateNameChange(uint32_t u32ClientId, const char *pszName)
+void Console::guestPropertiesVRDPUpdateActiveClient(uint32_t u32ClientId)
 {
     if (!guestPropertiesVRDPEnabled())
         return;
+
+    LogFlowFunc(("%d\n", u32ClientId));
+
+    Bstr bstrFlags(L"RDONLYGUEST,TRANSIENT");
+
+    char szClientId[64];
+    RTStrPrintf(szClientId, sizeof(szClientId), "%u", u32ClientId);
+
+    mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/ActiveClient").raw(),
+                               Bstr(szClientId).raw(),
+                               bstrFlags.raw());
+
+    return;
+}
+
+void Console::guestPropertiesVRDPUpdateNameChange(uint32_t u32ClientId, const char *pszName)
+{
+    if (!guestPropertiesVRDPEnabled())
+        return;
+
+    LogFlowFunc(("\n"));
 
     char szPropNm[256];
@@ -816 +839 @@
         return;
 
+    LogFlowFunc(("\n"));
+
     Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
 
@@ -832 +857 @@
     if (!guestPropertiesVRDPEnabled())
         return;
+
+    LogFlowFunc(("\n"));
 
     Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
@@ -1118 +1145 @@
     AssertComRCReturnVoid(autoCaller.rc());
 
+    LogFlowFunc(("%s\n", pszStatus));
+
     /* Parse the status string. */
     if (RTStrICmp(pszStatus, "ATTACH") == 0)
@@ -1157 +1186 @@
     NOREF(u32ClientId);
     mDisplay->VideoAccelVRDP(true);
+
+#ifdef VBOX_WITH_GUEST_PROPS
+    guestPropertiesVRDPUpdateActiveClient(u32ClientId);
+#endif /* VBOX_WITH_GUEST_PROPS */
 
     LogFlowFuncLeave();
@@ -1228 +1261 @@
 #ifdef VBOX_WITH_GUEST_PROPS
     guestPropertiesVRDPUpdateDisconnect(u32ClientId);
+    if (u32Clients == 0)
+        guestPropertiesVRDPUpdateActiveClient(0);
 #endif /* VBOX_WITH_GUEST_PROPS */