Changeset 31957 in vbox for trunk

Timestamp:

Aug 25, 2010 1:27:52 PM (14 years ago)

Author:

vboxsync

Message:

VRDP: allow to disable display output, input, USB, audio or clipboard.

Location:

trunk

Files:

• include/VBox/vrdpapi.h (modified) (3 diffs)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (1 diff)

trunk/include/VBox/vrdpapi.h

@@ -960 +960 @@
 #define VRDP_QP_VIDEO_CHANNEL_SUNFLSH (7)
 #endif /* VBOX_WITH_VRDP_VIDEO_CHANNEL */
+#define VRDP_QP_FEATURE           (8)
 
 #define VRDP_SP_BASE 0x1000
@@ -965 +966 @@
 
 #pragma pack(1)
+/* VRDP_QP_FEATURE data. */
+typedef struct _VRDPFEATURE
+{
+    uint32_t u32ClientId;
+    char     achInfo[1]; /* UTF8 property input name and output value. */
+} VRDPFEATURE;
+
 /* A framebuffer description. */
 typedef struct _VRDPFRAMEBUFFERINFO
@@ -1188 +1196 @@
  * client connections until the entry point VRDPEnableConnections is called by the application.
  *
- * The caller prepares the callbacks structure. The header.u64Version field
- * must be initialized with the version of the insterface to use.
- * The server will initialize the callbacks table to match the requested interface.
+ * The caller prepares the VRDPCALLBACKS_* structure. The header.u64Version field of the
+ * structure must be initialized with the version of the interface to use.
+ * The server will return pointer to VRDPENTRYPOINTS_* table in *ppEntryPoints
+ * to match the requested interface.
+ * That is if pCallbacks->header.u64Version == VRDP_INTERFACE_VERSION_1, then the server
+ * expects pCallbacks to point to VRDPCALLBACKS_1 and will return a pointer to VRDPENTRYPOINTS_1.
  *
  * @param pCallback     Pointer to the application callbacks which let the server to fetch

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -754 +754 @@
         } break;
 #endif /* VBOX_WITH_VRDP_VIDEO_CHANNEL */
+
+        case VRDP_QP_FEATURE:
+        {
+            if (cbBuffer < sizeof(VRDPFEATURE))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            size_t cbInfo = cbBuffer - RT_OFFSETOF(VRDPFEATURE, achInfo);
+
+            VRDPFEATURE *pFeature = (VRDPFEATURE *)pvBuffer;
+
+            size_t cchInfo = 0;
+            rc = RTStrNLenEx(pFeature->achInfo, cbInfo, &cchInfo);
+
+            if (RT_FAILURE(rc))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            /* features are mapped to "VRDP/Feature/NAME" extra data. */
+            com::Utf8Str extraData("VRDP/Feature/"); 
+            extraData += pFeature->achInfo;
+
+            com::Bstr bstrValue;
+
+            /* @todo these features should be per client. */
+            NOREF(pFeature->u32ClientId);
+
+            if (   RTStrICmp(pFeature->achInfo, "Client/DisableDisplay") == 0
+                || RTStrICmp(pFeature->achInfo, "Client/DisableInput") == 0
+                || RTStrICmp(pFeature->achInfo, "Client/DisableAudio") == 0
+                || RTStrICmp(pFeature->achInfo, "Client/DisableUSB") == 0
+                || RTStrICmp(pFeature->achInfo, "Client/DisableClipboard") == 0
+               )
+            {
+                HRESULT hrc = server->mConsole->machine ()->GetExtraData(com::Bstr(extraData), bstrValue.asOutParam());
+                if (hrc == S_OK && !bstrValue.isEmpty())
+                {
+                    rc = VINF_SUCCESS;
+                }
+            }
+            else
+            {
+                rc = VERR_NOT_SUPPORTED;
+            }
+
+            /* Copy the value string to the callers buffer. */
+            if (rc == VINF_SUCCESS)
+            {
+                com::Utf8Str value = bstrValue;
+
+                size_t cb = value.length() + 1;
+
+                if ((size_t)cbInfo >= cb)
+                {
+                    memcpy(pFeature->achInfo, value.c_str(), cb);
+                }
+                else
+                {
+                    rc = VINF_BUFFER_OVERFLOW;
+                }
+
+                *pcbOut = (uint32_t)cb;
+            }
+        } break;
 
         case VRDP_SP_NETWORK_BIND_PORT: