Changeset 50754 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserver

Timestamp:

Mar 12, 2014 5:43:09 PM (11 years ago)

Author:

vboxsync

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

92767

Message:

Dev/VGA/crOpenGL/wddm: command thread, more command processing

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (3 diffs)

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

@@ -962 +962 @@
  * We differentiate between a function handler for the guest and one for the host.
  */
-static DECLCALLBACK(int) svcHostCall (void *, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+static int svcHostCallPerform(void *, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     int rc = VINF_SUCCESS;
@@ -980 +980 @@
     switch (u32Function)
     {
-        case SHCRGL_HOST_FN_CRCMD_NOTIFY_CMDS:
-        {
-            rc = crVBoxServerCrCmdNotifyCmds();
-        } break;
 #ifdef VBOX_WITH_CRHGSMI
         case SHCRGL_HOST_FN_CRHGSMI_CMD:
@@ -1477 +1473 @@
 }
 
+static DECLCALLBACK(int) svcHostCall (void *, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+{
+    switch (u32Function)
+    {
+        case SHCRGL_HOST_FN_CTL:
+        {
+            if (cParms != 1)
+            {
+                WARN(("cParams != 1"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            if (paParms->type != VBOX_HGCM_SVC_PARM_PTR)
+            {
+                WARN(("invalid param type"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            if (paParms->u.pointer.size < sizeof (VBOXCRCMDCTL))
+            {
+                WARN(("invalid param size"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            if ((paParms->u.pointer.size - sizeof (VBOXCRCMDCTL)) % sizeof(VBOXHGCMSVCPARM))
+            {
+                WARN(("invalid param size"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            VBOXCRCMDCTL *pCtl = (VBOXCRCMDCTL*)paParms->u.pointer.addr;
+            uint32_t cParams = (paParms->u.pointer.size - sizeof (VBOXCRCMDCTL)) / sizeof (VBOXHGCMSVCPARM);
+            return svcHostCallPerform(NULL, pCtl->u32Function, cParms, (VBOXHGCMSVCPARM*)(pCtl + 1));
+        }
+        case VBOXCRCMDCTL_TYPE_DISABLE:
+            AssertMsgFailed(("VBOXCRCMDCTL_TYPE_DISABLE\n"));
+            return VERR_NOT_IMPLEMENTED;
+        case VBOXCRCMDCTL_TYPE_ENABLE:
+            AssertMsgFailed(("VBOXCRCMDCTL_TYPE_ENABLE\n"));
+            return VERR_NOT_IMPLEMENTED;
+        default:
+            return svcHostCallPerform(NULL, u32Function, cParms, paParms);
+    }
+
+}
+
 extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable)
 {