Changeset 98297 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jan 25, 2023 1:59:25 AM (2 years ago)

Author:

vboxsync

Message:

Main: rc -> hrc/vrc for all but testcases. Enabled scm rc checks accordingly. bugref:10223

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (16 diffs)
• EventQueue.cpp (modified) (9 diffs)
• NativeEventQueue.cpp (modified) (14 diffs)
• com.cpp (modified) (3 diffs)
• errorprint.cpp (modified) (10 diffs)
• initterm.cpp (modified) (19 diffs)
• string.cpp (modified) (7 diffs)

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -56 +56 @@
 HRESULT ErrorInfo::getVirtualBoxErrorInfo(ComPtr<IVirtualBoxErrorInfo> &pVirtualBoxErrorInfo)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     if (mErrorInfo)
-        rc = mErrorInfo.queryInterfaceTo(pVirtualBoxErrorInfo.asOutParam());
+        hrc = mErrorInfo.queryInterfaceTo(pVirtualBoxErrorInfo.asOutParam());
     else
         pVirtualBoxErrorInfo.setNull();
-    return rc;
+    return hrc;
 }
 
@@ -111 +111 @@
 void ErrorInfo::init(bool aKeepObj /* = false */)
 {
-    HRESULT rc = E_FAIL;
+    HRESULT hrc = E_FAIL;
 
 #if !defined(VBOX_WITH_XPCOM)
 
     ComPtr<IErrorInfo> err;
-    rc = ::GetErrorInfo(0, err.asOutParam());
-    if (rc == S_OK && err)
+    hrc = ::GetErrorInfo(0, err.asOutParam());
+    if (hrc == S_OK && err)
     {
         if (aKeepObj)
@@ -123 +123 @@
 
         ComPtr<IVirtualBoxErrorInfo> info;
-        rc = err.queryInterfaceTo(info.asOutParam());
-        if (SUCCEEDED(rc) && info)
+        hrc = err.queryInterfaceTo(info.asOutParam());
+        if (SUCCEEDED(hrc) && info)
             init(info);
 
@@ -131 +131 @@
             bool gotSomething = false;
 
-            rc = err->GetGUID(mInterfaceID.asOutParam());
-            gotSomething |= SUCCEEDED(rc);
-            if (SUCCEEDED(rc))
+            hrc = err->GetGUID(mInterfaceID.asOutParam());
+            gotSomething |= SUCCEEDED(hrc);
+            if (SUCCEEDED(hrc))
                 GetInterfaceNameByIID(mInterfaceID.ref(), mInterfaceName.asOutParam());
 
-            rc = err->GetSource(mComponent.asOutParam());
-            gotSomething |= SUCCEEDED(rc);
-
-            rc = err->GetDescription(mText.asOutParam());
-            gotSomething |= SUCCEEDED(rc);
+            hrc = err->GetSource(mComponent.asOutParam());
+            gotSomething |= SUCCEEDED(hrc);
+
+            hrc = err->GetDescription(mText.asOutParam());
+            gotSomething |= SUCCEEDED(hrc);
 
             if (gotSomething)
@@ -152 +152 @@
 
     nsCOMPtr<nsIExceptionService> es;
-    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-    if (NS_SUCCEEDED(rc))
+    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+    if (NS_SUCCEEDED(hrc))
     {
         nsCOMPtr<nsIExceptionManager> em;
-        rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-        if (NS_SUCCEEDED(rc))
+        hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+        if (NS_SUCCEEDED(hrc))
         {
             ComPtr<nsIException> ex;
-            rc = em->GetCurrentException(ex.asOutParam());
-            if (NS_SUCCEEDED(rc) && ex)
+            hrc = em->GetCurrentException(ex.asOutParam());
+            if (NS_SUCCEEDED(hrc) && ex)
             {
                 if (aKeepObj)
@@ -167 +167 @@
 
                 ComPtr<IVirtualBoxErrorInfo> info;
-                rc = ex.queryInterfaceTo(info.asOutParam());
-                if (NS_SUCCEEDED(rc) && info)
+                hrc = ex.queryInterfaceTo(info.asOutParam());
+                if (NS_SUCCEEDED(hrc) && info)
                     init(info);
 
@@ -175 +175 @@
                     bool gotSomething = false;
 
-                    rc = ex->GetResult(&mResultCode);
-                    gotSomething |= NS_SUCCEEDED(rc);
+                    hrc = ex->GetResult(&mResultCode);
+                    gotSomething |= NS_SUCCEEDED(hrc);
 
                     char *pszMsg;
-                    rc = ex->GetMessage(&pszMsg);
-                    gotSomething |= NS_SUCCEEDED(rc);
-                    if (NS_SUCCEEDED(rc))
+                    hrc = ex->GetMessage(&pszMsg);
+                    gotSomething |= NS_SUCCEEDED(hrc);
+                    if (NS_SUCCEEDED(hrc))
                     {
                         mText = Bstr(pszMsg);
@@ -196 +196 @@
                 em->SetCurrentException(NULL);
 
-                rc = NS_OK;
+                hrc = NS_OK;
             }
         }
     }
     /* Ignore failure when called after nsComponentManagerImpl::Shutdown(). */
-    else if (rc == NS_ERROR_UNEXPECTED)
-        rc = NS_OK;
-
-    AssertComRC(rc);
+    else if (hrc == NS_ERROR_UNEXPECTED)
+        hrc = NS_OK;
+
+    AssertComRC(hrc);
 
 #endif // defined(VBOX_WITH_XPCOM)
@@ -219 +219 @@
     ComPtr<IUnknown> iface = aI;
     ComPtr<ISupportErrorInfo> serr;
-    HRESULT rc = iface.queryInterfaceTo(serr.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        rc = serr->InterfaceSupportsErrorInfo(aIID);
-        if (SUCCEEDED(rc))
+    HRESULT hrc = iface.queryInterfaceTo(serr.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        hrc = serr->InterfaceSupportsErrorInfo(aIID);
+        if (SUCCEEDED(hrc))
             init(aKeepObj);
     }
@@ -244 +244 @@
     AssertReturnVoid(info);
 
-    HRESULT rc = E_FAIL;
+    HRESULT hrc = E_FAIL;
     bool gotSomething = false;
     bool gotAll = true;
     LONG lrc, lrd;
 
-    rc = info->COMGETTER(ResultCode)(&lrc); mResultCode = lrc;
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
-
-    rc = info->COMGETTER(ResultDetail)(&lrd); mResultDetail = lrd;
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
+    hrc = info->COMGETTER(ResultCode)(&lrc); mResultCode = lrc;
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
+
+    hrc = info->COMGETTER(ResultDetail)(&lrd); mResultDetail = lrd;
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
 
     Bstr iid;
-    rc = info->COMGETTER(InterfaceID)(iid.asOutParam());
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
-    if (SUCCEEDED(rc))
+    hrc = info->COMGETTER(InterfaceID)(iid.asOutParam());
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
+    if (SUCCEEDED(hrc))
     {
         mInterfaceID = iid;
@@ -267 +267 @@
     }
 
-    rc = info->COMGETTER(Component)(mComponent.asOutParam());
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
-
-    rc = info->COMGETTER(Text)(mText.asOutParam());
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
+    hrc = info->COMGETTER(Component)(mComponent.asOutParam());
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
+
+    hrc = info->COMGETTER(Text)(mText.asOutParam());
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
 
     m_pNext = NULL;
 
     ComPtr<IVirtualBoxErrorInfo> next;
-    rc = info->COMGETTER(Next)(next.asOutParam());
-    if (SUCCEEDED(rc) && !next.isNull())
+    hrc = info->COMGETTER(Next)(next.asOutParam());
+    if (SUCCEEDED(hrc) && !next.isNull())
     {
         m_pNext = new ErrorInfo(next);
         Assert(m_pNext != NULL);
         if (!m_pNext)
-            rc = E_OUTOFMEMORY;
-    }
-
-    gotSomething |= SUCCEEDED(rc);
-    gotAll &= SUCCEEDED(rc);
+            hrc = E_OUTOFMEMORY;
+    }
+
+    gotSomething |= SUCCEEDED(hrc);
+    gotAll &= SUCCEEDED(hrc);
 
     mIsBasicAvailable = gotSomething;
@@ -312 +312 @@
 
     ComPtr<IVirtualBoxErrorInfo> info;
-    HRESULT rc = progress->COMGETTER(ErrorInfo)(info.asOutParam());
-    if (SUCCEEDED(rc) && info)
+    HRESULT hrc = progress->COMGETTER(ErrorInfo)(info.asOutParam());
+    if (SUCCEEDED(hrc) && info)
         init(info);
 }
@@ -328 +328 @@
         return S_OK;
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
 #if !defined(VBOX_WITH_XPCOM)
@@ -335 +335 @@
     if (!mErrorInfo.isNull())
     {
-        rc = mErrorInfo.queryInterfaceTo(err.asOutParam());
-        AssertComRC(rc);
-    }
-    rc = ::SetErrorInfo(0, err);
+        hrc = mErrorInfo.queryInterfaceTo(err.asOutParam());
+        AssertComRC(hrc);
+    }
+    hrc = ::SetErrorInfo(0, err);
 
 #else // defined(VBOX_WITH_XPCOM)
 
     nsCOMPtr <nsIExceptionService> es;
-    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-    if (NS_SUCCEEDED(rc))
+    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+    if (NS_SUCCEEDED(hrc))
     {
         nsCOMPtr <nsIExceptionManager> em;
-        rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-        if (NS_SUCCEEDED(rc))
+        hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+        if (NS_SUCCEEDED(hrc))
         {
             ComPtr<nsIException> ex;
             if (!mErrorInfo.isNull())
             {
-                rc = mErrorInfo.queryInterfaceTo(ex.asOutParam());
-                AssertComRC(rc);
+                hrc = mErrorInfo.queryInterfaceTo(ex.asOutParam());
+                AssertComRC(hrc);
             }
-            rc = em->SetCurrentException(ex);
+            hrc = em->SetCurrentException(ex);
         }
     }
@@ -362 +362 @@
 #endif // defined(VBOX_WITH_XPCOM)
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         mErrorInfo.setNull();
@@ -368 +368 @@
     }
 
