Changeset 94937 in vbox

Timestamp:

May 9, 2022 9:10:16 AM (3 years ago)

Author:

vboxsync

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

151345

Message:

Main/src-client/HGCM.cpp: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

File:

• trunk/src/VBox/Main/src-client/HGCM.cpp (modified) (107 diffs)

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -357 +357 @@
     RTErrInfoInitStatic(&ErrInfo);
 
-    int rc;
+    int vrc;
 
     if (RTPathHasPath(m_pszSvcLibrary))
-        rc = SUPR3HardenedLdrLoadPlugIn(m_pszSvcLibrary, &m_hLdrMod, &ErrInfo.Core);
+        vrc = SUPR3HardenedLdrLoadPlugIn(m_pszSvcLibrary, &m_hLdrMod, &ErrInfo.Core);
     else
-        rc = SUPR3HardenedLdrLoadAppPriv(m_pszSvcLibrary, &m_hLdrMod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
-
-    if (RT_SUCCESS(rc))
+        vrc = SUPR3HardenedLdrLoadAppPriv(m_pszSvcLibrary, &m_hLdrMod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
+
+    if (RT_SUCCESS(vrc))
     {
         LogFlowFunc(("successfully loaded the library.\n"));
@@ -370 +370 @@
         m_pfnLoad = NULL;
 
-        rc = RTLdrGetSymbol(m_hLdrMod, VBOX_HGCM_SVCLOAD_NAME, (void**)&m_pfnLoad);
-
-        if (RT_FAILURE(rc) || !m_pfnLoad)
-        {
-            Log(("HGCMService::loadServiceDLL: Error resolving the service entry point %s, rc = %d, m_pfnLoad = %p\n",
-                 VBOX_HGCM_SVCLOAD_NAME, rc, m_pfnLoad));
-
-            if (RT_SUCCESS(rc))
+        vrc = RTLdrGetSymbol(m_hLdrMod, VBOX_HGCM_SVCLOAD_NAME, (void**)&m_pfnLoad);
+
+        if (RT_FAILURE(vrc) || !m_pfnLoad)
+        {
+            Log(("HGCMService::loadServiceDLL: Error resolving the service entry point %s, vrc = %Rrc, m_pfnLoad = %p\n",
+                 VBOX_HGCM_SVCLOAD_NAME, vrc, m_pfnLoad));
+
+            if (RT_SUCCESS(vrc))
             {
                 /* m_pfnLoad was NULL */
-                rc = VERR_SYMBOL_NOT_FOUND;
+                vrc = VERR_SYMBOL_NOT_FOUND;
             }
         }
 
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             RT_ZERO(m_fntable);
@@ -402 +402 @@
             /** @todo provide way to configure different values via extra data.   */
 
-            rc = m_pfnLoad(&m_fntable);
-
-            LogFlowFunc(("m_pfnLoad rc = %Rrc\n", rc));
-
-            if (RT_SUCCESS(rc))
+            vrc = m_pfnLoad(&m_fntable);
+
+            LogFlowFunc(("m_pfnLoad vrc = %Rrc\n", vrc));
+
+            if (RT_SUCCESS(vrc))
             {
                 if (   m_fntable.pfnUnload != NULL
@@ -434 +434 @@
                     Log(("HGCMService::loadServiceDLL: at least one of function pointers is NULL\n"));
 
-                    rc = VERR_INVALID_PARAMETER;
+                    vrc = VERR_INVALID_PARAMETER;
 
                     if (m_fntable.pfnUnload)
@@ -446 +446 @@
     else
     {
-        LogRel(("HGCM: Failed to load the service library: [%s], rc = %Rrc - %s. The service will be not available.\n",
-                m_pszSvcLibrary, rc, ErrInfo.Core.pszMsg));
+        LogRel(("HGCM: Failed to load the service library: [%s], vrc = %Rrc - %s. The service will be not available.\n",
+                m_pszSvcLibrary, vrc, ErrInfo.Core.pszMsg));
         m_hLdrMod = NIL_RTLDRMOD;
     }
 
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
     {
         unloadServiceDLL();
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -672 +672 @@
     {
         HGCMMsgCore *pMsgCore;
-        int rc = hgcmMsgGet(pThread, &pMsgCore);
-
-        if (RT_FAILURE(rc))
+        int vrc = hgcmMsgGet(pThread, &pMsgCore);
+
+        if (RT_FAILURE(vrc))
         {
             /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */
-            AssertMsgFailed(("%Rrc\n", rc));
+            AssertMsgFailed(("%Rrc\n", vrc));
             break;
         }
@@ -691 +691 @@
             {
                 LogFlowFunc(("SVC_MSG_LOAD\n"));
-                rc = pSvc->loadServiceDLL();
+                vrc = pSvc->loadServiceDLL();
             } break;
 
@@ -717 +717 @@
                 {
                     pSvc->m_fInConnectOrDisconnect = true;
-                    rc = pSvc->m_fntable.pfnConnect(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                    HGCM_CLIENT_DATA(pSvc, pClient),
-                                                    pMsg->fRequestor, pMsg->fRestoring);
+                    vrc = pSvc->m_fntable.pfnConnect(pSvc->m_fntable.pvService, pMsg->u32ClientId,
+                                                     HGCM_CLIENT_DATA(pSvc, pClient),
+                                                     pMsg->fRequestor, pMsg->fRestoring);
                     pSvc->m_fInConnectOrDisconnect = false;
 
@@ -726 +726 @@
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -739 +739 @@
                 {
                     pSvc->m_fInConnectOrDisconnect = true;
-                    rc = pSvc->m_fntable.pfnDisconnect(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                       HGCM_CLIENT_DATA(pSvc, pMsg->pClient));
+                    vrc = pSvc->m_fntable.pfnDisconnect(pSvc->m_fntable.pvService, pMsg->u32ClientId,
+                                                        HGCM_CLIENT_DATA(pSvc, pMsg->pClient));
                     pSvc->m_fInConnectOrDisconnect = false;
                 }
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -768 +768 @@
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -788 +788 @@
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -799 +799 @@
                              pMsg->u32Function, pMsg->cParms, pMsg->paParms));
 
-                rc = pSvc->m_fntable.pfnHostCall(pSvc->m_fntable.pvService, pMsg->u32Function, pMsg->cParms, pMsg->paParms);
+                vrc = pSvc->m_fntable.pfnHostCall(pSvc->m_fntable.pvService, pMsg->u32Function, pMsg->cParms, pMsg->paParms);
             } break;
 
@@ -815 +815 @@
                     bool fHaveClientState = pSvc->m_fntable.pfnLoadState != NULL;
                     if (pMsg->uVersion > HGCM_SAVED_STATE_VERSION_V2)
-                        rc = pMsg->pVMM->pfnSSMR3GetBool(pMsg->pSSM, &fHaveClientState);
+                        vrc = pMsg->pVMM->pfnSSMR3GetBool(pMsg->pSSM, &fHaveClientState);
                     else
-                        rc = VINF_SUCCESS;
-                    if (RT_SUCCESS(rc) )
+                        vrc = VINF_SUCCESS;
+                    if (RT_SUCCESS(vrc) )
                     {
                         if (pSvc->m_fntable.pfnLoadState)
-                            rc = pSvc->m_fntable.pfnLoadState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                              HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM, pMsg->pVMM,
-                                                              fHaveClientState ? pMsg->uVersion : 0);
+                            vrc = pSvc->m_fntable.pfnLoadState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
+                                                               HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM, pMsg->pVMM,
+                                                               fHaveClientState ? pMsg->uVersion : 0);
                         else
-                            AssertLogRelStmt(!fHaveClientState, rc = VERR_INTERNAL_ERROR_5);
+                            AssertLogRelStmt(!fHaveClientState, vrc = VERR_INTERNAL_ERROR_5);
                     }
                     hgcmObjDereference(pClient);
@@ -831 +831 @@
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -843 +843 @@
                 HGCMClient *pClient = HGCMClient::ReferenceByHandle(pMsg->u32ClientId);
 
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
 
                 if (pClient)
                 {
                     pMsg->pVMM->pfnSSMR3PutU32(pMsg->pSSM, pClient->fRequestor); /* Quicker to save this here than in the message sender. */
-                    rc = pMsg->pVMM->pfnSSMR3PutBool(pMsg->pSSM, pSvc->m_fntable.pfnSaveState != NULL);
-                    if (RT_SUCCESS(rc) && pSvc->m_fntable.pfnSaveState)
+                    vrc = pMsg->pVMM->pfnSSMR3PutBool(pMsg->pSSM, pSvc->m_fntable.pfnSaveState != NULL);
+                    if (RT_SUCCESS(vrc) && pSvc->m_fntable.pfnSaveState)
                     {
                         g_fSaveState = true;
-                        rc = pSvc->m_fntable.pfnSaveState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                          HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM, pMsg->pVMM);
+                        vrc = pSvc->m_fntable.pfnSaveState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
+                                                           HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM, pMsg->pVMM);
                         g_fSaveState = false;
                     }
@@ -861 +861 @@
                 else
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                 }
             } break;
@@ -873 +873 @@
                 if (pSvc->m_hExtension)
                 {
-                    rc = VERR_NOT_SUPPORTED;
+                    vrc = VERR_NOT_SUPPORTED;
                 }
                 else
@@ -879 +879 @@
                     if (pSvc->m_fntable.pfnRegisterExtension)
                     {
-                        rc = pSvc->m_fntable.pfnRegisterExtension(pSvc->m_fntable.pvService, pMsg->pfnExtension,
-                                                                  pMsg->pvExtension);
+                        vrc = pSvc->m_fntable.pfnRegisterExtension(pSvc->m_fntable.pvService, pMsg->pfnExtension,
+                                                                   pMsg->pvExtension);
                     }
                     else
                     {
-                        rc = VERR_NOT_SUPPORTED;
+                        vrc = VERR_NOT_SUPPORTED;
                     }
 
-                    if (RT_SUCCESS(rc))
+                    if (RT_SUCCESS(vrc))
                     {
                         pSvc->m_hExtension = pMsg->handle;
@@ -902 +902 @@
                 if (pSvc->m_hExtension != pMsg->handle)
                 {
-                    rc = VERR_NOT_SUPPORTED;
+                    vrc = VERR_NOT_SUPPORTED;
                 }
                 else
@@ -908 +908 @@
                     if (pSvc->m_fntable.pfnRegisterExtension)
                     {
-                        rc = pSvc->m_fntable.pfnRegisterExtension(pSvc->m_fntable.pvService, NULL, NULL);
+                        vrc = pSvc->m_fntable.pfnRegisterExtension(pSvc->m_fntable.pvService, NULL, NULL);
                     }
                     else
                     {
-                        rc = VERR_NOT_SUPPORTED;
+                        vrc = VERR_NOT_SUPPORTED;
                     }
 
@@ -931 +931 @@
             {
                 AssertMsgFailed(("hgcmServiceThread::Unsupported message number %08X\n", u32MsgId));
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             } break;
         }
@@ -940 +940 @@
              * Other messages have to be completed here.
              */
-            hgcmMsgComplete (pMsgCore, rc);
+            hgcmMsgComplete (pMsgCore, vrc);
         }
         STAM_REL_PROFILE_STOP(&pSvc->m_StatHandleMsg, a);
