Index: /trunk/include/VBox/VBoxGuestLib.h
===================================================================
--- /trunk/include/VBox/VBoxGuestLib.h	(revision 58183)
+++ /trunk/include/VBox/VBoxGuestLib.h	(revision 58184)
@@ -346,11 +346,11 @@
 /** @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, HGCMCLIENTID *pidClient);
-DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, HGCMCLIENTID idClient);
-DECLVBGL(int) VbglR0CrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo);
-DECLVBGL(int) VbglR0CrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo);
+typedef VBGLHGCMHANDLE VBGLCRCTLHANDLE;
+DECLVBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl);
+DECLVBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl);
+DECLVBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient);
+DECLVBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient);
+DECLVBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo);
+DECLVBGL(int) VbglR0CrCtlConCallUserData(VBGLCRCTLHANDLE hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo);
 /** @} */
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h	(revision 58183)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.h	(revision 58184)
@@ -24,5 +24,5 @@
 typedef struct VBOXMP_CRCTLCON
 {
-    HVBOXCRCTL hCrCtl;
+    VBGLCRCTLHANDLE hCrCtl;
     uint32_t cCrCtlRefs;
 } VBOXMP_CRCTLCON, *PVBOXMP_CRCTLCON;
Index: /trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp	(revision 58183)
+++ /trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp	(revision 58184)
@@ -40,19 +40,19 @@
 }
 
-VBGLR3DECL(int)     VbglR3GuestPropConnect(uint32_t *pu32ClientId)
-{
-    AssertPtrReturn(pu32ClientId, VERR_INVALID_POINTER);
+VBGLR3DECL(int)     VbglR3GuestPropConnect(HGCMCLIENTID *pidClient)
+{
+    AssertPtrReturn(pidClient, VERR_INVALID_POINTER);
     RTPrintf("Connect to guest property service...\n");
-    *pu32ClientId = 1;
-    return VINF_SUCCESS;
-}
-
-VBGLR3DECL(int)     VbglR3GuestPropDisconnect(uint32_t u32ClientId)
-{
-    RTPrintf("Disconnect client %d from guest property service...\n", u32ClientId);
-    return VINF_SUCCESS;
-}
-
-VBGLR3DECL(int)     VbglR3GuestPropWrite(uint32_t u32ClientId,
+    *pidClient = 1;
+    return VINF_SUCCESS;
+}
+
+VBGLR3DECL(int)     VbglR3GuestPropDisconnect(HGCMCLIENTID idClient)
+{
+    RTPrintf("Disconnect client %d from guest property service...\n", idClient);
+    return VINF_SUCCESS;
+}
+
+VBGLR3DECL(int)     VbglR3GuestPropWrite(HGCMCLIENTID idClient,
                                          const char *pszName,
                                          const char *pszValue,
@@ -60,19 +60,19 @@
 {
     RTPrintf("Called SET_PROP, client %d, name %s, value %s, flags %s...\n",
-             u32ClientId, pszName, pszValue, pszFlags);
-    return VINF_SUCCESS;
-}
-
-VBGLR3DECL(int)     VbglR3GuestPropWriteValue(uint32_t u32ClientId,
+             idClient, pszName, pszValue, pszFlags);
+    return VINF_SUCCESS;
+}
+
+VBGLR3DECL(int)     VbglR3GuestPropWriteValue(HGCMCLIENTID idClient,
                                               const char *pszName,
                                               const char *pszValue)
 {
     RTPrintf("Called SET_PROP_VALUE, client %d, name %s, value %s...\n",
-             u32ClientId, pszName, pszValue);
+             idClient, pszName, pszValue);
     return VINF_SUCCESS;
 }
 
 #ifdef VBOX_WITH_GUEST_PROPS