-    return rc;
+    return hrc;
 }
 

trunk/src/VBox/Main/glue/EventQueue.cpp

@@ -49 +49 @@
       mShutdown(false)
 {
-    int rc = RTCritSectInit(&mCritSect);
-    AssertRC(rc);
-
-    rc = RTSemEventCreate(&mSemEvent);
-    AssertRC(rc);
+    int vrc = RTCritSectInit(&mCritSect);
+    AssertRC(vrc);
+
+    vrc = RTSemEventCreate(&mSemEvent);
+    AssertRC(vrc);
 }
 
 EventQueue::~EventQueue(void)
 {
-    int rc = RTCritSectDelete(&mCritSect);
-    AssertRC(rc);
-
-    rc = RTSemEventDestroy(mSemEvent);
-    AssertRC(rc);
+    int vrc = RTCritSectDelete(&mCritSect);
+    AssertRC(vrc);
+
+    vrc = RTSemEventDestroy(mSemEvent);
+    AssertRC(vrc);
 
     EventQueueListIterator it  = mEvents.begin();
@@ -98 +98 @@
 {
     size_t cNumEvents;
-    int rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
+    int vrc = RTCritSectEnter(&mCritSect);
+    if (RT_SUCCESS(vrc))
     {
         if (mUserCnt == 0) /* No concurrent access allowed. */
@@ -108 +108 @@
             if (!cNumEvents)
             {
-                int rc2 = RTCritSectLeave(&mCritSect);
-                AssertRC(rc2);
-
-                rc = RTSemEventWaitNoResume(mSemEvent, cMsTimeout);
-
-                rc2 = RTCritSectEnter(&mCritSect);
-                AssertRC(rc2);
-
-                if (RT_SUCCESS(rc))
+                int vrc2 = RTCritSectLeave(&mCritSect);
+                AssertRC(vrc2);
+
+                vrc = RTSemEventWaitNoResume(mSemEvent, cMsTimeout);
+
+                vrc2 = RTCritSectEnter(&mCritSect);
+                AssertRC(vrc2);
+
+                if (RT_SUCCESS(vrc))
                 {
                     if (mShutdown)
-                        rc = VERR_INTERRUPTED;
+                        vrc = VERR_INTERRUPTED;
                     cNumEvents = mEvents.size();
                 }
             }
 
-            if (RT_SUCCESS(rc))
-                rc = processPendingEvents(cNumEvents);
+            if (RT_SUCCESS(vrc))
+                vrc = processPendingEvents(cNumEvents);
 
             Assert(mUserCnt);
@@ -131 +131 @@
         }
         else
-            rc = VERR_WRONG_ORDER;
-
-        int rc2 = RTCritSectLeave(&mCritSect);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    Assert(rc != VERR_TIMEOUT || cMsTimeout != RT_INDEFINITE_WAIT);
-    return rc;
+            vrc = VERR_WRONG_ORDER;
+
+        int vrc2 = RTCritSectLeave(&mCritSect);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
+    }
+
+    Assert(vrc != VERR_TIMEOUT || cMsTimeout != RT_INDEFINITE_WAIT);
+    return vrc;
 }
 