@@ -976 +976 @@
      /* Resolve the client ID and verify that it belongs to this service before
         trying to disconnect it. */
-     int rc = VERR_NOT_FOUND;
+     int vrc = VERR_NOT_FOUND;
      HGCMClient * const pClient = HGCMClient::ReferenceByHandle(idClient);
      if (pClient)
      {
          if (pClient->pService == pService)
-             rc = pService->DisconnectClient(idClient, true, pClient);
+             vrc = pService->DisconnectClient(idClient, true, pClient);
          hgcmObjDereference(pClient);
      }
-     return rc;
+     return vrc;
 }
 
@@ -1143 +1143 @@
         RTStrCopy(szThreadName, sizeof(szThreadName), pszServiceName);
 
-    int rc = hgcmThreadCreate(&m_pThread, szThreadName, hgcmServiceThread, this, pszServiceName, pUVM, pVMM);
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmThreadCreate(&m_pThread, szThreadName, hgcmServiceThread, this, pszServiceName, pUVM, pVMM);
+    if (RT_SUCCESS(vrc))
     {
         m_pszSvcName    = RTStrDup(pszServiceName);
@@ -1157 +1157 @@
             m_pszSvcName = NULL;
 
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
         }
         else
@@ -1182 +1182 @@
             /* Execute the load request on the service thread. */
             HGCMMsgCore *pCoreMsg;
