Changeset 107091 in vbox for trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

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

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (4 diffs)

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)