Changeset 51330 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 21, 2014 7:46:25 PM (11 years ago)

Author:

vboxsync

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

93813

Message:

crOpenGL: more extended flexible caps info, backwards compatibility fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/server_main.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -904 +904 @@
         }
 
-        case SHCRGL_GUEST_FN_GET_CAPS:
-        {
-            Log(("svcCall: SHCRGL_GUEST_FN_GET_CAPS\n"));
-
-            /* Verify parameter count and types. */
-            if (cParms != SHCRGL_CPARMS_GET_CAPS)
-            {
-                rc = VERR_INVALID_PARAMETER;
-            }
-            else
-            if (paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT)
+        case SHCRGL_GUEST_FN_GET_CAPS_NEW:
+        {
+            Log(("svcCall: SHCRGL_GUEST_FN_GET_CAPS_NEW\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_GET_CAPS_NEW)
+            {
+                WARN(("invalid parameter count"));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            if (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)
+            {
+                WARN(("invalid parameter"));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            if (paParms[0].u.pointer.size < sizeof (CR_CAPS_INFO))
+            {
+                WARN(("invalid buffer size"));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            CR_CAPS_INFO *pInfo = (CR_CAPS_INFO*)paParms[0].u.pointer.addr;
+            rc = crVBoxServerClientGetCapsNew(u32ClientID, pInfo);
+            AssertRC(rc);
+
+            break;
+        }
+
+        case SHCRGL_GUEST_FN_GET_CAPS_LEGACY:
+        {
+            Log(("svcCall: SHCRGL_GUEST_FN_GET_CAPS_LEGACY\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_GET_CAPS_LEGACY)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else if (paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT)
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -921 +953 @@
             {
                 /* Execute the function. */
-                rc = crVBoxServerClientGetCaps(u32ClientID, &paParms[0].u.uint32);
+                rc = crVBoxServerClientGetCapsLegacy(u32ClientID, &paParms[0].u.uint32);
                 AssertRC(rc);
             }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -840 +840 @@
 }
 
-extern DECLEXPORT(int32_t) crVBoxServerClientGetCaps(uint32_t u32ClientID, uint32_t *pu32Caps)
-{
-    *pu32Caps = cr_server.u32Caps;
+extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsLegacy(uint32_t u32ClientID, uint32_t *pu32Caps)
+{
+    uint32_t u32Caps = cr_server.u32Caps;
+    u32Caps &= ~CR_VBOX_CAP_CMDVBVA;
+    *pu32Caps = u32Caps;
+    return VINF_SUCCESS;
+}
+
+extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsNew(uint32_t u32ClientID, CR_CAPS_INFO *pInfo)
+{
+    pInfo->u32Caps = cr_server.u32Caps;
+    pInfo->u32CmdVbvaVersion = CR_CMDVBVA_VERSION;
     return VINF_SUCCESS;
 }