Index: /trunk/include/VBox/VBoxGuestLib.h =================================================================== --- /trunk/include/VBox/VBoxGuestLib.h (revision 58180) +++ /trunk/include/VBox/VBoxGuestLib.h (revision 58181) @@ -339,4 +339,15 @@ /** @} */ +/** @name Undocumented helpers for talking to the Chromium OpenGL Host Service + * @{ */ +typedef VBGLHGCMHANDLE HVBOXCRCTL; +DECLVBGL(int) VbglR0CrCtlCreate(HVBOXCRCTL *phCtl); +DECLVBGL(int) VbglR0CrCtlDestroy(HVBOXCRCTL hCtl); +DECLVBGL(int) VbglR0CrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID); +DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, uint32_t u32ClientID); +DECLVBGL(int) VbglR0CrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo); +DECLVBGL(int) VbglR0CrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo); +/** @} */ + # endif /* !VBGL_VBOXGUEST */ @@ -398,4 +409,5 @@ #endif /* IN_RING0 && !IN_RING0_AGNOSTIC */ + /** @} */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk (revision 58180) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk (revision 58181) @@ -97,5 +97,4 @@ .. \ . \ - ../../../../common/VBoxGuestLib \ $(VBOX_PATH_CROGL_INCLUDE) \ $(VBOX_PATH_CROGL_GENFILES) \ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp (revision 58180) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp (revision 58181) @@ -751,5 +751,5 @@ return VINF_ALREADY_INITIALIZED; - int rc = vboxCrCtlCreate(&pCrCtlCon->hCrCtl); + int rc = VbglR0CrCtlCreate(&pCrCtlCon->hCrCtl); if (RT_SUCCESS(rc)) { @@ -772,5 +772,5 @@ } - int rc = vboxCrCtlDestroy(pCrCtlCon->hCrCtl); + int rc = VbglR0CrCtlDestroy(pCrCtlCon->hCrCtl); if (RT_SUCCESS(rc)) { @@ -800,5 +800,5 @@ 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,5 +830,5 @@ *pu32Caps = 0; - rc = vboxCrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms)); + rc = VbglR0CrCtlConCall(pCrCtlCon->hCrCtl, &parms.hdr, sizeof (parms)); if (RT_FAILURE(rc)) { @@ -869,5 +869,5 @@ 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,5 +908,5 @@ 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,5 +931,5 @@ if (RT_SUCCESS(rc)) { - rc = vboxCrCtlConConnect(pCrCtlCon->hCrCtl, &u32ClientID); + rc = VbglR0CrCtlConConnect(pCrCtlCon->hCrCtl, &u32ClientID); if (RT_SUCCESS(rc)) { @@ -952,5 +952,5 @@ WARN(("vboxMpCrCtlConSetVersion failed, rc (%d)", rc)); } - vboxCrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID); + VbglR0CrCtlConDisconnect(pCrCtlCon->hCrCtl, u32ClientID); } else @@ -1003,5 +1003,5 @@ 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,8 +1009,5 @@ return VINF_SUCCESS; } - else - { - WARN(("vboxCrCtlConDisconnect failed, rc (%d)", rc)); - } + WARN(("vboxCrCtlConDisconnect failed, rc (%d)", rc)); return rc; } @@ -1032,5 +1029,5 @@ 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,5 +1039,5 @@ 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; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h (revision 58180) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h (revision 58181) @@ -1,4 +1,3 @@ /* $Id$ */ - /** @file * VBox WDDM Miniport driver @@ -21,6 +20,5 @@ #ifdef VBOX_WITH_CROGL -#include -#include +# include typedef struct VBOXMP_CRCTLCON @@ -221,2 +219,3 @@ #endif /* #ifndef ___VBoxMPCr_h__ */ + Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (revision 58180) +++ /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (revision 58181) @@ -37,5 +37,5 @@ #include -#define VBGL_HGCM_ASSERTMsg AssertReleaseMsg +#define VBGL_HGCM_ASSERT_MSG AssertReleaseMsg /** @@ -44,5 +44,5 @@ * @return VBox status code. */ -int vbglR0HGCMInit (void) +int vbglR0HGCMInit(void) { return RTSemFastMutexCreate(&g_vbgldata.mutexHGCMHandle); @@ -54,5 +54,5 @@ * @return VBox status code. */ -int vbglR0HGCMTerminate (void) +int vbglR0HGCMTerminate(void) { RTSemFastMutexDestroy(g_vbgldata.mutexHGCMHandle); @@ -62,159 +62,132 @@ } -DECLINLINE(int) vbglHandleHeapEnter (void) +DECLINLINE(int) vbglHandleHeapEnter(void) { int rc = RTSemFastMutexRequest(g_vbgldata.mutexHGCMHandle); - VBGL_HGCM_ASSERTMsg(RT_SUCCESS(rc), - ("Failed to request handle heap mutex, rc = %Rrc\n", rc)); + VBGL_HGCM_ASSERT_MSG(RT_SUCCESS(rc), ("Failed to request handle heap mutex, rc = %Rrc\n", rc)); return rc; } -DECLINLINE(void) vbglHandleHeapLeave (void) +DECLINLINE(void) vbglHandleHeapLeave(void) { RTSemFastMutexRelease(g_vbgldata.mutexHGCMHandle); } -struct VBGLHGCMHANDLEDATA *vbglHGCMHandleAlloc (void) +struct VBGLHGCMHANDLEDATA *vbglHGCMHandleAlloc(void) { - struct VBGLHGCMHANDLEDATA *p; - int rc = vbglHandleHeapEnter (); - uint32_t i; + struct VBGLHGCMHANDLEDATA *p = NULL; + int rc = vbglHandleHeapEnter(); + if (RT_SUCCESS(rc)) + { + uint32_t i; - if (RT_FAILURE (rc)) - return NULL; + /* Simple linear search in array. This will be called not so often, only connect/disconnect. */ + /** @todo bitmap for faster search and other obvious optimizations. */ + for (i = 0; i < RT_ELEMENTS(g_vbgldata.aHGCMHandleData); i++) + { + if (!g_vbgldata.aHGCMHandleData[i].fAllocated) + { + p = &g_vbgldata.aHGCMHandleData[i]; + p->fAllocated = 1; + break; + } + } - p = NULL; + vbglHandleHeapLeave(); - /** Simple linear search in array. This will be called not so often, only connect/disconnect. - * @todo bitmap for faster search and other obvious optimizations. - */ - - for (i = 0; i < RT_ELEMENTS(g_vbgldata.aHGCMHandleData); i++) - { - if (!g_vbgldata.aHGCMHandleData[i].fAllocated) - { - p = &g_vbgldata.aHGCMHandleData[i]; - p->fAllocated = 1; - break; - } + VBGL_HGCM_ASSERT_MSG(p != NULL, ("Not enough HGCM handles.\n")); } - - vbglHandleHeapLeave (); - - VBGL_HGCM_ASSERTMsg(p != NULL, - ("Not enough HGCM handles.\n")); - return p; } -void vbglHGCMHandleFree (struct VBGLHGCMHANDLEDATA *pHandle) +void vbglHGCMHandleFree(struct VBGLHGCMHANDLEDATA *pHandle) +{ + if (pHandle) + { + int rc = vbglHandleHeapEnter(); + if (RT_SUCCESS(rc)) + { + VBGL_HGCM_ASSERT_MSG(pHandle->fAllocated, ("Freeing not allocated handle.\n")); + + RT_ZERO(*pHandle); + vbglHandleHeapLeave(); + } + } +} + +DECLVBGL(int) VbglHGCMConnect(VBGLHGCMHANDLE *pHandle, VBoxGuestHGCMConnectInfo *pData) { int rc; + if (pHandle && pData) + { + struct VBGLHGCMHANDLEDATA *pHandleData = vbglHGCMHandleAlloc(); + if (pHandleData) + { + rc = vbglDriverOpen(&pHandleData->driver); + if (RT_SUCCESS(rc)) + { + rc = vbglDriverIOCtl(&pHandleData->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, pData, sizeof(*pData)); + if (RT_SUCCESS(rc)) + rc = pData->result; + if (RT_SUCCESS(rc)) + { + *pHandle = pHandleData; + return rc; + } - if (!pHandle) - return; + vbglDriverClose(&pHandleData->driver); + } - rc = vbglHandleHeapEnter (); - - if (RT_FAILURE (rc)) - return; - - VBGL_HGCM_ASSERTMsg(pHandle->fAllocated, - ("Freeing not allocated handle.\n")); - - memset(pHandle, 0, sizeof (struct VBGLHGCMHANDLEDATA)); - vbglHandleHeapLeave (); - return; + vbglHGCMHandleFree(pHandleData); + } + else + rc = VERR_NO_MEMORY; + } + else + rc = VERR_INVALID_PARAMETER; + return rc; } -DECLVBGL(int) VbglHGCMConnect (VBGLHGCMHANDLE *pHandle, VBoxGuestHGCMConnectInfo *pData) +DECLVBGL(int) VbglHGCMDisconnect(VBGLHGCMHANDLE handle, VBoxGuestHGCMDisconnectInfo *pData) { - int rc; - struct VBGLHGCMHANDLEDATA *pHandleData; + int rc = vbglDriverIOCtl(&handle->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, pData, sizeof(*pData)); - if (!pHandle || !pData) - return VERR_INVALID_PARAMETER; + vbglDriverClose(&handle->driver); - pHandleData = vbglHGCMHandleAlloc(); - if (!pHandleData) - rc = VERR_NO_MEMORY; - else - { - rc = vbglDriverOpen (&pHandleData->driver); - if (RT_SUCCESS(rc)) - { - rc = vbglDriverIOCtl (&pHandleData->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, pData, sizeof (*pData)); - if (RT_SUCCESS(rc)) - rc = pData->result; - if (RT_SUCCESS(rc)) - { - *pHandle = pHandleData; - return rc; - } - - vbglDriverClose (&pHandleData->driver); - } - - vbglHGCMHandleFree (pHandleData); - } + vbglHGCMHandleFree(handle); return rc; } -DECLVBGL(int) VbglHGCMDisconnect (VBGLHGCMHANDLE handle, VBoxGuestHGCMDisconnectInfo *pData) +DECLVBGL(int) VbglHGCMCall(VBGLHGCMHANDLE handle, VBoxGuestHGCMCallInfo *pData, uint32_t cbData) { - int rc = VINF_SUCCESS; + VBGL_HGCM_ASSERT_MSG(cbData >= sizeof(VBoxGuestHGCMCallInfo) + pData->cParms * sizeof(HGCMFunctionParameter), + ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, + sizeof(VBoxGuestHGCMCallInfo) + pData->cParms * sizeof(VBoxGuestHGCMCallInfo))); - rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, pData, sizeof (*pData)); - - vbglDriverClose (&handle->driver); - - vbglHGCMHandleFree (handle); - - return rc; -} - -DECLVBGL(int) VbglHGCMCall (VBGLHGCMHANDLE handle, VBoxGuestHGCMCallInfo *pData, uint32_t cbData) -{ - int rc = VINF_SUCCESS; - - VBGL_HGCM_ASSERTMsg(cbData >= sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (HGCMFunctionParameter), - ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (VBoxGuestHGCMCallInfo))); - - rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbData), pData, cbData); - - return rc; + return vbglDriverIOCtl(&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbData), pData, cbData); } DECLVBGL(int) VbglHGCMCallUserData (VBGLHGCMHANDLE handle, VBoxGuestHGCMCallInfo *pData, uint32_t cbData) { - int rc = VINF_SUCCESS; + VBGL_HGCM_ASSERT_MSG(cbData >= sizeof(VBoxGuestHGCMCallInfo) + pData->cParms * sizeof(HGCMFunctionParameter), + ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, + sizeof(VBoxGuestHGCMCallInfo) + pData->cParms * sizeof(VBoxGuestHGCMCallInfo))); - VBGL_HGCM_ASSERTMsg(cbData >= sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (HGCMFunctionParameter), - ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (VBoxGuestHGCMCallInfo))); - - rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbData), pData, cbData); - - return rc; + return vbglDriverIOCtl(&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbData), pData, cbData); } -DECLVBGL(int) VbglHGCMCallTimed (VBGLHGCMHANDLE handle, - VBoxGuestHGCMCallInfoTimed *pData, uint32_t cbData) +DECLVBGL(int) VbglHGCMCallTimed(VBGLHGCMHANDLE handle, VBoxGuestHGCMCallInfoTimed *pData, uint32_t cbData) { - int rc = VINF_SUCCESS; + uint32_t cbExpected = sizeof(VBoxGuestHGCMCallInfoTimed) + + pData->info.cParms * sizeof(HGCMFunctionParameter); + VBGL_HGCM_ASSERT_MSG(cbData >= cbExpected, + ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->info.cParms, cbExpected)); + NOREF(cbExpected); - uint32_t cbExpected = sizeof (VBoxGuestHGCMCallInfoTimed) - + pData->info.cParms * sizeof (HGCMFunctionParameter); - VBGL_HGCM_ASSERTMsg(cbData >= cbExpected, - ("cbData = %d, cParms = %d (calculated size %d)\n", - cbData, pData->info.cParms, cbExpected)); - - rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_TIMED(cbData), - pData, cbData); - - return rc; + return vbglDriverIOCtl(&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_TIMED(cbData), pData, cbData); } Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h (revision 58180) +++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h (revision 58181) @@ -155,7 +155,9 @@ #ifdef VBOX_WITH_HGCM # ifndef VBGL_VBOXGUEST -int vbglR0HGCMInit (void); -int vbglR0HGCMTerminate (void); +int vbglR0HGCMInit(void); +int vbglR0HGCMTerminate(void); # endif +struct VBGLHGCMHANDLEDATA *vbglHGCMHandleAlloc(void); +void vbglHGCMHandleFree(struct VBGLHGCMHANDLEDATA *pHandle); #endif /* VBOX_WITH_HGCM */ Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp (revision 58180) +++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp (revision 58181) @@ -1,5 +1,5 @@ /* $Id$ */ /** @file - * VBoxGuestLib - Central calls header. + * VBoxGuestLib - Ring-3 Support Library for VirtualBox guest additions, Chromium OpenGL Service. */ @@ -29,5 +29,4 @@ # error "VBGL_VBOXGUEST should not be defined" #else -#include "VBoxGuestR0LibCrOgl.h" #include @@ -35,41 +34,37 @@ #include "VBGLInternal.h" -struct VBGLHGCMHANDLEDATA *vbglHGCMHandleAlloc (void); -void vbglHGCMHandleFree (struct VBGLHGCMHANDLEDATA *pHandle); -DECLVBGL(int) vboxCrCtlCreate(HVBOXCRCTL *phCtl) +DECLVBGL(int) VbglR0CrCtlCreate(HVBOXCRCTL *phCtl) { int rc; - struct VBGLHGCMHANDLEDATA *pHandleData; - if (!phCtl) - return VERR_INVALID_PARAMETER; + if (phCtl) + { + struct VBGLHGCMHANDLEDATA *pHandleData = vbglHGCMHandleAlloc(); - pHandleData = vbglHGCMHandleAlloc (); + if (pHandleData) + { + rc = vbglDriverOpen(&pHandleData->driver); - rc = VINF_SUCCESS; + if (RT_SUCCESS(rc)) + { + *phCtl = pHandleData; + return VINF_SUCCESS; + } - if (!pHandleData) - { - rc = VERR_NO_MEMORY; + vbglHGCMHandleFree(pHandleData); + } + else + rc = VERR_NO_MEMORY; + + *phCtl = NULL; } else - { - rc = vbglDriverOpen (&pHandleData->driver); + rc = VERR_INVALID_PARAMETER; - if (RT_SUCCESS(rc)) - { - *phCtl = pHandleData; - return VINF_SUCCESS; - } - - vbglHGCMHandleFree (pHandleData); - } - - *phCtl = NULL; return rc; } -DECLVBGL(int) vboxCrCtlDestroy(HVBOXCRCTL hCtl) +DECLVBGL(int) VbglR0CrCtlDestroy(HVBOXCRCTL hCtl) { vbglDriverClose(&hCtl->driver); @@ -80,5 +75,5 @@ } -DECLVBGL(int) vboxCrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID) +DECLVBGL(int) VbglR0CrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID) { VBoxGuestHGCMConnectInfo info; @@ -88,8 +83,8 @@ return VERR_INVALID_PARAMETER; - memset(&info, 0, sizeof (info)); + RT_ZERO(info); info.Loc.type = VMMDevHGCMLoc_LocalHost_Existing; - RTStrCopy(info.Loc.u.host.achName, sizeof (info.Loc.u.host.achName), "VBoxSharedCrOpenGL"); - rc = vbglDriverIOCtl (&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof (info)); + RTStrCopy(info.Loc.u.host.achName, sizeof(info.Loc.u.host.achName), "VBoxSharedCrOpenGL"); + rc = vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof(info)); if (RT_SUCCESS(rc)) { @@ -103,25 +98,25 @@ } - Assert(RT_FAILURE(rc)); + AssertRC(rc); *pu32ClientID = 0; return rc; } -DECLVBGL(int) vboxCrCtlConDisconnect(HVBOXCRCTL hCtl, uint32_t u32ClientID) +DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, uint32_t u32ClientID) { VBoxGuestHGCMDisconnectInfo info; - memset (&info, 0, sizeof (info)); + RT_ZERO(info); info.u32ClientID = u32ClientID; - return vbglDriverIOCtl (&hCtl->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info, sizeof (info)); + return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info, sizeof(info)); } -DECLVBGL(int) vboxCrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo) +DECLVBGL(int) VbglR0CrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo) { - return vbglDriverIOCtl (&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbCallInfo), pCallInfo, cbCallInfo); + return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbCallInfo), pCallInfo, cbCallInfo); } -DECLVBGL(int) vboxCrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo) +DECLVBGL(int) VbglR0CrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo) { - return vbglDriverIOCtl (&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbCallInfo), pCallInfo, cbCallInfo); + return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbCallInfo), pCallInfo, cbCallInfo); } Index: unk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h (revision 58180) +++ (revision ) @@ -1,40 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxGuestLib - Central calls header. - */ - -/* - * Copyright (C) 2012-2015 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ -#ifndef ___VBoxGuestR0LibCrOgl_cpp__ -#define ___VBoxGuestR0LibCrOgl_cpp__ - -#include - -typedef VBGLHGCMHANDLE HVBOXCRCTL; - -DECLVBGL(int) vboxCrCtlCreate(HVBOXCRCTL *phCtl); -DECLVBGL(int) vboxCrCtlDestroy(HVBOXCRCTL hCtl); -DECLVBGL(int) vboxCrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID); -DECLVBGL(int) vboxCrCtlConDisconnect(HVBOXCRCTL hCtl, uint32_t u32ClientID); -DECLVBGL(int) vboxCrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo); -DECLVBGL(int) vboxCrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo); - -#endif /* #ifndef ___VBoxGuestR0LibCrOgl_cpp__ */