Changeset 98297 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Jan 25, 2023 1:59:25 AM (23 months ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (83 diffs)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -360 +360 @@
 
     /** The current total result. */
-    LSTATUS rc;
+    LSTATUS lrc;
 
     /** KEY_WOW64_32KEY, KEY_WOW64_64KEY or 0 (for default).  Allows doing all
@@ -395 +395 @@
 static LSTATUS vbpsRegInit(VBPSREGSTATE *pState, HKEY hkeyRoot, const char *pszSubRoot, bool fDelete, bool fUpdate, DWORD fSamWow)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
     unsigned i = 0;
 
@@ -411 +411 @@
     }
     pState->cAltDeletes                 = 0;
-    pState->rc                          = ERROR_SUCCESS;
+    pState->lrc                         = ERROR_SUCCESS;
     pState->fDelete                     = fDelete;
     pState->fUpdate                     = fUpdate;
@@ -428 +428 @@
      * Open the root keys.
      */
-    rc = RegOpenKeyExA(hkeyRoot, pszSubRoot, 0 /*fOptions*/, pState->fSamBoth, &pState->hkeyClassesRootDst);
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"CLSID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                             pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyClsidRootDst, NULL /*pdwDisposition*/);
-        if (rc == ERROR_SUCCESS)
+    lrc = RegOpenKeyExA(hkeyRoot, pszSubRoot, 0 /*fOptions*/, pState->fSamBoth, &pState->hkeyClassesRootDst);
+    if (lrc == ERROR_SUCCESS)
+    {
+        lrc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"CLSID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                              pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyClsidRootDst, NULL /*pdwDisposition*/);
+        if (lrc == ERROR_SUCCESS)
             return ERROR_SUCCESS;
 
         /* Ignore access denied errors as these may easily happen for
            non-admin users. Just give up when this happens */
-        AssertLogRelMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
+        AssertLogRelMsgReturn(lrc == ERROR_ACCESS_DENIED, ("%u\n", lrc), pState->lrc = lrc);
     }
     else
-       AssertLogRelMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
-    return pState->rc = rc;
+       AssertLogRelMsgReturn(lrc == ERROR_ACCESS_DENIED, ("%u\n", lrc), pState->lrc = lrc);
+    return pState->lrc = lrc;
 }
 
@@ -453 +453 @@
 static void vbpsRegTerm(VBPSREGSTATE *pState)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
     if (pState->hkeyClassesRootDst)
     {
-        rc = RegCloseKey(pState->hkeyClassesRootDst);
-        Assert(rc == ERROR_SUCCESS);
+        lrc = RegCloseKey(pState->hkeyClassesRootDst);
+        Assert(lrc == ERROR_SUCCESS);
         pState->hkeyClassesRootDst = NULL;
     }
     if (pState->hkeyClsidRootDst)
     {
-        rc = RegCloseKey(pState->hkeyClsidRootDst);
-        Assert(rc == ERROR_SUCCESS);
+        lrc = RegCloseKey(pState->hkeyClsidRootDst);
+        Assert(lrc == ERROR_SUCCESS);
         pState->hkeyClsidRootDst = NULL;
     }
     if (pState->hkeyInterfaceRootDst)
     {
-        rc = RegCloseKey(pState->hkeyInterfaceRootDst);
-        Assert(rc == ERROR_SUCCESS);
+        lrc = RegCloseKey(pState->hkeyInterfaceRootDst);
+        Assert(lrc == ERROR_SUCCESS);
         pState->hkeyInterfaceRootDst = NULL;
     }
@@ -478 +478 @@
         if (pState->aAltDeletes[i].hkeyClasses)
         {
-            rc = RegCloseKey(pState->aAltDeletes[i].hkeyClasses);
-            Assert(rc == ERROR_SUCCESS);
+            lrc = RegCloseKey(pState->aAltDeletes[i].hkeyClasses);
+            Assert(lrc == ERROR_SUCCESS);
             pState->aAltDeletes[i].hkeyClasses = NULL;
         }
         if (pState->aAltDeletes[i].hkeyClsid)
         {
-            rc = RegCloseKey(pState->aAltDeletes[i].hkeyClsid);
-            Assert(rc == ERROR_SUCCESS);
+            lrc = RegCloseKey(pState->aAltDeletes[i].hkeyClsid);
+            Assert(lrc == ERROR_SUCCESS);
             pState->aAltDeletes[i].hkeyClsid = NULL;
         }
         if (pState->aAltDeletes[i].hkeyInterface)
         {
-            rc = RegCloseKey(pState->aAltDeletes[i].hkeyInterface);
-            Assert(rc == ERROR_SUCCESS);
+            lrc = RegCloseKey(pState->aAltDeletes[i].hkeyInterface);
+            Assert(lrc == ERROR_SUCCESS);
             pState->aAltDeletes[i].hkeyInterface = NULL;
         }
@@ -512 +512 @@
 {
     unsigned i;
-    LSTATUS rc;
+    LSTATUS lrc;
 
     /* Ignore call if not in delete mode. */
@@ -520 +520 @@
     /* Check that there is space in the state. */
     i = pState->cAltDeletes;
-    AssertReturn(i < RT_ELEMENTS(pState->aAltDeletes), pState->rc = ERROR_TOO_MANY_NAMES);
+    AssertReturn(i < RT_ELEMENTS(pState->aAltDeletes), pState->lrc = ERROR_TOO_MANY_NAMES);
 
 
     /* Open the root. */
-    rc = RegOpenKeyExA(hkeyAltRoot, pszAltSubRoot, 0 /*fOptions*/, pState->fSamDelete,
+    lrc = RegOpenKeyExA(hkeyAltRoot, pszAltSubRoot, 0 /*fOptions*/, pState->fSamDelete,
                        &pState->aAltDeletes[i].hkeyClasses);
-    if (rc == ERROR_SUCCESS)
+    if (lrc == ERROR_SUCCESS)
     {
         /* Try open the CLSID subkey, it's fine if it doesn't exists. */
-        rc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"CLSID", 0 /*fOptions*/, pState->fSamDelete,
-                           &pState->aAltDeletes[i].hkeyClsid);
-        if (rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND)
+        lrc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"CLSID", 0 /*fOptions*/, pState->fSamDelete,
+                            &pState->aAltDeletes[i].hkeyClsid);
+        if (lrc == ERROR_SUCCESS || lrc == ERROR_FILE_NOT_FOUND)
         {
-            if (rc == ERROR_FILE_NOT_FOUND)
+            if (lrc == ERROR_FILE_NOT_FOUND)
                 pState->aAltDeletes[i].hkeyClsid = NULL;
             pState->cAltDeletes = i + 1;
             return ERROR_SUCCESS;
         }
-        AssertLogRelMsgFailed(("%u\n", rc));
+        AssertLogRelMsgFailed(("%u\n", lrc));
         RegCloseKey(pState->aAltDeletes[i].hkeyClasses);
     }
     /* No need to add non-existing alternative roots, nothing to delete in the void. */