-            rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc);
-
-            if (RT_SUCCESS(rc))
+            vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc);
+
+            if (RT_SUCCESS(vrc))
             {
                 HGCMMsgSvcLoad *pMsg = (HGCMMsgSvcLoad *)pCoreMsg;
@@ -1190 +1190 @@
                 pMsg->pUVM = pUVM;
 
-                rc = hgcmMsgSend(pMsg);
+                vrc = hgcmMsgSend(pMsg);
             }
         }
     }
 
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
     {
         instanceDestroy();
     }
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1242 +1242 @@
 
     HGCMMsgCore *pMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
-    {
-        rc = hgcmMsgSend(pMsg);
-
-        if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = hgcmMsgSend(pMsg);
+
+        if (RT_SUCCESS(vrc))
             hgcmThreadWait(m_pThread);
     }
@@ -1275 +1275 @@
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)pCoreMsg;
@@ -1285 +1285 @@
         pMsg->pVMM        = pVMM;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1297 +1297 @@
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)pCoreMsg;
@@ -1308 +1308 @@
         pMsg->u32ClientId = u32ClientId;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1335 +1335 @@
 
     HGCMService *pSvc;
-    int rc = HGCMService::ResolveService(&pSvc, pszServiceName);
-
-    if (RT_SUCCESS(rc))
+    int vrc = HGCMService::ResolveService(&pSvc, pszServiceName);
+
+    if (RT_SUCCESS(vrc))
     {
         /* The service is already loaded. */
         pSvc->ReleaseService();
-        rc = VERR_HGCM_SERVICE_EXISTS;
+        vrc = VERR_HGCM_SERVICE_EXISTS;
     }
     else