@@ -154 +154 @@
         return VINF_SUCCESS;
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     EventQueueListIterator it = mEvents.begin();
@@ -166 +166 @@
         mEvents.erase(it);
 
-        int rc2 = RTCritSectLeave(&mCritSect);
-        AssertRC(rc2);
+        int vrc2 = RTCritSectLeave(&mCritSect);
+        AssertRC(vrc2);
 
         pEvent->handler();
         pEvent->Release();
 
-        rc2 = RTCritSectEnter(&mCritSect);
-        AssertRC(rc2);
+        vrc2 = RTCritSectEnter(&mCritSect);
+        AssertRC(vrc2);
 
         it = mEvents.begin();
         if (mShutdown)
         {
-            rc = VERR_INTERRUPTED;
+            vrc = VERR_INTERRUPTED;
             break;
         }
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -208 +208 @@
 BOOL EventQueue::postEvent(Event *pEvent)
 {
-    int rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
+    int vrc = RTCritSectEnter(&mCritSect);
+    if (RT_SUCCESS(vrc))
     {
         try
@@ -231 +231 @@
 
             /* Leave critical section before signalling event. */
-            rc = RTCritSectLeave(&mCritSect);
-            if (RT_SUCCESS(rc))
-            {
-                int rc2 = RTSemEventSignal(mSemEvent);
-                AssertRC(rc2);
+            vrc = RTCritSectLeave(&mCritSect);
+            if (RT_SUCCESS(vrc))
+            {
+                int vrc2 = RTSemEventSignal(mSemEvent);
+                AssertRC(vrc2);
             }
         }
@@ -241 +241 @@
         {
             NOREF(ba);
-            rc = VERR_NO_MEMORY;
-        }
-
-        if (RT_FAILURE(rc))
-        {
-            int rc2 = RTCritSectLeave(&mCritSect);
-            AssertRC(rc2);
-        }
-    }
-
-    return RT_SUCCESS(rc) ? TRUE : FALSE;
+            vrc = VERR_NO_MEMORY;
+        }
+
+        if (RT_FAILURE(vrc))
+        {
+            int vrc2 = RTCritSectLeave(&mCritSect);
+            AssertRC(vrc2);
+        }
+    }
+
+    return RT_SUCCESS(vrc) ? TRUE : FALSE;
 }
 

trunk/src/VBox/Main/glue/NativeEventQueue.cpp

@@ -163 +163 @@
     // NULL to the event thread (because it stopped accepting events).
 
-    nsresult rc = NS_GetEventQueueService(getter_AddRefs(mEventQService));
-
-    if (NS_SUCCEEDED(rc))
-    {
-        rc = mEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,
-                                                 getter_AddRefs(mEventQ));
-        if (rc == NS_ERROR_NOT_AVAILABLE)
+    nsresult hrc = NS_GetEventQueueService(getter_AddRefs(mEventQService));
+
+    if (NS_SUCCEEDED(hrc))
+    {
+        hrc = mEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQ));
+        if (hrc == NS_ERROR_NOT_AVAILABLE)
         {
-            rc = mEventQService->CreateThreadEventQueue();
-            if (NS_SUCCEEDED(rc))
+            hrc = mEventQService->CreateThreadEventQueue();
+            if (NS_SUCCEEDED(hrc))
             {
                 mEQCreated = true;
-                rc = mEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,
-                                                         getter_AddRefs(mEventQ));
+                hrc = mEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQ));
             }
         }
     }
-    AssertComRC(rc);
+    AssertComRC(hrc);
 
 #endif // VBOX_WITH_XPCOM
@@ -356 +354 @@
     }
 
-    int rc = select(fd + 1, &fdsetR, NULL, &fdsetE, ptv);
-    if (rc > 0)
-        rc = VINF_SUCCESS;
-    else if (rc == 0)
-        rc = VERR_TIMEOUT;
+    int iRc = select(fd + 1, &fdsetR, NULL, &fdsetE, ptv);
+    int vrc;
+    if (iRc > 0)
+        vrc = VINF_SUCCESS;
+    else if (iRc == 0)
+        vrc = VERR_TIMEOUT;
     else if (errno == EINTR)
-        rc = VINF_INTERRUPTED;
+        vrc = VINF_INTERRUPTED;
     else
     {
@@ -368 +367 @@
         if (s_ErrorCount < 500)
         {
-            LogRel(("waitForEventsOnXPCOM rc=%d errno=%d\n", rc, errno));
+            LogRel(("waitForEventsOnXPCOM iRc=%d errno=%d\n", iRc, errno));
             ++s_ErrorCount;
         }
 
-        AssertMsgFailed(("rc=%d errno=%d\n", rc, errno));
-        rc = VERR_INTERNAL_ERROR_4;
-    }
-    return rc;
+        AssertMsgFailed(("iRc=%d errno=%d\n", iRc, errno));
+        vrc = VERR_INTERNAL_ERROR_4;
+    }
+    return vrc;
 }
 