-    else if (rc == ERROR_FILE_NOT_FOUND)
-        rc = ERROR_SUCCESS;
+    else if (lrc == ERROR_FILE_NOT_FOUND)
+        lrc = ERROR_SUCCESS;
     else
     {
-        AssertLogRelMsgFailed(("%u (%#x %s)\n", rc));
-        pState->rc = rc;
+        AssertLogRelMsgFailed(("%u (%#x %s)\n", lrc));
+        pState->lrc = lrc;
     }
 
     pState->aAltDeletes[i].hkeyClasses = NULL;
     pState->aAltDeletes[i].hkeyClsid   = NULL;
-    return rc;
+    return lrc;
 }
 
@@ -568 +568 @@
 {
     unsigned i;
-    LSTATUS rc;
+    LSTATUS lrc;
 
     /*
@@ -576 +576 @@
     {
         if (pState->fSamUpdate)
-            rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                                 pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyInterfaceRootDst, NULL /*pdwDisposition*/);
+            lrc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                                  pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyInterfaceRootDst, NULL /*pdwDisposition*/);
         else
-            rc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*fOptions*/, pState->fSamBoth,
-                               &pState->hkeyClsidRootDst);
-        if (rc == ERROR_ACCESS_DENIED)
+            lrc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*fOptions*/, pState->fSamBoth,
+                                &pState->hkeyClsidRootDst);
+        if (lrc == ERROR_ACCESS_DENIED)
         {
             pState->hkeyInterfaceRootDst = NULL;
-            return pState->rc = rc;
+            return pState->lrc = lrc;
         }
-        AssertLogRelMsgReturnStmt(rc == ERROR_SUCCESS, ("%u\n", rc), pState->hkeyInterfaceRootDst = NULL,  pState->rc = rc);
+        AssertLogRelMsgReturnStmt(lrc == ERROR_SUCCESS, ("%u\n", lrc), pState->hkeyInterfaceRootDst = NULL,  pState->lrc = lrc);
     }
 
@@ -596 +596 @@
         if (pState->aAltDeletes[i].hkeyInterface == NULL)
         {
-            rc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"Interface", 0 /*fOptions*/, pState->fSamDelete,
-                               &pState->aAltDeletes[i].hkeyInterface);
-            if (rc != ERROR_SUCCESS)
+            lrc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"Interface", 0 /*fOptions*/, pState->fSamDelete,
+                                &pState->aAltDeletes[i].hkeyInterface);
+            if (lrc != ERROR_SUCCESS)
             {
-                AssertMsgStmt(rc == ERROR_FILE_NOT_FOUND || rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
+                AssertMsgStmt(lrc == ERROR_FILE_NOT_FOUND || lrc == ERROR_ACCESS_DENIED, ("%u\n", lrc), pState->lrc = lrc);
                 pState->aAltDeletes[i].hkeyInterface = NULL;
             }
@@ -687 +687 @@
 {
     DWORD const cbValue = (DWORD)((RTUtf16Len(pwszValue) + 1) * sizeof(RTUTF16));
-    LSTATUS rc;
+    LSTATUS lrc;
     Assert(pState->fUpdate);
 
@@ -699 +699 @@
         PRTUTF16    pwszExistingData = (PRTUTF16)alloca(cbExistingData);
         DWORD       dwExistingType;
-        rc = RegQueryValueExW(hkey, pwszValueNm, 0 /*Reserved*/, &dwExistingType, (BYTE *)pwszExistingData, &cbExistingData);
-        if (rc == ERROR_SUCCESS)
+        lrc = RegQueryValueExW(hkey, pwszValueNm, 0 /*Reserved*/, &dwExistingType, (BYTE *)pwszExistingData, &cbExistingData);
+        if (lrc == ERROR_SUCCESS)
         {
             if (   dwExistingType == REG_SZ
@@ -718 +718 @@
         }
         else
-            Assert(rc == ERROR_FILE_NOT_FOUND || rc == ERROR_MORE_DATA);
+            Assert(lrc == ERROR_FILE_NOT_FOUND || lrc == ERROR_MORE_DATA);
     }
 
@@ -724 +724 @@
      * Set the value.
      */
-    rc = RegSetValueExW(hkey, pwszValueNm, 0 /*Reserved*/, REG_SZ, (const BYTE *)pwszValue, cbValue);
-    if (rc == ERROR_SUCCESS)
+    lrc = RegSetValueExW(hkey, pwszValueNm, 0 /*Reserved*/, REG_SZ, (const BYTE *)pwszValue, cbValue);
+    if (lrc == ERROR_SUCCESS)
     {
         VBSP_LOG_SET_VALUE(("vbpsSetRegValueWW: %ls/%ls=%ls (at %d)\n",
@@ -732 +732 @@
     }
 
-    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                    ("%d: '%ls'='%ls' -> %u\n", uLine, pwszValueNm, pwszValue, rc));
-    pState->rc = rc;
-    return rc;
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                    ("%d: '%ls'='%ls' -> %u\n", uLine, pwszValueNm, pwszValue, lrc));
+    pState->lrc = lrc;
+    return lrc;
 }
 
@@ -752 +752 @@
 {
     DWORD const cbValue = (DWORD)strlen(pszValue) + 1;
-    LSTATUS rc;
+    LSTATUS lrc;
     Assert(pState->fUpdate);
 
@@ -764 +764 @@
         char *pszExistingData = alloca(cbExistingData);
         DWORD dwExistingType;
-        rc = RegQueryValueExA(hkey, pszValueNm, 0 /*Reserved*/, &dwExistingType, (PBYTE)pszExistingData, &cbExistingData);
-        if (rc == ERROR_SUCCESS)
+        lrc = RegQueryValueExA(hkey, pszValueNm, 0 /*Reserved*/, &dwExistingType, (PBYTE)pszExistingData, &cbExistingData);
+        if (lrc == ERROR_SUCCESS)
         {
             if (   dwExistingType == REG_SZ
@@ -785 +785 @@
         }
         else
-            Assert(rc == ERROR_FILE_NOT_FOUND || rc == ERROR_MORE_DATA);
+            Assert(lrc == ERROR_FILE_NOT_FOUND || lrc == ERROR_MORE_DATA);
     }
 
@@ -791 +791 @@
      * Set the value.
      */
-    rc = RegSetValueExA(hkey, pszValueNm, 0 /*Reserved*/, REG_SZ, (PBYTE)pszValue, cbValue);
-    if (rc == ERROR_SUCCESS)
+    lrc = RegSetValueExA(hkey, pszValueNm, 0 /*Reserved*/, REG_SZ, (PBYTE)pszValue, cbValue);
+    if (lrc == ERROR_SUCCESS)
     {
         VBSP_LOG_SET_VALUE(("vbpsSetRegValueAA: %ls/%s=%s (at %d)\n",
@@ -799 +799 @@
     }
 
-    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                    ("%d: '%s'='%s' -> %u\n", uLine, pszValueNm, pszValue, rc));
-    pState->rc = rc;
-    return rc;
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                    ("%d: '%s'='%s' -> %u\n", uLine, pszValueNm, pszValue, lrc));
+    pState->lrc = lrc;
+    return lrc;
 }
 
@@ -816 +816 @@
 static LSTATUS vbpsCloseKey(VBPSREGSTATE *pState, HKEY hkey, unsigned uLine)
 {
-    LSTATUS rc = RegCloseKey(hkey);
-    if (rc == ERROR_SUCCESS)
+    LSTATUS lrc = RegCloseKey(hkey);
+    if (lrc == ERROR_SUCCESS)
         return ERROR_SUCCESS;
 
-    AssertLogRelMsgFailed(("%d: close key -> %u\n", uLine, rc));
-    pState->rc = rc;
-    return rc;
+    AssertLogRelMsgFailed(("%d: close key -> %u\n", uLine, lrc));
+    pState->lrc = lrc;
+    return lrc;
 }
 
@@ -844 +844 @@
     HKEY hNewKey;
     DWORD dwDisposition = 0;
-    LSTATUS rc = RegCreateKeyExA(hkeyParent, pszKey, 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                                 pState->fSamBoth, NULL /*pSecAttr*/, &hNewKey, &dwDisposition);
-    if (rc == ERROR_SUCCESS)
+    LSTATUS lrc = RegCreateKeyExA(hkeyParent, pszKey, 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                                  pState->fSamBoth, NULL /*pSecAttr*/, &hNewKey, &dwDisposition);
+    if (lrc == ERROR_SUCCESS)
     {
         *phkey = hNewKey;
@@ -854 +854 @@
     else
     {
-        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                        ("%d: create key '%s' -> %u\n", uLine, pszKey,  rc));
-        pState->rc = rc;
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s' -> %u\n", uLine, pszKey,  lrc));
+        pState->lrc = lrc;
         *phkey = NULL;
     }
-    return rc;
+    return lrc;
 }
 
