Index: trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 94958)
+++ trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 94960)
@@ -564,5 +564,5 @@
     ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
-    int rc = VERR_NOT_SUPPORTED;
+    int vrc = VERR_NOT_SUPPORTED;
 
     switch (index)
@@ -576,9 +576,9 @@
             {
                 *(uint32_t *)pvBuffer = (uint32_t)port;
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -599,5 +599,5 @@
             {
                 /* More than 64K seems to be an  invalid address. */
-                rc = VERR_TOO_MUCH_DATA;
+                vrc = VERR_TOO_MUCH_DATA;
                 break;
             }
@@ -606,9 +606,9 @@
             {
                 memcpy(pvBuffer, address.c_str(), cbAddress);
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -623,9 +623,9 @@
             {
                 *(uint32_t *)pvBuffer = (uint32_t)cMonitors;
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -656,5 +656,5 @@
             {
                 /* More than 64K seems to be an invalid port range string. */
-                rc = VERR_TOO_MUCH_DATA;
+                vrc = VERR_TOO_MUCH_DATA;
                 break;
             }
@@ -663,9 +663,9 @@
             {
                 memcpy(pvBuffer, portRange.c_str(), cbPortRange);
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -692,9 +692,9 @@
             {
                 *(uint32_t *)pvBuffer = (uint32_t)fVideoEnabled;
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -720,9 +720,9 @@
             {
                 *(uint32_t *)pvBuffer = (uint32_t)ulQuality;
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -749,9 +749,9 @@
             {
                 *(uint32_t *)pvBuffer = (uint32_t)ulSunFlsh;
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
             }
             else
             {
-                rc = VINF_BUFFER_OVERFLOW;
+                vrc = VINF_BUFFER_OVERFLOW;
             }
 
@@ -763,5 +763,5 @@
             if (cbBuffer < sizeof(VRDEFEATURE))
             {
-                rc = VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -772,9 +772,9 @@
 
             size_t cchInfo = 0;
-            rc = RTStrNLenEx(pFeature->achInfo, cbInfo, &cchInfo);
-
-            if (RT_FAILURE(rc))
-            {
-                rc = VERR_INVALID_PARAMETER;
+            vrc = RTStrNLenEx(pFeature->achInfo, cbInfo, &cchInfo);
+
+            if (RT_FAILURE(vrc))
+            {
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -810,5 +810,5 @@
                     if (FAILED(hrc))
                     {
-                        rc = VERR_NOT_SUPPORTED;
+                        vrc = VERR_NOT_SUPPORTED;
                     }
                 }
@@ -822,14 +822,14 @@
                 if (FAILED(hrc))
                 {
-                    rc = VERR_NOT_SUPPORTED;
+                    vrc = VERR_NOT_SUPPORTED;
                 }
             }
             else
             {
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             }
 
             /* Copy the value string to the callers buffer. */
-            if (rc == VINF_SUCCESS)
+            if (vrc == VINF_SUCCESS)
             {
                 com::Utf8Str value = bstrValue;
@@ -843,5 +843,5 @@
                 else
                 {
-                    rc = VINF_BUFFER_OVERFLOW;
+                    vrc = VINF_BUFFER_OVERFLOW;
                 }
 
@@ -854,5 +854,5 @@
             if (cbBuffer != sizeof(uint32_t))
             {
-                rc = VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -862,5 +862,5 @@
             server->mVRDPBindPort = port;
 
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
 
             if (pcbOut)
@@ -876,5 +876,5 @@
             if (cbBuffer < sizeof(VRDECLIENTSTATUS))
             {
-                rc = VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -886,14 +886,14 @@
             if (cbBuffer < RT_UOFFSETOF(VRDECLIENTSTATUS, achStatus) + pStatus->cbStatus)
             {
-                rc = VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
 
             size_t cchStatus = 0;
-            rc = RTStrNLenEx(pStatus->achStatus, cbStatus, &cchStatus);
-
-            if (RT_FAILURE(rc))
-            {
-                rc = VERR_INVALID_PARAMETER;
+            vrc = RTStrNLenEx(pStatus->achStatus, cbStatus, &cchStatus);
+
+            if (RT_FAILURE(vrc))
+            {
+                vrc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -903,5 +903,5 @@
             server->mConsole->i_VRDPClientStatusChange(pStatus->u32ClientId, pStatus->achStatus);
 
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
 
             if (pcbOut)
@@ -917,5 +917,5 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -990,5 +990,5 @@
     LogFlowFunc(("%x\n", fu32Intercept));
 
-    int rc = VERR_NOT_SUPPORTED;
+    int vrc = VERR_NOT_SUPPORTED;
 
     switch (fu32Intercept)
@@ -1001,5 +1001,5 @@
                 *ppvIntercept = pServer;
             }
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
         } break;
 
@@ -1007,5 +1007,5 @@
         {
             pServer->mConsole->i_VRDPInterceptUSB(u32ClientId, ppvIntercept);
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
         } break;
 
@@ -1017,5 +1017,5 @@
                 *ppvIntercept = pServer;
             }
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
         } break;
 
@@ -1039,5 +1039,5 @@
             {
                 Log(("AUDIOIN: ignored client %RU32, active client %RU32\n", u32ClientId, pServer->mu32AudioInputClientId));
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             }
         } break;
@@ -1047,5 +1047,5 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -1340,6 +1340,6 @@
     mConsole = console;
 
-    int rc = RTCritSectInit(&mCritSect);
-    AssertRC(rc);
+    int vrc = RTCritSectInit(&mCritSect);
+    AssertRC(vrc);
 
     mcClipboardRefs = 0;
@@ -1413,6 +1413,6 @@
     RT_ZERO(m_interfaceCallbacksInput);
 
-    rc = RTCritSectInit(&mTSMFLock);
-    AssertRC(rc);
+    vrc = RTCritSectInit(&mTSMFLock);
+    AssertRC(vrc);
 
     mEmWebcam = new EmWebcam(this);
@@ -1892,7 +1892,7 @@
         else
         {
-            int rc = p->fFallback?
-                        VERR_NOT_SUPPORTED: /* Try to go out of fallback mode. */
-                        p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
+            int vrc = p->fFallback?
+                         VERR_NOT_SUPPORTED: /* Try to go out of fallback mode. */
+                         p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
             if (RT_SUCCESS(rc))
             {
@@ -1924,15 +1924,15 @@
         uint32_t fu32CompletionFlags = 0;
         p->fFallback = false;
-        int rc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
-                                                                  &p->hImageBitmap,
-                                                                  p,
-                                                                  u32ScreenId,
-                                                                  VRDE_IMAGE_F_CREATE_CONTENT_3D
-                                                                  | VRDE_IMAGE_F_CREATE_WINDOW,
-                                                                  &rect,
-                                                                  VRDE_IMAGE_FMT_ID_BITMAP_BGRA8,
-                                                                  NULL,
-                                                                  0,
-                                                                  &fu32CompletionFlags);
+        int vrc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
+                                                                   &p->hImageBitmap,
+                                                                   p,
+                                                                   u32ScreenId,
+                                                                   VRDE_IMAGE_F_CREATE_CONTENT_3D
+                                                                   | VRDE_IMAGE_F_CREATE_WINDOW,
+                                                                   &rect,
+                                                                   VRDE_IMAGE_FMT_ID_BITMAP_BGRA8,
+                                                                   NULL,
+                                                                   0,
+                                                                   &fu32CompletionFlags);
         if (RT_FAILURE(rc))
         {
@@ -1941,19 +1941,19 @@
             fu32CompletionFlags = 0;
             p->fFallback = true;
-            rc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
-                                                                  &p->hImageBitmap,
-                                                                  p,
-                                                                  u32ScreenId,
-                                                                  0,
-                                                                  &rect,
-                                                                  VRDE_IMAGE_FMT_ID_BITMAP_BGRA8,
-                                                                  NULL,
-                                                                  0,
-                                                                  &fu32CompletionFlags);
+            vrc = p->pThis->m_interfaceImage.VRDEImageHandleCreate(p->pThis->mhServer,
+                                                                   &p->hImageBitmap,
+                                                                   p,
+                                                                   u32ScreenId,
+                                                                   0,
+                                                                   &rect,
+                                                                   VRDE_IMAGE_FMT_ID_BITMAP_BGRA8,
+                                                                   NULL,
+                                                                   0,
+                                                                   &fu32CompletionFlags);
         }
 
         H3DORLOG(("H3DORGeometry: Image handle create %Rrc, flags 0x%RX32\n", rc, fu32CompletionFlags));
 
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             p->x = x;
@@ -2063,5 +2063,5 @@
 {
     RT_NOREF(pvContext, pvBuffer);
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     H3DORLOG(("H3DORContextProperty: index %d\n", index));
@@ -2084,5 +2084,5 @@
         else
         {
-            rc = VERR_BUFFER_OVERFLOW;
+            vrc = VERR_BUFFER_OVERFLOW;
         }
         *pcbOut = cbOut;
@@ -2090,9 +2090,9 @@
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    H3DORLOG(("H3DORContextProperty: %Rrc\n", rc));
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    H3DORLOG(("H3DORContextProperty: %Rrc\n", vrc));
+    return vrc;
 }
 #endif
@@ -2212,5 +2212,5 @@
 
 /* static */ DECLCALLBACK(int) ConsoleVRDPServer::VRDESCardCbResponse(void *pvContext,
-                                                                      int rcRequest,
+                                                                      int vrcRequest,
                                                                       void *pvUser,
                                                                       uint32_t u32Function,
@@ -2221,8 +2221,8 @@
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvContext);
     UsbCardReader *pReader = pThis->mConsole->i_getUsbCardReader();
-    return pReader->VRDEResponse(rcRequest, pvUser, u32Function, pvData, cbData);
+    return pReader->VRDEResponse(vrcRequest, pvUser, u32Function, pvData, cbData);
 #else
     NOREF(pvContext);
-    NOREF(rcRequest);
+    NOREF(vrcRequest);
     NOREF(pvUser);
     NOREF(u32Function);
@@ -2235,16 +2235,16 @@
 int ConsoleVRDPServer::SCardRequest(void *pvUser, uint32_t u32Function, const void *pvData, uint32_t cbData)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     if (mhServer && mpEntryPoints && m_interfaceSCard.VRDESCardRequest)
     {
-        rc = m_interfaceSCard.VRDESCardRequest(mhServer, pvUser, u32Function, pvData, cbData);
+        vrc = m_interfaceSCard.VRDESCardRequest(mhServer, pvUser, u32Function, pvData, cbData);
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
@@ -2298,7 +2298,7 @@
 int ConsoleVRDPServer::tsmfLock(void)
 {
-    int rc = RTCritSectEnter(&mTSMFLock);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectEnter(&mTSMFLock);
+    AssertRC(vrc);
+    return vrc;
 }
 
@@ -2322,8 +2322,8 @@
     TSMFVRDPCTX *pVRDPCtx = NULL;
 
-    int rc = tsmfContextsAlloc(&pHostChCtx, &pVRDPCtx);
-    if (RT_FAILURE(rc))
-    {
-        return rc;
+    int vrc = tsmfContextsAlloc(&pHostChCtx, &pVRDPCtx);
+    if (RT_FAILURE(vrc))
+    {
+        return vrc;
     }
 
@@ -2336,7 +2336,7 @@
     pVRDPCtx->pHostChCtx = pHostChCtx;
 
-    rc = pThis->m_interfaceTSMF.VRDETSMFChannelCreate(pThis->mhServer, pVRDPCtx, u32Flags);
-
-    if (RT_SUCCESS(rc))
+    vrc = pThis->m_interfaceTSMF.VRDETSMFChannelCreate(pThis->mhServer, pVRDPCtx, u32Flags);
+
+    if (RT_SUCCESS(vrc))
     {
         /** @todo contexts should be in a list for accounting. */
@@ -2349,5 +2349,5 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -2359,6 +2359,6 @@
     ConsoleVRDPServer *pThis = pHostChCtx->pThis;
 
-    int rc = pThis->tsmfLock();
-    if (RT_SUCCESS(rc))
+    int vrc = pThis->tsmfLock();
+    if (RT_SUCCESS(vrc))
     {
         bool fClose = false;
@@ -2398,6 +2398,6 @@
     ConsoleVRDPServer *pThis = pHostChCtx->pThis;
 
-    int rc = pThis->tsmfLock();
-    if (RT_SUCCESS(rc))
+    int vrc = pThis->tsmfLock();
+    if (RT_SUCCESS(vrc))
     {
         bool fSend = false;
@@ -2415,10 +2415,10 @@
         {
             LogFlowFunc(("Send to VRDE channel %d.\n", u32ChannelHandle));
-            rc = pThis->m_interfaceTSMF.VRDETSMFChannelSend(pThis->mhServer, u32ChannelHandle,
-                                                            pvData, cbData);
-        }
-    }
-
-    return rc;
+            vrc = pThis->m_interfaceTSMF.VRDETSMFChannelSend(pThis->mhServer, u32ChannelHandle,
+                                                             pvData, cbData);
+        }
+    }
+
+    return vrc;
 }
 
@@ -2434,6 +2434,6 @@
     ConsoleVRDPServer *pThis = pHostChCtx->pThis;
 
-    int rc = pThis->tsmfLock();
-    if (RT_SUCCESS(rc))
+    int vrc = pThis->tsmfLock();
+    if (RT_SUCCESS(vrc))
     {
         uint32_t cbToCopy = RT_MIN(cbData, pHostChCtx->cbDataReceived);
@@ -2460,5 +2460,5 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -2529,12 +2529,12 @@
     }
 
-    int rc = pVMMDev->hgcmHostCall("VBoxHostChannel",
-                                   VBOX_HOST_CHANNEL_HOST_FN_REGISTER,
-                                   2,
-                                   &parms.name);
-
-    if (!RT_SUCCESS(rc))
-    {
-        Log(("VBOX_HOST_CHANNEL_HOST_FN_REGISTER failed with %Rrc\n", rc));
+    int vrc = pVMMDev->hgcmHostCall("VBoxHostChannel",
+                                    VBOX_HOST_CHANNEL_HOST_FN_REGISTER,
+                                    2,
+                                    &parms.name);
+
+    if (!RT_SUCCESS(vrc))
+    {
+        Log(("VBOX_HOST_CHANNEL_HOST_FN_REGISTER failed with %Rrc\n", vrc));
         return;
     }
@@ -2557,5 +2557,5 @@
 {
     RT_NOREF(cbParm);
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvContext);
@@ -2608,7 +2608,7 @@
             ev.u32SizeAvailable = 0;
 
-            rc = pThis->tsmfLock();
-
-            if (RT_SUCCESS(rc))
+            vrc = pThis->tsmfLock();
+
+            if (RT_SUCCESS(vrc))
             {
                 TSMFHOSTCHCTX *pHostChCtx = pVRDPCtx->pHostChCtx;
@@ -2662,6 +2662,6 @@
             pVRDPCtx->pvCallbacks = NULL;
 
-            rc = pThis->tsmfLock();
-            if (RT_SUCCESS(rc))
+            vrc = pThis->tsmfLock();
+            if (RT_SUCCESS(vrc))
             {
                 if (pVRDPCtx->pHostChCtx)
@@ -2698,5 +2698,5 @@
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInDeviceDesc(void *pvCallback,
-                                                                                 int rcRequest,
+                                                                                 int vrcRequest,
                                                                                  void *pDeviceCtx,
                                                                                  void *pvUser,
@@ -2707,10 +2707,10 @@
     if (pThis->mEmWebcam)
     {
-        pThis->mEmWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
+        pThis->mEmWebcam->EmWebcamCbDeviceDesc(vrcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
     }
 }
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInControl(void *pvCallback,
-                                                                              int rcRequest,
+                                                                              int vrcRequest,
                                                                               void *pDeviceCtx,
                                                                               void *pvUser,
@@ -2721,10 +2721,10 @@
     if (pThis->mEmWebcam)
     {
-        pThis->mEmWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
+        pThis->mEmWebcam->EmWebcamCbControl(vrcRequest, pDeviceCtx, pvUser, pControl, cbControl);
     }
 }
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInFrame(void *pvCallback,
-                                                                            int rcRequest,
+                                                                            int vrcRequest,
                                                                             void *pDeviceCtx,
                                                                             const VRDEVIDEOINPAYLOADHDR *pFrame,
@@ -2734,5 +2734,5 @@
     if (pThis->mEmWebcam)
     {
-        pThis->mEmWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame);
+        pThis->mEmWebcam->EmWebcamCbFrame(vrcRequest, pDeviceCtx, pFrame, cbFrame);
     }
 }
@@ -2740,48 +2740,48 @@
 int ConsoleVRDPServer::VideoInDeviceAttach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, void *pvDeviceCtx)
 {
-    int rc;
+    int vrc;
 
     if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInDeviceAttach)
     {
-        rc = m_interfaceVideoIn.VRDEVideoInDeviceAttach(mhServer, pDeviceHandle, pvDeviceCtx);
+        vrc = m_interfaceVideoIn.VRDEVideoInDeviceAttach(mhServer, pDeviceHandle, pvDeviceCtx);
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
 int ConsoleVRDPServer::VideoInDeviceDetach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle)
 {
-    int rc;
+    int vrc;
 
     if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInDeviceDetach)
     {
-        rc = m_interfaceVideoIn.VRDEVideoInDeviceDetach(mhServer, pDeviceHandle);
+        vrc = m_interfaceVideoIn.VRDEVideoInDeviceDetach(mhServer, pDeviceHandle);
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
 int ConsoleVRDPServer::VideoInGetDeviceDesc(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle)
 {
-    int rc;
+    int vrc;
 
     if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInGetDeviceDesc)
     {
-        rc = m_interfaceVideoIn.VRDEVideoInGetDeviceDesc(mhServer, pvUser, pDeviceHandle);
+        vrc = m_interfaceVideoIn.VRDEVideoInGetDeviceDesc(mhServer, pvUser, pDeviceHandle);
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
@@ -2789,21 +2789,21 @@
                                       const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq)
 {
-    int rc;
+    int vrc;
 
     if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInControl)
     {
-        rc = m_interfaceVideoIn.VRDEVideoInControl(mhServer, pvUser, pDeviceHandle, pReq, cbReq);
+        vrc = m_interfaceVideoIn.VRDEVideoInControl(mhServer, pvUser, pDeviceHandle, pReq, cbReq);
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
 
 /* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackInputSetup(void *pvCallback,
-                                                                          int rcRequest,
+                                                                          int vrcRequest,
                                                                           uint32_t u32Method,
                                                                           const void *pvResult,
@@ -2811,5 +2811,5 @@
 {
     NOREF(pvCallback);
-    NOREF(rcRequest);
+    NOREF(vrcRequest);
     NOREF(u32Method);
     NOREF(pvResult);
@@ -2921,5 +2921,5 @@
                                     const uint8_t *pu8Shape)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     if (mhServer && mpEntryPoints && m_interfaceMousePtr.VRDEMousePtr)
@@ -2960,13 +2960,13 @@
         else
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
         }
     }
     else
     {
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
@@ -3077,6 +3077,6 @@
     mUSBBackends.thread = thread;
     mUSBBackends.fThreadRunning = true;
-    int rc = RTThreadUserSignal(thread);
-    AssertRC(rc);
+    int vrc = RTThreadUserSignal(thread);
+    AssertRC(vrc);
 }
 
@@ -3088,14 +3088,14 @@
 void ConsoleVRDPServer::waitRemoteUSBThreadEvent(RTMSINTERVAL cMillies)
 {
-    int rc = RTSemEventWait(mUSBBackends.event, cMillies);
-    Assert(RT_SUCCESS(rc) || rc == VERR_TIMEOUT);
-    NOREF(rc);
+    int vrc = RTSemEventWait(mUSBBackends.event, cMillies);
+    Assert(RT_SUCCESS(vrc) || vrc == VERR_TIMEOUT);
+    NOREF(vrc);
 }
 
 void ConsoleVRDPServer::remoteUSBThreadStart(void)
 {
-    int rc = RTSemEventCreate(&mUSBBackends.event);
-
-    if (RT_FAILURE(rc))
+    int vrc = RTSemEventCreate(&mUSBBackends.event);
+
+    if (RT_FAILURE(vrc))
     {
         AssertFailed();
@@ -3103,13 +3103,13 @@
     }
 
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTThreadCreate(&mUSBBackends.thread, threadRemoteUSB, this, 65536,
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTThreadCreate(&mUSBBackends.thread, threadRemoteUSB, this, 65536,
                              RTTHREADTYPE_VRDP_IO, RTTHREADFLAGS_WAITABLE, "remote usb");
     }
 
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("Warning: could not start the remote USB thread, rc = %Rrc!!!\n", rc));
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("Warning: could not start the remote USB thread, vrc = %Rrc!!!\n", vrc));
         mUSBBackends.thread = NIL_RTTHREAD;
     }
@@ -3117,7 +3117,7 @@
     {
         /* Wait until the thread is ready. */
-        rc = RTThreadUserWait(mUSBBackends.thread, 60000);
-        AssertRC(rc);
-        Assert (mUSBBackends.fThreadRunning || RT_FAILURE(rc));
+        vrc = RTThreadUserWait(mUSBBackends.thread, 60000);
+        AssertRC(vrc);
+        Assert (mUSBBackends.fThreadRunning || RT_FAILURE(vrc));
     }
 }
@@ -3133,6 +3133,6 @@
         RTSemEventSignal(mUSBBackends.event);
 
-        int rc = RTThreadWait(mUSBBackends.thread, 60000, NULL);
-        AssertRC(rc);
+        int vrc = RTThreadWait(mUSBBackends.thread, 60000, NULL);
+        AssertRC(vrc);
 
         mUSBBackends.thread = NIL_RTTHREAD;
@@ -3248,7 +3248,7 @@
 
         Bstr authResult;
-        HRESULT hr = mConsole->mControl->AuthenticateExternal(ComSafeArrayAsInParam(authParams),
-                                                              authResult.asOutParam());
-        LogFlowFunc(("%Rhrc [%ls]\n", hr, authResult.raw())); NOREF(hr);
+        HRESULT hrc = mConsole->mControl->AuthenticateExternal(ComSafeArrayAsInParam(authParams),
+                                                               authResult.asOutParam());
+        LogFlowFunc(("%Rhrc [%ls]\n", hrc, authResult.raw())); NOREF(hrc);
     }
     catch (std::bad_alloc &)
@@ -3262,7 +3262,7 @@
 int ConsoleVRDPServer::lockConsoleVRDPServer(void)
 {
-    int rc = RTCritSectEnter(&mCritSect);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectEnter(&mCritSect);
+    AssertRC(vrc);
+    return vrc;
 }
 
@@ -3282,5 +3282,5 @@
                  pvCallback, u32ClientId, u32Function, u32Format, pvData, cbData));
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     ConsoleVRDPServer *pServer = static_cast <ConsoleVRDPServer *>(pvCallback);
@@ -3294,8 +3294,8 @@
             if (pServer->mpfnClipboardCallback)
             {
-                rc = pServer->mpfnClipboardCallback(VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE,
-                                                    u32Format,
-                                                    (void *)pvData,
-                                                    cbData);
+                vrc = pServer->mpfnClipboardCallback(VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE,
+                                                     u32Format,
+                                                     (void *)pvData,
+                                                     cbData);
             }
         } break;
@@ -3305,8 +3305,8 @@
             if (pServer->mpfnClipboardCallback)
             {
-                rc = pServer->mpfnClipboardCallback(VBOX_CLIPBOARD_EXT_FN_DATA_READ,
-                                                    u32Format,
-                                                    (void *)pvData,
-                                                    cbData);
+                vrc = pServer->mpfnClipboardCallback(VBOX_CLIPBOARD_EXT_FN_DATA_READ,
+                                                     u32Format,
+                                                     (void *)pvData,
+                                                     cbData);
             }
         } break;
@@ -3314,9 +3314,9 @@
         default:
         {
-            rc = VERR_NOT_SUPPORTED;
+            vrc = VERR_NOT_SUPPORTED;
         } break;
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -3328,5 +3328,5 @@
                  pvExtension, u32Function, pvParms, cbParms));
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     ConsoleVRDPServer *pServer = static_cast <ConsoleVRDPServer *>(pvExtension);
@@ -3386,8 +3386,8 @@
 
         default:
-            rc = VERR_NOT_SUPPORTED;
-    }
-
-    return rc;
+            vrc = VERR_NOT_SUPPORTED;
+    }
+
+    return vrc;
 }
 