@@ -1350 +1350 @@
         if (!pSvc)
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
         }
         else
         {
             /* Load the library and call the initialization entry point. */
-            rc = pSvc->instanceCreate(pszServiceLibrary, pszServiceName, pUVM, pVMM, pHgcmPort);
-            if (RT_SUCCESS(rc))
+            vrc = pSvc->instanceCreate(pszServiceLibrary, pszServiceName, pUVM, pVMM, pHgcmPort);
+            if (RT_SUCCESS(vrc))
             {
                 /* Insert the just created service to list for future references. */
@@ -1380 +1380 @@
     }
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1555 +1555 @@
 {
     /* Save the current handle count and restore afterwards to avoid client id conflicts. */
-    int rc = pVMM->pfnSSMR3PutU32(pSSM, hgcmObjQueryHandleCount());
-    AssertRCReturn(rc, rc);
+    int vrc = pVMM->pfnSSMR3PutU32(pSSM, hgcmObjQueryHandleCount());
+    AssertRCReturn(vrc, vrc);
 
     LogFlowFunc(("%d services to be saved:\n", sm_cServices));
 
     /* Save number of services. */
-    rc = pVMM->pfnSSMR3PutU32(pSSM, sm_cServices);
-    AssertRCReturn(rc, rc);
+    vrc = pVMM->pfnSSMR3PutU32(pSSM, sm_cServices);
+    AssertRCReturn(vrc, vrc);
 
     /* Save every service. */
@@ -1572 +1572 @@
 
         /* Save the length of the service name. */
-        rc = pVMM->pfnSSMR3PutU32(pSSM, (uint32_t) strlen(pSvc->m_pszSvcName) + 1);
-        AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnSSMR3PutU32(pSSM, (uint32_t) strlen(pSvc->m_pszSvcName) + 1);
+        AssertRCReturn(vrc, vrc);
 
         /* Save the name of the service. */
-        rc = pVMM->pfnSSMR3PutStrZ(pSSM, pSvc->m_pszSvcName);
-        AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnSSMR3PutStrZ(pSSM, pSvc->m_pszSvcName);
+        AssertRCReturn(vrc, vrc);
 
         /* Save the number of clients. */
-        rc = pVMM->pfnSSMR3PutU32(pSSM, pSvc->m_cClients);
-        AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnSSMR3PutU32(pSSM, pSvc->m_cClients);
+        AssertRCReturn(vrc, vrc);
 
         /* Call the service for every client. Normally a service must not have
@@ -1596 +1596 @@
 
             /* Save the client id. (fRequestor is saved via SVC_MSG_SAVESTATE for convenience.) */
-            rc = pVMM->pfnSSMR3PutU32(pSSM, u32ClientId);
-            AssertRCReturn(rc, rc);
+            vrc = pVMM->pfnSSMR3PutU32(pSSM, u32ClientId);
+            AssertRCReturn(vrc, vrc);
 
             /* Call the service, so the operation is executed by the service thread. */
-            rc = pSvc->saveClientState(u32ClientId, pSSM, pVMM);
-            AssertRCReturn(rc, rc);
+            vrc = pSvc->saveClientState(u32ClientId, pSSM, pVMM);
+            AssertRCReturn(vrc, vrc);
         }
 
@@ -1623 +1623 @@
     uint32_t u32;
 
-    int rc = pVMM->pfnSSMR3GetU32(pSSM, &u32);
-    AssertRCReturn(rc, rc);
+    int vrc = pVMM->pfnSSMR3GetU32(pSSM, &u32);
+    AssertRCReturn(vrc, vrc);
 
     hgcmObjSetHandleCount(u32);
@@ -1631 +1631 @@
     uint32_t cServices;
 
-    rc = pVMM->pfnSSMR3GetU32(pSSM, &cServices);
-    AssertRCReturn(rc, rc);
+    vrc = pVMM->pfnSSMR3GetU32(pSSM, &cServices);
+    AssertRCReturn(vrc, vrc);
 
     LogFlowFunc(("%d services to be restored:\n", cServices));
@@ -1639 +1639 @@
     {
         /* Get the length of the service name. */
-        rc = pVMM->pfnSSMR3GetU32(pSSM, &u32);
-        AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnSSMR3GetU32(pSSM, &u32);
+        AssertRCReturn(vrc, vrc);
         AssertReturn(u32 <= VBOX_HGCM_SVC_NAME_MAX_BYTES, VERR_SSM_UNEXPECTED_DATA);
 
         /* Get the service name. */
         char szServiceName[VBOX_HGCM_SVC_NAME_MAX_BYTES];
-        rc = pVMM->pfnSSMR3GetStrZ(pSSM, szServiceName, u32);
-        AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnSSMR3GetStrZ(pSSM, szServiceName, u32);
+        AssertRCReturn(vrc, vrc);
 
         LogRel(("HGCM: Restoring [%s]\n", szServiceName));
@@ -1652 +1652 @@
         /* Resolve the service instance. */
         HGCMService *pSvc;
-        rc = ResolveService(&pSvc, szServiceName);
-        AssertLogRelMsgReturn(pSvc, ("rc=%Rrc, %s\n", rc, szServiceName), VERR_SSM_UNEXPECTED_DATA);
+        vrc = ResolveService(&pSvc, szServiceName);
+        AssertLogRelMsgReturn(pSvc, ("vrc=%Rrc, %s\n", vrc, szServiceName), VERR_SSM_UNEXPECTED_DATA);
 
         /* Get the number of clients. */
         uint32_t cClients;
-        rc = pVMM->pfnSSMR3GetU32(pSSM, &cClients);
-        if (RT_FAILURE(rc))
+        vrc = pVMM->pfnSSMR3GetU32(pSSM, &cClients);
+        if (RT_FAILURE(vrc))
         {
             pSvc->ReleaseService();
             AssertFailed();
-            return rc;
+            return vrc;
         }
 
@@ -1670 +1670 @@
                but restored here in time for calling CreateAndConnectClient). */
             uint32_t u32ClientId;
-            rc = pVMM->pfnSSMR3GetU32(pSSM, &u32ClientId);
+            vrc = pVMM->pfnSSMR3GetU32(pSSM, &u32ClientId);
             uint32_t fRequestor = VMMDEV_REQUESTOR_LEGACY;
-            if (RT_SUCCESS(rc) && uVersion > HGCM_SAVED_STATE_VERSION_V2)
-                rc = pVMM->pfnSSMR3GetU32(pSSM, &fRequestor);
-            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
+            if (RT_SUCCESS(vrc) && uVersion > HGCM_SAVED_STATE_VERSION_V2)
+                vrc = pVMM->pfnSSMR3GetU32(pSSM, &fRequestor);
+            AssertLogRelMsgRCReturnStmt(vrc, ("vrc=%Rrc, %s\n", vrc, szServiceName), pSvc->ReleaseService(), vrc);
 
             /* Connect the client. */
-            rc = pSvc->CreateAndConnectClient(NULL, u32ClientId, fRequestor, true /*fRestoring*/);
-            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
+            vrc = pSvc->CreateAndConnectClient(NULL, u32ClientId, fRequestor, true /*fRestoring*/);
+            AssertLogRelMsgRCReturnStmt(vrc, ("vrc=%Rrc, %s\n", vrc, szServiceName), pSvc->ReleaseService(), vrc);
 
             /* Call the service, so the operation is executed by the service thread. */
-            rc = pSvc->loadClientState(u32ClientId, pSSM, pVMM, uVersion);
-            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
+            vrc = pSvc->loadClientState(u32ClientId, pSSM, pVMM, uVersion);
+            AssertLogRelMsgRCReturnStmt(vrc, ("vrc=%Rrc, %s\n", vrc, szServiceName), pSvc->ReleaseService(), vrc);
         }
 
