Changeset 58183 in vbox for trunk/src

Timestamp:

Oct 12, 2015 1:46:16 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103297

Message:

VBoxGuestLib: u32ClientI[Dd] -> idClient. Some cleanups.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• GenericRequest.cpp (modified) (1 diff)
• HGCMInternal.cpp (modified) (2 diffs)
• Mouse.cpp (modified) (5 diffs)
• SysHlp.cpp (modified) (19 diffs)
• VBoxGuestR0LibCrOgl.cpp (modified) (3 diffs)
• VBoxGuestR3LibAutoLogon.cpp (modified) (3 diffs)
• VBoxGuestR3LibBalloon.cpp (modified) (1 diff)
• VBoxGuestR3LibClipboard.cpp (modified) (8 diffs)
• VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• VBoxGuestR3LibGuestProp.cpp (modified) (38 diffs)
• VBoxGuestR3LibHostVersion.cpp (modified) (7 diffs)
• VBoxGuestR3LibMouse.cpp (modified) (1 diff)
• VBoxGuestR3LibSharedFolders.cpp (modified) (14 diffs)
• VBoxGuestR3LibVideo.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp ¶

@@ -105 +105 @@
 }
 
-DECLVBGL(int) VbglGRAlloc(VMMDevRequestHeader **ppReq, uint32_t cbReq, VMMDevRequestType enmReqType)
+DECLVBGL(int) VbglGRAlloc(VMMDevRequestHeader **ppReq, size_t cbReq, VMMDevRequestType enmReqType)
 {
     int rc = vbglR0Enter();
     if (RT_SUCCESS(rc))
     {
-        if (ppReq && cbReq >= sizeof(VMMDevRequestHeader))
+        if (   ppReq
+            && cbReq >= sizeof(VMMDevRequestHeader)
+            && cbReq == (uint32_t)cbReq)
         {
-            VMMDevRequestHeader *pReq = (VMMDevRequestHeader *)VbglPhysHeapAlloc(cbReq);
+            VMMDevRequestHeader *pReq = (VMMDevRequestHeader *)VbglPhysHeapAlloc((uint32_t)cbReq);
             AssertMsgReturn(pReq, ("VbglGRAlloc: no memory (cbReq=%u)\n", cbReq), VERR_NO_MEMORY);
             memset(pReq, 0xAA, cbReq);
 
-            pReq->size        = cbReq;
+            pReq->size        = (uint32_t)cbReq;
             pReq->version     = VMMDEV_REQUEST_HEADER_VERSION;
             pReq->requestType = enmReqType;

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp ¶

@@ -487 +487 @@
     HGCMFunctionParameter       *pDstParm = VMMDEV_HGCM_CALL_PARMS(pHGCMCall);
     uint32_t    cParms   = pCallInfo->cParms;
-    uint32_t    offExtra = (uintptr_t)(pDstParm + cParms) - (uintptr_t)pHGCMCall;
+    uint32_t    offExtra = (uint32_t)((uintptr_t)(pDstParm + cParms) - (uintptr_t)pHGCMCall);
     uint32_t    iLockBuf = 0;
     uint32_t    iParm;
@@ -575 +575 @@
 #endif
                             pDstPgLst->offFirstPage = pSrcParm->u.Pointer.u.linearAddr & PAGE_OFFSET_MASK;
-                        pDstPgLst->cPages           = cPages; Assert(pDstPgLst->cPages == cPages);
+                        pDstPgLst->cPages           = (uint32_t)cPages; Assert(pDstPgLst->cPages == cPages);
                         for (iPage = 0; iPage < cPages; iPage++)
                         {

trunk/src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp ¶

@@ -41 +41 @@
  * @param   pvUser     user supplied data/cookie to be passed to the function.
  */
-DECLVBGL(int) VbglSetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify,
-                                         void *pvUser)
+DECLVBGL(int) VbglSetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser)
 {
     VBoxGuestMouseSetNotifyCallback NotifyCallback;
@@ -51 +50 @@
     NotifyCallback.pfnNotify = pfnNotify;
     NotifyCallback.pvUser    = pvUser;
-    return vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK,
-                           &NotifyCallback, sizeof(NotifyCallback));
+    return vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK, &NotifyCallback, sizeof(NotifyCallback));
 }
 
@@ -65 +63 @@
  * @param   py          Where to store the Y co-ordinate.
  */
-DECLVBGL(int) VbglGetMouseStatus(uint32_t *pfFeatures, uint32_t *px,
-                                 uint32_t *py)
+DECLVBGL(int) VbglGetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py)
 {
     VMMDevReqMouseStatus Req;
@@ -79 +76 @@
     Req.pointerXPos = 0;
     Req.pointerYPos = 0;
-    rc = vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(Req)),
-                         &Req.header, sizeof(Req));
+    rc = vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(Req)), &Req.header, sizeof(Req));
     if (RT_FAILURE(rc))
         return rc;
@@ -112 +108 @@
     if (RT_FAILURE(rc))
         return rc;
-    return vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_SET_MOUSE_STATUS,
-                           &fFeatures, sizeof(fFeatures));
+    return vbglDriverIOCtl(pDriver, VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures, sizeof(fFeatures));
 }
+

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp ¶

@@ -51 +51 @@
  * @param   fFlags          HGCM call flags, VBGLR0_HGCM_F_XXX.
  */
