Changeset 107091 in vbox

Timestamp:

Nov 21, 2024 4:12:02 PM (8 weeks ago)

Author:

vboxsync

Message:

iprt/cdefs.h,SUPDrvIOC.h,VBoxGuestR0Lib: Added a RT_UOFFSETOF_FLEX_ARRAY macro for calculating the size of structures ending with an variables length arrays. Only tested on windows... bugref:10585

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (4 diffs)

trunk/include/iprt/cdefs.h

@@ -2978 +2978 @@
  * @param   type        Structure type.
  * @param   memberarray Member.
+ * @deprecated Use RT_UOFFSETOF_FLEX_ARRAY when possible.
  */
 #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4)
@@ -2984 +2985 @@
 # define RT_UOFFSETOF_DYN(type, memberarray)    ( (uintptr_t)&( ((type *)(void *)0)->memberarray) )
 #endif
+
+/** @def RT_UOFFSETOF_FLEX_ARRAY
+ * Calculates the size of a structure that ends with a flexible array.
+ *
+ * @returns offset into the structure of the specified member. signed.
+ * @param   a_Type          Structure type.
+ * @param   a_ArrayMember   The name of flexible array member.
+ * @param   a_cEntries      The number of array entries to include in the
+ *                          offset.
+ */
+#define RT_UOFFSETOF_FLEX_ARRAY(a_Type, a_ArrayMember, a_cEntries) \
+        ( RT_UOFFSETOF(a_Type, a_ArrayMember) + RT_SIZEOFMEMB(a_Type, a_ArrayMember[0]) * (a_cEntries) )
 
 

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

@@ -437 +437 @@
                     {
                         size_t const cPages = RTR0MemObjSize(hObj) >> PAGE_SHIFT;
-                        *pcbExtra += RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages)
-                                     + RT_SIZEOFMEMB(HGCMPageListInfo, aPages) * cPages;
+                        *pcbExtra += RT_UOFFSETOF_FLEX_ARRAY(HGCMPageListInfo, aPages, cPages);
                     }
                 }
@@ -647 +646 @@
                         }
 
-                        offExtra += (uint32_t)(RT_UOFFSETOF_DYN(HGCMPageListInfo, aPages)
-                                    + RT_SIZEOFMEMB(HGCMPageListInfo, aPages) * cPages);
+                        offExtra += (uint32_t)RT_UOFFSETOF_FLEX_ARRAY(HGCMPageListInfo, aPages, cPages);
                     }
                     else

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -278 +278 @@
  */
 #define SUP_IOCTL_QUERY_FUNCS(cFuncs)                   SUP_CTL_CODE_BIG(2)
-#define SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)              ((uint32_t)(RT_UOFFSETOF_DYN(SUPQUERYFUNCS, u.Out.aFunctions) \
-                                                        + RT_SIZEOFMEMB(SUPQUERYFUNCS, u.Out.aFunctions) * (cFuncs)))
+#define SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)              ((uint32_t)RT_UOFFSETOF_FLEX_ARRAY(SUPQUERYFUNCS, u.Out.aFunctions, (cFuncs)))
 #define SUP_IOCTL_QUERY_FUNCS_SIZE_IN                   sizeof(SUPREQHDR)
 #define SUP_IOCTL_QUERY_FUNCS_SIZE_OUT(cFuncs)          SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)
@@ -362 +361 @@
  */
 #define SUP_IOCTL_LDR_LOAD                              SUP_CTL_CODE_BIG(4)
-#define SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage)             ((uint32_t)(RT_UOFFSETOF_DYN(SUPLDRLOAD, u.In.abImage) \
-                                                        + RT_SIZEOFMEMB(SUPLDRLOAD, u.In.abImage) * (cbImage)))
+#define SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage)             ((uint32_t)RT_UOFFSETOF_FLEX_ARRAY(SUPLDRLOAD, u.In.abImage, (cbImage)))
 #define SUP_IOCTL_LDR_LOAD_SIZE_OUT                     (RT_UOFFSETOF(SUPLDRLOAD, u.Out.szError) + RT_SIZEOFMEMB(SUPLDRLOAD, u.Out.szError))
 #define SUP_IOCTL_LDR_LOAD_SIZE(cbImage)                RT_MAX(SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage), SUP_IOCTL_LDR_LOAD_SIZE_OUT)
@@ -638 +636 @@
  */
 #define SUP_IOCTL_LOW_ALLOC                             SUP_CTL_CODE_BIG(8)
-#define SUP_IOCTL_LOW_ALLOC_SIZE(cPages)                ((uint32_t)(RT_UOFFSETOF_DYN(SUPLOWALLOC, u.Out.aPages) \
-                                                        + RT_SIZEOFMEMB(SUPLOWALLOC, u.Out.aPages) * (cPages)))
+#define SUP_IOCTL_LOW_ALLOC_SIZE(cPages)                ((uint32_t)RT_UOFFSETOF_FLEX_ARRAY(SUPLOWALLOC, u.Out.aPages, (cPages)))
 #define SUP_IOCTL_LOW_ALLOC_SIZE_IN                     (sizeof(SUPREQHDR) + RT_SIZEOFMEMB(SUPLOWALLOC, u.In))
 #define SUP_IOCTL_LOW_ALLOC_SIZE_OUT(cPages)            SUP_IOCTL_LOW_ALLOC_SIZE(cPages)
@@ -701 +698 @@
  */
 #define SUP_IOCTL_PAGE_ALLOC_EX                         SUP_CTL_CODE_BIG(10)
-#define SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)            ((uint32_t)(RT_UOFFSETOF_DYN(SUPPAGEALLOCEX, u.Out.aPages) \
-                                                        + RT_SIZEOFMEMB(SUPPAGEALLOCEX, u.Out.aPages) * (cPages)))
+#define SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)            ((uint32_t)RT_UOFFSETOF_FLEX_ARRAY(SUPPAGEALLOCEX, u.Out.aPages, (cPages)))
 #define SUP_IOCTL_PAGE_ALLOC_EX_SIZE_IN                 (sizeof(SUPREQHDR) + RT_SIZEOFMEMB(SUPPAGEALLOCEX, u.In))
 #define SUP_IOCTL_PAGE_ALLOC_EX_SIZE_OUT(cPages)        SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)