@@ -388 +387 @@
  * This will pick out our events and handle them specially.
  *
- * @returns @a rc or VERR_INTERRUPTED (WM_QUIT or NULL msg).
+ * @returns @a vrc or VERR_INTERRUPTED (WM_QUIT or NULL msg).
  * @param   pMsg    The message to dispatch.
- * @param   rc      The current status code.
+ * @param   vrc     The current status code.
  */
 /*static*/
-int NativeEventQueue::dispatchMessageOnWindows(MSG const *pMsg, int rc)
+int NativeEventQueue::dispatchMessageOnWindows(MSG const *pMsg, int vrc)
 {
     /*
@@ -410 +409 @@
             }
             else
-                rc = VERR_INTERRUPTED;
-            return rc;
+                vrc = VERR_INTERRUPTED;
+            return vrc;
         }
         AssertMsgFailed(("lParam=%p wParam=%p\n", pMsg->lParam, pMsg->wParam));
@@ -420 +419 @@
      */
     if (pMsg->message == WM_QUIT)
-        rc = VERR_INTERRUPTED;
+        vrc = VERR_INTERRUPTED;
     TranslateMessage(pMsg);
     DispatchMessage(pMsg);
 
-    return rc;
+    return vrc;
 }
 
@@ -437 +436 @@
 static int processPendingEvents(void)
 {
-    int rc = VERR_TIMEOUT;
+    int vrc = VERR_TIMEOUT;
     MSG Msg;
     if (PeekMessage(&Msg, NULL /*hWnd*/, 0 /*wMsgFilterMin*/, 0 /*wMsgFilterMax*/, PM_REMOVE))
     {
-        rc = VINF_SUCCESS;
+        vrc = VINF_SUCCESS;
         do
-            rc = NativeEventQueue::dispatchMessageOnWindows(&Msg, rc);
+            vrc = NativeEventQueue::dispatchMessageOnWindows(&Msg, vrc);
         while (PeekMessage(&Msg, NULL /*hWnd*/, 0 /*wMsgFilterMin*/, 0 /*wMsgFilterMax*/, PM_REMOVE));
     }
-    return rc;
+    return vrc;
 }
 
@@ -463 +462 @@
     /* ProcessPendingEvents doesn't report back what it did, so check here. */
     PRBool fHasEvents = PR_FALSE;
-    nsresult hr = pQueue->PendingEvents(&fHasEvents);
-    if (NS_FAILED(hr))
+    nsresult hrc = pQueue->PendingEvents(&fHasEvents);
+    if (NS_FAILED(hrc))
         return VERR_INTERNAL_ERROR_2;
 
     /* Process pending events. */
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (fHasEvents)
         pQueue->ProcessPendingEvents();
     else
-        rc = VERR_TIMEOUT;
+        vrc = VERR_TIMEOUT;
 
 # ifdef RT_OS_DARWIN
     /* Process pending native events. */
-    int rc2 = waitForEventsOnDarwin(0);
-    if (rc == VERR_TIMEOUT || rc2 == VERR_INTERRUPTED)
-        rc = rc2;
+    int vrc2 = waitForEventsOnDarwin(0);
+    if (vrc == VERR_TIMEOUT || vrc2 == VERR_INTERRUPTED)
+        vrc = vrc2;
 # endif
 
-    return rc;
+    return vrc;
 }
 
