Changeset 73097 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

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.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -935 +935 @@
     CRASSERT(rc == VINF_SUCCESS);
 
-    rc = SSMR3PutMem(pSSM, pMI, RT_OFFSETOF(CRMuralInfo, CreateInfo));
+    rc = SSMR3PutMem(pSSM, pMI, RT_UOFFSETOF(CRMuralInfo, CreateInfo));
     CRASSERT(rc == VINF_SUCCESS);
 
@@ -1387 +1387 @@
     } Data;
 
-    Assert(sizeof (Data) >= RT_OFFSETOF(CRFBData, aElements[4]));
+    Assert(sizeof (Data) >= RT_UOFFSETOF(CRFBData, aElements[4]));
 
     pCtxInfo = cr_server.currentCtxInfo;
@@ -1938 +1938 @@
         rc = crServerLsrDataGetMem(pReader, &key, sizeof(key));
         AssertLogRelRCReturn(rc, rc);
-        rc = crServerLsrDataGetMem(pReader, &muralInfo, RT_OFFSETOF(CRMuralInfo, CreateInfo));
+        rc = crServerLsrDataGetMem(pReader, &muralInfo, RT_UOFFSETOF(CRMuralInfo, CreateInfo));
         AssertLogRelRCReturn(rc, rc);
 
@@ -1952 +1952 @@
                 CR_SERVER_BUGGY_MURAL_DATA Data;
                 /* need to chak spuWindow, so taking the offset of filed following it*/
-                uint8_t au8[RT_OFFSETOF(CRMuralInfo, screenId)];
+                uint8_t au8[RT_UOFFSETOF(CRMuralInfo, screenId)];
                 RTRECT aVisRects[sizeof (CR_SERVER_BUGGY_MURAL_DATA) / sizeof (RTRECT)];
             } LaBuf;
@@ -2091 +2091 @@
     } Data;
 
-    Assert(sizeof (Data) >= RT_OFFSETOF(CRFBData, aElements[4]));
+    Assert(sizeof (Data) >= RT_UOFFSETOF(CRFBData, aElements[4]));
 
     if (version >= SHCROGL_SSM_VERSION_WITH_SAVED_DEPTH_STENCIL_BUFFER)
@@ -2177 +2177 @@
         if (Data.data.cElements)
         {
-            CRFBData *pLazyData = crAlloc(RT_OFFSETOF(CRFBData, aElements[Data.data.cElements]));
+            CRFBData *pLazyData = crAlloc(RT_UOFFSETOF_DYN(CRFBData, aElements[Data.data.cElements]));
             if (!RT_SUCCESS(rc))
             {
@@ -2185 +2185 @@
             }
 
-            crMemcpy(pLazyData, &Data.data, RT_OFFSETOF(CRFBData, aElements[Data.data.cElements]));
+            crMemcpy(pLazyData, &Data.data, RT_UOFFSETOF_DYN(CRFBData, aElements[Data.data.cElements]));
             pBuf->pFrontImg = pLazyData;
         }
@@ -2902 +2902 @@
     cParams = cBuffers-1;
 
-    if (cbCmd < RT_OFFSETOF(VBOXCMDVBVA_CRCMD_CMD, aBuffers[cBuffers]))
+    if (cbCmd < RT_UOFFSETOF_DYN(VBOXCMDVBVA_CRCMD_CMD, aBuffers[cBuffers]))
     {
         WARN(("invalid buffer size"));
@@ -3325 +3325 @@
                     VBOXCMDVBVA_3DCTL_CMD RT_UNTRUSTED_VOLATILE_GUEST *p3DCmd
                         = (VBOXCMDVBVA_3DCTL_CMD RT_UNTRUSTED_VOLATILE_GUEST *)pbCmd;
-                    return crVBoxCrCmdCmd(NULL, &p3DCmd->Cmd, cbCmd - RT_OFFSETOF(VBOXCMDVBVA_3DCTL_CMD, Cmd));
+                    return crVBoxCrCmdCmd(NULL, &p3DCmd->Cmd, cbCmd - RT_UOFFSETOF(VBOXCMDVBVA_3DCTL_CMD, Cmd));
                 }
 
@@ -3543 +3543 @@
                     = (VBOXCMDVBVA_CRCMD const RT_UNTRUSTED_VOLATILE_GUEST *)pCmd;
                 VBOXCMDVBVA_CRCMD_CMD const RT_UNTRUSTED_VOLATILE_GUEST *pCrCmd = &pCrCmdDr->Cmd;
-                int rc = crVBoxServerCmdVbvaCrCmdProcess(pCrCmd, cbCmd - RT_OFFSETOF(VBOXCMDVBVA_CRCMD, Cmd));
+                int rc = crVBoxServerCmdVbvaCrCmdProcess(pCrCmd, cbCmd - RT_UOFFSETOF(VBOXCMDVBVA_CRCMD, Cmd));
                 ASSERT_GUEST_LOGREL_RC_RETURN(rc, -1);
                 return 0;