Changeset 73097 in vbox for trunk/src/VBox/Runtime/r3/win

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/Runtime/r3/win

Files:

• RTSystemShutdown-win.cpp (modified) (1 diff)
• direnum-win.cpp (modified) (4 diffs)
• fileaio-win.cpp (modified) (1 diff)
• krnlmod-win.cpp (modified) (2 diffs)
• localipc-win.cpp (modified) (1 diff)
• process-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp

@@ -76 +76 @@
                                        FALSE /*DisableAllPrivileges*/,
                                        &u.TokenPriv,
-                                       RT_OFFSETOF(TOKEN_PRIVILEGES, Privileges[1]),
+                                       RT_UOFFSETOF(TOKEN_PRIVILEGES, Privileges[1]),
                                        NULL,
                                        NULL) )

trunk/src/VBox/Runtime/r3/win/direnum-win.cpp

@@ -161 +161 @@
         if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRY, szName[2]))
         {
-            AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRY, szName[2])));
+            AssertMsgFailed(("Invalid *pcbDirEntry=%zu (min %zu)\n", *pcbDirEntry, RT_UOFFSETOF(RTDIRENTRY, szName[2])));
             return VERR_INVALID_PARAMETER;
         }
@@ -203 +203 @@
     const char  *pszName    = pDir->pszName;
     const size_t cchName    = pDir->cchName;
-    const size_t cbRequired = RT_OFFSETOF(RTDIRENTRY, szName[1]) + cchName;
+    const size_t cbRequired = RT_UOFFSETOF(RTDIRENTRY, szName[1]) + cchName;
     if (pcbDirEntry)
         *pcbDirEntry = cbRequired;
@@ -255 +255 @@
         if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRYEX, szName[2]))
         {
-            AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRYEX, szName[2])));
+            AssertMsgFailed(("Invalid *pcbDirEntry=%zu (min %zu)\n", *pcbDirEntry, RT_UOFFSETOF(RTDIRENTRYEX, szName[2])));
             return VERR_INVALID_PARAMETER;
         }
@@ -297 +297 @@
     const char  *pszName    = pDir->pszName;
     const size_t cchName    = pDir->cchName;
-    const size_t cbRequired = RT_OFFSETOF(RTDIRENTRYEX, szName[1]) + cchName;
+    const size_t cbRequired = RT_UOFFSETOF(RTDIRENTRYEX, szName[1]) + cchName;
     if (pcbDirEntry)
         *pcbDirEntry = cbRequired;

trunk/src/VBox/Runtime/r3/win/fileaio-win.cpp

@@ -122 +122 @@
 #define AIO_CONTEXT_WAKEUP_EVENT 1
 /** Converts a pointer to an OVERLAPPED structure to a internal request. */
-#define OVERLAPPED_2_RTFILEAIOREQINTERNAL(pOverlapped) ( (PRTFILEAIOREQINTERNAL)((uintptr_t)(pOverlapped) - RT_OFFSETOF(RTFILEAIOREQINTERNAL, Overlapped)) )
+#define OVERLAPPED_2_RTFILEAIOREQINTERNAL(pOverlapped) ( (PRTFILEAIOREQINTERNAL)((uintptr_t)(pOverlapped) - RT_UOFFSETOF(RTFILEAIOREQINTERNAL, Overlapped)) )
 
 RTR3DECL(int) RTFileAioGetLimits(PRTFILEAIOLIMITS pAioLimits)

trunk/src/VBox/Runtime/r3/win/krnlmod-win.cpp