@@ -1767 +1767 @@
 
     /* Initialize the HGCM part of the client. */
-    int rc = pClient->Init(this);
-
-    if (RT_SUCCESS(rc))
+    int vrc = pClient->Init(this);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Call the service. */
         HGCMMsgCore *pCoreMsg;
 
-        rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc);
-
-        if (RT_SUCCESS(rc))
+        vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc);
+
+        if (RT_SUCCESS(vrc))
         {
             HGCMMsgSvcConnect *pMsg = (HGCMMsgSvcConnect *)pCoreMsg;
@@ -1784 +1784 @@
             pMsg->fRestoring = fRestoring;
 
-            rc = hgcmMsgSend(pMsg);
-
-            if (RT_SUCCESS(rc))
+            vrc = hgcmMsgSend(pMsg);
+
+            if (RT_SUCCESS(vrc))
             {
                 /* Add the client Id to the array. */
@@ -1809 +1809 @@
                         else
                         {
-                            rc = VERR_NO_MEMORY;
+                            vrc = VERR_NO_MEMORY;
                         }
                     }
                     else
                     {
-                        rc = VERR_NO_MEMORY;
+                        vrc = VERR_NO_MEMORY;
                     }
                 }
 
-                if (RT_SUCCESS(rc))
+                if (RT_SUCCESS(vrc))
                 {
                     m_paClientIds[m_cClients] = handle;
@@ -1830 +1830 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         if (pu32ClientIdOut != NULL)
@@ -1847 +1847 @@
     }
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1874 +1874 @@
 
     bool fReleaseService = false;
-    int  rc              = VERR_NOT_FOUND;
+    int  vrc             = VERR_NOT_FOUND;
     for (uint32_t i = 0; i < m_cClients; i++)
     {
@@ -1891 +1891 @@
             fReleaseService = true;
 
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
             break;
         }
@@ -1897 +1897 @@
 
     /* Some paranoia wrt to not trusting the client ID array. */
-    Assert(rc == VINF_SUCCESS || fFromService);
-    if (rc == VERR_NOT_FOUND && !fFromService)
+    Assert(vrc == VINF_SUCCESS || fFromService);
+    if (vrc == VERR_NOT_FOUND && !fFromService)
     {
         if (m_acClients[pClient->idxCategory] > 0)
@@ -1908 +1908 @@
 
     LogFunc(("idClient=%u m_cClients=%u m_acClients[%u]=%u %s (cPendingCalls=%u) rc=%Rrc\n", u32ClientId, m_cClients,
-             pClient->idxCategory, m_acClients[pClient->idxCategory], m_pszSvcName, pClient->cPendingCalls, rc));
+             pClient->idxCategory, m_acClients[pClient->idxCategory], m_pszSvcName, pClient->cPendingCalls, vrc));
 
     /*
@@ -1918 +1918 @@
         HGCMMsgCore *pCoreMsg;
 
-        rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
-
-        if (RT_SUCCESS(rc))
+        vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
+
+        if (RT_SUCCESS(vrc))
         {
             HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)pCoreMsg;
@@ -1927 +1927 @@
             pMsg->pClient = pClient;
 
-            rc = hgcmMsgSend(pMsg);
+            vrc = hgcmMsgSend(pMsg);
         }
         else
         {
             LogRel(("(%d, %d) [%s] hgcmMsgAlloc(%p, SVC_MSG_DISCONNECT) failed %Rrc\n",
-                    u32ClientId, fFromService, RT_VALID_PTR(m_pszSvcName)? m_pszSvcName: "", m_pThread, rc));
+                    u32ClientId, fFromService, RT_VALID_PTR(m_pszSvcName)? m_pszSvcName: "", m_pThread, vrc));
         }
     }
@@ -1943 +1943 @@
         ReleaseService();
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1955 +1955 @@
     /* Forward the message to the service thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgSvcRegisterExtension *pMsg = (HGCMMsgSvcRegisterExtension *)pCoreMsg;
@@ -1965 +1965 @@
         pMsg->pvExtension  = pvExtension;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -1976 +1976 @@
     /* Forward the message to the service thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgSvcUnregisterExtension *pMsg = (HGCMMsgSvcUnregisterExtension *)pCoreMsg;
@@ -1984 +1984 @@
         pMsg->handle = handle;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
 }
 
@@ -1997 +1997 @@
      * for the client if necessary.
      */