-VBGLR3DECL(int)     VbglR3GuestPropRead(uint32_t u32ClientId,
+VBGLR3DECL(int)     VbglR3GuestPropRead(HGCMCLIENTID idClient,
                                         const char *pszName,
                                         void *pvBuf,
@@ -84,5 +84,5 @@
 {
     RTPrintf("Called GET_PROP, client %d, name %s...\n",
-             u32ClientId, pszName);
+             idClient, pszName);
     static char szValue[] = "Value";
     static char szFlags[] = "TRANSIENT";
@@ -98,9 +98,9 @@
 }
 
-VBGLR3DECL(int)     VbglR3GuestPropDelete(uint32_t u32ClientId,
+VBGLR3DECL(int)     VbglR3GuestPropDelete(HGCMCLIENTID idClient,
                                           const char *pszName)
 {
     RTPrintf("Called DEL_PROP, client %d, name %s...\n",
-             u32ClientId, pszName);
+             idClient, pszName);
     return VINF_SUCCESS;
 }
@@ -111,5 +111,5 @@
 };
 
-VBGLR3DECL(int)     VbglR3GuestPropEnum(uint32_t u32ClientId,
+VBGLR3DECL(int)     VbglR3GuestPropEnum(HGCMCLIENTID idClient,
                                         char const * const *ppaszPatterns,
                                         uint32_t cPatterns,
@@ -120,5 +120,5 @@
                                         char const **ppszFlags)
 {
-    RTPrintf("Called ENUM_PROPS, client %d...\n", u32ClientId);
+    RTPrintf("Called ENUM_PROPS, client %d...\n", idClient);
     AssertPtrReturn(ppHandle, VERR_INVALID_POINTER);
     static VBGLR3GUESTPROPENUM Handle = { 0 };
@@ -163,5 +163,5 @@
 }
 
-VBGLR3DECL(int)     VbglR3GuestPropWait(uint32_t u32ClientId,
+VBGLR3DECL(int)     VbglR3GuestPropWait(HGCMCLIENTID idClient,
                                         const char *pszPatterns,
                                         void *pvBuf,
@@ -178,9 +178,9 @@
         RTPrintf("Called GET_NOTIFICATION, client %d, patterns %s, timestamp %llu,\n"
                  "    timeout RT_INDEFINITE_WAIT...\n",
-                 u32ClientId, pszPatterns, u64Timestamp);
+                 idClient, pszPatterns, u64Timestamp);
     else
         RTPrintf("Called GET_NOTIFICATION, client %d, patterns %s, timestamp %llu,\n"
                  "    timeout %u...\n",
-                 u32ClientId, pszPatterns, u64Timestamp, u32Timeout);
+                 idClient, pszPatterns, u64Timestamp, u32Timeout);
     static char szName[] = "Name";
     static char szValue[] = "Value";
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp	(revision 58183)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp	(revision 58184)
@@ -35,5 +35,5 @@
 
 
-DECLVBGL(int) VbglR0CrCtlCreate(HVBOXCRCTL *phCtl)
+DECLVBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl)
 {
     int rc;
@@ -66,5 +66,5 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlDestroy(HVBOXCRCTL hCtl)
+DECLVBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl)
 {
     vbglDriverClose(&hCtl->driver);
@@ -75,5 +75,5 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConConnect(HVBOXCRCTL hCtl, HGCMCLIENTID *pidClient)
+DECLVBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient)
 {
     VBoxGuestHGCMConnectInfo info;
@@ -103,5 +103,5 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, HGCMCLIENTID idClient)
+DECLVBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient)
 {
     VBoxGuestHGCMDisconnectInfo info;
@@ -111,10 +111,10 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConCall(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo)
+DECLVBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo)
 {
     return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbCallInfo), pCallInfo, cbCallInfo);
 }
 
-DECLVBGL(int) VbglR0CrCtlConCallUserData(HVBOXCRCTL hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo)
+DECLVBGL(int) VbglR0CrCtlConCallUserData(VBGLCRCTLHANDLE hCtl, struct VBoxGuestHGCMCallInfo *pCallInfo, int cbCallInfo)
 {
     return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbCallInfo), pCallInfo, cbCallInfo);