@@ -3396,11 +3396,11 @@
     RT_NOREF(u32ClientId);
 
-    int rc = lockConsoleVRDPServer();
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+    if (RT_SUCCESS(vrc))
     {
         if (mcClipboardRefs == 0)
         {
-            rc = HGCMHostRegisterServiceExtension(&mhClipboard, "VBoxSharedClipboard", ClipboardServiceExtension, this);
-            AssertRC(rc);
+            vrc = HGCMHostRegisterServiceExtension(&mhClipboard, "VBoxSharedClipboard", ClipboardServiceExtension, this);
+            AssertRC(vrc);
         }
 
@@ -3414,6 +3414,6 @@
     RT_NOREF(u32ClientId);
 
-    int rc = lockConsoleVRDPServer();
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+    if (RT_SUCCESS(vrc))
     {
         Assert(mcClipboardRefs);
@@ -3449,7 +3449,7 @@
 
         /* Append the new instance in the list. */
-        int rc = lockConsoleVRDPServer();
-
-        if (RT_SUCCESS(rc))
+        int vrc = lockConsoleVRDPServer();
+
+        if (RT_SUCCESS(vrc))
         {
             pRemoteUSBBackend->pNext = mUSBBackends.pHead;
@@ -3473,5 +3473,5 @@
         }
 
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(vrc))
         {
             pRemoteUSBBackend->Release();
@@ -3491,7 +3491,7 @@
 
     /* Find the instance. */
-    int rc = lockConsoleVRDPServer();
-
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+
+    if (RT_SUCCESS(vrc))
     {
         pRemoteUSBBackend = usbBackendFind(u32ClientId);
@@ -3522,7 +3522,7 @@
 
     /* Find the instance. */
-    int rc = lockConsoleVRDPServer();
-
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+
+    if (RT_SUCCESS(vrc))
     {
         pRemoteUSBBackend = usbBackendFind(u32ClientId);
@@ -3563,7 +3563,7 @@
 
     /* Find the instance. */
-    int rc = lockConsoleVRDPServer();
-
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+
+    if (RT_SUCCESS(vrc))
     {
         pRemoteUSBBackend = usbBackendFindByUUID(pGuid);
@@ -3593,7 +3593,7 @@
 #ifdef VBOX_WITH_USB
 
-    int rc = lockConsoleVRDPServer();
-
-    if (RT_SUCCESS(rc))
+    int vrc = lockConsoleVRDPServer();
+
+    if (RT_SUCCESS(vrc))
     {
         if (pRemoteUSBBackend == NULL)
@@ -3667,6 +3667,6 @@
 {
 #ifdef VBOX_WITH_USB
-    int rc = lockConsoleVRDPServer();
-    AssertRC(rc);
+    int vrc = lockConsoleVRDPServer();
+    AssertRC(vrc);
 
     /* Exclude the found instance from the list. */
@@ -3820,5 +3820,5 @@
 /* static */ int ConsoleVRDPServer::loadVRDPLibrary(const char *pszLibraryName)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     if (mVRDPLibrary == NIL_RTLDRMOD)
@@ -3828,8 +3828,8 @@
 
         if (RTPathHavePath(pszLibraryName))
-            rc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &mVRDPLibrary, &ErrInfo.Core);
+            vrc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &mVRDPLibrary, &ErrInfo.Core);
         else
-            rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &mVRDPLibrary, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
-        if (RT_SUCCESS(rc))
+            vrc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &mVRDPLibrary, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
+        if (RT_SUCCESS(vrc))
         {
             struct SymbolEntry
@@ -3850,9 +3850,9 @@
             for (unsigned i = 0; i < RT_ELEMENTS(s_aSymbols); i++)
             {
-                rc = RTLdrGetSymbol(mVRDPLibrary, s_aSymbols[i].name, s_aSymbols[i].ppfn);
-
-                if (RT_FAILURE(rc))
+                vrc = RTLdrGetSymbol(mVRDPLibrary, s_aSymbols[i].name, s_aSymbols[i].ppfn);
+
+                if (RT_FAILURE(vrc))
                 {
-                    LogRel(("VRDE: Error resolving symbol '%s', rc %Rrc.\n", s_aSymbols[i].name, rc));
+                    LogRel(("VRDE: Error resolving symbol '%s', vrc %Rrc.\n", s_aSymbols[i].name, vrc));
                     break;
                 }
@@ -3862,7 +3862,7 @@
         {
             if (RTErrInfoIsSet(&ErrInfo.Core))
-                LogRel(("VRDE: Error loading the library '%s': %s (%Rrc)\n", pszLibraryName, ErrInfo.Core.pszMsg, rc));
+                LogRel(("VRDE: Error loading the library '%s': %s (%Rrc)\n", pszLibraryName, ErrInfo.Core.pszMsg, vrc));
             else
-                LogRel(("VRDE: Error loading the library '%s' rc = %Rrc.\n", pszLibraryName, rc));
+                LogRel(("VRDE: Error loading the library '%s' vrc = %Rrc.\n", pszLibraryName, vrc));
 
             mVRDPLibrary = NIL_RTLDRMOD;
@@ -3870,5 +3870,5 @@
     }
 
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
     {
         if (mVRDPLibrary != NIL_RTLDRMOD)
@@ -3879,5 +3879,5 @@
     }
 
-    return rc;
+    return vrc;
 }
 