-    int rc = hgcmMsgCompletionCallback(result, pMsgCore);
+    int vrc = hgcmMsgCompletionCallback(result, pMsgCore);
 
     HGCMMsgCall *pMsg = (HGCMMsgCall *)pMsgCore;
@@ -2009 +2009 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -2030 +2030 @@
     LogFlow(("MAIN::HGCMService::GuestCall\n"));
 
-    int rc;
+    int vrc;
     HGCMMsgCall *pMsg = new(std::nothrow) HGCMMsgCall(m_pThread);
     if (pMsg)
@@ -2052 +2052 @@
             pMsg->tsArrival   = tsArrival;
 
-            rc = hgcmMsgPost(pMsg, hgcmMsgCallCompletionCallback);
-
-            if (RT_SUCCESS(rc))
+            vrc = hgcmMsgPost(pMsg, hgcmMsgCallCompletionCallback);
+
+            if (RT_SUCCESS(vrc))
             { /* Reference donated on success. */ }
             else
@@ -2060 +2060 @@
                 ASMAtomicDecU32(&pClient->cPendingCalls);
                 pMsg->pcCounter = NULL;
-                Log(("MAIN::HGCMService::GuestCall: hgcmMsgPost failed: %Rrc\n", rc));
+                Log(("MAIN::HGCMService::GuestCall: hgcmMsgPost failed: %Rrc\n", vrc));
                 pMsg->Dereference();
             }
@@ -2071 +2071 @@
             pMsg->Dereference();
             STAM_REL_COUNTER_INC(&m_StatTooManyCalls);
-            rc = VERR_HGCM_TOO_MANY_CLIENT_CALLS;
+            vrc = VERR_HGCM_TOO_MANY_CLIENT_CALLS;
         }
     }
@@ -2077 +2077 @@
     {
         Log(("MAIN::HGCMService::GuestCall: Message allocation failed\n"));
-        rc = VERR_NO_MEMORY;
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2126 +2126 @@
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgHostCallSvc *pMsg = (HGCMMsgHostCallSvc *)pCoreMsg;
@@ -2136 +2136 @@
         pMsg->paParms          = paParms;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2165 +2165 @@
     {
         HGCMMsgCore *pCoreMsg;
-        int rc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_NOTIFY, hgcmMessageAllocSvc);
-        if (RT_SUCCESS(rc))
+        int vrc = hgcmMsgAlloc(m_pThread, &pCoreMsg, SVC_MSG_NOTIFY, hgcmMessageAllocSvc);
+        if (RT_SUCCESS(vrc))
         {
             HGCMMsgNotify *pMsg = (HGCMMsgNotify *)pCoreMsg;
             pMsg->enmEvent = enmEvent;
 
-            rc = hgcmMsgPost(pMsg, NULL);
-            AssertRC(rc);
+            vrc = hgcmMsgPost(pMsg, NULL);
+            AssertRC(vrc);
         }
     }
@@ -2327 +2327 @@
     {
         HGCMMsgCore *pMsgCore;
-        int rc = hgcmMsgGet(pThread, &pMsgCore);
-
-        if (RT_FAILURE(rc))
+        int vrc = hgcmMsgGet(pThread, &pMsgCore);
+
+        if (RT_FAILURE(vrc))
         {
             /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */
-            AssertMsgFailed(("%Rrc\n", rc));
+            AssertMsgFailed(("%Rrc\n", vrc));
             break;
         }
@@ -2350 +2350 @@
                  */
                 HGCMService *pService;
-                rc = HGCMService::ResolveService(&pService, pMsg->pszServiceName);
-
-                if (RT_SUCCESS(rc))
+                vrc = HGCMService::ResolveService(&pService, pMsg->pszServiceName);
+
+                if (RT_SUCCESS(vrc))
                 {
                     /* Call the service instance method. */
-                    rc = pService->CreateAndConnectClient(pMsg->pu32ClientId,
-                                                          0,
-                                                          pMsg->pHGCMPort->pfnGetRequestor(pMsg->pHGCMPort, pMsg->pCmd),
-                                                          pMsg->pHGCMPort->pfnIsCmdRestored(pMsg->pHGCMPort, pMsg->pCmd));
+                    vrc = pService->CreateAndConnectClient(pMsg->pu32ClientId,
+                                                           0,
+                                                           pMsg->pHGCMPort->pfnGetRequestor(pMsg->pHGCMPort, pMsg->pCmd),
+                                                           pMsg->pHGCMPort->pfnIsCmdRestored(pMsg->pHGCMPort, pMsg->pCmd));
 
                     /* Release the service after resolve. */
@@ -2376 +2376 @@
                 if (!pClient)
                 {
-                    rc = VERR_HGCM_INVALID_CLIENT_ID;
+                    vrc = VERR_HGCM_INVALID_CLIENT_ID;
                     break;
                 }
@@ -2384 +2384 @@
 
                 /* Call the service instance to disconnect the client. */
-                rc = pService->DisconnectClient(pMsg->u32ClientId, false, pClient);
+                vrc = pService->DisconnectClient(pMsg->u32ClientId, false, pClient);
 
                 hgcmObjDereference(pClient);
@@ -2396 +2396 @@
                              pMsg->pszServiceName, pMsg->pszServiceLibrary, pMsg->pUVM));
 