@@ -514 +513 @@
 int NativeEventQueue::processEventQueue(RTMSINTERVAL cMsTimeout)
 {
-    int rc;
+    int vrc;
     CHECK_THREAD_RET(VERR_INVALID_CONTEXT);
 
@@ -527 +526 @@
      *       while select() is.  So we cannot use it for indefinite waits.
      */
-    rc = processPendingEvents(mEventQ);
-    if (    rc == VERR_TIMEOUT
+    vrc = processPendingEvents(mEventQ);
+    if (    vrc == VERR_TIMEOUT
         &&  cMsTimeout > 0)
     {
@@ -538 +537 @@
          *         Ctrl-C handling is important, signal needs to be handled on
          *         a different thread or something. */
-        rc = waitForEventsOnDarwin(cMsTimeout);
+        vrc = waitForEventsOnDarwin(cMsTimeout);
 # else // !RT_OS_DARWIN
-        rc = waitForEventsOnXPCOM(mEventQ, cMsTimeout);
+        vrc = waitForEventsOnXPCOM(mEventQ, cMsTimeout);
 # endif // !RT_OS_DARWIN
-        if (    RT_SUCCESS(rc)
-            ||  rc == VERR_TIMEOUT)
+        if (    RT_SUCCESS(vrc)
+            ||  vrc == VERR_TIMEOUT)
         {
-            int rc2 = processPendingEvents(mEventQ);
+            int vrc2 = processPendingEvents(mEventQ);
             /* If the wait was successful don't fail the whole operation. */
-            if (RT_FAILURE(rc) && RT_FAILURE(rc2))
-                rc = rc2;
+            if (RT_FAILURE(vrc) && RT_FAILURE(vrc2))
+                vrc = vrc2;
         }
     }
 
-    if (  (   RT_SUCCESS(rc)
-           || rc == VERR_INTERRUPTED
-           || rc == VERR_TIMEOUT)
+    if (  (   RT_SUCCESS(vrc)
+           || vrc == VERR_INTERRUPTED
+           || vrc == VERR_TIMEOUT)
         && mInterrupted)
     {
         mInterrupted = false;
-        rc = VERR_INTERRUPTED;
+        vrc = VERR_INTERRUPTED;
     }
 
@@ -566 +565 @@
         BOOL fRet = 0; /* Shut up MSC */
         MSG  Msg;
-        rc = VINF_SUCCESS;
-        while (   rc != VERR_INTERRUPTED
+        vrc = VINF_SUCCESS;
+        while (   vrc != VERR_INTERRUPTED
                && (fRet = GetMessage(&Msg, NULL /*hWnd*/, WM_USER, WM_USER))
                && fRet != -1)
-            rc = NativeEventQueue::dispatchMessageOnWindows(&Msg, rc);
+            vrc = NativeEventQueue::dispatchMessageOnWindows(&Msg, vrc);
         if (fRet == 0)
-            rc = VERR_INTERRUPTED;
+            vrc = VERR_INTERRUPTED;
         else if (fRet == -1)
-            rc = RTErrConvertFromWin32(GetLastError());
+            vrc = RTErrConvertFromWin32(GetLastError());
     }
     else
     {
-        rc = processPendingEvents();
-        if (   rc == VERR_TIMEOUT
+        vrc = processPendingEvents();
+        if (   vrc == VERR_TIMEOUT
             && cMsTimeout != 0)
         {
@@ -590 +589 @@
                             ("%d\n", rcW),
                             VERR_INTERNAL_ERROR_4);
-            rc = processPendingEvents();
+            vrc = processPendingEvents();
         }
     }
 #endif // !VBOX_WITH_XPCOM
 
-    Assert(rc != VERR_TIMEOUT || cMsTimeout != RT_INDEFINITE_WAIT);
-    return rc;
+    Assert(vrc != VERR_TIMEOUT || cMsTimeout != RT_INDEFINITE_WAIT);
+    return vrc;
 }
 
@@ -646 +645 @@
         mEventQ->InitEvent(pMyEvent, this, com::NativeEventQueue::plEventHandler,
                            com::NativeEventQueue::plEventDestructor);
-        HRESULT rc = mEventQ->PostEvent(pMyEvent);
-        return NS_SUCCEEDED(rc);
+        HRESULT hrc = mEventQ->PostEvent(pMyEvent);
+        return NS_SUCCEEDED(hrc);
     }
     catch (std::bad_alloc &ba)

trunk/src/VBox/Main/glue/com.cpp

@@ -78 +78 @@
 #if !defined(VBOX_WITH_XPCOM)
 
-    LONG rc;
     LPOLESTR iidStr = NULL;
     if (StringFromIID(aIID, &iidStr) == S_OK)
     {
         HKEY ifaceKey;
-        rc = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Interface",
-                           0, KEY_QUERY_VALUE, &ifaceKey);
-        if (rc == ERROR_SUCCESS)
+        LSTATUS lrc = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Interface", 0, KEY_QUERY_VALUE, &ifaceKey);
+        if (lrc == ERROR_SUCCESS)
         {
             HKEY iidKey;
-            rc = RegOpenKeyExW(ifaceKey, iidStr, 0, KEY_QUERY_VALUE, &iidKey);
-            if (rc == ERROR_SUCCESS)
+            lrc = RegOpenKeyExW(ifaceKey, iidStr, 0, KEY_QUERY_VALUE, &iidKey);
+            if (lrc == ERROR_SUCCESS)
             {
                 /* determine the size and type */
                 DWORD sz, type;
-                rc = RegQueryValueExW(iidKey, NULL, NULL, &type, NULL, &sz);
-                if (rc == ERROR_SUCCESS && type == REG_SZ)
+                lrc = RegQueryValueExW(iidKey, NULL, NULL, &type, NULL, &sz);
+                if (lrc == ERROR_SUCCESS && type == REG_SZ)
                 {
                     /* query the value to BSTR */
                     *aName = SysAllocStringLen(NULL, (sz + 1) / sizeof(TCHAR) + 1);
-                    rc = RegQueryValueExW(iidKey, NULL, NULL, NULL, (LPBYTE) *aName, &sz);
-                    if (rc != ERROR_SUCCESS)
+                    lrc = RegQueryValueExW(iidKey, NULL, NULL, NULL, (LPBYTE) *aName, &sz);
+                    if (lrc != ERROR_SUCCESS)
                     {
                         SysFreeString(*aName);
@@ -149 +147 @@
                                  void** ppobj)
 {
-    HRESULT rc;
-    nsCOMPtr<ipcIService> ipcServ = do_GetService(IPC_SERVICE_CONTRACTID, &rc);
-    if (SUCCEEDED(rc))
+    HRESULT hrc = E_UNEXPECTED;
+    nsCOMPtr<ipcIService> ipcServ = do_GetService(IPC_SERVICE_CONTRACTID, &hrc);
+    if (SUCCEEDED(hrc))
     {
         PRUint32 serverID = 0;
-        rc = ipcServ->ResolveClientName(serverName, &serverID);
-        if (SUCCEEDED (rc))
+        hrc = ipcServ->ResolveClientName(serverName, &serverID);
+        if (SUCCEEDED (hrc))
         {
-            nsCOMPtr<ipcIDConnectService> dconServ = do_GetService(IPC_DCONNECTSERVICE_CONTRACTID, &rc);
-            if (SUCCEEDED(rc))
-                rc = dconServ->CreateInstance(serverID,
-                                              clsid,
-                                              id,
-                                              ppobj);
+            nsCOMPtr<ipcIDConnectService> dconServ = do_GetService(IPC_DCONNECTSERVICE_CONTRACTID, &hrc);
+            if (SUCCEEDED(hrc))
+                hrc = dconServ->CreateInstance(serverID,
+                                               clsid,
+                                               id,
+                                               ppobj);
         }
     }
-    return rc;
+    return hrc;
 }
 
@@ -173 +171 @@
 {
     nsCOMPtr<nsIComponentManager> manager;
-    HRESULT rc = NS_GetComponentManager(getter_AddRefs(manager));
-    if (SUCCEEDED(rc))
-        rc = manager->CreateInstance(clsid,
-                                     nsnull,
-                                     id,
-                                     ppobj);
-    return rc;
+    HRESULT hrc = NS_GetComponentManager(getter_AddRefs(manager));
+    if (SUCCEEDED(hrc))
+        hrc = manager->CreateInstance(clsid,
+                                      nsnull,
+                                      id,
+                                      ppobj);
+    return hrc;
 }
 

trunk/src/VBox/Main/glue/errorprint.cpp

@@ -57 +57 @@
     try
     {
-        HRESULT rc = S_OK;
+        HRESULT hrc = S_OK;
         Utf8Str str;
         RTCList<Utf8Str> comp;
@@ -67 +67 @@
         if (haveResultCode)
         {
-            rc = info.getResultCode();
-            comp.append(Utf8StrFmt("code %Rhrc (0x%RX32)", rc, rc));
+            hrc = info.getResultCode();
+            comp.append(Utf8StrFmt("code %Rhrc (0x%RX32)", hrc, hrc));
         }
         if (haveComponent)
@@ -90 +90 @@
 
         // print and log
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             RTMsgError("%s", str.c_str());
@@ -126 +126 @@
 }
 
-void GluePrintRCMessage(HRESULT rc)
+void GluePrintRCMessage(HRESULT hrc)
 {
     // print and log
-    if (FAILED(rc))
-    {
-        RTMsgError("Code %Rhra (extended info not available)\n", rc);
-        Log(("ERROR: Code %Rhra (extended info not available)\n", rc));
+    if (FAILED(hrc))
+    {
+        RTMsgError("Code %Rhra (extended info not available)\n", hrc);
+        Log(("ERROR: Code %Rhra (extended info not available)\n", hrc));
     }
     else
     {
-        RTMsgWarning("Code %Rhra (extended info not available)\n", rc);
-        Log(("WARNING: Code %Rhra (extended info not available)\n", rc));
+        RTMsgWarning("Code %Rhra (extended info not available)\n", hrc);
+        Log(("WARNING: Code %Rhra (extended info not available)\n", hrc));
     }
 }
@@ -143 +143 @@
 static void glueHandleComErrorInternal(com::ErrorInfo &info,
                                        const char *pcszContext,
-                                       HRESULT rc,
+                                       HRESULT hrc,
                                        const char *pcszSourceFile,
                                        uint32_t ulLine)
@@ -154 +154 @@
             GluePrintErrorInfo(*pInfo);
 
-            /* Use rc for figuring out if there were just warnings. */
-            HRESULT rc2 = pInfo->getResultCode();
-            if (   (SUCCEEDED_WARNING(rc) && FAILED(rc2))
-                || (SUCCEEDED(rc) && (FAILED(rc2) || SUCCEEDED_WARNING(rc2))))
-                rc = rc2;
+            /* Use hrc for figuring out if there were just warnings. */
+            HRESULT hrc2 = pInfo->getResultCode();
+            if (   (SUCCEEDED_WARNING(hrc) && FAILED(hrc2))
+                || (SUCCEEDED(hrc) && (FAILED(hrc2) || SUCCEEDED_WARNING(hrc2))))
+                hrc = hrc2;
 
             pInfo = pInfo->getNext();
@@ -171 +171 @@
                 RTMsgError("--------\n");
             }
-        }
-        while (pInfo);
+        } while (pInfo);
     }
     else
-        GluePrintRCMessage(rc);
+        GluePrintRCMessage(hrc);
 
     if (pcszContext != NULL || pcszSourceFile != NULL)
-        GluePrintErrorContext(pcszContext, pcszSourceFile, ulLine, SUCCEEDED_WARNING(rc));
+        GluePrintErrorContext(pcszContext, pcszSourceFile, ulLine, SUCCEEDED_WARNING(hrc));
 }
 
 void GlueHandleComError(ComPtr<IUnknown> iface,
                         const char *pcszContext,
-                        HRESULT rc,
+                        HRESULT hrc,
                         const char *pcszSourceFile,
                         uint32_t ulLine)
