Changeset 105377 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 17, 2024 2:06:05 PM (7 months ago)

Author:

vboxsync

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

164030

Message:

iprt/cdefs.h,*: s/RT_IPRT_CALL_ATTR/RT_IPRT_CALLREQ_ATTR/g bugref:10725

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -70 +70 @@
 static DECLCALLBACK(int)    vgsvcGstCtrlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
                                                         uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
+static int                  vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, bool fAsync, RTMSINTERVAL cMsTimeout,
+                                                          PFNRT pfnFunction, unsigned cArgs,
+                                                          va_list Args) RT_IPRT_CALLREQ_ATTR(4, 5, 0); /* attrib req prototype */
+static int                  vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, PFNRT pfnFunction,
+                                                            unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(2, 3, 4); /* ditto */
+#if 0 /* unused */
+static int                  vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL cMsTimeout,
+                                                           PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALLREQ_ATTR(3, 4, 5);
+#endif
 
 
@@ -2082 +2091 @@
 
 
-static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                         bool fAsync, RTMSINTERVAL uTimeoutMS,
-                                         PFNRT pfnFunction, unsigned cArgs, va_list Args) RT_IPRT_CALL_ATTR(5, 6, 0)
-{
-    RT_NOREF1(pHostCtx);
+static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, bool fAsync, RTMSINTERVAL cMsTimeout,
+                                         PFNRT pfnFunction, unsigned cArgs, va_list Args)
+{
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
-    /* pHostCtx is optional. */
     AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
     if (!fAsync)
@@ -2097 +2103 @@
     {
 #ifdef DEBUG
-        VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV fAsync=%RTbool, uTimeoutMS=%RU32, cArgs=%u\n",
-                     pProcess->uPID, fAsync, uTimeoutMS, cArgs);
+        VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV fAsync=%RTbool, cMsTimeout=%RU32, cArgs=%u\n",
+                     pProcess->uPID, fAsync, cMsTimeout, cArgs);
 #endif
         uint32_t fFlags = RTREQFLAGS_IPRT_STATUS;
         if (fAsync)
         {
-            Assert(uTimeoutMS == 0);
+            Assert(cMsTimeout == 0);
             fFlags |= RTREQFLAGS_NO_WAIT;
         }
 
         PRTREQ hReq = NIL_RTREQ;
-        rc = RTReqQueueCallV(pProcess->hReqQueue, &hReq, uTimeoutMS, fFlags, pfnFunction, cArgs, Args);
+        rc = RTReqQueueCallV(pProcess->hReqQueue, &hReq, cMsTimeout, fFlags, pfnFunction, cArgs, Args);
         RTReqRelease(hReq);
         if (RT_SUCCESS(rc))
@@ -2143 +2149 @@
 
 
-static int vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                           PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(3, 4, 5)
+static int vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, PFNRT pfnFunction, unsigned cArgs, ...)
+{
+    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
+    AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
+
+    va_list va;
+    va_start(va, cArgs);
+    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, true /* fAsync */, 0 /* cMsTimeout */,
+                                           pfnFunction, cArgs, va);
+    va_end(va);
+
+    return rc;
+}
+
+
+#if 0 /* unused */
+static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL cMsTimeout,
+                                          PFNRT pfnFunction, unsigned cArgs, ...)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2152 +2174 @@
     va_list va;
     va_start(va, cArgs);
-    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, true /* fAsync */, 0 /* uTimeoutMS */,
+    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, false /* fAsync */, cMsTimeout,
                                            pfnFunction, cArgs, va);
     va_end(va);
@@ -2158 +2180 @@
     return rc;
 }
-
-
-#if 0 /* unused */
-static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                          RTMSINTERVAL uTimeoutMS, PFNRT pfnFunction, unsigned cArgs, ...)
-{
-    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
-    /* pHostCtx is optional. */
-    AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
-
-    va_list va;
-    va_start(va, cArgs);
-    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, false /* fAsync */, uTimeoutMS,
-                                           pfnFunction, cArgs, va);
-    va_end(va);
-
-    return rc;
-}
 #endif
 
@@ -2183 +2187 @@
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
-        return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnInput, 5 /*cArgs*/,
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnInput, 5 /*cArgs*/,
                                                pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
 
@@ -2194 +2198 @@
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
-        return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnOutput, 5 /*cArgs*/,
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnOutput, 5 /*cArgs*/,
                                                pProcess, pHostCtx, uHandle, cbToRead, fFlags);
 
@@ -2204 +2208 @@
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown) && !ASMAtomicReadBool(&pProcess->fStopped))
-        return vgsvcGstCtrlProcessRequestAsync(pProcess, NULL /* pHostCtx */, (PFNRT)vgsvcGstCtrlProcessOnTerm, 1 /*cArgs*/,
-                                               pProcess);
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, (PFNRT)vgsvcGstCtrlProcessOnTerm, 1 /*cArgs*/, pProcess);
 
     return vgsvcGstCtrlProcessOnTerm(pProcess);