@@ -878 +878 @@
 {
     HKEY hNewKey;
-    LSTATUS rc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = vbpsSetRegValueAA(pState, hNewKey, NULL /*pszValueNm*/, pszValue, uLine);
+    LSTATUS lrc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
+    if (lrc == ERROR_SUCCESS)
+    {
+        lrc = vbpsSetRegValueAA(pState, hNewKey, NULL /*pszValueNm*/, pszValue, uLine);
         vbpsCloseKey(pState, hNewKey, uLine);
     }
     else
     {
-        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
-        pState->rc = rc;
-    }
-    return rc;
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, lrc));
+        pState->lrc = lrc;
+    }
+    return lrc;
 }
 
@@ -909 +909 @@
 {
     HKEY hNewKey;
-    LSTATUS rc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = vbpsSetRegValueWW(pState, hNewKey, NULL /*pwszValueNm*/, pwszValue, uLine);
+    LSTATUS lrc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
+    if (lrc == ERROR_SUCCESS)
+    {
+        lrc = vbpsSetRegValueWW(pState, hNewKey, NULL /*pwszValueNm*/, pwszValue, uLine);
         vbpsCloseKey(pState, hNewKey, uLine);
     }
     else
     {
-        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                        ("%d: create key '%s'(/Default='%ls') -> %u\n", uLine, pszKey, pwszValue, rc));
-        pState->rc = rc;
-    }
-    return rc;
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%ls') -> %u\n", uLine, pszKey, pwszValue, lrc));
+        pState->lrc = lrc;
+    }
+    return lrc;
 }
 
@@ -941 +941 @@
 {
     HKEY hNewKey;
-    LSTATUS rc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = vbpsSetRegValueAA(pState, hNewKey, NULL /*pszValueNm*/, pszValue, uLine);
+    LSTATUS lrc = vbpsCreateRegKeyA(pState, hkeyParent, pszKey, &hNewKey, uLine);
+    if (lrc == ERROR_SUCCESS)
+    {
+        lrc = vbpsSetRegValueAA(pState, hNewKey, NULL /*pszValueNm*/, pszValue, uLine);
         *phkey = hNewKey;
     }
     else
     {
-        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
-        pState->rc = rc;
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, lrc));
+        pState->lrc = lrc;
         *phkey = NULL;
     }
-    return rc;
+    return lrc;
 }
 
@@ -970 +970 @@
 static LSTATUS vbpsDeleteKeyRecursiveA(VBPSREGSTATE *pState, HKEY hkeyParent, const char *pszKey, unsigned uLine)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
 
     Assert(pState->fDelete);
     Assert(pszKey);
-    AssertReturn(*pszKey != '\0', pState->rc = ERROR_INVALID_PARAMETER);
+    AssertReturn(*pszKey != '\0', pState->lrc = ERROR_INVALID_PARAMETER);
 
 #ifdef VBSP_LOG_ENABLED
     {
         HKEY hkeyLog;
-        rc = RegOpenKeyExA(hkeyParent, pszKey, 0 /*fOptions*/, pState->fSamDelete, &hkeyLog);
-        if (rc != ERROR_FILE_NOT_FOUND)
+        lrc = RegOpenKeyExA(hkeyParent, pszKey, 0 /*fOptions*/, pState->fSamDelete, &hkeyLog);
+        if (lrc != ERROR_FILE_NOT_FOUND)
             VBSP_LOG_DEL_KEY(("vbpsDeleteKeyRecursiveA: %ls/%s (at %d)\n", vbpsDebugKeyToWSZ(hkeyParent), pszKey, uLine));
-        if (rc == ERROR_SUCCESS)
+        if (lrc == ERROR_SUCCESS)
             RegCloseKey(hkeyLog);
     }
 #endif
 
-    rc = SHDeleteKeyA(hkeyParent, pszKey);
-    if (rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND)
+    lrc = SHDeleteKeyA(hkeyParent, pszKey);
+    if (lrc == ERROR_SUCCESS || lrc == ERROR_FILE_NOT_FOUND)
         return ERROR_SUCCESS;
 
-    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                    ("%d: delete key '%s' -> %u\n", uLine, pszKey, rc));
-    pState->rc = rc;
-    return rc;
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                    ("%d: delete key '%s' -> %u\n", uLine, pszKey, lrc));
+    pState->lrc = lrc;
+    return lrc;
 }
 
@@ -1010 +1010 @@
 static LSTATUS vbpsDeleteKeyRecursiveW(VBPSREGSTATE *pState, HKEY hkeyParent, PCRTUTF16 pwszKey, unsigned uLine)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
 
     Assert(pState->fDelete);
     Assert(pwszKey);
-    AssertReturn(*pwszKey != '\0', pState->rc = ERROR_INVALID_PARAMETER);
+    AssertReturn(*pwszKey != '\0', pState->lrc = ERROR_INVALID_PARAMETER);
 
 #ifdef VBSP_LOG_ENABLED
     {
         HKEY hkeyLog;
-        rc = RegOpenKeyExW(hkeyParent, pwszKey, 0 /*fOptions*/, pState->fSamDelete, &hkeyLog);
-        if (rc != ERROR_FILE_NOT_FOUND)
+        lrc = RegOpenKeyExW(hkeyParent, pwszKey, 0 /*fOptions*/, pState->fSamDelete, &hkeyLog);
+        if (lrc != ERROR_FILE_NOT_FOUND)
             VBSP_LOG_DEL_KEY(("vbpsDeleteKeyRecursiveW: %ls/%ls (at %d)\n", vbpsDebugKeyToWSZ(hkeyParent), pwszKey, uLine));
-        if (rc == ERROR_SUCCESS)
+        if (lrc == ERROR_SUCCESS)
             RegCloseKey(hkeyLog);
     }
 #endif
 