@@ -193 +192 @@
     glueHandleComErrorInternal(info,
                                pcszContext,
-                               rc,
+                               hrc,
                                pcszSourceFile,
                                ulLine);
@@ -199 +198 @@
 }
 
-void GlueHandleComErrorNoCtx(ComPtr<IUnknown> iface, HRESULT rc)
-{
-    GlueHandleComError(iface, NULL, rc, NULL, 0);
+void GlueHandleComErrorNoCtx(ComPtr<IUnknown> iface, HRESULT hrc)
+{
+    GlueHandleComError(iface, NULL, hrc, NULL, 0);
 }
 
 void GlueHandleComErrorProgress(ComPtr<IProgress> progress,
                                 const char *pcszContext,
-                                HRESULT rc,
+                                HRESULT hrc,
                                 const char *pcszSourceFile,
                                 uint32_t ulLine)
@@ -215 +214 @@
     glueHandleComErrorInternal(ei,
                                pcszContext,
-                               rc,
+                               hrc,
                                pcszSourceFile,
                                ulLine);

trunk/src/VBox/Main/glue/initterm.cpp

@@ -443 +443 @@
 HRESULT Initialize(uint32_t fInitFlags /*=VBOX_COM_INIT_F_DEFAULT*/)
 {
-    HRESULT rc = E_FAIL;
+    HRESULT hrc = E_FAIL;
 
 #if !defined(VBOX_WITH_XPCOM)
@@ -511 +511 @@
                   | COINIT_SPEED_OVER_MEMORY;
 
-    rc = CoInitializeEx(NULL, flags);
+    hrc = CoInitializeEx(NULL, flags);
 
     /* the overall result must be either S_OK or S_FALSE (S_FALSE means
      * "already initialized using the same apartment model") */
-    AssertMsg(rc == S_OK || rc == S_FALSE, ("rc=%08X\n", rc));
+    AssertMsg(hrc == S_OK || hrc == S_FALSE, ("hrc=%08X\n", hrc));
 
 #if defined(VBOX_WITH_SDS)
     // Setup COM Security to enable impersonation
-    HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
-                                                             -1,
-                                                             NULL,
-                                                             NULL,
-                                                             RPC_C_AUTHN_LEVEL_DEFAULT,
-                                                             RPC_C_IMP_LEVEL_IMPERSONATE,
-                                                             NULL,
-                                                             EOAC_NONE,
-                                                             NULL);
-    NOREF(hrGUICoInitializeSecurity);
-    Assert(SUCCEEDED(hrGUICoInitializeSecurity) || hrGUICoInitializeSecurity == RPC_E_TOO_LATE);
+    HRESULT hrcGUICoInitializeSecurity = CoInitializeSecurity(NULL,
+                                                              -1,
+                                                              NULL,
+                                                              NULL,
+                                                              RPC_C_AUTHN_LEVEL_DEFAULT,
+                                                              RPC_C_IMP_LEVEL_IMPERSONATE,
+                                                              NULL,
+                                                              EOAC_NONE,
+                                                              NULL);
+    NOREF(hrcGUICoInitializeSecurity);
+    Assert(SUCCEEDED(hrcGUICoInitializeSecurity) || hrcGUICoInitializeSecurity == RPC_E_TOO_LATE);
 #endif
 
@@ -556 +556 @@
     {
         if (   gCOMMainThread == hSelf
-            && SUCCEEDED(rc))
+            && SUCCEEDED(hrc))
             gCOMMainInitCount++;
 
-        AssertComRC(rc);
-        return rc;
+        AssertComRC(hrc);
+        return hrc;
     }
     Assert(RTThreadIsMain(hSelf));
