Changeset 58181 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 12, 2015 12:54:23 PM (9 years ago)

Author:

vboxsync

Message:

VBoxGuestLib: Removed misunderstood common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h moving the function prototypes into VBoxGuestLib.h where they belong, after correcting the prefix. Did some more positive thinking excercises.

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• wddm/VBoxMPCr.cpp (modified) (12 diffs)
• wddm/VBoxMPCr.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -97 +97 @@
         .. \
         . \
-        ../../../../common/VBoxGuestLib \
         $(VBOX_PATH_CROGL_INCLUDE) \
         $(VBOX_PATH_CROGL_GENFILES) \

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

@@ -751 +751 @@
         return VINF_ALREADY_INITIALIZED;
 
-    int rc = vboxCrCtlCreate(&pCrCtlCon->hCrCtl);
+    int rc = VbglR0CrCtlCreate(&pCrCtlCon->hCrCtl);
     if (RT_SUCCESS(rc))
     {
@@ -772 +772 @@
     }
 
-    int rc = vboxCrCtlDestroy(pCrCtlCon->hCrCtl);
+    int rc = VbglR0CrCtlDestroy(pCrCtlCon->hCrCtl);
     if (RT_SUCCESS(rc))
     {
@@ -800 +800 @@
     parms.vMinor.u.value32 = vMinor;
 
-    rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
+    rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
     {
@@ -830 +830 @@
     *pu32Caps = 0;
 
-    rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
+    rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
     {
@@ -869 +869 @@
     parms.Caps.u.Pointer.size = sizeof (*pCapsInfo);
 
-    rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
+    rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
     {
@@ -908 +908 @@
     Assert(parms.u64PID.u.value64);
 
-    rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
+    rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms));
     if (RT_FAILURE(rc))
     {
@@ -931 +931 @@
     if (RT_SUCCESS(rc))
     {
-        rc = vboxCrCtlConConnect(pCrCtlCon->hCrCtl, &u32ClientID);
+        rc = VbglR0CrCtlConConnect(pCrCtlCon->hCrCtl, &u32ClientID);
         if (RT_SUCCESS(rc))
         {
@@ -952 +952 @@
                 WARN(("vboxMpCrCtlConSetVersion failed, rc (%d)", rc));
             }
-            vboxCrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID);
+            VbglR0CrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID);
         }
         else
@@ -1003 +1003 @@
 int VBoxMpCrCtlConDisconnectHgcm(PVBOXMP_CRCTLCON pCrCtlCon, uint32_t u32ClientID)
 {
-    int rc = vboxCrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID);
+    int rc = VbglR0CrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID);
     if (RT_SUCCESS(rc))
     {
@@ -1009 +1009 @@
         return VINF_SUCCESS;
     }
-    else
-    {
-        WARN(("vboxCrCtlConDisconnect failed, rc (%d)", rc));
-    }
+    WARN(("vboxCrCtlConDisconnect failed, rc (%d)", rc));
     return rc;
 }
@@ -1032 +1029 @@
 int VBoxMpCrCtlConCall(PVBOXMP_CRCTLCON pCrCtlCon, VBoxGuestHGCMCallInfo *pData, uint32_t cbData)
 {
-    int rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, pData, cbData);
+    int rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, pData, cbData);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -1042 +1039 @@
 int VBoxMpCrCtlConCallUserData(PVBOXMP_CRCTLCON pCrCtlCon, VBoxGuestHGCMCallInfo *pData, uint32_t cbData)
 {
-    int rc = vboxCrCtlConCallUserData(pCrCtlCon->hCrCtl, pData, cbData);
+    int rc = VbglR0CrCtlConCallUserData(pCrCtlCon->hCrCtl, pData, cbData);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox WDDM Miniport driver
@@ -21 +20 @@
 #ifdef VBOX_WITH_CROGL
 
-#include <VBox/VBoxGuestLib.h>
-#include <VBoxGuestR0LibCrOgl.h>
+# include <VBox/VBoxGuestLib.h>
 
 typedef struct VBOXMP_CRCTLCON
@@ -221 +219 @@
 
 #endif /* #ifndef ___VBoxMPCr_h__ */
+