-    rc = SHDeleteKeyW(hkeyParent, pwszKey);
-    if (rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND)
+    lrc = SHDeleteKeyW(hkeyParent, pwszKey);
+    if (lrc == ERROR_SUCCESS || lrc == ERROR_FILE_NOT_FOUND)
         return ERROR_SUCCESS;
 
-    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
-                    ("%d: delete key '%ls' -> %u\n", uLine, pwszKey, rc));
-    pState->rc = rc;
-    return rc;
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(lrc == ERROR_ACCESS_DENIED),
+                    ("%d: delete key '%ls' -> %u\n", uLine, pwszKey, lrc));
+    pState->lrc = lrc;
+    return lrc;
 }
 
@@ -1052 +1052 @@
                           const char *pszDescription, const char *pszServiceName)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
     HKEY hkeyAppIds;
     Assert(*pszAppId == '{');
@@ -1064 +1064 @@
         while (i-- > 0)
         {
-            rc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"AppID", 0 /*fOptions*/, pState->fSamDelete, &hkeyAppIds);
-            AssertLogRelMsgStmt(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND, ("%u\n", rc), pState->rc = rc);
-            if (rc == ERROR_SUCCESS)
+            lrc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"AppID", 0 /*fOptions*/, pState->fSamDelete, &hkeyAppIds);
+            AssertLogRelMsgStmt(lrc == ERROR_SUCCESS || lrc == ERROR_FILE_NOT_FOUND, ("%u\n", lrc), pState->lrc = lrc);
+            if (lrc == ERROR_SUCCESS)
             {
                 vbpsDeleteKeyRecursiveA(pState, hkeyAppIds, pszAppId, __LINE__);
@@ -1076 +1076 @@
     if (pState->fUpdate)
     {
-        rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"AppID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                             pState->fSamBoth, NULL /*pSecAttr*/, &hkeyAppIds, NULL /*pdwDisposition*/);
-        if (rc == ERROR_ACCESS_DENIED)
+        lrc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"AppID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                              pState->fSamBoth, NULL /*pSecAttr*/, &hkeyAppIds, NULL /*pdwDisposition*/);
+        if (lrc == ERROR_ACCESS_DENIED)
             return ERROR_SUCCESS;
     }
     else
     {
-        rc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"AppID", 0 /*fOptions*/, pState->fSamBoth, &hkeyAppIds);
-        if (rc == ERROR_FILE_NOT_FOUND || rc == ERROR_ACCESS_DENIED)
+        lrc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"AppID", 0 /*fOptions*/, pState->fSamBoth, &hkeyAppIds);
+        if (lrc == ERROR_FILE_NOT_FOUND || lrc == ERROR_ACCESS_DENIED)
             return ERROR_SUCCESS;
     }
-    if (rc == ERROR_ACCESS_DENIED)
-        return pState->rc = rc;
-    AssertLogRelMsgReturn(rc == ERROR_SUCCESS, ("%u\n", rc), pState->rc = rc);
+    if (lrc == ERROR_ACCESS_DENIED)
+        return pState->lrc = lrc;
+    AssertLogRelMsgReturn(lrc == ERROR_SUCCESS, ("%u\n", lrc), pState->lrc = lrc);
 
     if (pState->fDelete)
@@ -1103 +1103 @@
     {
         HKEY hkey;
-        rc = vbpsCreateRegKeyA(pState, hkeyAppIds, pszAppId, &hkey, __LINE__);
-        if (rc == ERROR_SUCCESS)
+        lrc = vbpsCreateRegKeyA(pState, hkeyAppIds, pszAppId, &hkey, __LINE__);
+        if (lrc == ERROR_SUCCESS)
         {
             vbpsSetRegValueAA(pState, hkey, NULL /*pszValueNm*/, pszDescription, __LINE__);
@@ -1112 +1112 @@
         }
 
-        rc = vbpsCreateRegKeyA(pState, hkeyAppIds, pszModuleName, &hkey, __LINE__);
-        if (rc == ERROR_SUCCESS)
+        lrc = vbpsCreateRegKeyA(pState, hkeyAppIds, pszModuleName, &hkey, __LINE__);
+        if (lrc == ERROR_SUCCESS)
         {
             vbpsSetRegValueAA(pState, hkey, NULL /*pszValueNm*/, "", __LINE__);
@@ -1123 +1123 @@
     vbpsCloseKey(pState, hkeyAppIds, __LINE__);
 
-    return pState->rc;
+    return pState->lrc;
 }
 
@@ -1142 +1142 @@
                               const CLSID *pClsId, const char *pszCurVerSuffIfRootName)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
 
     /*
@@ -1162 +1162 @@
         /* pszClassName/Default = description. */
         HKEY hkeyClass;
-        rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyClassesRootDst, pszClassName, pszDescription,
-                                                  &hkeyClass, __LINE__);
-        if (rc == ERROR_SUCCESS)
+        lrc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyClassesRootDst, pszClassName, pszDescription,
+                                                   &hkeyClass, __LINE__);
+        if (lrc == ERROR_SUCCESS)
         {
             char szClsId[CURLY_UUID_STR_BUF_SIZE];
@@ -1175 +1175 @@
             {
                 char szCurClassNameVer[128];
-                rc = RTStrCopy(szCurClassNameVer, sizeof(szCurClassNameVer), pszClassName);
-                if (RT_SUCCESS(rc))
-                    rc = RTStrCat(szCurClassNameVer, sizeof(szCurClassNameVer), pszCurVerSuffIfRootName);
-                AssertStmt(RT_SUCCESS(rc), pState->rc = rc = ERROR_INVALID_DATA);
-                if (rc == ERROR_SUCCESS)
+                lrc = RTStrCopy(szCurClassNameVer, sizeof(szCurClassNameVer), pszClassName);
+                if (RT_SUCCESS(lrc))
+                    lrc = RTStrCat(szCurClassNameVer, sizeof(szCurClassNameVer), pszCurVerSuffIfRootName);
+                AssertStmt(RT_SUCCESS(lrc), pState->lrc = lrc = ERROR_INVALID_DATA);
+                if (lrc == ERROR_SUCCESS)
                     vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyClass, "CurVer", szCurClassNameVer, __LINE__);
             }
@@ -1187 +1187 @@
     }
 
-    return pState->rc;
+    return pState->lrc;
 }
 