@@ -566 +566 @@
     /* this is the first main thread initialization */
     Assert(gCOMMainInitCount == 0);
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         gCOMMainInitCount = 1;
 
@@ -583 +583 @@
 
         nsCOMPtr<nsIEventQueue> eventQ;
-        rc = NS_GetMainEventQ(getter_AddRefs(eventQ));
-
-        if (NS_SUCCEEDED(rc))
+        hrc = NS_GetMainEventQ(getter_AddRefs(eventQ));
+
+        if (NS_SUCCEEDED(hrc))
         {
             PRBool isOnMainThread = PR_FALSE;
-            rc = eventQ->IsOnCurrentThread(&isOnMainThread);
-            if (NS_SUCCEEDED(rc) && isOnMainThread)
+            hrc = eventQ->IsOnCurrentThread(&isOnMainThread);
+            if (NS_SUCCEEDED(hrc) && isOnMainThread)
                 ++gXPCOMInitCount;
         }
 
-        AssertComRC(rc);
-        return rc;
+        AssertComRC(hrc);
+        return hrc;
     }
     Assert(RTThreadIsMain(RTThreadSelf()));
@@ -682 +682 @@
         if (RT_FAILURE(vrc))
         {
-            rc = NS_ERROR_FAILURE;
+            hrc = NS_ERROR_FAILURE;
             continue;
         }
@@ -689 +689 @@
         if (RT_FAILURE(vrc))
         {
-            rc = NS_ERROR_FAILURE;
+            hrc = NS_ERROR_FAILURE;
             continue;
         }
@@ -695 +695 @@
         if (RT_FAILURE(vrc))
         {
-            rc = NS_ERROR_FAILURE;
+            hrc = NS_ERROR_FAILURE;
             continue;
         }
@@ -703 +703 @@
         dsProv = new DirectoryServiceProvider();
         if (dsProv)
-            rc = dsProv->init(szCompReg, szXptiDat, szCompDir, szAppHomeDir);
+            hrc = dsProv->init(szCompReg, szXptiDat, szCompDir, szAppHomeDir);
         else
-            rc = NS_ERROR_OUT_OF_MEMORY;
-        if (NS_FAILED(rc))
+            hrc = NS_ERROR_OUT_OF_MEMORY;
+        if (NS_FAILED(hrc))
             break;
 
@@ -721 +721 @@
             {
                 nsCOMPtr<nsILocalFile> file;
-                rc = NS_NewNativeLocalFile(nsEmbedCString(appDirCP),
-                                           PR_FALSE, getter_AddRefs(file));
-                if (NS_SUCCEEDED(rc))
-                    appDir = do_QueryInterface(file, &rc);
+                hrc = NS_NewNativeLocalFile(nsEmbedCString(appDirCP), PR_FALSE, getter_AddRefs(file));
+                if (NS_SUCCEEDED(hrc))
+                    appDir = do_QueryInterface(file, &hrc);
 
                 RTStrFree(appDirCP);
             }
             else
-                rc = NS_ERROR_FAILURE;
-        }
-        if (NS_FAILED(rc))
+                hrc = NS_ERROR_FAILURE;
+        }
+        if (NS_FAILED(hrc))
             break;
 
