Changeset 33988 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

Timestamp:

Nov 11, 2010 1:03:17 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: more multithreading fixes, vista expirience index works now

File:

• trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -35 +35 @@
 #include "cr_threads.h"
 #include "net_internals.h"
+#include "cr_process.h"
 
 #include <iprt/thread.h>
@@ -1250 +1251 @@
 }
 
+static int crVBoxHGCMSetPID(CRConnection *conn, CRpid pid)
+{
+    CRVBOXHGCMSETPID parms;
+    int rc;
+
+    parms.hdr.result      = VERR_WRONG_ORDER;
+    parms.hdr.u32ClientID = conn->u32ClientID;
+    parms.hdr.u32Function = SHCRGL_GUEST_FN_SET_PID;
+    parms.hdr.cParms      = SHCRGL_CPARMS_SET_PID;
+
+    parms.u64PID.type     = VMMDevHGCMParmType_64bit;
+    parms.u64PID.u.value64 = (uintptr_t) pid;
+
+    rc = crVBoxHGCMCall(&parms, sizeof(parms));
+
+    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
+    {
+        Assert(0);
+
+        crWarning("SHCRGL_GUEST_FN_SET_PID failed!");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /**
  * The function that actually connects.  This should only be called by clients,
@@ -1322 +1349 @@
     if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &Hdr) >= 0)
 #else
-    /*@todo it'd fail */
     if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof (info)) >= 0)
 #endif
@@ -1328 +1354 @@
         if (info.result == VINF_SUCCESS)
         {
+            int rc;
             conn->u32ClientID = info.u32ClientID;
             crDebug("HGCM connect was successful: client id =0x%x\n", conn->u32ClientID);
 
+            rc = crVBoxHGCMSetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
+            if (!rc)
+            {
+                return rc;
+            }
+            rc = crVBoxHGCMSetPID(conn, crGetPID());
             VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
-            return crVBoxHGCMSetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
+            return rc;
         }
         else