@@ -1218 +1218 @@
                             const char *pszThreadingModel)
 {
-    LSTATUS rc;
+    LSTATUS lrc;
     char szClsId[CURLY_UUID_STR_BUF_SIZE];
     RT_NOREF(pszAppId);
@@ -1248 +1248 @@
     {
         HKEY hkeyClass;
-        rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyClsidRootDst, szClsId, pszDescription,
-                                                  &hkeyClass, __LINE__);
-        if (rc == ERROR_SUCCESS)
+        lrc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyClsidRootDst, szClsId, pszDescription,
+                                                   &hkeyClass, __LINE__);
+        if (lrc == ERROR_SUCCESS)
         {
             bool const fIsLocalServer32 = strcmp(pszServerType, "LocalServer32") == 0;
@@ -1257 +1257 @@
 
             /* pszServerType/Default = module. */
-            rc = vbpsCreateRegKeyA(pState, hkeyClass, pszServerType, &hkeyServerType, __LINE__);
-            if (rc == ERROR_SUCCESS)
+            lrc = vbpsCreateRegKeyA(pState, hkeyClass, pszServerType, &hkeyServerType, __LINE__);
+            if (lrc == ERROR_SUCCESS)
             {
                 RTUTF16 wszModule[MAX_PATH * 2];
@@ -1265 +1265 @@
                     *pwszCur++ = '"';
 
-                rc = RTUtf16Copy(pwszCur, MAX_PATH, pwszVBoxDir); AssertRC(rc);
+                int vrc = RTUtf16Copy(pwszCur, MAX_PATH, pwszVBoxDir); AssertRC(vrc);
                 pwszCur += RTUtf16Len(pwszCur);
-                rc = RTUtf16CopyAscii(pwszCur, MAX_PATH - 3, pszServerSubPath); AssertRC(rc);
+                vrc = RTUtf16CopyAscii(pwszCur, MAX_PATH - 3, pszServerSubPath); AssertRC(vrc);
                 pwszCur += RTUtf16Len(pwszCur);
 
@@ -1286 +1286 @@
             if (pszClassName)
             {
-                rc = RTStrCopy(szCurClassNameVer, sizeof(szCurClassNameVer), pszClassName);
-                if (RT_SUCCESS(rc))
-                    rc = RTStrCat(szCurClassNameVer, sizeof(szCurClassNameVer), pszCurClassNameVerSuffix);
-                AssertStmt(RT_SUCCESS(rc), pState->rc = rc = ERROR_INVALID_DATA);
-                if (rc == ERROR_SUCCESS)
+                int vrc = RTStrCopy(szCurClassNameVer, sizeof(szCurClassNameVer), pszClassName);
+                if (RT_SUCCESS(vrc))
+                    vrc = RTStrCat(szCurClassNameVer, sizeof(szCurClassNameVer), pszCurClassNameVerSuffix);
+                AssertStmt(RT_SUCCESS(vrc), pState->lrc = lrc = ERROR_INVALID_DATA);
+                if (lrc == ERROR_SUCCESS)
                     vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyClass, "ProgId", szCurClassNameVer, __LINE__);
 
@@ -1313 +1313 @@
     }
 
-    return pState->rc;
+    return pState->lrc;
 }
 
@@ -1393 +1393 @@
     HKEY hkeyTypeLibs;
     HKEY hkeyTypeLibId;
-    LSTATUS rc;
+    LSTATUS lrc;
     RT_NOREF(fIs32On64);
 
@@ -1403 +1403 @@
 
     /* Open Classes/TypeLib/. */
-    rc = vbpsCreateRegKeyA(pState, pState->hkeyClassesRootDst, "TypeLib", &hkeyTypeLibs, __LINE__);
-    if (rc != ERROR_SUCCESS)
+    lrc = vbpsCreateRegKeyA(pState, pState->hkeyClassesRootDst, "TypeLib", &hkeyTypeLibs, __LINE__);
+    if (lrc != ERROR_SUCCESS)
         return;
 
     /* Create TypeLib/{UUID}. */
-    rc = vbpsCreateRegKeyA(pState, hkeyTypeLibs, vbpsFormatUuidInCurly(szTypeLibId, &LIBID_VirtualBox), &hkeyTypeLibId, __LINE__);
-    if (rc == ERROR_SUCCESS)
+    lrc = vbpsCreateRegKeyA(pState, hkeyTypeLibs, vbpsFormatUuidInCurly(szTypeLibId, &LIBID_VirtualBox), &hkeyTypeLibId, __LINE__);
+    if (lrc == ERROR_SUCCESS)
     {
         /* {UUID}/Major.Minor/Default = pszDescription. */
@@ -1415 +1415 @@
         char szMajMin[64];
         sprintf(szMajMin, "%u.%u", kTypeLibraryMajorVersion, kTypeLibraryMinorVersion);
-        rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, hkeyTypeLibId, szMajMin, pszDescription, &hkeyMajMin, __LINE__);
-        if (rc == ERROR_SUCCESS)
+        lrc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, hkeyTypeLibId, szMajMin, pszDescription, &hkeyMajMin, __LINE__);
+        if (lrc == ERROR_SUCCESS)
         {
             RTUTF16 wszBuf[MAX_PATH * 2];
@@ -1422 +1422 @@
             /* {UUID}/Major.Minor/0. */
             HKEY hkey0;
-            rc = vbpsCreateRegKeyA(pState, hkeyMajMin, "0", &hkey0, __LINE__);
-            if (rc == ERROR_SUCCESS)
+            lrc = vbpsCreateRegKeyA(pState, hkeyMajMin, "0", &hkey0, __LINE__);
+            if (lrc == ERROR_SUCCESS)
             {
                 /* {UUID}/Major.Minor/0/winXX/Default = VBoxProxyStub. */
-                rc = RTUtf16Copy(wszBuf, MAX_PATH, pwszVBoxDir); AssertRC(rc);
-                rc = RTUtf16CatAscii(wszBuf, MAX_PATH * 2, pszTypeLibDll); AssertRC(rc);
+                int vrc = RTUtf16Copy(wszBuf, MAX_PATH, pwszVBoxDir); AssertRC(vrc);
+                vrc = RTUtf16CatAscii(wszBuf, MAX_PATH * 2, pszTypeLibDll); AssertRC(vrc);
 
                 vbpsCreateRegKeyWithDefaultValueAW(pState, hkey0, pszWinXx, wszBuf, __LINE__);
@@ -1437 +1437 @@
 
             /* {UUID}/Major.Minor/HELPDIR */
-            rc = RTUtf16Copy(wszBuf, MAX_PATH, pwszVBoxDir); AssertRC(rc);
+            int vrc = RTUtf16Copy(wszBuf, MAX_PATH, pwszVBoxDir); AssertRC(vrc);
 #if 0 /* MSI: trailing slash;  regsvr32/comregister: strip unnecessary trailing slash.  Go with MSI to avoid user issues. */
             {
@@ -1497 +1497 @@
     const ProxyFileInfo **ppProxyFile = &g_apProxyFiles[0];
     const ProxyFileInfo  *pProxyFile;
-    LSTATUS               rc;
+    LSTATUS               lrc;
     char                  szProxyClsId[CURLY_UUID_STR_BUF_SIZE];
     char                  szTypeLibId[CURLY_UUID_STR_BUF_SIZE];
@@ -1507 +1507 @@
 
     Assert(pState->fUpdate && !pState->fDelete);
-    rc = vbpsRegOpenInterfaceKeys(pState);
-    if (rc != ERROR_SUCCESS)
+    lrc = vbpsRegOpenInterfaceKeys(pState);
+    if (lrc != ERROR_SUCCESS)
         return;
 
@@ -1534 +1534 @@
             HKEY                hkeyIfId;
 
-            AssertReturnVoidStmt(cchIfNm >= 3 && cchIfNm <= 72, pState->rc = ERROR_INVALID_DATA);
-
-            AssertReturnVoidStmt(cMethods >= 3 && cMethods < 1024, pState->rc = ERROR_INVALID_DATA);
+            AssertReturnVoidStmt(cchIfNm >= 3 && cchIfNm <= 72, pState->lrc = ERROR_INVALID_DATA);
+
+            AssertReturnVoidStmt(cMethods >= 3 && cMethods < 1024, pState->lrc = ERROR_INVALID_DATA);
             sprintf(szMethods, "%u", cMethods);
 
-            rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyInterfaceRootDst,
-                                                      vbpsFormatUuidInCurly(szIfId, papStubVtbls[iIf]->header.piid),
-                                                      pszIfNm, &hkeyIfId, __LINE__);
-            if (rc == ERROR_SUCCESS)
+            lrc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyInterfaceRootDst,
+                                                       vbpsFormatUuidInCurly(szIfId, papStubVtbls[iIf]->header.piid),
+                                                       pszIfNm, &hkeyIfId, __LINE__);
+            if (lrc == ERROR_SUCCESS)
             {
                 HKEY hkeyTypeLib;
@@ -1549 +1549 @@
 
                 /* The MSI seems to still be putting TypeLib keys here. So, let's do that too. */
-                rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, hkeyIfId, "TypeLib", szTypeLibId, &hkeyTypeLib, __LINE__);
-                if (rc == ERROR_SUCCESS)
+                lrc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, hkeyIfId, "TypeLib", szTypeLibId, &hkeyTypeLib, __LINE__);
+                if (lrc == ERROR_SUCCESS)
                 {
                     vbpsSetRegValueAA(pState, hkeyTypeLib, "Version", szTypeLibVersion, __LINE__);
@@ -1629 +1629 @@
 #endif
     VBPSREGSTATE    State;
-    LSTATUS         rc;
+    LSTATUS         lrc;
 
     /*
      * Do registration for the current execution mode of the DLL.
      */
-    rc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL /* Alt: HKEY_LOCAL_MACHINE, "Software\\Classes", */, fDelete, fUpdate, 0);
-    if (rc == ERROR_SUCCESS)
+    lrc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL /* Alt: HKEY_LOCAL_MACHINE, "Software\\Classes", */, fDelete, fUpdate, 0);
+    if (lrc == ERROR_SUCCESS)
     {
         if (!fUpdate)
@@ -1646 +1646 @@
 
         RegisterXidlModulesAndClassesGenerated(&State, pwszVBoxDir, fIs32On64);
-        rc = State.rc;
+        lrc = State.lrc;
     }
     vbpsRegTerm(&State);
