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

Timestamp:

Mar 19, 2014 4:57:33 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: new command submission continued

File:

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

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

@@ -45 +45 @@
 static uint32_t g_u32ScreenCount = 0;
 static PVM g_pVM = NULL;
+static uint32_t g_u32fCrHgcmDisabled = 0;
 
 #ifndef RT_OS_WINDOWS
@@ -558 +559 @@
 
     NOREF(pvClient);
+
+    if (g_u32fCrHgcmDisabled)
+    {
+        WARN(("cr hgcm disabled!"));
+        return;
+    }
 
     Log(("SHARED_CROPENGL svcCall: u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n", u32ClientID, u32Function, cParms, paParms));
@@ -1519 +1526 @@
                     if (paParms->u.pointer.size != sizeof (VBOXCRCMDCTL))
                         WARN(("invalid param size"));
-                    return crVBoxServerHgcmDisable();
+                    int rc = crVBoxServerHgcmDisable();
+                    if (RT_SUCCESS(rc))
+                        g_u32fCrHgcmDisabled = 1;
+                    else
+                        WARN(("crVBoxServerHgcmDisable failed %d", rc));
+                    return rc;
                 }
                 case VBOXCRCMDCTL_TYPE_ENABLE:
@@ -1526 +1538 @@
                         WARN(("invalid param size"));
                     VBOXCRCMDCTL_ENABLE *pEnable = (VBOXCRCMDCTL_ENABLE*)pCtl;
-                    return crVBoxServerHgcmEnable(pEnable->hRHCmd, pEnable->pfnRHCmd);
+                    int rc = crVBoxServerHgcmEnable(pEnable->hRHCmd, pEnable->pfnRHCmd);
+                    if (RT_SUCCESS(rc))
+                        g_u32fCrHgcmDisabled = 0;
+                    else
+                        WARN(("crVBoxServerHgcmEnable failed %d", rc));
+                    return rc;
                 }
                 default:
@@ -1536 +1553 @@
         }
         default:
+            if (g_u32fCrHgcmDisabled)
+            {
+                WARN(("cr hgcm disabled!"));
+                return VERR_INVALID_STATE;
+            }
             return svcHostCallPerform(u32Function, cParms, paParms);
     }
@@ -1562 +1584 @@
         {
             g_pHelpers = ptable->pHelpers;
+
+            g_u32fCrHgcmDisabled = 0;
 
             ptable->cbClient = sizeof (void*);