@@ -742 +741 @@
         {
             nsCOMPtr<nsIServiceManager> serviceManager;
-            rc = NS_InitXPCOM2(getter_AddRefs(serviceManager), appDir, dsProv);
-            if (NS_SUCCEEDED(rc))
+            hrc = NS_InitXPCOM2(getter_AddRefs(serviceManager), appDir, dsProv);
+            if (NS_SUCCEEDED(hrc))
             {
-                nsCOMPtr<nsIComponentRegistrar> registrar =
-                    do_QueryInterface(serviceManager, &rc);
-                if (NS_SUCCEEDED(rc))
+                nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(serviceManager, &hrc);
+                if (NS_SUCCEEDED(hrc))
                 {
-                    rc = registrar->AutoRegister(nsnull);
-                    if (NS_SUCCEEDED(rc))
+                    hrc = registrar->AutoRegister(nsnull);
+                    if (NS_SUCCEEDED(hrc))
                     {
                         /* We succeeded, stop probing paths */
@@ -761 +759 @@
 
         /* clean up before the new try */
-        HRESULT rc2 = NS_ShutdownXPCOM(nsnull);
-        if (SUCCEEDED(rc))
-            rc = rc2;
+        HRESULT hrc2 = NS_ShutdownXPCOM(nsnull);
+        if (SUCCEEDED(hrc))
+            hrc = hrc2;
 
         if (i == 0)
@@ -774 +772 @@
 #endif /* !defined(VBOX_WITH_XPCOM) */
 
-    AssertComRCReturnRC(rc);
+    AssertComRCReturnRC(hrc);
 
     // for both COM and XPCOM, we only get here if this is the main thread;
@@ -784 +782 @@
      * Init the main event queue (ASSUMES it cannot fail).
      */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         NativeEventQueue::init();
 
-    return rc;
+    return hrc;
 }
 
 HRESULT Shutdown()
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
 #if !defined(VBOX_WITH_XPCOM)
@@ -813 +811 @@
 
     nsCOMPtr<nsIEventQueue> eventQ;
-    rc = NS_GetMainEventQ(getter_AddRefs(eventQ));
-
-    if (NS_SUCCEEDED(rc) || rc == NS_ERROR_NOT_AVAILABLE)
+    hrc = NS_GetMainEventQ(getter_AddRefs(eventQ));
+
+    if (NS_SUCCEEDED(hrc) || hrc == NS_ERROR_NOT_AVAILABLE)
     {
         /* NS_ERROR_NOT_AVAILABLE seems to mean that
@@ -825 +823 @@
 
         PRBool isOnMainThread = PR_FALSE;
-        if (NS_SUCCEEDED(rc))
-        {
-            rc = eventQ->IsOnCurrentThread(&isOnMainThread);
+        if (NS_SUCCEEDED(hrc))
+        {
+            hrc = eventQ->IsOnCurrentThread(&isOnMainThread);
             eventQ = nsnull; /* early release before shutdown */
         }
@@ -833 +831 @@
         {
             isOnMainThread = RTThreadIsMain(RTThreadSelf());
-            rc = NS_OK;
-        }
-
-        if (NS_SUCCEEDED(rc) && isOnMainThread)
+            hrc = NS_OK;
+        }
+
+        if (NS_SUCCEEDED(hrc) && isOnMainThread)
         {
             /* only the main thread needs to uninitialize XPCOM and only if
@@ -843 +841 @@
             {
                 NativeEventQueue::uninit();
-                rc = NS_ShutdownXPCOM(nsnull);
+                hrc = NS_ShutdownXPCOM(nsnull);
 
                 /* This is a thread initialized XPCOM and set gIsXPCOMInitialized to
@@ -856 +854 @@
 #endif /* !defined(VBOX_WITH_XPCOM) */
 
-    AssertComRC(rc);
-
-    return rc;
+    AssertComRC(hrc);
+
+    return hrc;
 }
 

trunk/src/VBox/Main/glue/string.cpp

@@ -112 +112 @@
     {
         size_t cwcAppend;
-        int rc = ::RTStrCalcUtf16LenEx(pachChars, cbChars, &cwcAppend);
-        AssertRCReturnStmt(rc, pArgs->hrc = E_UNEXPECTED, 0);
+        int vrc = ::RTStrCalcUtf16LenEx(pachChars, cbChars, &cwcAppend);
+        AssertRCReturnStmt(vrc, pArgs->hrc = E_UNEXPECTED, 0);
 
         /*
@@ -143 +143 @@
         PRTUTF16 pwszDst = pThis->m_bstr + pArgs->offDst;
         Assert(pArgs->cwcAlloc > pArgs->offDst);
-        rc = ::RTStrToUtf16Ex(pachChars, cbChars, &pwszDst, pArgs->cwcAlloc - pArgs->offDst, &cwcAppend);
-        AssertRCReturnStmt(rc, pArgs->hrc = E_UNEXPECTED, 0);
+        vrc = ::RTStrToUtf16Ex(pachChars, cbChars, &pwszDst, pArgs->cwcAlloc - pArgs->offDst, &cwcAppend);
+        AssertRCReturnStmt(vrc, pArgs->hrc = E_UNEXPECTED, 0);
         pArgs->offDst += cwcAppend;
     }
@@ -269 +269 @@
     {
         RTUNICP ucLeft;
-        int rc = RTUtf16GetCpEx(&pwszLeft, &ucLeft);
-        AssertRCReturn(rc, 1);
+        int vrc = RTUtf16GetCpEx(&pwszLeft, &ucLeft);
+        AssertRCReturn(vrc, 1);
 
         RTUNICP ucRight;
-        rc = RTStrGetCpEx(&a_pszRight, &ucRight);
-        AssertRCReturn(rc, -1);
+        vrc = RTStrGetCpEx(&a_pszRight, &ucRight);
+        AssertRCReturn(vrc, -1);
         if (ucLeft == ucRight)
         {
@@ -577 +577 @@
 {
     size_t cwcSrc;
-    int rc = RTStrCalcUtf16LenEx(pszSrc, cchSrc, &cwcSrc);
+    int vrc = RTStrCalcUtf16LenEx(pszSrc, cchSrc, &cwcSrc);
 #ifdef RT_EXCEPTIONS_ENABLED
-    AssertRCStmt(rc, throw std::bad_alloc());
+    AssertRCStmt(vrc, throw std::bad_alloc());
 #else
-    AssertRCReturn(rc, *this);
+    AssertRCReturn(vrc, *this);
 #endif
 
@@ -590 +590 @@
     {
         PRTUTF16 pwszDst = &m_bstr[cwcOld];
-        rc = RTStrToUtf16Ex(pszSrc, cchSrc, &pwszDst, cwcSrc + 1, NULL);
+        vrc = RTStrToUtf16Ex(pszSrc, cchSrc, &pwszDst, cwcSrc + 1, NULL);
 #ifdef RT_EXCEPTIONS_ENABLED
-        AssertRCStmt(rc, throw std::bad_alloc());
+        AssertRCStmt(vrc, throw std::bad_alloc());
 #else
-        AssertRC(rc);
+        AssertRC(vrc);
 #endif
     }
@@ -605 +605 @@
 {
     size_t cwcSrc;
-    int rc = RTStrCalcUtf16LenEx(pszSrc, cchSrc, &cwcSrc);
-    AssertRCStmt(rc, E_INVALIDARG);
+    int vrc = RTStrCalcUtf16LenEx(pszSrc, cchSrc, &cwcSrc);
+    AssertRCStmt(vrc, E_INVALIDARG);
 
     size_t cwcOld = length();
@@ -615 +615 @@
     {
         PRTUTF16 pwszDst = &m_bstr[cwcOld];
-        rc = RTStrToUtf16Ex(pszSrc, cchSrc, &pwszDst, cwcSrc + 1, NULL);
-        AssertRCStmt(rc, E_INVALIDARG);
+        vrc = RTStrToUtf16Ex(pszSrc, cchSrc, &pwszDst, cwcSrc + 1, NULL);
+        AssertRCStmt(vrc, E_INVALIDARG);
     }
     m_bstr[cwcTotal] = '\0';