@@ -1653 +1653 @@
      * Translate error code? Return.
      */
-    if (rc == ERROR_SUCCESS)
+    if (lrc == ERROR_SUCCESS)
         return S_OK;
     return E_FAIL;
@@ -1880 +1880 @@
          */
         HKEY hkeyInterfaces;
-        LRESULT rc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"Interface",
-                                   0 /*fOptions*/, pState->fSamDelete, &hkeyInterfaces);
-        if (rc == ERROR_SUCCESS)
+        LRESULT lrc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"Interface",
+                                    0 /*fOptions*/, pState->fSamDelete, &hkeyInterfaces);
+        if (lrc == ERROR_SUCCESS)
         {
             /*
@@ -1893 +1893 @@
                 RTUTF16 wszCurNm[128 + 48];
                 DWORD   cwcCurNm = 128;
-                rc = RegEnumKeyExW(hkeyInterfaces, idxKey, wszCurNm, &cwcCurNm,
-                                   NULL /*pdwReserved*/, NULL /*pwszClass*/, NULL /*pcwcClass*/, NULL /*pLastWriteTime*/);
-                if (rc == ERROR_SUCCESS)
+                lrc = RegEnumKeyExW(hkeyInterfaces, idxKey, wszCurNm, &cwcCurNm,
+                                    NULL /*pdwReserved*/, NULL /*pwszClass*/, NULL /*pcwcClass*/, NULL /*pLastWriteTime*/);
+                if (lrc == ERROR_SUCCESS)
                 {
                     /*
@@ -1918 +1918 @@
                     /* Try the TypeLib sub-key. */
                     memcpy(&wszCurNm[cwcCurNm], s_wszTypeLib, sizeof(s_wszTypeLib));
-                    rc = RegOpenKeyExW(hkeyInterfaces, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
-                    if (rc == ERROR_SUCCESS)
+                    lrc = RegOpenKeyExW(hkeyInterfaces, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
+                    if (lrc == ERROR_SUCCESS)
                     {
                         cbValue = sizeof(wszValue) - sizeof(RTUTF16);
-                        rc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
-                                              &dwType, (PBYTE)&wszValue[0], &cbValue);
-                        if (rc != ERROR_SUCCESS || dwType != REG_SZ)
+                        lrc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
+                                               &dwType, (PBYTE)&wszValue[0], &cbValue);
+                        if (lrc != ERROR_SUCCESS || dwType != REG_SZ)
                             cbValue = 0;
                         wszValue[cbValue / sizeof(RTUTF16)] = '\0';
 
-                        if (   rc == ERROR_SUCCESS
+                        if (   lrc == ERROR_SUCCESS
                             && vbpsIsTypeLibIdToRemove(wszValue))
                         {
                             /* Check the TypeLib/Version value to make sure. */
                             cbValue = sizeof(wszValue) - sizeof(RTUTF16);
-                            rc = RegQueryValueExW(hkeySub, L"Version", 0 /*pdwReserved*/, &dwType, (PBYTE)&wszValue[0], &cbValue);
-                            if (rc != ERROR_SUCCESS)
+                            lrc = RegQueryValueExW(hkeySub, L"Version", 0 /*pdwReserved*/, &dwType, (PBYTE)&wszValue[0], &cbValue);
+                            if (lrc != ERROR_SUCCESS)
                                 cbValue = 0;
                             wszValue[cbValue] = '\0';
 
-                            if (   rc == ERROR_SUCCESS
+                            if (   lrc == ERROR_SUCCESS
                                 && vbpsIsTypeLibVersionToRemove(wszValue))
                                 fDeleteMe = true;
@@ -1944 +1944 @@
                         vbpsCloseKey(pState, hkeySub, __LINE__);
                     }
-                    else if (rc == ERROR_FILE_NOT_FOUND)
+                    else if (lrc == ERROR_FILE_NOT_FOUND)
                     {
                         /* No TypeLib, try the ProxyStubClsid32 sub-key next. */
                         static RTUTF16 const    s_wszProxyStubClsid32[] = L"\\ProxyStubClsid32";
                         memcpy(&wszCurNm[cwcCurNm], s_wszProxyStubClsid32, sizeof(s_wszProxyStubClsid32));
-                        rc = RegOpenKeyExW(hkeyInterfaces, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
-                        if (rc == ERROR_SUCCESS)
+                        lrc = RegOpenKeyExW(hkeyInterfaces, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
+                        if (lrc == ERROR_SUCCESS)
                         {
                             cbValue = sizeof(wszValue) - sizeof(RTUTF16);
-                            rc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
-                                                  &dwType, (PBYTE)&wszValue[0], &cbValue);
-                            if (rc != ERROR_SUCCESS || dwType != REG_SZ)
+                            lrc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
+                                                   &dwType, (PBYTE)&wszValue[0], &cbValue);
+                            if (lrc != ERROR_SUCCESS || dwType != REG_SZ)
                                 cbValue = 0;
                             wszValue[cbValue / sizeof(RTUTF16)] = '\0';
 
-                            if (   rc == ERROR_SUCCESS
+                            if (   lrc == ERROR_SUCCESS
                                 && vbpsIsProxyStubClsIdToRemove(wszValue))
                                 fDeleteMe = true;
@@ -1978 +1978 @@
                 else
                 {
-                    Assert(rc == ERROR_NO_MORE_ITEMS);
+                    Assert(lrc == ERROR_NO_MORE_ITEMS);
                     break;
                 }
@@ -2004 +2004 @@
          */
         HKEY hkeyClsIds;
-        LRESULT rc;
-        rc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"CLSID", 0 /*fOptions*/, pState->fSamDelete, &hkeyClsIds);
-        if (rc == ERROR_SUCCESS)
+        LRESULT lrc;
+        lrc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"CLSID", 0 /*fOptions*/, pState->fSamDelete, &hkeyClsIds);
+        if (lrc == ERROR_SUCCESS)
         {
             /*
@@ -2017 +2017 @@
                 RTUTF16 wszCurNm[128 + 48];
                 DWORD   cwcCurNm = 128;
-                rc = RegEnumKeyExW(hkeyClsIds, idxKey, wszCurNm, &cwcCurNm,
-                                   NULL /*pdwReserved*/, NULL /*pwszClass*/, NULL /*pcwcClass*/, NULL /*pLastWriteTime*/);
-                if (rc == ERROR_SUCCESS)
+                lrc = RegEnumKeyExW(hkeyClsIds, idxKey, wszCurNm, &cwcCurNm,
+                                    NULL /*pdwReserved*/, NULL /*pwszClass*/, NULL /*pcwcClass*/, NULL /*pLastWriteTime*/);
+                if (lrc == ERROR_SUCCESS)
                 {
                     /*
@@ -2039 +2039 @@
                     /* The TypeLib sub-key. */
                     memcpy(&wszCurNm[cwcCurNm], s_wszTypeLib, sizeof(s_wszTypeLib));
-                    rc = RegOpenKeyExW(hkeyClsIds, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
-                    if (rc == ERROR_SUCCESS)
+                    lrc = RegOpenKeyExW(hkeyClsIds, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
+                    if (lrc == ERROR_SUCCESS)
                     {
                         bool fDeleteMe = false;
 
                         cbValue = sizeof(wszValue) - sizeof(RTUTF16);
-                        rc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
-                                              &dwType, (PBYTE)&wszValue[0], &cbValue);
-                        if (rc != ERROR_SUCCESS || dwType != REG_SZ)
+                        lrc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
+                                               &dwType, (PBYTE)&wszValue[0], &cbValue);
+                        if (lrc != ERROR_SUCCESS || dwType != REG_SZ)
                             cbValue = 0;
                         wszValue[cbValue / sizeof(RTUTF16)] = '\0';
 
-                        if (   rc == ERROR_SUCCESS
+                        if (   lrc == ERROR_SUCCESS
                             && vbpsIsTypeLibIdToRemove(wszValue))
                             fDeleteMe = true;
@@ -2062 +2062 @@
                             static RTUTF16 const    s_wszProgId[] = L"\\ProgId";
                             memcpy(&wszCurNm[cwcCurNm], s_wszProgId, sizeof(s_wszProgId));
-                            rc = RegOpenKeyExW(hkeyClsIds, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
-                            if (rc == ERROR_SUCCESS)
+                            lrc = RegOpenKeyExW(hkeyClsIds, wszCurNm, 0 /*fOptions*/, KEY_QUERY_VALUE, &hkeySub);
+                            if (lrc == ERROR_SUCCESS)
                             {
                                 static RTUTF16 const s_wszProgIdPrefix[] = L"VirtualBox.";
 
                                 cbValue = sizeof(wszValue) - sizeof(RTUTF16);
-                                rc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
-                                                      &dwType, (PBYTE)&wszValue[0], &cbValue);
-                                if (rc != ERROR_SUCCESS || dwType != REG_SZ)
+                                lrc = RegQueryValueExW(hkeySub, NULL /*pszValueNm*/, NULL /*pdwReserved*/,
+                                                       &dwType, (PBYTE)&wszValue[0], &cbValue);
+                                if (lrc != ERROR_SUCCESS || dwType != REG_SZ)
                                     cbValue = 0;
                                 wszValue[cbValue / sizeof(RTUTF16)] = '\0';
@@ -2081 +2081 @@
                             }
                             else
-                                AssertStmt(rc == ERROR_FILE_NOT_FOUND, fDeleteMe = false);
+                                AssertStmt(lrc == ERROR_FILE_NOT_FOUND, fDeleteMe = false);
 
                             if (fDeleteMe)
@@ -2094 +2094 @@
                     }
                     else
-                        Assert(rc == ERROR_FILE_NOT_FOUND);
+                        Assert(lrc == ERROR_FILE_NOT_FOUND);
                 }
                 else
                 {
-                    Assert(rc == ERROR_NO_MORE_ITEMS);
+                    Assert(lrc == ERROR_NO_MORE_ITEMS);
                     break;
                 }
@@ -2106 +2106 @@
         }
         else
-            Assert(rc == ERROR_FILE_NOT_FOUND);
+            Assert(lrc == ERROR_FILE_NOT_FOUND);
     }
 }
@@ -2123 +2123 @@
          */
         HKEY hkeyTypeLibs;
-        LSTATUS rc;
-        rc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"TypeLib", 0 /*fOptions*/, pState->fSamDelete, &hkeyTypeLibs);
-        if (rc == ERROR_SUCCESS)
+        LSTATUS lrc;
+        lrc = RegOpenKeyExW(pState->aAltDeletes[iAlt].hkeyClasses, L"TypeLib", 0 /*fOptions*/, pState->fSamDelete, &hkeyTypeLibs);
+        if (lrc == ERROR_SUCCESS)
         {
             /*
@@ -2134 +2134 @@
             {
                 HKEY hkeyTypeLibId;
-                rc = RegOpenKeyExW(hkeyTypeLibs, g_apwszTypeLibIds[iTlb], 0 /*fOptions*/, pState->fSamDelete, &hkeyTypeLibId);
-                if (rc == ERROR_SUCCESS)
+                lrc = RegOpenKeyExW(hkeyTypeLibs, g_apwszTypeLibIds[iTlb], 0 /*fOptions*/, pState->fSamDelete, &hkeyTypeLibId);
+                if (lrc == ERROR_SUCCESS)
                 {
                     unsigned iVer = RT_ELEMENTS(g_apwszTypelibVersions);
@@ -2141 +2141 @@
                     {
                         HKEY hkeyVer;
-                        rc = RegOpenKeyExW(hkeyTypeLibId, g_apwszTypelibVersions[iVer], 0, KEY_READ, &hkeyVer);
-                        if (rc == ERROR_SUCCESS)
+                        lrc = RegOpenKeyExW(hkeyTypeLibId, g_apwszTypelibVersions[iVer], 0, KEY_READ, &hkeyVer);
+                        if (lrc == ERROR_SUCCESS)
                         {
                             char szValue[128];
                             DWORD cbValue = sizeof(szValue) - 1;
-                            rc = RegQueryValueExA(hkeyVer, NULL, NULL, NULL, (PBYTE)&szValue[0], &cbValue);
+                            lrc = RegQueryValueExA(hkeyVer, NULL, NULL, NULL, (PBYTE)&szValue[0], &cbValue);
                             vbpsCloseKey(pState, hkeyVer, __LINE__);
-                            if (rc == ERROR_SUCCESS)
+                            if (lrc == ERROR_SUCCESS)
                             {
                                 szValue[cbValue] = '\0';
@@ -2167 +2167 @@
                      * The type library ID key should be empty now, so we can try remove it (non-recursively).
                      */
-                    rc = RegDeleteKeyW(hkeyTypeLibs, g_apwszTypeLibIds[iTlb]);
-                    Assert(rc == ERROR_SUCCESS);
+                    lrc = RegDeleteKeyW(hkeyTypeLibs, g_apwszTypeLibIds[iTlb]);
+                    Assert(lrc == ERROR_SUCCESS);
                 }
             }
         }
         else
-            Assert(rc == ERROR_FILE_NOT_FOUND);
+            Assert(lrc == ERROR_FILE_NOT_FOUND);
     }
 }
@@ -2188 +2188 @@
      */
     VBPSREGSTATE State;
-    LRESULT rc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, true /*fDelete*/, false /*fUpdate*/, fSamWow);
-    if (rc == ERROR_SUCCESS)
+    LRESULT lrc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, true /*fDelete*/, false /*fUpdate*/, fSamWow);
+    if (lrc == ERROR_SUCCESS)
     {
         vbpsRegAddAltDelete(&State, HKEY_CURRENT_USER,  "Software\\Classes");
@@ -2342 +2342 @@
      */
     WCHAR wszFilePath[MAX_PATH + 2];
-    int rc = RTUtf16CopyAscii(wszFilePath, RT_ELEMENTS(wszFilePath), "\"");
-    if (RT_SUCCESS(rc))
-        rc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszVBoxDir);
-    if (RT_SUCCESS(rc))
-        rc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszModule);
-    if (RT_SUCCESS(rc))
-        rc = RTUtf16CatAscii(wszFilePath, RT_ELEMENTS(wszFilePath), "\"");
-    AssertLogRelRCReturnVoid(rc);
+    int vrc = RTUtf16CopyAscii(wszFilePath, RT_ELEMENTS(wszFilePath), "\"");
+    if (RT_SUCCESS(vrc))
+        vrc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszVBoxDir);
+    if (RT_SUCCESS(vrc))
+        vrc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszModule);
+    if (RT_SUCCESS(vrc))
+        vrc = RTUtf16CatAscii(wszFilePath, RT_ELEMENTS(wszFilePath), "\"");
+    AssertLogRelRCReturnVoid(vrc);
 
     /*
@@ -2463 +2463 @@
             else
             {
-                pState->rc = GetLastError();
-                LogRel(("Failed to not open service %ls for stop+delete: %u\n", pwszServiceName, pState->rc));
+                pState->lrc = GetLastError();
+                LogRel(("Failed to not open service %ls for stop+delete: %u\n", pwszServiceName, pState->lrc));
                 hService = OpenServiceW(hSCM, pwszServiceName, SERVICE_CHANGE_CONFIG);
             }
@@ -2506 +2506 @@
                 else
                 {
-                    pState->rc = GetLastError();
-                    AssertMsgFailed(("Failed to create service '%ls': %u\n", pwszServiceName, pState->rc));
+                    pState->lrc = GetLastError();
+                    AssertMsgFailed(("Failed to create service '%ls': %u\n", pwszServiceName, pState->lrc));
                 }
                 CloseServiceHandle(hSCM);
@@ -2513 +2513 @@
             else
             {
-                pState->rc = GetLastError();
-                LogRel(("Failed to open service manager with create service access: %u\n", pState->rc));
+                pState->lrc = GetLastError();
+                LogRel(("Failed to open service manager with create service access: %u\n", pState->lrc));
             }
         }
@@ -2535 +2535 @@
 DECLEXPORT(uint32_t) VbpsUpdateRegistrations(void)
 {
-    LSTATUS         rc;
+    LSTATUS         lrc;
     VBPSREGSTATE    State;
 #ifdef VBOX_IN_32_ON_64_MAIN_API
@@ -2557 +2557 @@
      * Update registry entries for the current CPU bitness.
      */
