Changeset 90780 in vbox

Timestamp:

Aug 23, 2021 9:25:17 AM (4 years ago)

Author:

vboxsync

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

146415

Message:

SUP: VALID_PTR -> RT_VALID_PTR.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (4 diffs)
• SUPDrvInternal.h (modified) (2 diffs)
• SUPLib.cpp (modified) (1 diff)
• SUPR0IdcClient.c (modified) (2 diffs)
• SUPR3HardenedVerify.cpp (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (2 diffs)
• freebsd/SUPDrv-freebsd.c (modified) (2 diffs)
• linux/SUPDrv-linux.c (modified) (2 diffs)
• solaris/SUPDrv-solaris.c (modified) (2 diffs)
• win/SUPDrv-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -2027 +2027 @@
             REQ_CHECK_SIZES(SUP_IOCTL_SET_VM_FOR_FAST);
             REQ_CHECK_EXPR_FMT(     !pReq->u.In.pVMR0
-                               ||   (   VALID_PTR(pReq->u.In.pVMR0)
+                               ||   (   RT_VALID_PTR(pReq->u.In.pVMR0)
                                      && !((uintptr_t)pReq->u.In.pVMR0 & (PAGE_SIZE - 1))),
                                ("SUP_IOCTL_SET_VM_FOR_FAST: pVMR0=%p!\n", pReq->u.In.pVMR0));
@@ -3044 +3044 @@
      */
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(pObj)&& pObj->u32Magic == SUPDRVOBJ_MAGIC,
+    AssertMsgReturn(RT_VALID_PTR(pObj) && pObj->u32Magic == SUPDRVOBJ_MAGIC,
                     ("Invalid pvObj=%p magic=%#x (expected %#x)\n", pvObj, pObj ? pObj->u32Magic : 0, SUPDRVOBJ_MAGIC),
                     VERR_INVALID_PARAMETER);
@@ -3152 +3152 @@
      */
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(pObj) && pObj->u32Magic == SUPDRVOBJ_MAGIC,
+    AssertMsgReturn(RT_VALID_PTR(pObj) && pObj->u32Magic == SUPDRVOBJ_MAGIC,
                     ("Invalid pvObj=%p magic=%#x (exepcted %#x)\n", pvObj, pObj ? pObj->u32Magic : 0, SUPDRVOBJ_MAGIC),
                     VERR_INVALID_PARAMETER);
@@ -5223 +5223 @@
         return rc;
     }
-    Assert(VALID_PTR(pImage->pvImage) || RT_FAILURE(rc));
+    Assert(RT_VALID_PTR(pImage->pvImage) || RT_FAILURE(rc));
 
     /*

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

@@ -336 +336 @@
  */
 #define SUP_IS_SESSION_VALID(pSession)  \
-    (   VALID_PTR(pSession) \
+    (   RT_VALID_PTR(pSession) \
      && pSession->u32Cookie == BIRD_INV)
 
@@ -346 +346 @@
  */
 #define SUP_IS_DEVEXT_VALID(pDevExt) \
-    (   VALID_PTR(pDevExt)\
+    (   RT_VALID_PTR(pDevExt) \
      && pDevExt->u32Cookie == BIRD)
 

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -177 +177 @@
      *       initialized at this point.
      */
-    if (!VALID_PTR(pPreInitData))
+    if (!RT_VALID_PTR(pPreInitData))
         return VERR_INVALID_POINTER;
     if (g_fPreInited || g_cInits > 0)

trunk/src/VBox/HostDrivers/Support/SUPR0IdcClient.c

@@ -122 +122 @@
          * session and version values actually makes sense.
          */
-        if (    VALID_PTR(Req.u.Out.pSession)
+        if (    RT_VALID_PTR(Req.u.Out.pSession)
             &&  Req.u.Out.uSessionVersion >= uMinVersion
             &&  (Req.u.Out.uSessionVersion & UINT32_C(0xffff0000)) == (SUPDRV_IDC_VERSION & UINT32_C(0xffff0000)))
@@ -205 +205 @@
 {
     PSUPDRVIDCHANDLE pHandle = ASMAtomicUoReadPtrT(&g_pMainHandle, PSUPDRVIDCHANDLE);
-    if (    VALID_PTR(pHandle)
-        &&  pHandle->s.pSession == pSession)
+    if (   RT_VALID_PTR(pHandle)
+        && pHandle->s.pSession == pSession)
         return pHandle;
     return NULL;

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -1051 +1051 @@
         {
             const char *pszMsg = va_arg(va,  const char *);
-            size_t cchMsg = VALID_PTR(pszMsg) ? suplibHardenedStrLen(pszMsg) : 0;
+            size_t cchMsg = RT_VALID_PTR(pszMsg) ? suplibHardenedStrLen(pszMsg) : 0;
             if (cchMsg >= cbErr)
                 cchMsg = cbErr - 1;

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -956 +956 @@
      * Some quick validations.
      */
-    if (RT_UNLIKELY(!VALID_PTR(pReq)))
+    if (RT_UNLIKELY(!RT_VALID_PTR(pReq)))
         return VERR_INVALID_POINTER;
 
@@ -962 +962 @@
     if (pSession)
     {
-        if (RT_UNLIKELY(!VALID_PTR(pSession)))
+        if (RT_UNLIKELY(!RT_VALID_PTR(pSession)))
             return VERR_INVALID_PARAMETER;
         if (RT_UNLIKELY(pSession->pDevExt != &g_DevExt))

trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c

@@ -476 +476 @@
      * Some quick validations.
      */
-    if (RT_UNLIKELY(!VALID_PTR(pReq)))
+    if (RT_UNLIKELY(!RT_VALID_PTR(pReq)))
         return VERR_INVALID_POINTER;
 
@@ -482 +482 @@
     if (pSession)
     {
-        if (RT_UNLIKELY(!VALID_PTR(pReq->pSession)))
+        if (RT_UNLIKELY(!RT_VALID_PTR(pReq->pSession)))
             return VERR_INVALID_PARAMETER;
         if (RT_UNLIKELY(pSession->pDevExt != &g_VBoxDrvFreeBSDDevExt))

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -739 +739 @@
      * Some quick validations.
      */
-    if (RT_UNLIKELY(!VALID_PTR(pReq)))
+    if (RT_UNLIKELY(!RT_VALID_PTR(pReq)))
         return VERR_INVALID_POINTER;
 
@@ -745 +745 @@
     if (pSession)
     {
-        if (RT_UNLIKELY(!VALID_PTR(pSession)))
+        if (RT_UNLIKELY(!RT_VALID_PTR(pSession)))
             return VERR_INVALID_PARAMETER;
         if (RT_UNLIKELY(pSession->pDevExt != &g_DevExt))

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -862 +862 @@
      * Some quick validations.
      */
-    if (RT_UNLIKELY(!VALID_PTR(pReq)))
+    if (RT_UNLIKELY(!RT_VALID_PTR(pReq)))
         return VERR_INVALID_POINTER;
 
@@ -868 +868 @@
     if (pSession)
     {
-        if (RT_UNLIKELY(!VALID_PTR(pSession)))
+        if (RT_UNLIKELY(!RT_VALID_PTR(pSession)))
             return VERR_INVALID_PARAMETER;
         if (RT_UNLIKELY(pSession->pDevExt != &g_DevExt))

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -1475 +1475 @@
         /* Verify the pDevExt in the session. */
         if (  pStack->Parameters.DeviceIoControl.IoControlCode != SUPDRV_IDC_REQ_CONNECT
-            ? VALID_PTR(pSession) && pSession->pDevExt == pDevExt
+            ? RT_VALID_PTR(pSession) && pSession->pDevExt == pDevExt
             : !pSession
            )