-int vbglLockLinear (void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess, uint32_t fFlags)
+int vbglLockLinear(void **ppvCtx, void *pv, uint32_t u32Size, bool fWriteAccess, uint32_t fFlags)
 {
     int         rc      = VINF_SUCCESS;
@@ -74 +74 @@
      *        Then we can move all this up one level even. */
 #ifdef RT_OS_WINDOWS
-    PMDL pMdl = IoAllocateMdl (pv, u32Size, FALSE, FALSE, NULL);
+    PMDL pMdl = IoAllocateMdl(pv, u32Size, FALSE, FALSE, NULL);
 
     if (pMdl == NULL)
@@ -85 +85 @@
         __try {
             /* Calls to MmProbeAndLockPages must be enclosed in a try/except block. */
-            MmProbeAndLockPages (pMdl,
-                                 /** @todo (fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER? UserMode: KernelMode */
-                                 KernelMode,
-                                 (fWriteAccess) ? IoModifyAccess : IoReadAccess);
+            MmProbeAndLockPages(pMdl,
+                                /** @todo (fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER? UserMode: KernelMode */
+                                KernelMode,
+                                (fWriteAccess) ? IoModifyAccess : IoReadAccess);
 
             *ppvCtx = pMdl;
@@ -94 +94 @@
         } __except(EXCEPTION_EXECUTE_HANDLER) {
 
-            IoFreeMdl (pMdl);
+            IoFreeMdl(pMdl);
             /** @todo  */
             rc = VERR_INVALID_PARAMETER;
@@ -124 +124 @@
 }
 
-void vbglUnlockLinear (void *pvCtx, void *pv, uint32_t u32Size)
+void vbglUnlockLinear(void *pvCtx, void *pv, uint32_t u32Size)
 {
 #ifdef RT_OS_WINDOWS
@@ -132 +132 @@
     if (pMdl != NULL)
     {
-        MmUnlockPages (pMdl);
-        IoFreeMdl (pMdl);
+        MmUnlockPages(pMdl);
+        IoFreeMdl(pMdl);
     }
 
@@ -164 +164 @@
   && !defined(RT_OS_WINDOWS)
 RT_C_DECLS_BEGIN
-extern DECLVBGL(void *) VBoxGuestIDCOpen (uint32_t *pu32Version);
-extern DECLVBGL(void)   VBoxGuestIDCClose (void *pvOpaque);
-extern DECLVBGL(int)    VBoxGuestIDCCall (void *pvOpaque, unsigned int iCmd, void *pvData, size_t cbSize, size_t *pcbReturn);
+extern DECLVBGL(void *) VBoxGuestIDCOpen(uint32_t *pu32Version);
+extern DECLVBGL(void)   VBoxGuestIDCClose(void *pvOpaque);
+extern DECLVBGL(int)    VBoxGuestIDCCall(void *pvOpaque, unsigned int iCmd, void *pvData, size_t cbSize, size_t *pcbReturn);
 RT_C_DECLS_END
 # endif
 
-bool vbglDriverIsOpened (VBGLDRIVER *pDriver)
+bool vbglDriverIsOpened(VBGLDRIVER *pDriver)
 {
 # ifdef RT_OS_WINDOWS
@@ -181 +181 @@
 }
 
-int vbglDriverOpen (VBGLDRIVER *pDriver)
+int vbglDriverOpen(VBGLDRIVER *pDriver)
 {
 # ifdef RT_OS_WINDOWS
     UNICODE_STRING uszDeviceName;
-    RtlInitUnicodeString (&uszDeviceName, L"\\Device\\VBoxGuest");
+    RtlInitUnicodeString(&uszDeviceName, L"\\Device\\VBoxGuest");
 
     PDEVICE_OBJECT pDeviceObject = NULL;
     PFILE_OBJECT pFileObject = NULL;
 
-    NTSTATUS rc = IoGetDeviceObjectPointer (&uszDeviceName, FILE_ALL_ACCESS,
-                                            &pFileObject, &pDeviceObject);
-
-    if (NT_SUCCESS (rc))
+    NTSTATUS rc = IoGetDeviceObjectPointer(&uszDeviceName, FILE_ALL_ACCESS, &pFileObject, &pDeviceObject);
+    if (NT_SUCCESS(rc))
     {
         Log(("vbglDriverOpen VBoxGuest successful pDeviceObject=%x\n", pDeviceObject));
@@ -208 +206 @@
      * Just check whether the connection was made or not.
      */
-    if (    g_VBoxGuestIDC.u32Version == VMMDEV_VERSION
-        &&  VALID_PTR(g_VBoxGuestIDC.u32Session)
-        &&  VALID_PTR(g_VBoxGuestIDC.pfnServiceEP))
+    if (   g_VBoxGuestIDC.u32Version == VMMDEV_VERSION
+        && RT_VALID_PTR(g_VBoxGuestIDC.u32Session)
+        && RT_VALID_PTR(g_VBoxGuestIDC.pfnServiceEP))
     {
         pDriver->u32Session = g_VBoxGuestIDC.u32Session;
@@ -221 +219 @@
 # else
     uint32_t u32VMMDevVersion;
-    pDriver->pvOpaque = VBoxGuestIDCOpen (&u32VMMDevVersion);
-    if (    pDriver->pvOpaque
-        &&  u32VMMDevVersion == VMMDEV_VERSION)
+    pDriver->pvOpaque = VBoxGuestIDCOpen(&u32VMMDevVersion);
+    if (   pDriver->pvOpaque
+        && u32VMMDevVersion == VMMDEV_VERSION)
         return VINF_SUCCESS;
 
@@ -232 +230 @@
 
 # ifdef RT_OS_WINDOWS
-static NTSTATUS vbglDriverIOCtlCompletion (IN PDEVICE_OBJECT DeviceObject,
-                                           IN PIRP Irp,
-                                           IN PVOID Context)
+static NTSTATUS vbglDriverIOCtlCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context)
 {
     Log(("VBGL completion %x\n", Irp));
 
     KEVENT *pEvent = (KEVENT *)Context;
-    KeSetEvent (pEvent, IO_NO_INCREMENT, FALSE);
+    KeSetEvent(pEvent, IO_NO_INCREMENT, FALSE);
 
     return STATUS_MORE_PROCESSING_REQUIRED;
@@ -245 +241 @@
 # endif
 
-int vbglDriverIOCtl (VBGLDRIVER *pDriver, uint32_t u32Function, void *pvData, uint32_t cbData)
+int vbglDriverIOCtl(VBGLDRIVER *pDriver, uint32_t u32Function, void *pvData, uint32_t cbData)
 {
     Log(("vbglDriverIOCtl: pDriver: %p, Func: %x, pvData: %p, cbData: %d\n", pDriver, u32Function, pvData, cbData));
@@ -252 +248 @@
     KEVENT Event;
 
-    KeInitializeEvent (&Event, NotificationEvent, FALSE);
+    KeInitializeEvent(&Event, NotificationEvent, FALSE);
 
     /* Have to use the IoAllocateIRP method because this code is generic and
@@ -259 +255 @@
      * when APCs are disabled, for example.
      */
-    PIRP irp = IoAllocateIrp (pDriver->pDeviceObject->StackSize, FALSE);
+    PIRP irp = IoAllocateIrp(pDriver->pDeviceObject->StackSize, FALSE);
 
     Log(("vbglDriverIOCtl: irp %p, IRQL = %d\n", irp, KeGetCurrentIrql()));
@@ -273 +269 @@
      */
 
-    PIO_STACK_LOCATION nextStack = IoGetNextIrpStackLocation (irp);
+    PIO_STACK_LOCATION nextStack = IoGetNextIrpStackLocation(irp);
 
     nextStack->MajorFunction = IRP_MJ_DEVICE_CONTROL;
@@ -287 +283 @@
 
     /* A completion routine is required to signal the Event. */
-    IoSetCompletionRoutine (irp, vbglDriverIOCtlCompletion, &Event, TRUE, TRUE, TRUE);
-
-    NTSTATUS rc = IoCallDriver (pDriver->pDeviceObject, irp);
+    IoSetCompletionRoutine(irp, vbglDriverIOCtlCompletion, &Event, TRUE, TRUE, TRUE);
+
+    NTSTATUS rc = IoCallDriver(pDriver->pDeviceObject, irp);
 
     if (NT_SUCCESS (rc))
     {
         /* Wait the event to be signalled by the completion routine. */
-        KeWaitForSingleObject (&Event,
-                               Executive,
-                               KernelMode,
-                               FALSE,
-                               NULL);
+        KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
 
         rc = irp->IoStatus.Status;
@@ -305 +297 @@
     }
 
-    IoFreeIrp (irp);
+    IoFreeIrp(irp);
 
     if (rc != STATUS_SUCCESS)
@@ -331 +323 @@
 }
 
-void vbglDriverClose (VBGLDRIVER *pDriver)
+void vbglDriverClose(VBGLDRIVER *pDriver)
 {
 # ifdef RT_OS_WINDOWS
     Log(("vbglDriverClose pDeviceObject=%x\n", pDriver->pDeviceObject));
-    ObDereferenceObject (pDriver->pFileObject);
+    ObDereferenceObject(pDriver->pFileObject);
     pDriver->pFileObject = NULL;
     pDriver->pDeviceObject = NULL;
@@ -343 +335 @@
 
 # else
-    VBoxGuestIDCClose (pDriver->pvOpaque);
+    VBoxGuestIDCClose(pDriver->pvOpaque);
     pDriver->pvOpaque = NULL;
 # endif

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp ¶

@@ -75 +75 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID)
+DECLVBGL(int) VbglR0CrCtlConConnect(HVBOXCRCTL hCtl, HGCMCLIENTID *pidClient)
 {
     VBoxGuestHGCMConnectInfo info;
     int rc;
 
-    if (!hCtl || !pu32ClientID)
+    if (!hCtl || !pidClient)
         return VERR_INVALID_PARAMETER;
 
@@ -93 +93 @@
         {
             Assert(info.u32ClientID);
-            *pu32ClientID = info.u32ClientID;
+            *pidClient = info.u32ClientID;
             return rc;
         }
@@ -99 +99 @@
 
     AssertRC(rc);
-    *pu32ClientID = 0;
+    *pidClient = 0;
     return rc;
 }
 
-DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, uint32_t u32ClientID)
+DECLVBGL(int) VbglR0CrCtlConDisconnect(HVBOXCRCTL hCtl, HGCMCLIENTID idClient)
 {
     VBoxGuestHGCMDisconnectInfo info;
     RT_ZERO(info);
-    info.u32ClientID = u32ClientID;
+    info.u32ClientID = idClient;
     return vbglDriverIOCtl(&hCtl->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info, sizeof(info));
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp ¶

@@ -53 +53 @@
     if (s_enmLastStatus != VBoxGuestFacilityStatus_Failed)
     {
-        int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_AutoLogon,
-                                             enmStatus, 0 /* Flags */);
+        int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_AutoLogon, enmStatus, 0 /* Flags */);
         if (rc == VERR_NOT_SUPPORTED)
         {
@@ -63 +62 @@
              */
 #ifdef VBOX_WITH_GUEST_PROPS
-            uint32_t u32ClientId = 0;
-            rc = VbglR3GuestPropConnect(&u32ClientId);
+            HGCMCLIENTID idClient = 0;
+            rc = VbglR3GuestPropConnect(&idClient);
             if (RT_SUCCESS(rc))
             {
@@ -87 +86 @@
                      */
                     static const char s_szPath[] = "/VirtualBox/GuestInfo/OS/AutoLogonStatus";
-                    rc = VbglR3GuestPropWrite(u32ClientId, s_szPath, pszStatus, "TRANSRESET");
+                    rc = VbglR3GuestPropWrite(idClient, s_szPath, pszStatus, "TRANSRESET");
                     if (rc == VERR_PARSE_ERROR)
-                        rc = VbglR3GuestPropWrite(u32ClientId, s_szPath, pszStatus, "TRANSIENT");
+                        rc = VbglR3GuestPropWrite(idClient, s_szPath, pszStatus, "TRANSIENT");
                 }
                 else
                     rc = VERR_INVALID_PARAMETER;
 
-                VbglR3GuestPropDisconnect(u32ClientId);
+                VbglR3GuestPropDisconnect(idClient);
             }
 #endif

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp ¶

@@ -46 +46 @@
     {
         *pcChunks = Info.cBalloonChunks;
-        Assert(Info.fHandleInR3 == false || Info.fHandleInR3 == true ||  RT_FAILURE(rc));
+        Assert(Info.fHandleInR3 == (uint32_t)false || Info.fHandleInR3 == (uint32_t)true || RT_FAILURE(rc));
         *pfHandleInR3 = Info.fHandleInR3 != false;
     }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp ¶

@@ -39 +39 @@
  *
  * @returns VBox status code
- * @param   pu32ClientId    Where to put the client id on success. The client id
+ * @param   pidClient       Where to put the client id on success. The client id
  *                          must be passed to all the other clipboard calls.
  */
-VBGLR3DECL(int) VbglR3ClipboardConnect(uint32_t *pu32ClientId)
+VBGLR3DECL(int) VbglR3ClipboardConnect(HGCMCLIENTID *pidClient )
 {
     VBoxGuestHGCMConnectInfo Info;
@@ -56 +56 @@
         rc = Info.result;
         if (RT_SUCCESS(rc))
-            *pu32ClientId = Info.u32ClientID;
+            *pidClient = Info.u32ClientID;
     }
     if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
@@ -68 +68 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
- */
-VBGLR3DECL(int) VbglR3ClipboardDisconnect(uint32_t u32ClientId)
+ * @param   idClientId      The client id returned by VbglR3ClipboardConnect().
+ */
+VBGLR3DECL(int) VbglR3ClipboardDisconnect(HGCMCLIENTID idClient)
 {
     VBoxGuestHGCMDisconnectInfo Info;
     Info.result = VERR_WRONG_ORDER;
-    Info.u32ClientID = u32ClientId;
+    Info.u32ClientID = idClient;
 
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
@@ -89 +89 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   idClient        The client id returned by VbglR3ClipboardConnect().
  * @param   pMsg            Where to store the message id.
  * @param   pfFormats       Where to store the format(s) the message applies to.
  */
-VBGLR3DECL(int) VbglR3ClipboardGetHostMsg(uint32_t u32ClientId, uint32_t *pMsg, uint32_t *pfFormats)
+VBGLR3DECL(int) VbglR3ClipboardGetHostMsg(HGCMCLIENTID idClient, uint32_t *pMsg, uint32_t *pfFormats)
 {
     VBoxClipboardGetHostMsg Msg;
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG;
     Msg.hdr.cParms = 2;
@@ -136 +136 @@
  * @retval  VINF_BUFFER_OVERFLOW    If there is more data available than the caller provided buffer space for.
  *
- * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   idClient        The client id returned by VbglR3ClipboardConnect().
  * @param   fFormat         The format we're requesting the data in.
  * @param   pv              Where to store the data.
@@ -142 +142 @@
  * @param   pcb             The actual size of the host clipboard data. May be larger than cb.
  */
-VBGLR3DECL(int) VbglR3ClipboardReadData(uint32_t u32ClientId, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcb)
+VBGLR3DECL(int) VbglR3ClipboardReadData(HGCMCLIENTID idClient, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcb)
 {
     VBoxClipboardReadData Msg;
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = VBOX_SHARED_CLIPBOARD_FN_READ_DATA;
     Msg.hdr.cParms = 3;
@@ -179 +179 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   idClient        The client id returned by VbglR3ClipboardConnect().
  * @param   fFormats        The formats to advertise.
  */
-VBGLR3DECL(int) VbglR3ClipboardReportFormats(uint32_t u32ClientId, uint32_t fFormats)
+VBGLR3DECL(int) VbglR3ClipboardReportFormats(HGCMCLIENTID idClient, uint32_t fFormats)
 {
     VBoxClipboardFormats Msg;
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = VBOX_SHARED_CLIPBOARD_FN_FORMATS;
     Msg.hdr.cParms = 1;
@@ -206 +206 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   idClient        The client id returned by VbglR3ClipboardConnect().
  * @param   fFormat         The format of the data.
  * @param   pv              The data.
  * @param   cb              The size of the data.
  */
-VBGLR3DECL(int) VbglR3ClipboardWriteData(uint32_t u32ClientId, uint32_t fFormat, void *pv, uint32_t cb)
+VBGLR3DECL(int) VbglR3ClipboardWriteData(HGCMCLIENTID idClient, uint32_t fFormat, void *pv, uint32_t cb)
 {
     VBoxClipboardWriteData Msg;
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = VBOX_SHARED_CLIPBOARD_FN_WRITE_DATA;
     Msg.hdr.cParms = 2;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp ¶

@@ -1488 +1488 @@
                                          /* Include total bytes of all file paths,
                                           * file sizes etc. */
-                                         lstURI.TotalBytes());
+                                         (uint32_t)lstURI.TotalBytes());
     }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp ¶

@@ -124 +124 @@
  * @returns VBox status code
  * @returns VERR_NOT_SUPPORTED if guest properties are not available on the host.
- * @param   pu32ClientId    Where to put the client id on success. The client id
+ * @param   pidClient       Where to put the client ID on success. The client ID
  *                          must be passed to all the other calls to the service.
  */
-VBGLR3DECL(int) VbglR3GuestPropConnect(uint32_t *pu32ClientId)
+VBGLR3DECL(int) VbglR3GuestPropConnect(HGCMCLIENTID *pidClient)
 {
     VBoxGuestHGCMConnectInfo Info;
@@ -141 +141 @@
         rc = Info.result;
         if (RT_SUCCESS(rc))
-            *pu32ClientId = Info.u32ClientID;
+            *pidClient = Info.u32ClientID;
         if (rc == VERR_NOT_IMPLEMENTED || rc == VERR_HGCM_SERVICE_NOT_FOUND)
             rc = VERR_NOT_SUPPORTED;
@@ -153 +153 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
- */
-VBGLR3DECL(int) VbglR3GuestPropDisconnect(uint32_t u32ClientId)
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
+ */
+VBGLR3DECL(int) VbglR3GuestPropDisconnect(HGCMCLIENTID idClient)
 {
     VBoxGuestHGCMDisconnectInfo Info;
     Info.result = VERR_WRONG_ORDER;
-    Info.u32ClientID = u32ClientId;
+    Info.u32ClientID = idClient;
 
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
@@ -172 +172 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InvsSvcConnect().
  * @param   pszName         The property to save to.  Utf8
  * @param   pszValue        The value to store.  Utf8.  If this is NULL then
@@ -178 +178 @@
  * @param   pszFlags        The flags for the property
  */
-VBGLR3DECL(int) VbglR3GuestPropWrite(uint32_t u32ClientId, const char *pszName, const char *pszValue, const char *pszFlags)
+VBGLR3DECL(int) VbglR3GuestPropWrite(HGCMCLIENTID idClient, const char *pszName, const char *pszValue, const char *pszFlags)
 {
     int rc;
@@ -187 +187 @@
 
         Msg.hdr.result = VERR_WRONG_ORDER;
-        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32ClientID = idClient;
         Msg.hdr.u32Function = SET_PROP_VALUE;
         Msg.hdr.cParms = 3;
@@ -202 +202 @@
 
         Msg.hdr.result = VERR_WRONG_ORDER;
-        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32ClientID = idClient;
         Msg.hdr.u32Function = DEL_PROP;
         Msg.hdr.cParms = 1;
@@ -219 +219 @@
  * @returns VBox status code.
  *
- * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InvsSvcConnect().
  * @param   pszName         The property to save to.  Must be valid UTF-8.
  * @param   pszValue        The value to store.  Must be valid UTF-8.
@@ -227 +227 @@
  *        property's flags field will be left unchanged
  */
-VBGLR3DECL(int) VbglR3GuestPropWriteValue(uint32_t u32ClientId, const char *pszName, const char *pszValue)
+VBGLR3DECL(int) VbglR3GuestPropWriteValue(HGCMCLIENTID idClient, const char *pszName, const char *pszValue)
 {
     int rc;
@@ -236 +236 @@
 
         Msg.hdr.result = VERR_WRONG_ORDER;
-        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32ClientID = idClient;
         Msg.hdr.u32Function = SET_PROP_VALUE;
         Msg.hdr.cParms = 2;
@@ -250 +250 @@
 
         Msg.hdr.result = VERR_WRONG_ORDER;
-        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32ClientID = idClient;
         Msg.hdr.u32Function = DEL_PROP;
         Msg.hdr.cParms = 1;
@@ -267 +267 @@
  * @returns The same as VbglR3GuestPropWriteValue with the addition of VERR_NO_STR_MEMORY.
  *
- * @param   u32ClientId     The client ID returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client ID returned by VbglR3InvsSvcConnect().
  * @param   pszName         The property to save to.  Must be valid UTF-8.
  * @param   pszValueFormat  The value format. This must be valid UTF-8 when fully formatted.
  * @param   va              The format arguments.
  */
-VBGLR3DECL(int) VbglR3GuestPropWriteValueV(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, va_list va)
+VBGLR3DECL(int) VbglR3GuestPropWriteValueV(HGCMCLIENTID idClient, const char *pszName, const char *pszValueFormat, va_list va)
 {
     /*
@@ -281 +281 @@
     if (RTStrAPrintfV(&pszValue, pszValueFormat, va) >= 0)
     {
-        rc = VbglR3GuestPropWriteValue(u32ClientId, pszName, pszValue);
+        rc = VbglR3GuestPropWriteValue(idClient, pszName, pszValue);
         RTStrFree(pszValue);
     }
@@ -293 +293 @@
  * @returns The same as VbglR3GuestPropWriteValue with the addition of VERR_NO_STR_MEMORY.
  *
- * @param   u32ClientId     The client ID returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client ID returned by VbglR3InvsSvcConnect().
  * @param   pszName         The property to save to.  Must be valid UTF-8.
  * @param   pszValueFormat  The value format. This must be valid UTF-8 when fully formatted.
  * @param   ...             The format arguments.
  */
-VBGLR3DECL(int) VbglR3GuestPropWriteValueF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...)
+VBGLR3DECL(int) VbglR3GuestPropWriteValueF(HGCMCLIENTID idClient, const char *pszName, const char *pszValueFormat, ...)
 {
     va_list va;
     va_start(va, pszValueFormat);
-    int rc = VbglR3GuestPropWriteValueV(u32ClientId, pszName, pszValueFormat, va);
+    int rc = VbglR3GuestPropWriteValueV(idClient, pszName, pszValueFormat, va);
     va_end(va);
     return rc;
@@ -319 +319 @@
  * @retval  VERR_NOT_FOUND if the key wasn't found.
  *
- * @param   u32ClientId     The client id returned by VbglR3GuestPropConnect().
+ * @param   idClient        The client id returned by VbglR3GuestPropConnect().
  * @param   pszName         The value to read.  Utf8
  * @param   pvBuf           A scratch buffer to store the data retrieved into.
@@ -332 +332 @@
  *                          Optional.
  */
-VBGLR3DECL(int) VbglR3GuestPropRead(uint32_t u32ClientId, const char *pszName,
+VBGLR3DECL(int) VbglR3GuestPropRead(HGCMCLIENTID idClient, const char *pszName,
                                     void *pvBuf, uint32_t cbBuf,
                                     char **ppszValue, uint64_t *pu64Timestamp,
@@ -344 +344 @@
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = GET_PROP;
     Msg.hdr.cParms = 4;
@@ -415 +415 @@
  *          property value.
  *
- * @param   u32ClientId     The client id returned by VbglR3GuestPropConnect().
+ * @param   idClient        The client id returned by VbglR3GuestPropConnect().
  * @param   pszName         The value to read. Must be valid UTF-8.
  * @param   ppszValue       Where to store the pointer to the value returned.
@@ -421 +421 @@
  *                          on failure.
  */
-VBGLR3DECL(int) VbglR3GuestPropReadValueAlloc(uint32_t u32ClientId,
-                                              const char *pszName,
-                                              char **ppszValue)
+VBGLR3DECL(int) VbglR3GuestPropReadValueAlloc(HGCMCLIENTID idClient, const char *pszName, char **ppszValue)
 {
     /*
@@ -449 +447 @@
         {
             pvBuf = pvTmpBuf;
-            rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchBuf,
+            rc = VbglR3GuestPropRead(idClient, pszName, pvBuf, cchBuf,
                                      &pszValue, NULL, NULL, &cchBuf);
         }
@@ -497 +495 @@
  *          needed to hold the value and the value being updated.
  *
- * @param   u32ClientId     The client id returned by VbglR3GuestPropConnect().
+ * @param   idClient        The client id returned by VbglR3GuestPropConnect().
  * @param   pszName         The value to read.  Utf8
  * @param   pszValue        Where to store the value retrieved.
@@ -504 +502 @@
  *                          the buffer supplied is too small.  Optional.
  */
-VBGLR3DECL(int) VbglR3GuestPropReadValue(uint32_t u32ClientId, const char *pszName,
+VBGLR3DECL(int) VbglR3GuestPropReadValue(HGCMCLIENTID idClient, const char *pszName,
                                          char *pszValue, uint32_t cchValue,
                                          uint32_t *pcchValueActual)
@@ -510 +508 @@
     void *pvBuf = pszValue;
     uint32_t cchValueActual;
-    int rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchValue,
-                                 &pszValue, NULL, NULL, &cchValueActual);
+    int rc = VbglR3GuestPropRead(idClient, pszName, pvBuf, cchValue, &pszValue, NULL, NULL, &cchValueActual);
     if (pcchValueActual != NULL)
         *pcchValueActual = cchValueActual;
@@ -531 +528 @@
  * @returns IPRT error code in other cases, and pchBufActual is undefined.
  *
- * @param   u32ClientId   The client ID returned by VbglR3GuestPropConnect
+ * @param   idClient      The client ID returned by VbglR3GuestPropConnect
  * @param   paszPatterns  A packed array of zero terminated strings, terminated
  *                        by an empty string.
@@ -540 +537 @@
  *                        small.
  */
-VBGLR3DECL(int) VbglR3GuestPropEnumRaw(uint32_t u32ClientId,
+VBGLR3DECL(int) VbglR3GuestPropEnumRaw(HGCMCLIENTID idClient,
                                        const char *pszzPatterns,
                                        char *pcBuf,
@@ -549 +546 @@
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = ENUM_PROPS;
     Msg.hdr.cParms = 3;
@@ -593 +590 @@
  *          uninitialised
  *
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
  * @param   papszPatterns   The patterns against which the properties are
  *                          matched.  Pass NULL if everything should be matched.
@@ -617 +614 @@
  *          figure out when to stop.
  */
-VBGLR3DECL(int) VbglR3GuestPropEnum(uint32_t u32ClientId,
+VBGLR3DECL(int) VbglR3GuestPropEnum(HGCMCLIENTID idClient,
                                     char const * const *papszPatterns,
                                     uint32_t cPatterns,
@@ -664 +661 @@
             break;
         }
-        rc = VbglR3GuestPropEnumRaw(u32ClientId, pszzPatterns, pchBuf, cbBuf, &cbBuf);
+        rc = VbglR3GuestPropEnumRaw(idClient, pszzPatterns, pchBuf, cbBuf, &cbBuf);
         if (rc != VERR_BUFFER_OVERFLOW)
             break;
@@ -809 +806 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InvsSvcConnect().
  * @param   pszName         The property to delete.  Utf8
  */
-VBGLR3DECL(int) VbglR3GuestPropDelete(uint32_t u32ClientId, const char *pszName)
+VBGLR3DECL(int) VbglR3GuestPropDelete(HGCMCLIENTID idClient, const char *pszName)
 {
     AssertPtrReturn(pszName,  VERR_INVALID_POINTER);
@@ -819 +816 @@
 
     Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32ClientID = idClient;
     Msg.hdr.u32Function = DEL_PROP;
     Msg.hdr.cParms = 1;
@@ -839 +836 @@
  *          See also VbglR3GuestPropEnum.
  *
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
  * @param   papszPatterns   The patterns against which the properties are
  *                          matched.  Pass NULL if everything should be matched.
@@ -845 +842 @@
  *                          match everything.
  */
-VBGLR3DECL(int) VbglR3GuestPropDelSet(uint32_t u32ClientId,
+VBGLR3DECL(int) VbglR3GuestPropDelSet(HGCMCLIENTID idClient,
                                       const char * const *papszPatterns,
                                       uint32_t cPatterns)
@@ -852 +849 @@
     char const *pszName, *pszValue, *pszFlags;
     uint64_t pu64Timestamp;
-    int rc = VbglR3GuestPropEnum(u32ClientId,
+    int rc = VbglR3GuestPropEnum(idClient,
                                  (char **)papszPatterns, /** @todo fix this cast. */
                                  cPatterns,
@@ -863 +860 @@
     while (RT_SUCCESS(rc) && pszName)
     {
-        rc = VbglR3GuestPropWriteValue(u32ClientId, pszName, NULL);
+        rc = VbglR3GuestPropWriteValue(idClient, pszName, NULL);
         if (RT_FAILURE(rc))
             break;
@@ -895 +892 @@
  * @retval  VERR_TIMEOUT if a timeout occurred before a notification was seen.
  *
- * @param   u32ClientId     The client id returned by VbglR3GuestPropConnect().
+ * @param   idClient        The client id returned by VbglR3GuestPropConnect().
  * @param   pszPatterns     The patterns that the property names must matchfor
  *                          the change to be reported.
@@ -915 +912 @@
  *                          Optional.
  */
-VBGLR3DECL(int) VbglR3GuestPropWait(uint32_t u32ClientId,
+VBGLR3DECL(int) VbglR3GuestPropWait(HGCMCLIENTID idClient,
                                     const char *pszPatterns,
                                     void *pvBuf, uint32_t cbBuf,
@@ -931 +928 @@
     Msg.hdr.fInterruptible = true;
     Msg.hdr.info.result = VERR_WRONG_ORDER;
-    Msg.hdr.info.u32ClientID = u32ClientId;
+    Msg.hdr.info.u32ClientID = idClient;
     Msg.hdr.info.u32Function = GET_NOTIFICATION;
     Msg.hdr.info.cParms = 4;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp ¶

@@ -46 +46 @@
  * @returns VBox status code
  *
- * @param   u32ClientId         The client id returned by
+ * @param   idClient            The client id returned by
  *                              VbglR3InfoSvcConnect().
  * @param   pfUpdate            Receives pointer to boolean flag indicating
@@ -59 +59 @@
  *                              NULL.
  */
-VBGLR3DECL(int) VbglR3HostVersionCheckForUpdate(uint32_t u32ClientId, bool *pfUpdate, char **ppszHostVersion, char **ppszGuestVersion)
+VBGLR3DECL(int) VbglR3HostVersionCheckForUpdate(HGCMCLIENTID idClient, bool *pfUpdate, char **ppszHostVersion, char **ppszGuestVersion)
 {
-    Assert(u32ClientId > 0);
+    Assert(idClient > 0);
     AssertPtr(pfUpdate);
     AssertPtr(ppszHostVersion);
@@ -75 +75 @@
     /* Do we need to do all this stuff? */
     char *pszCheckHostVersion;
-    int rc = VbglR3GuestPropReadValueAlloc(u32ClientId, "/VirtualBox/GuestAdd/CheckHostVersion", &pszCheckHostVersion);
+    int rc = VbglR3GuestPropReadValueAlloc(idClient, "/VirtualBox/GuestAdd/CheckHostVersion", &pszCheckHostVersion);
     if (RT_FAILURE(rc))
     {
@@ -100 +100 @@
     {
         /* Look up host version */
-        rc = VbglR3GuestPropReadValueAlloc(u32ClientId, "/VirtualBox/HostInfo/VBoxVer", ppszHostVersion);
+        rc = VbglR3GuestPropReadValueAlloc(idClient, "/VirtualBox/HostInfo/VBoxVer", ppszHostVersion);
         if (RT_FAILURE(rc))
         {
@@ -111 +111 @@
             /* Get last checked host version */
             char *pszLastCheckedHostVersion;
-            rc = VbglR3HostVersionLastCheckedLoad(u32ClientId, &pszLastCheckedHostVersion);
+            rc = VbglR3HostVersionLastCheckedLoad(idClient, &pszLastCheckedHostVersion);
             if (RT_SUCCESS(rc))
             {
@@ -173 +173 @@
  * @returns VBox status code.
  *
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
  * @param   ppszVer         Receives pointer of allocated version string.
  *                          The returned pointer must be freed using RTStrFree() on VINF_SUCCESS.
  */
-VBGLR3DECL(int) VbglR3HostVersionLastCheckedLoad(uint32_t u32ClientId, char **ppszVer)
+VBGLR3DECL(int) VbglR3HostVersionLastCheckedLoad(HGCMCLIENTID idClient, char **ppszVer)
 {
-    Assert(u32ClientId > 0);
+    Assert(idClient > 0);
     AssertPtr(ppszVer);
-    return VbglR3GuestPropReadValueAlloc(u32ClientId, "/VirtualBox/GuestAdd/HostVerLastChecked", ppszVer);
+    return VbglR3GuestPropReadValueAlloc(idClient, "/VirtualBox/GuestAdd/HostVerLastChecked", ppszVer);
 }
 
@@ -190 +190 @@
  * @returns VBox status code.
  *
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
  * @param   pszVer          Pointer to version string to store.
  */
-VBGLR3DECL(int) VbglR3HostVersionLastCheckedStore(uint32_t u32ClientId, const char *pszVer)
+VBGLR3DECL(int) VbglR3HostVersionLastCheckedStore(HGCMCLIENTID idClient, const char *pszVer)
 {
-    Assert(u32ClientId > 0);
+    Assert(idClient > 0);
     AssertPtr(pszVer);
-    return VbglR3GuestPropWriteValue(u32ClientId, "/VirtualBox/GuestAdd/HostVerLastChecked", pszVer);
+    return VbglR3GuestPropWriteValue(idClient, "/VirtualBox/GuestAdd/HostVerLastChecked", pszVer);
 }
+

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp ¶

@@ -73 +73 @@
 VBGLR3DECL(int) VbglR3SetMouseStatus(uint32_t fFeatures)
 {
-    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures,
-                         sizeof(fFeatures));
+    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures, sizeof(fFeatures));
 }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp ¶

@@ -44 +44 @@
  *
  * @returns VBox status code
- * @param   pu32ClientId    Where to put the client id on success. The client id
+ * @param   pidClient       Where to put the client id on success. The client id
  *                          must be passed to all the other calls to the service.
  */
-VBGLR3DECL(int) VbglR3SharedFolderConnect(uint32_t *pu32ClientId)
+VBGLR3DECL(int) VbglR3SharedFolderConnect(HGCMCLIENTID *pidClient)
 {
     VBoxGuestHGCMConnectInfo Info;
@@ -61 +61 @@
         rc = Info.result;
         if (RT_SUCCESS(rc))
-            *pu32ClientId = Info.u32ClientID;
+            *pidClient = Info.u32ClientID;
     }
     return rc;
@@ -71 +71 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
- */
-VBGLR3DECL(int) VbglR3SharedFolderDisconnect(uint32_t u32ClientId)
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
+ */
+VBGLR3DECL(int) VbglR3SharedFolderDisconnect(HGCMCLIENTID idClient)
 {
     VBoxGuestHGCMDisconnectInfo Info;
     Info.result = VERR_WRONG_ORDER;
-    Info.u32ClientID = u32ClientId;
+    Info.u32ClientID = idClient;
 
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
@@ -90 +90 @@
  *
  * @returns True if shared folder exists, false if not.
- * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InfoSvcConnect().
  * @param   pszShareName    Shared folder name to check.
  */
-VBGLR3DECL(bool) VbglR3SharedFolderExists(uint32_t u32ClientId, const char *pszShareName)
+VBGLR3DECL(bool) VbglR3SharedFolderExists(HGCMCLIENTID idClient, const char *pszShareName)
 {
     AssertPtr(pszShareName);
@@ -102 +102 @@
     /** @todo Use some caching here? */
     bool fFound = false;
-    int rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
-                                           &paMappings, &cMappings);
+    int rc = VbglR3SharedFolderGetMappings(idClient, true /* Only process auto-mounted folders */, &paMappings, &cMappings);
     if (RT_SUCCESS(rc))
     {
@@ -109 +108 @@
         {
             char *pszName = NULL;
-            rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
+            rc = VbglR3SharedFolderGetName(idClient, paMappings[i].u32Root, &pszName);
             if (   RT_SUCCESS(rc)
                 && *pszName)
@@ -128 +127 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3SharedFolderConnect().
+ * @param   idClient        The client id returned by VbglR3SharedFolderConnect().
  * @param   fAutoMountOnly  Flag whether only auto-mounted shared folders
  *                          should be reported.
@@ -135 +134 @@
  * @param   pcMappings      The number of mappings returned in @a ppaMappings.
  */
-VBGLR3DECL(int) VbglR3SharedFolderGetMappings(uint32_t u32ClientId, bool fAutoMountOnly,
+VBGLR3DECL(int) VbglR3SharedFolderGetMappings(HGCMCLIENTID idClient, bool fAutoMountOnly,
                                               PVBGLR3SHAREDFOLDERMAPPING *ppaMappings, uint32_t *pcMappings)
 {
@@ -147 +146 @@
 
     Msg.callInfo.result = VERR_WRONG_ORDER;
-    Msg.callInfo.u32ClientID = u32ClientId;
+    Msg.callInfo.u32ClientID = idClient;
     Msg.callInfo.u32Function = SHFL_FN_QUERY_MAPPINGS;
     Msg.callInfo.cParms = 3;
@@ -228 +227 @@
  *
  * @returns VBox status code.
- * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
+ * @param   idClient        The client id returned by VbglR3InvsSvcConnect().
  * @param   u32Root         Root ID of shared folder to get the name for.
  * @param   ppszName        Where to return the name string.  This shall be
  *                          freed by calling RTStrFree.
  */
-VBGLR3DECL(int) VbglR3SharedFolderGetName(uint32_t u32ClientId, uint32_t u32Root, char **ppszName)
+VBGLR3DECL(int) VbglR3SharedFolderGetName(HGCMCLIENTID idClient, uint32_t u32Root, char **ppszName)
 {
     AssertPtr(ppszName);
@@ -240 +239 @@
 
     Msg.callInfo.result = VERR_WRONG_ORDER;
-    Msg.callInfo.u32ClientID = u32ClientId;
+    Msg.callInfo.u32ClientID = idClient;
     Msg.callInfo.u32Function = SHFL_FN_QUERY_MAP_NAME;
     Msg.callInfo.cParms = 2;
@@ -288 +287 @@
     int rc;
 #ifdef VBOX_WITH_GUEST_PROPS
-    uint32_t u32ClientIdGuestProp;
-    rc = VbglR3GuestPropConnect(&u32ClientIdGuestProp);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropReadValueAlloc(u32ClientIdGuestProp, "/VirtualBox/GuestAdd/SharedFolders/MountPrefix", ppszPrefix);
+    HGCMCLIENTID idClientGuestProp;
+    rc = VbglR3GuestPropConnect(&idClientGuestProp);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3GuestPropReadValueAlloc(idClientGuestProp, "/VirtualBox/GuestAdd/SharedFolders/MountPrefix", ppszPrefix);
         if (rc == VERR_NOT_FOUND) /* No prefix set? Then set the default. */
         {
@@ -299 +298 @@
 #ifdef VBOX_WITH_GUEST_PROPS
         }
-        VbglR3GuestPropDisconnect(u32ClientIdGuestProp);
+        VbglR3GuestPropDisconnect(idClientGuestProp);
     }
 #endif
@@ -320 +319 @@
     int rc;
 #ifdef VBOX_WITH_GUEST_PROPS
-    uint32_t u32ClientIdGuestProp;
-    rc = VbglR3GuestPropConnect(&u32ClientIdGuestProp);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropReadValueAlloc(u32ClientIdGuestProp, "/VirtualBox/GuestAdd/SharedFolders/MountDir", ppszDir);
-        VbglR3GuestPropDisconnect(u32ClientIdGuestProp);
+    HGCMCLIENTID idClientGuestProp;
+    rc = VbglR3GuestPropConnect(&idClientGuestProp);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3GuestPropReadValueAlloc(idClientGuestProp, "/VirtualBox/GuestAdd/SharedFolders/MountDir", ppszDir);
+        VbglR3GuestPropDisconnect(idClientGuestProp);
     }
 #endif

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp ¶

@@ -314 +314 @@
 
     int rc, rc2 = VERR_UNRESOLVED_ERROR;
-    uint32_t u32ClientId = 0;
+    HGCMCLIENTID idClient = 0;
     const char *pszPattern = VIDEO_PROP_PREFIX"*";
     PVBGLR3GUESTPROPENUM pHandle = NULL;
@@ -321 +321 @@
 
     AssertPtrReturn(pcScreen, VERR_INVALID_POINTER);
-    rc = VbglR3GuestPropConnect(&u32ClientId);
-    if (RT_SUCCESS(rc))
-        rc = VbglR3GuestPropEnum(u32ClientId, &pszPattern, 1, &pHandle,
-                                 &pszName, NULL, NULL, NULL);
+    rc = VbglR3GuestPropConnect(&idClient);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GuestPropEnum(idClient, &pszPattern, 1, &pHandle, &pszName, NULL, NULL, NULL);
     if (u32ClientId != 0)
         rc2 = VbglR3GuestPropDisconnect(u32ClientId);
@@ -333 +332 @@
         uint32_t cScreen;
 
-        rc = RTStrToUInt32Full(pszName + sizeof(VIDEO_PROP_PREFIX) - 1, 10,
-                               &cScreen);
+        rc = RTStrToUInt32Full(pszName + sizeof(VIDEO_PROP_PREFIX) - 1, 10, &cScreen);
         if (RT_SUCCESS(rc))  /* There may be similar properties with text. */
             cHighestScreen = RT_MAX(cHighestScreen, cScreen);
@@ -366 +364 @@
     using namespace guestProp;
 
-    uint32_t u32ClientId = 0;
+    HGCMCLIENTID idClient = 0;
     unsigned cx2, cy2, cBits2, x2, y2, cHighestScreen, cHighestScreen2;
     bool fEnabled2;
@@ -374 +372 @@
     rc = VbglR3VideoModeGetHighestSavedScreen(&cHighestScreen);
     if (RT_SUCCESS(rc))
-        rc = VbglR3GuestPropConnect(&u32ClientId);
+        rc = VbglR3GuestPropConnect(&idClient);
     if (RT_SUCCESS(rc))
     {
@@ -382 +380 @@
         RTStrPrintf(szModeParms, sizeof(szModeParms), "%ux%ux%u,%ux%u,%u", cx, cy, cBits, x, y, (unsigned) fEnabled);
 
-        rc = VbglR3GuestPropWriteValue(u32ClientId, szModeName, szModeParms);
+        rc = VbglR3GuestPropWriteValue(idClient, szModeName, szModeParms);
         /* Write out the mode using the legacy name too, in case the user
          * re-installs older Additions. */
@@ -388 +386 @@
         {
             RTStrPrintf(szModeParms, sizeof(szModeParms), "%ux%ux%u", cx, cy, cBits);
-            VbglR3GuestPropWriteValue(u32ClientId, VIDEO_PROP_PREFIX "SavedMode", szModeParms);
+            VbglR3GuestPropWriteValue(idClient, VIDEO_PROP_PREFIX "SavedMode", szModeParms);
         }
     }
-    if (u32ClientId != 0)
-        rc2 = VbglR3GuestPropDisconnect(u32ClientId);
+    if (idClient != 0)
+        rc2 = VbglR3GuestPropDisconnect(idClient);
     if (rc == VINF_PERMISSION_DENIED)
         return rc;
@@ -440 +438 @@
     using namespace guestProp;
 
-/*
- * First we retrieve the video mode which is saved as a string in the
- * guest property store.
- */
+    /*
+     * First we retrieve the video mode which is saved as a string in the
+     * guest property store.
+     */
     /* The buffer for VbglR3GuestPropReadValue.  If this is too small then
      * something is wrong with the data stored in the property. */
     char szModeParms[1024];
-    uint32_t u32ClientId = 0;
+    HGCMCLIENTID idClient = 0;
     int cMatches;
     unsigned cx, cy, cBits;
@@ -456 +454 @@
     int rc2 = VERR_UNRESOLVED_ERROR;
 
-    rc = VbglR3GuestPropConnect(&u32ClientId);
+    rc = VbglR3GuestPropConnect(&idClient);
     if (RT_SUCCESS(rc))
     {
@@ -462 +460 @@
         char szModeName[MAX_NAME_LEN];
         RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX "%u", idScreen);
-        rc = VbglR3GuestPropReadValue(u32ClientId, szModeName, szModeParms,
-                                      sizeof(szModeParms), NULL);
+        rc = VbglR3GuestPropReadValue(idClient, szModeName, szModeParms, sizeof(szModeParms), NULL);
         /* Try legacy single screen name. */
         if (rc == VERR_NOT_FOUND && idScreen == 0)
-            rc = VbglR3GuestPropReadValue(u32ClientId,
+            rc = VbglR3GuestPropReadValue(idClient,
                                           VIDEO_PROP_PREFIX"SavedMode",
                                           szModeParms, sizeof(szModeParms),
                                           NULL);
     }
-    if (u32ClientId != 0)
-        rc2 = VbglR3GuestPropDisconnect(u32ClientId);
+    if (idClient != 0)
+        rc2 = VbglR3GuestPropDisconnect(idClient);
     if (RT_SUCCESS(rc))
         rc = rc2;
 
-/*
- * Now we convert the string returned to numeric values.
- */
+    /*
+     * Now we convert the string returned to numeric values.
+     */
     if (RT_SUCCESS(rc))
     {
         char c1, c2;
-        cMatches = sscanf(szModeParms, "%5ux%5ux%2u%c%5ux%5u,%1u%c", &cx, &cy, &cBits,
-                          &c1, &x, &y, &fEnabled, &c2);
+        cMatches = sscanf(szModeParms, "%5ux%5ux%2u%c%5ux%5u,%1u%c", &cx, &cy, &cBits, &c1, &x, &y, &fEnabled, &c2);
         if ((cMatches == 7 && c1 == ',') || cMatches == 3)
             rc = VINF_SUCCESS;
@@ -491 +487 @@
             rc = VERR_PARSE_ERROR;
     }
-/*
- * And clean up and return the values if we successfully obtained them.
- */
+
+    /*
+     * And clean up and return the values if we successfully obtained them.
+     */
     if (RT_SUCCESS(rc))
     {