Changeset 68550 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Aug 31, 2017 12:09:41 PM (7 years ago)

Author:

vboxsync

Message:

merging vbglioc r117689: Initial VBoxGuest I/O control changes.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Files:

• wddm/VBoxMPCr.cpp (modified) (6 diffs)
• wddm/VBoxMPCr.h (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (3 diffs)
• xpdm/VBoxMPDriver.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp

@@ -849 +849 @@
     rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
-    {
-        WARN(("vboxCrCtlConCall failed, rc (%d)", rc));
-        return rc;
-    }
-
-    if (RT_FAILURE(parms.hdr.result))
-    {
-        WARN(("version validation failed, rc (%d)", parms.hdr.result));
-        return parms.hdr.result;
-    }
-    return VINF_SUCCESS;
+        WARN(("vboxCrCtlConCall/SET_VERSION failed, rc = %Rrc", rc));
+    return rc;
 }
 
@@ -877 +868 @@
     if (RT_FAILURE(rc))
     {
-        WARN(("vboxCrCtlConCall failed, rc (%d)", rc));
+        WARN(("vboxCrCtlConCall/GET_CAPS_LEAGCY failed, rc=%Rrc", rc));
         return rc;
-    }
-
-    if (RT_FAILURE(parms.hdr.result))
-    {
-        WARN(("SHCRGL_GUEST_FN_GET_CAPS_LEGACY failed, rc (%d)", parms.hdr.result));
-        return parms.hdr.result;
     }
 
@@ -913 +898 @@
     if (RT_FAILURE(rc))
     {
-        WARN(("vboxCrCtlConCall failed, rc (%d)", rc));
+        WARN(("vboxCrCtlConCall/GET_CAPS_NEW failed, rc=%Rrc", rc));
         return rc;
-    }
-
-    if (RT_FAILURE(parms.hdr.result))
-    {
-        WARN(("SHCRGL_GUEST_FN_GET_CAPS_NEW failed, rc (%d)", parms.hdr.result));
-        return parms.hdr.result;
     }
 
@@ -948 +927 @@
     rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
-    {
-        WARN(("vboxCrCtlConCall failed, rc (%d)", rc));
-        return rc;
-    }
-
-    if (RT_FAILURE(parms.hdr.result))
-    {
-        WARN(("set PID failed, rc (%d)", parms.hdr.result));
-        return parms.hdr.result;
-    }
-    return VINF_SUCCESS;
+        WARN(("vboxCrCtlConCall/SET_PIDfailed, rc=%Rrc", rc));
+    return rc;
 }
 
@@ -1066 +1036 @@
 }
 
-int VBoxMpCrCtlConCall(PVBOXMP_CRCTLCON pCrCtlCon, VBoxGuestHGCMCallInfo *pData, uint32_t cbData)
-{
-    int rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, pData, cbData);
+int VBoxMpCrCtlConCall(PVBOXMP_CRCTLCON pCrCtlCon, PVBGLIOCHGCMCALL pData, uint32_t cbData)
+{
+    int rc = VbglR0CrCtlConCallRaw(pCrCtlCon->hCrCtl, pData, cbData);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -1076 +1046 @@
 }
 
-int VBoxMpCrCtlConCallUserData(PVBOXMP_CRCTLCON pCrCtlCon, VBoxGuestHGCMCallInfo *pData, uint32_t cbData)
-{
-    int rc = VbglR0CrCtlConCallUserData(pCrCtlCon->hCrCtl, pData, cbData);
+int VBoxMpCrCtlConCallUserData(PVBOXMP_CRCTLCON pCrCtlCon, PVBGLIOCHGCMCALL pData, uint32_t cbData)
+{
+    int rc = VbglR0CrCtlConCallUserDataRaw(pCrCtlCon->hCrCtl, pData, cbData);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h

@@ -37 +37 @@
         uint32_t *pu32ClientID);
 int VBoxMpCrCtlConDisconnect(PVBOXMP_DEVEXT pDevExt, PVBOXMP_CRCTLCON pCrCtlCon, uint32_t u32ClientID);
-int VBoxMpCrCtlConCall(PVBOXMP_CRCTLCON pCrCtlCon, struct VBoxGuestHGCMCallInfo *pData, uint32_t cbData);
-int VBoxMpCrCtlConCallUserData(PVBOXMP_CRCTLCON pCrCtlCon, struct VBoxGuestHGCMCallInfo *pData, uint32_t cbData);
+int VBoxMpCrCtlConCall(PVBOXMP_CRCTLCON pCrCtlCon, struct VBGLIOCHGCMCALL *pData, uint32_t cbData);
+int VBoxMpCrCtlConCallUserData(PVBOXMP_CRCTLCON pCrCtlCon, struct VBGLIOCHGCMCALL *pData, uint32_t cbData);
 
 # include <cr_pack.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -2132 +2132 @@
     vboxVDbgBreakFv();
 
-    VbglTerminate();
+    VbglR0TerminateClient();
 
 #ifdef VBOX_WITH_CROGL
@@ -7608 +7608 @@
     NTSTATUS Status = STATUS_SUCCESS;
     /* Initialize VBoxGuest library, which is used for requests which go through VMMDev. */
-    int rc = VbglInitClient();
+    int rc = VbglR0InitClient();
     if (RT_SUCCESS(rc))
     {
@@ -7718 +7718 @@
             LOGREL(("Aborting the video driver load due to 3D support missing"));
 
-        VbglTerminate();
+        VbglR0TerminateClient();
     }
     else
     {
-        WARN(("VbglInitClient failed, rc(%d)", rc));
+        WARN(("VbglR0InitClient failed, rc(%d)", rc));
         Status = STATUS_UNSUCCESSFUL;
     }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -139 +139 @@
 
     /* Initialize VBoxGuest library, which is used for requests which go through VMMDev. */
-    rc = VbglInitClient();
+    rc = VbglR0InitClient();
     VBOXMP_WARN_VPS(rc);
 
@@ -669 +669 @@
         }
 
-        VbglTerminate();
+        VbglR0TerminateClient();
 
         VBoxFreeDisplaysHGSMI(VBoxCommonFromDeviceExt(pExt));