-                rc = HGCMService::LoadService(pMsg->pszServiceLibrary, pMsg->pszServiceName,
-                                              pMsg->pUVM, pMsg->pVMM, pMsg->pHgcmPort);
+                vrc = HGCMService::LoadService(pMsg->pszServiceLibrary, pMsg->pszServiceName,
+                                               pMsg->pUVM, pMsg->pVMM, pMsg->pHgcmPort);
             } break;
 
@@ -2409 +2409 @@
                 /* Resolve the service name to the pointer to service instance. */
                 HGCMService *pService;
-                rc = HGCMService::ResolveService(&pService, pMsg->pszServiceName);
-
-                if (RT_SUCCESS(rc))
+                vrc = HGCMService::ResolveService(&pService, pMsg->pszServiceName);
+
+                if (RT_SUCCESS(vrc))
                 {
-                    rc = pService->HostCall(pMsg->u32Function, pMsg->cParms, pMsg->paParms);
+                    vrc = pService->HostCall(pMsg->u32Function, pMsg->cParms, pMsg->paParms);
 
                     pService->ReleaseService();
@@ -2445 +2445 @@
                 LogFlowFunc(("HGCM_MSG_LOADSTATE\n"));
 
-                rc = HGCMService::LoadState(pMsg->pSSM, pMsg->pVMM, pMsg->uVersion);
+                vrc = HGCMService::LoadState(pMsg->pSSM, pMsg->pVMM, pMsg->uVersion);
             } break;
 
@@ -2454 +2454 @@
                 LogFlowFunc(("HGCM_MSG_SAVESTATE\n"));
 
-                rc = HGCMService::SaveState(pMsg->pSSM, pMsg->pVMM);
+                vrc = HGCMService::SaveState(pMsg->pSSM, pMsg->pVMM);
             } break;
 
@@ -2480 +2480 @@
                 if (handle == NULL)
                 {
-                    rc = VERR_NO_MEMORY;
+                    vrc = VERR_NO_MEMORY;
                 }
                 else
@@ -2488 +2488 @@
 
                     HGCMService *pService;
-                    rc = HGCMService::ResolveService(&pService, handle->pszServiceName);
-
-                    if (RT_SUCCESS(rc))
+                    vrc = HGCMService::ResolveService(&pService, handle->pszServiceName);
+
+                    if (RT_SUCCESS(vrc))
                     {
                         pService->RegisterExtension(handle, pMsg->pfnExtension, pMsg->pvExtension);
@@ -2497 +2497 @@
                     }
 
-                    if (RT_FAILURE(rc))
+                    if (RT_FAILURE(vrc))
                     {
                         RTMemFree(handle);
@@ -2515 +2515 @@
 
                 HGCMService *pService;
-                rc = HGCMService::ResolveService(&pService, pMsg->handle->pszServiceName);
-
-                if (RT_SUCCESS(rc))
+                vrc = HGCMService::ResolveService(&pService, pMsg->handle->pszServiceName);
+
+                if (RT_SUCCESS(vrc))
                 {
                     pService->UnregisterExtension(pMsg->handle);
@@ -2530 +2530 @@
             {
                 AssertMsgFailed(("hgcmThread: Unsupported message number %08X!!!\n", u32MsgId));
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             } break;
         }
 
         /* Complete the message processing. */
-        hgcmMsgComplete(pMsgCore, rc);
-
-        LogFlowFunc(("message processed %Rrc\n", rc));
+        hgcmMsgComplete(pMsgCore, vrc);
+
+        LogFlowFunc(("message processed %Rrc\n", vrc));
     }
 }
@@ -2579 +2579 @@
     /* Forward the request to the main hgcm thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc);
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc);
+    if (RT_SUCCESS(vrc))
     {
         /* Initialize the message. Since the message is synchronous, use the supplied pointers. */
@@ -2591 +2591 @@
         pMsg->pHgcmPort         = pHgcmPort;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2620 +2620 @@
     /* Forward the request to the main hgcm thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Initialize the message. Since the message is synchronous, use the supplied pointers. */
@@ -2632 +2632 @@
         pMsg->pvExtension    = pvExtension;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("*pHandle = %p, rc = %Rrc\n", *pHandle, rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("*pHandle = %p, vrc = %Rrc\n", *pHandle, vrc));
+    return vrc;
 }
 
@@ -2645 +2645 @@
     /* Forward the request to the main hgcm thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Initialize the message. */
@@ -2654 +2654 @@
         pMsg->handle = handle;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
     return;
 }
@@ -2684 +2684 @@
     /* Forward the request to the main hgcm thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Initialize the message. Since 'pszServiceName' and 'pu32ClientId'
@@ -2699 +2699 @@
         pMsg->pu32ClientId   = pu32ClientId;
 
-        rc = hgcmMsgPost(pMsg, hgcmMsgCompletionCallback);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgPost(pMsg, hgcmMsgCompletionCallback);
+    }
+
+    LogFlowFunc(("rc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2727 +2727 @@
     /* Forward the request to the main hgcm thread. */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Initialize the message. */
