Changeset 73097 in vbox for trunk/src/bldprogs

Timestamp:

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

Author:

vboxsync

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

123672

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/bldprogs

Files:

• VBoxCPP.cpp (modified) (3 diffs)
• VBoxPeSetVersion.cpp (modified) (1 diff)
• VBoxTpG.cpp (modified) (1 diff)

trunk/src/bldprogs/VBoxCPP.cpp

@@ -2693 +2693 @@
      * Allocate a structure.
      */
-    size_t    cbDef = RT_OFFSETOF(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1 + cchArgNames])
+    size_t    cbDef = RT_UOFFSETOF_DYN(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1 + cchArgNames])
                     + sizeof(const char *) * cArgs;
     cbDef = RT_ALIGN_Z(cbDef, sizeof(const char *));
@@ -2811 +2811 @@
         return RTEXITCODE_FAILURE;
 
-    PVBCPPMACRO pMacro = (PVBCPPMACRO)RTMemAlloc(RT_OFFSETOF(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1]));
+    PVBCPPMACRO pMacro = (PVBCPPMACRO)RTMemAlloc(RT_UOFFSETOF_DYN(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1]));
     if (!pMacro)
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "out of memory");
@@ -5229 +5229 @@
 
     size_t      cchName = strlen(pThis->pszInput);
-    PVBCPPINPUT pInput = (PVBCPPINPUT)RTMemAlloc(RT_OFFSETOF(VBCPPINPUT, szName[cchName + 1]));
+    PVBCPPINPUT pInput = (PVBCPPINPUT)RTMemAlloc(RT_UOFFSETOF_DYN(VBCPPINPUT, szName[cchName + 1]));
     if (!pInput)
         return vbcppError(pThis, "out of memory");

trunk/src/bldprogs/VBoxPeSetVersion.cpp

@@ -191 +191 @@
 
         unsigned long offShdrs = offNtHdrs
-                               + RT_UOFFSETOF(IMAGE_NT_HEADERS32,
-                                              OptionalHeader.DataDirectory[NtHdrsNew.x32.OptionalHeader.NumberOfRvaAndSizes]);
+                               + RT_UOFFSETOF_DYN(IMAGE_NT_HEADERS32,
+                                                  OptionalHeader.DataDirectory[NtHdrsNew.x32.OptionalHeader.NumberOfRvaAndSizes]);
         if (fseek(pFile, offShdrs, SEEK_SET) != 0)
             return Error("Failed to seek to section headers at %#lx: %s", offShdrs, strerror(errno));

trunk/src/bldprogs/VBoxTpG.cpp

@@ -220 +220 @@
      * Create a new entry.
      */
-    pStr = (PVTGSTRING)RTMemAlloc(RT_OFFSETOF(VTGSTRING, szString[cch + 1]));
+    pStr = (PVTGSTRING)RTMemAlloc(RT_UOFFSETOF_DYN(VTGSTRING, szString[cch + 1]));
     if (!pStr)
         return NULL;