Changeset 73097 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib

Timestamp:

Jul 12, 2018 9:06:33 PM (7 years ago)

Author:

vboxsync

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

Location:

trunk/src/VBox/Additions/common/VBoxGuest/lib

Files:

• VBoxGuestR0LibHGCMInternal.cpp (modified) (5 diffs)
• VBoxGuestR0LibSharedFolders.c (modified) (3 diffs)
• VBoxGuestR3LibGuestUser.cpp (modified) (1 diff)
• VBoxGuestR3LibModule.cpp (modified) (1 diff)
• VBoxGuestR3LibVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp

@@ -235 +235 @@
                     pPgLst = (HGCMPageListInfo *)((uint8_t *)pCallInfo + off);
                     cPages = pPgLst->cPages;
-                    u32    = RT_OFFSETOF(HGCMPageListInfo, aPages[cPages]) + off;
+                    u32    = RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]) + off;
                     AssertMsgReturn(u32 <= cbCallInfo,
                                     ("u32=%#x (cPages=%#x offset=%#x) cbCallInfo=%#x\n", u32, cPages, off, cbCallInfo),
@@ -254 +254 @@
                     }
 
-                    *pcbExtra += RT_OFFSETOF(HGCMPageListInfo, aPages[pPgLst->cPages]);
+                    *pcbExtra += RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[pPgLst->cPages]);
                 }
                 else
@@ -407 +407 @@
                     {
                         size_t const cPages = RTR0MemObjSize(hObj) >> PAGE_SHIFT;
-                        *pcbExtra += RT_OFFSETOF(HGCMPageListInfo, aPages[cPages]);
+                        *pcbExtra += RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]);
                     }
                 }
@@ -541 +541 @@
                         pDstPgLst->aPages[iPage] = pSrcPgLst->aPages[iPage];
 
-                    offExtra += RT_OFFSETOF(HGCMPageListInfo, aPages[cPages]);
+                    offExtra += RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]);
                 }
                 else
@@ -592 +592 @@
                         }
 
-                        offExtra += RT_OFFSETOF(HGCMPageListInfo, aPages[cPages]);
+                        offExtra += RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]);
                     }
                     else

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibSharedFolders.c

@@ -325 +325 @@
 {
     uint32_t            cbToRead  = *pcbBuffer;
-    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFRead) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]));
+    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFRead) + RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]));
     VBoxSFRead         *pData     = (VBoxSFRead *)RTMemTmpAlloc(cbData);
     HGCMPageListInfo   *pPgLst    = (HGCMPageListInfo *)(pData + 1);
@@ -403 +403 @@
     uint32_t            cbToWrite = *pcbBuffer;
     uint32_t            cPages    = RT_ALIGN_32((PhysBuffer & PAGE_OFFSET_MASK) + cbToWrite, PAGE_SIZE) >> PAGE_SHIFT;
-    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFWrite) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]));
+    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFWrite) + RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]));
     VBoxSFWrite        *pData     = (VBoxSFWrite *)RTMemTmpAlloc(cbData);
     HGCMPageListInfo   *pPgLst    = (HGCMPageListInfo *)(pData + 1);
@@ -451 +451 @@
 {
     uint32_t            cbToWrite = *pcbBuffer;
-    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFWrite) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]));
+    uint32_t            cbData    = (uint32_t)(sizeof(VBoxSFWrite) + RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages[cPages]));
     VBoxSFWrite        *pData     = (VBoxSFWrite *)RTMemTmpAlloc(cbData);
     HGCMPageListInfo   *pPgLst    = (HGCMPageListInfo *)(pData + 1);

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestUser.cpp

@@ -87 +87 @@
          *       without altering this code. Don't try this at home.
          */
-        uint32_t cbOffDynamic = RT_OFFSETOF(VBoxGuestUserStatus, szUser);
+        uint32_t cbOffDynamic = RT_UOFFSETOF(VBoxGuestUserStatus, szUser);
 
         /* pDynamic marks the beginning for the dynamically allocated areas. */

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibModule.cpp

@@ -54 +54 @@
     AssertReturn(cRegions < VMMDEVSHAREDREGIONDESC_MAX, VERR_INVALID_PARAMETER);
 
-    pReq = (VMMDevSharedModuleRegistrationRequest *)RTMemAllocZ(RT_OFFSETOF(VMMDevSharedModuleRegistrationRequest, aRegions[cRegions]));
+    pReq = (VMMDevSharedModuleRegistrationRequest *)RTMemAllocZ(RT_UOFFSETOF_DYN(VMMDevSharedModuleRegistrationRequest,
+                                                                                 aRegions[cRegions]));
     AssertReturn(pReq, VERR_NO_MEMORY);
 
     vmmdevInitRequest(&pReq->header, VMMDevReq_RegisterSharedModule);
-    pReq->header.size   = RT_OFFSETOF(VMMDevSharedModuleRegistrationRequest, aRegions[cRegions]);
+    pReq->header.size   = RT_UOFFSETOF_DYN(VMMDevSharedModuleRegistrationRequest, aRegions[cRegions]);
     pReq->GCBaseAddr    = GCBaseAddr;
     pReq->cbModule      = cbModule;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibVideo.cpp

@@ -102 +102 @@
     size_t cbReq = vmmdevGetMousePointerReqSize(cx, cy);
     AssertReturn(   !pvImg
-                 || cbReq == RT_OFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg,
+                 || cbReq == RT_UOFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg,
                  VERR_INVALID_PARAMETER);
     int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq, VMMDevReq_SetPointerShape);