@@ -2738 +2738 @@
         pMsg->u32ClientId = u32ClientId;
 
-        rc = hgcmMsgPost(pMsg, hgcmMsgCompletionCallback);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgPost(pMsg, hgcmMsgCompletionCallback);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2758 +2758 @@
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, idMsg, hgcmMainMessageAlloc);
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, idMsg, hgcmMainMessageAlloc);
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgMainLoadSaveState *pMsg = (HGCMMsgMainLoadSaveState *)pCoreMsg;
@@ -2768 +2768 @@
         pMsg->uVersion = uVersion;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2825 +2825 @@
     }
 
-    int rc = VERR_HGCM_INVALID_CLIENT_ID;
+    int vrc = VERR_HGCM_INVALID_CLIENT_ID;
 
     /* Resolve the client handle to the client instance pointer. */
@@ -2835 +2835 @@
 
         /* Forward the message to the service thread. */
-        rc = pClient->pService->GuestCall(pHGCMPort, pCmd, u32ClientId, pClient, u32Function, cParms, paParms, tsArrival);
+        vrc = pClient->pService->GuestCall(pHGCMPort, pCmd, u32ClientId, pClient, u32Function, cParms, paParms, tsArrival);
 
         hgcmObjDereference(pClient);
     }
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2901 +2901 @@
      */
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)pCoreMsg;
@@ -2912 +2912 @@
         pMsg->paParms        = paParms;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2929 +2929 @@
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_BRD_NOTIFY, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, HGCM_MSG_BRD_NOTIFY, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgMainBroadcastNotify *pMsg = (HGCMMsgMainBroadcastNotify *)pCoreMsg;
@@ -2937 +2937 @@
         pMsg->enmEvent = enmEvent;
 
-        rc = hgcmMsgPost(pMsg, NULL);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgPost(pMsg, NULL);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2953 +2953 @@
 
     HGCMMsgCore *pMsgCore;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pMsgCore, HGCM_MSG_RESET, hgcmMainMessageAlloc);
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmMsgAlloc(g_pHgcmThread, &pMsgCore, HGCM_MSG_RESET, hgcmMainMessageAlloc);
+
+    if (RT_SUCCESS(vrc))
     {
         HGCMMsgMainReset *pMsg = (HGCMMsgMainReset *)pMsgCore;
@@ -2961 +2961 @@
         pMsg->fForShutdown = fForShutdown;
 
-        rc = hgcmMsgSend(pMsg);
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmMsgSend(pMsg);
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2972 +2972 @@
     LogFlowFunc(("\n"));
 
-    int rc = hgcmThreadInit();
-
-    if (RT_SUCCESS(rc))
+    int vrc = hgcmThreadInit();
+
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -2980 +2980 @@
          */
 
-        rc = hgcmThreadCreate(&g_pHgcmThread, "MainHGCMthread", hgcmThread, NULL /*pvUser*/,
-                              NULL /*pszStatsSubDir*/, NULL /*pUVM*/, NULL /*pVMM*/);
-
-        if (RT_FAILURE(rc))
-            LogRel(("Failed to start HGCM thread. HGCM services will be unavailable!!! rc = %Rrc\n", rc));
-    }
-
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
+        vrc = hgcmThreadCreate(&g_pHgcmThread, "MainHGCMthread", hgcmThread, NULL /*pvUser*/,
+                               NULL /*pszStatsSubDir*/, NULL /*pUVM*/, NULL /*pVMM*/);
+
+        if (RT_FAILURE(vrc))
+            LogRel(("Failed to start HGCM thread. HGCM services will be unavailable!!! vrc = %Rrc\n", vrc));
+    }
+
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -2999 +2999 @@
      */
 
-    int rc = HGCMHostReset(true /*fForShutdown*/);
-
-    if (RT_SUCCESS(rc))
+    int vrc = HGCMHostReset(true /*fForShutdown*/);
+
+    if (RT_SUCCESS(vrc))
     {
         /* Send the quit message to the main hgcmThread. */
         HGCMMsgCore *pMsgCore;
-        rc = hgcmMsgAlloc(g_pHgcmThread, &pMsgCore, HGCM_MSG_QUIT, hgcmMainMessageAlloc);
-
-        if (RT_SUCCESS(rc))
+        vrc = hgcmMsgAlloc(g_pHgcmThread, &pMsgCore, HGCM_MSG_QUIT, hgcmMainMessageAlloc);
+
+        if (RT_SUCCESS(vrc))
         {
             HGCMMsgMainQuit *pMsg = (HGCMMsgMainQuit *)pMsgCore;
             pMsg->fUvmIsInvalid = fUvmIsInvalid;
 
-            rc = hgcmMsgSend(pMsg);
-
-            if (RT_SUCCESS(rc))
+            vrc = hgcmMsgSend(pMsg);
+
+            if (RT_SUCCESS(vrc))
             {
                 /* Wait for the thread termination. */
@@ -3025 +3025 @@
     }
 
-    LogFlowFunc(("rc = %Rrc\n", rc));
-    return rc;
-}
-
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
+    return vrc;
+}
+