@@ -95 +95 @@
     if (NT_SUCCESS(rcNt) || rcNt == STATUS_INFO_LENGTH_MISMATCH)
     {
-        ULONG cbKrnlMods = RT_OFFSETOF(RTL_PROCESS_MODULES, Modules[KrnlModsSize.NumberOfModules]);
+        ULONG cbKrnlMods = RT_UOFFSETOF_DYN(RTL_PROCESS_MODULES, Modules[KrnlModsSize.NumberOfModules]);
         PRTL_PROCESS_MODULES pKrnlMods = (PRTL_PROCESS_MODULES)RTMemAllocZ(cbKrnlMods);
         if (RT_LIKELY(pKrnlMods))
@@ -127 +127 @@
     RT_NOREF2(pModInfo, phKrnlModInfo);
     size_t cchFilePath = strlen((const char *)&pModInfo->FullPathName[0]) + 1;
-    PRTKRNLMODINFOINT pThis = (PRTKRNLMODINFOINT)RTMemAllocZ(RT_OFFSETOF(RTKRNLMODINFOINT, achFilePath[cchFilePath]));
+    PRTKRNLMODINFOINT pThis = (PRTKRNLMODINFOINT)RTMemAllocZ(RT_UOFFSETOF_DYN(RTKRNLMODINFOINT, achFilePath[cchFilePath]));
     if (RT_LIKELY(pThis))
     {

trunk/src/VBox/Runtime/r3/win/localipc-win.cpp

@@ -401 +401 @@
          * Allocate and initialize the instance data.
          */
-        size_t cbThis = RT_OFFSETOF(RTLOCALIPCSERVERINT, wszName[cwcFullName + 1]);
+        size_t cbThis = RT_UOFFSETOF_DYN(RTLOCALIPCSERVERINT, wszName[cwcFullName + 1]);
         PRTLOCALIPCSERVERINT pThis = (PRTLOCALIPCSERVERINT)RTMemAllocVar(cbThis);
         AssertReturn(pThis, VERR_NO_MEMORY);

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -831 +831 @@
             uOld = uNew;
             SetLastError(NO_ERROR);
-            DWORD cbActual = RT_OFFSETOF(TOKEN_PRIVILEGES, Privileges[1]);
+            DWORD cbActual = RT_UOFFSETOF(TOKEN_PRIVILEGES, Privileges[1]);
             AdjustTokenPrivileges(hToken, FALSE /*fDisableAllPrivileges*/, &uNew.TokPriv, cbActual, &uOld.TokPriv, &cbActual);
             if (GetLastError() != NO_ERROR)
@@ -1124 +1124 @@
     } AceBuf;
     RT_ZERO(AceBuf);
-    uint32_t const cbAllowedAce = RT_OFFSETOF(ACCESS_ALLOWED_ACE, SidStart) + cbSid;
+    uint32_t const cbAllowedAce = RT_UOFFSETOF(ACCESS_ALLOWED_ACE, SidStart) + cbSid;
     AssertReturn(cbAllowedAce <= sizeof(AceBuf), false);
 
@@ -1848 +1848 @@
                     SIZE_T cbCopied = 0;
                     if (!ReadProcessMemory(hDstProcess,
-                                           (char *)BasicInfo.PebBaseAddress + RT_OFFSETOF(PEB_COMMON, ProcessParameters),
+                                           (char *)BasicInfo.PebBaseAddress + RT_UOFFSETOF(PEB_COMMON, ProcessParameters),
                                            ppvDstProcParamCache, sizeof(*ppvDstProcParamCache), &cbCopied))
                     {
@@ -2006 +2006 @@
                 PVOID pvDstProcParamCache = NULL;
                 rtProcWinDupStdHandleIntoChild(pStartupInfo->hStdInput, pProcInfo->hProcess,
-                                               RT_OFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardInput), &pvDstProcParamCache);
+                                               RT_UOFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardInput), &pvDstProcParamCache);
                 rtProcWinDupStdHandleIntoChild(pStartupInfo->hStdOutput, pProcInfo->hProcess,
-                                               RT_OFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardOutput), &pvDstProcParamCache);
+                                               RT_UOFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardOutput), &pvDstProcParamCache);
                 rtProcWinDupStdHandleIntoChild(pStartupInfo->hStdError,  pProcInfo->hProcess,
-                                               RT_OFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardError), &pvDstProcParamCache);
+                                               RT_UOFFSETOF(RTL_USER_PROCESS_PARAMETERS, StandardError), &pvDstProcParamCache);
 
                 if (ResumeThread(pProcInfo->hThread) != ~(DWORD)0)