-    rc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, false /*fDelete*/, true /*fUpdate*/, 0);
-    if (rc == ERROR_SUCCESS && !vbpsIsUpToDate(&State))
+    lrc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, false /*fDelete*/, true /*fUpdate*/, 0);
+    if (lrc == ERROR_SUCCESS && !vbpsIsUpToDate(&State))
     {
 
@@ -2570 +2570 @@
         RegisterXidlModulesAndClassesGenerated(&State, wszVBoxDir, fIs32On64);
         vbpsMarkUpToDate(&State);
-        rc = State.rc;
+        lrc = State.lrc;
     }
     vbpsRegTerm(&State);
@@ -2579 +2579 @@
      * Update registry entries for the other CPU bitness.
      */
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, false /*fDelete*/, true /*fUpdate*/,
-                         !fIs32On64 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY);
-        if (rc == ERROR_SUCCESS && !vbpsIsUpToDate(&State))
+    if (lrc == ERROR_SUCCESS)
+    {
+        lrc = vbpsRegInit(&State, HKEY_CLASSES_ROOT, NULL, false /*fDelete*/, true /*fUpdate*/,
+                          !fIs32On64 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY);
+        if (lrc == ERROR_SUCCESS && !vbpsIsUpToDate(&State))
         {
             vbpsUpdateTypeLibRegistration(&State, wszVBoxDir, !fIs32On64);
@@ -2590 +2590 @@
             RegisterXidlModulesAndClassesGenerated(&State, wszVBoxDir, !fIs32On64);
             vbpsMarkUpToDate(&State);
-            rc = State.rc;
+            lrc = State.lrc;
         }
         vbpsRegTerm(&State);