Index: trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTest.cpp
===================================================================
--- trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTest.cpp	(revision 98183)
+++ trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTest.cpp	(revision 98281)
@@ -50,8 +50,4 @@
     static char pszVBoxPath[RTPATH_MAX];
     const char *papszArgs[4] = { NULL, "-test", "3D", NULL};
-    int rc;
-    RTPROCESS Process;
-    RTPROCSTATUS ProcStatus;
-    uint64_t StartTS;
 
 #ifdef __SANITIZE_ADDRESS__
@@ -63,28 +59,31 @@
     RTEnvPutEx(env, "ASAN_OPTIONS=detect_leaks=0");  /* If this fails we will notice later */
 #endif
-    rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, false);
+    int vrc = RTPathExecDir(pszVBoxPath, RTPATH_MAX);
+    AssertRCReturn(vrc, false);
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
+    vrc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
 #else
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
+    vrc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
 #endif
     papszArgs[0] = pszVBoxPath;         /* argv[0] */
-    AssertRCReturn(rc, false);
+    AssertRCReturn(vrc, false);
 
+    RTPROCESS Process;
 #ifndef __SANITIZE_ADDRESS__
-    rc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
+    vrc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
 #else
-    rc = RTProcCreate(pszVBoxPath, papszArgs, env, 0, &Process);
+    vrc = RTProcCreate(pszVBoxPath, papszArgs, env, 0, &Process);
     RTEnvDestroy(env);
 #endif
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
         return false;
 
-    StartTS = RTTimeMilliTS();
+    uint64_t StartTS = RTTimeMilliTS();
 
+    RTPROCSTATUS ProcStatus = {0};
     while (1)
     {
-        rc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ProcStatus);
-        if (rc != VERR_PROCESS_RUNNING)
+        vrc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ProcStatus);
+        if (vrc != VERR_PROCESS_RUNNING)
             break;
 
@@ -101,11 +100,8 @@
     }
 
-    if (RT_SUCCESS(rc))
-    {
-        if ((ProcStatus.enmReason==RTPROCEXITREASON_NORMAL) && (ProcStatus.iStatus==0))
-        {
+    if (RT_SUCCESS(vrc))
+        if (   ProcStatus.enmReason == RTPROCEXITREASON_NORMAL
+            && ProcStatus.iStatus   == 0)
             return true;
-        }
-    }
 
     return false;
Index: trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp	(revision 98183)
+++ trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp	(revision 98281)
@@ -164,5 +164,5 @@
 DECLINLINE(PFNRT) vboxTestOglGetProc(const char *pszSymbol)
 {
-    int rc;
+    int vrc;
 
 #ifdef RT_OS_WINDOWS
@@ -170,6 +170,6 @@
     if (s_hOpenGL32 == NULL)
     {
-        rc = RTLdrLoadSystem("opengl32", /* fNoUnload = */ true, &s_hOpenGL32);
-        if (RT_FAILURE(rc))
+        vrc = RTLdrLoadSystem("opengl32", /* fNoUnload = */ true, &s_hOpenGL32);
+        if (RT_FAILURE(vrc))
            s_hOpenGL32 = NULL;
     }
@@ -181,6 +181,6 @@
         if (s_hOpenGL32 != NULL)
         {
-            rc = RTLdrGetSymbol(s_hOpenGL32, "wglGetProcAddress", (void **)&s_wglGetProcAddress);
-            if (RT_FAILURE(rc))
+            vrc = RTLdrGetSymbol(s_hOpenGL32, "wglGetProcAddress", (void **)&s_wglGetProcAddress);
+            if (RT_FAILURE(vrc))
                s_wglGetProcAddress = NULL;
         }
@@ -195,6 +195,6 @@
 
         /* Might be an exported symbol. */
-        rc = RTLdrGetSymbol(s_hOpenGL32, pszSymbol, (void **)&p);
-        if (RT_SUCCESS(rc))
+        vrc = RTLdrGetSymbol(s_hOpenGL32, pszSymbol, (void **)&p);
+        if (RT_SUCCESS(vrc))
             return p;
     }
@@ -204,6 +204,6 @@
     {
         static const char s_szLibGL[] = "libGL.so.1";
-        rc = RTLdrLoadEx(s_szLibGL, &s_hGL, RTLDRLOAD_FLAGS_GLOBAL | RTLDRLOAD_FLAGS_NO_UNLOAD, NULL);
-        if (RT_FAILURE(rc))
+        vrc = RTLdrLoadEx(s_szLibGL, &s_hGL, RTLDRLOAD_FLAGS_GLOBAL | RTLDRLOAD_FLAGS_NO_UNLOAD, NULL);
+        if (RT_FAILURE(vrc))
         {
             s_hGL = NULL;
@@ -216,6 +216,6 @@
     if (s_glXGetProcAddress == NULL)
     {
-        rc = RTLdrGetSymbol(s_hGL, "glXGetProcAddress", (void **)&s_glXGetProcAddress);
-        if (RT_FAILURE(rc))
+        vrc = RTLdrGetSymbol(s_hGL, "glXGetProcAddress", (void **)&s_glXGetProcAddress);
+        if (RT_FAILURE(vrc))
         {
             s_glXGetProcAddress = NULL;
@@ -229,6 +229,6 @@
 
     /* Might be an exported symbol. */
-    rc = RTLdrGetSymbol(s_hGL, pszSymbol, (void **)&p);
-    if (RT_SUCCESS(rc))
+    vrc = RTLdrGetSymbol(s_hGL, pszSymbol, (void **)&p);
+    if (RT_SUCCESS(vrc))
         return p;
 #endif
@@ -390,9 +390,9 @@
     RTR3InitExe(argc, &argv, 0);
 
-    int rc = 0;
+    int vrc = 0;
     if (argc < 2)
     {
         /* backwards compatibility: check 3D */
-        rc = vboxCheck3DAccelerationSupported();
+        vrc = vboxCheck3DAccelerationSupported();
     }
     else
@@ -409,14 +409,14 @@
 
         RTGETOPTSTATE State;
-        rc = RTGetOptInit(&State, argc, argv, &s_aOptionDefs[0], RT_ELEMENTS(s_aOptionDefs), 1, 0);
-        AssertRCReturn(rc, 49);
+        vrc = RTGetOptInit(&State, argc, argv, &s_aOptionDefs[0], RT_ELEMENTS(s_aOptionDefs), 1, 0);
+        AssertRCReturn(vrc, 49);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-        bool bTest2D = false;
-#endif
-        bool bTest3D = false;
-#ifdef VBOXGLTEST_WITH_LOGGING
-        bool bLog = false;
-        bool bLogSuffix = false;
+        bool fTest2D = false;
+#endif
+        bool fTest3D = false;
+#ifdef VBOXGLTEST_WITH_LOGGING
+        bool fLog = false;
+        bool fLogSuffix = false;
         const char * pLog = NULL;
 #endif
@@ -425,15 +425,15 @@
         {
             RTGETOPTUNION Val;
-            rc = RTGetOpt(&State, &Val);
-            if (!rc)
+            vrc = RTGetOpt(&State, &Val);
+            if (!vrc)
                 break;
-            switch (rc)
+            switch (vrc)
             {
                 case 't':
                     if (!strcmp(Val.psz, "3D") || !strcmp(Val.psz, "3d"))
-                        bTest3D = true;
+                        fTest3D = true;
 #ifdef VBOX_WITH_VIDEOHWACCEL
                     else if (!strcmp(Val.psz, "2D") || !strcmp(Val.psz, "2d"))
-                        bTest2D = true;
+                        fTest2D = true;
 #endif
                     else
@@ -443,9 +443,9 @@
 #ifdef VBOXGLTEST_WITH_LOGGING
                 case 'l':
-                    bLog = true;
+                    fLog = true;
                     pLog = Val.psz;
                     break;
                 case 'L':
-                    bLog = true;
+                    fLog = true;
                     pLog = NULL;
                     break;
@@ -478,5 +478,5 @@
                 case VINF_GETOPT_NOT_OPTION:
                 default:
-                    return RTGetOptPrintError(rc, &Val);
+                    return RTGetOptPrintError(vrc, &Val);
             }
         }
@@ -486,32 +486,32 @@
          */
 #ifdef VBOXGLTEST_WITH_LOGGING
-        if (!bLog)
+        if (!fLog)
         {
             /* check the VBOXGLTEST_LOG env var */
             pLog = RTEnvGet("VBOXGLTEST_LOG");
             if(pLog)
-                bLog = true;
-            bLogSuffix = true;
-        }
-        if (bLog)
-            rc = vboxInitLogging(pLog, bLogSuffix);
+                fLog = true;
+            fLogSuffix = true;
+        }
+        if (fLog)
+            vrc = vboxInitLogging(pLog, fLogSuffix);
         else
 #endif
-            rc = vboxInitQuietMode();
+            vrc = vboxInitQuietMode();
 
         /*
          * Do the job.
          */
-        if (!rc && bTest3D)
-            rc = vboxCheck3DAccelerationSupported();
+        if (!vrc && fTest3D)
+            vrc = vboxCheck3DAccelerationSupported();
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-        if (!rc && bTest2D)
-            rc = vboxCheck2DVideoAccelerationSupported();
+        if (!vrc && fTest2D)
+            vrc = vboxCheck2DVideoAccelerationSupported();
 #endif
     }
 
     /*RTR3Term();*/
-    return rc;
+    return vrc;
 
 }
Index: trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestDarwin.cpp
===================================================================
--- trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestDarwin.cpp	(revision 98183)
+++ trunk/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestDarwin.cpp	(revision 98281)
@@ -102,6 +102,6 @@
     static RTONCE s_Once = RTONCE_INITIALIZER;
     static bool   s_fCached = false;
-    int rc = RTOnce(&s_Once, vboxOglIsOfflineRenderingAppropriateOnce, &s_fCached);
-    AssertRC(rc);
+    int vrc = RTOnce(&s_Once, vboxOglIsOfflineRenderingAppropriateOnce, &s_fCached);
+    AssertRC(vrc);
     return s_fCached;
 }
Index: trunk/src/VBox/Main/src-helper-apps/OpenGLTest/VBoxGLSupportInfo.cpp
===================================================================
--- trunk/src/VBox/Main/src-helper-apps/OpenGLTest/VBoxGLSupportInfo.cpp	(revision 98183)
+++ trunk/src/VBox/Main/src-helper-apps/OpenGLTest/VBoxGLSupportInfo.cpp	(revision 98281)
@@ -356,22 +356,21 @@
 void VBoxGLInfo::initExtSupport(const MY_QOpenGLContext &context)
 {
-    int rc = 0;
+    int vrc = VINF_SUCCESS;
     do
     {
-        rc = 0;
         mMultiTexNumSupported = 1; /* default, 1 means not supported */
         if(mGLVersion >= 0x010201) /* ogl >= 1.2.1 */
         {
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_ACTIVE_TEXTURE, ActiveTexture, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2I, MultiTexCoord2i, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2D, MultiTexCoord2d, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2F, MultiTexCoord2f, rc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_ACTIVE_TEXTURE, ActiveTexture, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2I, MultiTexCoord2i, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2D, MultiTexCoord2d, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_MULTI_TEX_COORD2F, MultiTexCoord2f, vrc);
         }
         else if(m_GL_ARB_multitexture)
         {
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_ACTIVE_TEXTURE, ActiveTexture, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2I, MultiTexCoord2i, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2D, MultiTexCoord2d, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2F, MultiTexCoord2f, rc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_ACTIVE_TEXTURE, ActiveTexture, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2I, MultiTexCoord2i, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2D, MultiTexCoord2d, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MULTI_TEX_COORD2F, MultiTexCoord2f, vrc);
         }
         else
@@ -380,5 +379,5 @@
         }
 
-        if(RT_FAILURE(rc))
+        if(RT_FAILURE(vrc))
             break;
 
@@ -403,15 +402,15 @@
     do
     {
-        rc = 0;
+        vrc = 0;
         mPBOSupported = false;
 
         if(m_GL_ARB_pixel_buffer_object)
         {
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_GEN_BUFFERS, GenBuffers, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_DELETE_BUFFERS, DeleteBuffers, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_BIND_BUFFER, BindBuffer, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_BUFFER_DATA, BufferData, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MAP_BUFFER, MapBuffer, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNMAP_BUFFER, UnmapBuffer, rc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_GEN_BUFFERS, GenBuffers, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_DELETE_BUFFERS, DeleteBuffers, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_BIND_BUFFER, BindBuffer, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_BUFFER_DATA, BufferData, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_MAP_BUFFER, MapBuffer, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNMAP_BUFFER, UnmapBuffer, vrc);
         }
         else
@@ -420,5 +419,5 @@
         }
 
-        if(RT_FAILURE(rc))
+        if(RT_FAILURE(vrc))
             break;
 
@@ -428,74 +427,74 @@
     do
     {
-        rc = 0;
+        vrc = 0;
         mFragmentShaderSupported = false;
 
         if(mGLVersion >= 0x020000)  /* if ogl >= 2.0*/
         {
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_CREATE_SHADER, CreateShader, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_SHADER_SOURCE, ShaderSource, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_COMPILE_SHADER, CompileShader, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DELETE_SHADER, DeleteShader, rc);
-
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_CREATE_PROGRAM, CreateProgram, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_ATTACH_SHADER, AttachShader, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DETACH_SHADER, DetachShader, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_LINK_PROGRAM, LinkProgram, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_USE_PROGRAM, UseProgram, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DELETE_PROGRAM, DeleteProgram, rc);
-
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_IS_SHADER, IsShader, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_SHADERIV, GetShaderiv, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_IS_PROGRAM, IsProgram, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_PROGRAMIV, GetProgramiv, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_ATTACHED_SHADERS, GetAttachedShaders,  rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_SHADER_INFO_LOG, GetShaderInfoLog, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_PROGRAM_INFO_LOG, GetProgramInfoLog, rc);
-
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_UNIFORM_LOCATION, GetUniformLocation, rc);
-
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM1F, Uniform1f, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM2F, Uniform2f, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM3F, Uniform3f, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM4F, Uniform4f, rc);
-
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM1I, Uniform1i, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM2I, Uniform2i, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM3I, Uniform3i, rc);
-            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM4I, Uniform4i, rc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_CREATE_SHADER, CreateShader, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_SHADER_SOURCE, ShaderSource, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_COMPILE_SHADER, CompileShader, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DELETE_SHADER, DeleteShader, vrc);
+
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_CREATE_PROGRAM, CreateProgram, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_ATTACH_SHADER, AttachShader, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DETACH_SHADER, DetachShader, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_LINK_PROGRAM, LinkProgram, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_USE_PROGRAM, UseProgram, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_DELETE_PROGRAM, DeleteProgram, vrc);
+
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_IS_SHADER, IsShader, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_SHADERIV, GetShaderiv, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_IS_PROGRAM, IsProgram, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_PROGRAMIV, GetProgramiv, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_ATTACHED_SHADERS, GetAttachedShaders,  vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_SHADER_INFO_LOG, GetShaderInfoLog, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_PROGRAM_INFO_LOG, GetProgramInfoLog, vrc);
+
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_GET_UNIFORM_LOCATION, GetUniformLocation, vrc);
+
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM1F, Uniform1f, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM2F, Uniform2f, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM3F, Uniform3f, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM4F, Uniform4f, vrc);
+
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM1I, Uniform1i, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM2I, Uniform2i, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM3I, Uniform3i, vrc);
+            VBOXVHWA_PFNINIT_SAME(context, PFNVBOXVHWA_UNIFORM4I, Uniform4i, vrc);
         }
         else if(m_GL_ARB_shader_objects && m_GL_ARB_fragment_shader)
         {
-            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_CREATE_SHADER, CreateShader, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_SHADER_SOURCE, ShaderSource, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_COMPILE_SHADER, CompileShader, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DELETE_SHADER, DeleteShader, DeleteObjectARB, rc);
-
-            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_CREATE_PROGRAM, CreateProgram, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_ATTACH_SHADER, AttachShader, AttachObjectARB, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DETACH_SHADER, DetachShader, DetachObjectARB, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_LINK_PROGRAM, LinkProgram, rc);
-            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_USE_PROGRAM, UseProgram, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DELETE_PROGRAM, DeleteProgram, DeleteObjectARB, rc);
-
-        /// @todo    VBOXVHWA_PFNINIT(PFNVBOXVHWA_IS_SHADER, IsShader, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_SHADERIV, GetShaderiv, GetObjectParameterivARB, rc);
-        /// @todo    VBOXVHWA_PFNINIT(PFNVBOXVHWA_IS_PROGRAM, IsProgram, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_PROGRAMIV, GetProgramiv, GetObjectParameterivARB, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_ATTACHED_SHADERS, GetAttachedShaders, GetAttachedObjectsARB, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_SHADER_INFO_LOG, GetShaderInfoLog, GetInfoLogARB, rc);
-            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_PROGRAM_INFO_LOG, GetProgramInfoLog, GetInfoLogARB, rc);
-
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_GET_UNIFORM_LOCATION, GetUniformLocation, rc);
-
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM1F, Uniform1f, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM2F, Uniform2f, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM3F, Uniform3f, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM4F, Uniform4f, rc);
-
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM1I, Uniform1i, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM2I, Uniform2i, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM3I, Uniform3i, rc);
-            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM4I, Uniform4i, rc);
+            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_CREATE_SHADER, CreateShader, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_SHADER_SOURCE, ShaderSource, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_COMPILE_SHADER, CompileShader, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DELETE_SHADER, DeleteShader, DeleteObjectARB, vrc);
+
+            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_CREATE_PROGRAM, CreateProgram, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_ATTACH_SHADER, AttachShader, AttachObjectARB, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DETACH_SHADER, DetachShader, DetachObjectARB, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_LINK_PROGRAM, LinkProgram, vrc);
+            VBOXVHWA_PFNINIT_OBJECT_ARB(context, PFNVBOXVHWA_USE_PROGRAM, UseProgram, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_DELETE_PROGRAM, DeleteProgram, DeleteObjectARB, vrc);
+
+        /// @todo    VBOXVHWA_PFNINIT(PFNVBOXVHWA_IS_SHADER, IsShader, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_SHADERIV, GetShaderiv, GetObjectParameterivARB, vrc);
+        /// @todo    VBOXVHWA_PFNINIT(PFNVBOXVHWA_IS_PROGRAM, IsProgram, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_PROGRAMIV, GetProgramiv, GetObjectParameterivARB, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_ATTACHED_SHADERS, GetAttachedShaders, GetAttachedObjectsARB, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_SHADER_INFO_LOG, GetShaderInfoLog, GetInfoLogARB, vrc);
+            VBOXVHWA_PFNINIT(context, PFNVBOXVHWA_GET_PROGRAM_INFO_LOG, GetProgramInfoLog, GetInfoLogARB, vrc);
+
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_GET_UNIFORM_LOCATION, GetUniformLocation, vrc);
+
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM1F, Uniform1f, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM2F, Uniform2f, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM3F, Uniform3f, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM4F, Uniform4f, vrc);
+
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM1I, Uniform1i, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM2I, Uniform2i, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM3I, Uniform3i, vrc);
+            VBOXVHWA_PFNINIT_ARB(context, PFNVBOXVHWA_UNIFORM4I, Uniform4i, vrc);
         }
         else
@@ -504,5 +503,5 @@
         }
 
-        if(RT_FAILURE(rc))
+        if(RT_FAILURE(vrc))
             break;
 
@@ -512,18 +511,18 @@
     do
     {
-        rc = 0;
+        vrc = 0;
         mFBOSupported = false;
 
         if(m_GL_EXT_framebuffer_object)
         {
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_IS_FRAMEBUFFER, IsFramebuffer, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_BIND_FRAMEBUFFER, BindFramebuffer, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_DELETE_FRAMEBUFFERS, DeleteFramebuffers, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_GEN_FRAMEBUFFERS, GenFramebuffers, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_CHECK_FRAMEBUFFER_STATUS, CheckFramebufferStatus, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE1D, FramebufferTexture1D, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE2D, FramebufferTexture2D, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE3D, FramebufferTexture3D, rc);
-            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_GET_FRAMEBUFFER_ATTACHMENT_PARAMETRIV, GetFramebufferAttachmentParameteriv, rc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_IS_FRAMEBUFFER, IsFramebuffer, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_BIND_FRAMEBUFFER, BindFramebuffer, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_DELETE_FRAMEBUFFERS, DeleteFramebuffers, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_GEN_FRAMEBUFFERS, GenFramebuffers, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_CHECK_FRAMEBUFFER_STATUS, CheckFramebufferStatus, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE1D, FramebufferTexture1D, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE2D, FramebufferTexture2D, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_FRAMEBUFFER_TEXTURE3D, FramebufferTexture3D, vrc);
+            VBOXVHWA_PFNINIT_EXT(context, PFNVBOXVHWA_GET_FRAMEBUFFER_ATTACHMENT_PARAMETRIV, GetFramebufferAttachmentParameteriv, vrc);
         }
         else
@@ -532,5 +531,5 @@
         }
 
-        if(RT_FAILURE(rc))
+        if(RT_FAILURE(vrc))
             break;
 
@@ -625,20 +624,17 @@
     static char pszVBoxPath[RTPATH_MAX];
     const char *papszArgs[] = { NULL, "-test", "2D", NULL};
-    int rc;
+
+    int vrc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(vrc, false);
+# if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    vrc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
+# else
+    vrc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
+# endif
+    papszArgs[0] = pszVBoxPath;         /* argv[0] */
+    AssertRCReturn(vrc, false);
+
     RTPROCESS Process;
-    RTPROCSTATUS ProcStatus;
-    uint64_t StartTS;
-
-    rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, false);
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
-#else
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
-#endif
-    papszArgs[0] = pszVBoxPath;         /* argv[0] */
-    AssertRCReturn(rc, false);
-
-    rc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
-    if (RT_FAILURE(rc))
+    vrc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
+    if (RT_FAILURE(vrc))
     {
         VBOXQGLLOGREL(("2D support test failed: failed to create a test process\n"));
@@ -646,10 +642,11 @@
     }
 
-    StartTS = RTTimeMilliTS();
-
+    uint64_t const StartTS = RTTimeMilliTS();
+
+    RTPROCSTATUS ProcStatus = {0};
     while (1)
     {
-        rc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ProcStatus);
-        if (rc != VERR_PROCESS_RUNNING)
+        vrc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ProcStatus);
+        if (vrc != VERR_PROCESS_RUNNING)
             break;
 
@@ -665,5 +662,5 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         if ((ProcStatus.enmReason==RTPROCEXITREASON_NORMAL) && (ProcStatus.iStatus==0))
@@ -674,5 +671,5 @@
     }
 
-    VBOXQGLLOGREL(("2D support test failed: err code (%Rra)\n", rc));
+    VBOXQGLLOGREL(("2D support test failed: err code (%Rra)\n", vrc));
 
     return false;
Index: trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
===================================================================
--- trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp	(revision 98183)
+++ trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp	(revision 98281)
@@ -173,9 +173,9 @@
      */
     char szCorrect[RTPATH_MAX];
-    int rc = RTPathAppPrivateNoArch(szCorrect, sizeof(szCorrect));
-    if (RT_FAILURE(rc))
+    int vrc = RTPathAppPrivateNoArch(szCorrect, sizeof(szCorrect));
+    if (RT_FAILURE(vrc))
         return false;
-    rc = RTPathAppend(szCorrect, sizeof(szCorrect), VBOX_EXTPACK_CERT_DIR);
-    if (RT_FAILURE(rc))
+    vrc = RTPathAppend(szCorrect, sizeof(szCorrect), VBOX_EXTPACK_CERT_DIR);
+    if (RT_FAILURE(vrc))
         return false;
 
@@ -196,9 +196,9 @@
      */
     char szCorrect[RTPATH_MAX];
-    int rc = RTPathAppPrivateArchTop(szCorrect, sizeof(szCorrect));
-    if (RT_FAILURE(rc))
+    int vrc = RTPathAppPrivateArchTop(szCorrect, sizeof(szCorrect));
+    if (RT_FAILURE(vrc))
         return false;
-    rc = RTPathAppend(szCorrect, sizeof(szCorrect), VBOX_EXTPACK_INSTALL_DIR);
-    if (RT_FAILURE(rc))
+    vrc = RTPathAppend(szCorrect, sizeof(szCorrect), VBOX_EXTPACK_INSTALL_DIR);
+    if (RT_FAILURE(vrc))
         return false;
 
@@ -221,9 +221,9 @@
 {
     /** @todo May have to undo 555 modes here later.  */
-    int rc = RTDirRemoveRecursive(pszDir, RTDIRRMREC_F_CONTENT_AND_DIR);
-    if (RT_FAILURE(rc))
+    int vrc = RTDirRemoveRecursive(pszDir, RTDIRRMREC_F_CONTENT_AND_DIR);
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
                               "Failed to delete the %sextension pack directory: %Rrc ('%s')",
-                              fTemporary ? "temporary " : "", rc, pszDir);
+                              fTemporary ? "temporary " : "", vrc, pszDir);
     return RTEXITCODE_SUCCESS;
 }
@@ -240,9 +240,9 @@
     for (;;)
     {
-        int rc = RTDirRename(pszSrc, pszDst, fFlags);
-        if (   (   rc != VERR_ACCESS_DENIED
-                && rc != VERR_SHARING_VIOLATION)
+        int vrc = RTDirRename(pszSrc, pszDst, fFlags);
+        if (   (   vrc != VERR_ACCESS_DENIED
+                && vrc != VERR_SHARING_VIOLATION)
             || RTTimeNanoTS() - nsNow > RT_NS_15SEC)
-            return rc;
+            return vrc;
         RTThreadSleep(128);
     }
@@ -263,12 +263,12 @@
        VM processes from picking it up. */
     char szExtPackUnInstDir[RTPATH_MAX];
-    int rc = RTStrCopy(szExtPackUnInstDir, sizeof(szExtPackUnInstDir), pszExtPackDir);
-    if (RT_SUCCESS(rc))
-        rc = RTStrCat(szExtPackUnInstDir, sizeof(szExtPackUnInstDir), "-_-uninst");
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct temporary extension pack path: %Rrc", rc);
-
-    rc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
-    if (rc == VERR_ALREADY_EXISTS)
+    int vrc = RTStrCopy(szExtPackUnInstDir, sizeof(szExtPackUnInstDir), pszExtPackDir);
+    if (RT_SUCCESS(vrc))
+        vrc = RTStrCat(szExtPackUnInstDir, sizeof(szExtPackUnInstDir), "-_-uninst");
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct temporary extension pack path: %Rrc", vrc);
+
+    vrc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
+    if (vrc == VERR_ALREADY_EXISTS)
     {
         /* Automatic cleanup and try again.  It's in theory possible that we're
@@ -277,10 +277,10 @@
            installation directory.) */
         RemoveExtPackDir(szExtPackUnInstDir, false /*fTemporary*/);
-        rc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
-    }
-    if (RT_FAILURE(rc))
+        vrc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
+    }
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
                               "Failed to rename the extension pack directory: %Rrc\n"
-                              "If the problem persists, try running the command: VBoxManage extpack cleanup", rc);
+                              "If the problem persists, try running the command: VBoxManage extpack cleanup", vrc);
 
     /* Recursively delete the directory content. */
@@ -299,6 +299,6 @@
 {
     char szError[8192];
-    int rc = VBoxExtPackOpenTarFss(hTarballFile, szError, sizeof(szError), phTarFss, NULL);
-    if (RT_FAILURE(rc))
+    int vrc = VBoxExtPackOpenTarFss(hTarballFile, szError, sizeof(szError), phTarFss, NULL);
+    if (RT_FAILURE(vrc))
     {
         Assert(szError[0]);
@@ -324,7 +324,7 @@
     RTMsgInfo("Setting permissions...");
 #if !defined(RT_OS_WINDOWS)
-     int rc = RTPathSetMode(pszDir, 0755);
-     if (RT_FAILURE(rc))
-         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions: %Rrc ('%s')", rc, pszDir);
+     int vrc = RTPathSetMode(pszDir, 0755);
+     if (RT_FAILURE(vrc))
+         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions: %Rrc ('%s')", vrc, pszDir);
 #else
      /** @todo TrustedInstaller? */
@@ -347,6 +347,6 @@
 {
     char szError[8192];
-    int rc = VBoxExtPackValidateMember(pszName, enmType, hVfsObj, szError, sizeof(szError));
-    if (RT_FAILURE(rc))
+    int vrc = VBoxExtPackValidateMember(pszName, enmType, hVfsObj, szError, sizeof(szError));
+    if (RT_FAILURE(vrc))
     {
         Assert(szError[0]);
@@ -378,7 +378,7 @@
     RTERRINFOSTATIC ErrInfo;
     RTErrInfoInitStatic(&ErrInfo);
-    int rc = SUPR3HardenedVerifyDir(pszDir, true /*fRecursive*/, true /*fCheckFiles*/, &ErrInfo.Core);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Hardening check failed with %Rrc: %s", rc, ErrInfo.Core.pszMsg);
+    int vrc = SUPR3HardenedVerifyDir(pszDir, true /*fRecursive*/, true /*fCheckFiles*/, &ErrInfo.Core);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Hardening check failed with %Rrc: %s", vrc, ErrInfo.Core.pszMsg);
     return RTEXITCODE_SUCCESS;
 }
@@ -398,12 +398,12 @@
      */
     RTFSOBJINFO ObjInfo;
-    int rc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsObjQueryInfo failed on '%s': %Rrc", pszDstDirName, rc);
+    int vrc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsObjQueryInfo failed on '%s': %Rrc", pszDstDirName, vrc);
     ObjInfo.Attr.fMode &= ~(RTFS_UNIX_IWOTH | RTFS_UNIX_IWGRP);
 
-    rc = RTDirCreate(pszDstDirName, ObjInfo.Attr.fMode, 0);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create directory '%s': %Rrc", pszDstDirName, rc);
+    vrc = RTDirCreate(pszDstDirName, ObjInfo.Attr.fMode, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create directory '%s': %Rrc", pszDstDirName, vrc);
 
 #ifndef RT_OS_WINDOWS
@@ -411,7 +411,7 @@
      * Because of umask, we have to apply the mode again.
      */
-    rc = RTPathSetMode(pszDstDirName, ObjInfo.Attr.fMode);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions on '%s': %Rrc", pszDstDirName, rc);
+    vrc = RTPathSetMode(pszDstDirName, ObjInfo.Attr.fMode);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions on '%s': %Rrc", pszDstDirName, vrc);
 #else
     /** @todo Ownership tricks on windows? */
@@ -438,7 +438,7 @@
      */
     RTFSOBJINFO ObjInfo;
-    int rc = RTVfsIoStrmQueryInfo(hVfsIosSrc, &ObjInfo, RTFSOBJATTRADD_NOTHING);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsIoStrmQueryInfo failed with %Rrc on '%s'", rc, pszDstFilename);
+    int vrc = RTVfsIoStrmQueryInfo(hVfsIosSrc, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsIoStrmQueryInfo failed with %Rrc on '%s'", vrc, pszDstFilename);
 
     /*
@@ -447,7 +447,7 @@
     uint32_t fFlags = RTFILE_O_WRITE | RTFILE_O_DENY_ALL | RTFILE_O_CREATE | (0600 << RTFILE_O_CREATE_MODE_SHIFT);
     RTFILE   hFile;
-    rc = RTFileOpen(&hFile, pszDstFilename, fFlags);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create '%s': %Rrc", pszDstFilename, rc);
+    vrc = RTFileOpen(&hFile, pszDstFilename, fFlags);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create '%s': %Rrc", pszDstFilename, vrc);
 
     /*
@@ -456,22 +456,22 @@
      */
     RTVFSIOSTREAM hVfsIosDst2;
-    rc = RTVfsIoStrmFromRTFile(hFile, fFlags, true /*fLeaveOpen*/, &hVfsIosDst2);
-    if (RT_SUCCESS(rc))
+    vrc = RTVfsIoStrmFromRTFile(hFile, fFlags, true /*fLeaveOpen*/, &hVfsIosDst2);
+    if (RT_SUCCESS(vrc))
     {
         RTVFSIOSTREAM hVfsIosDst;
-        rc = RTManifestEntryAddPassthruIoStream(hUnpackManifest, hVfsIosDst2, pszName,
-                                                RTMANIFEST_ATTR_SIZE | RTMANIFEST_ATTR_SHA256,
-                                                false /*fReadOrWrite*/, &hVfsIosDst);
+        vrc = RTManifestEntryAddPassthruIoStream(hUnpackManifest, hVfsIosDst2, pszName,
+                                                 RTMANIFEST_ATTR_SIZE | RTMANIFEST_ATTR_SHA256,
+                                                 false /*fReadOrWrite*/, &hVfsIosDst);
         RTVfsIoStrmRelease(hVfsIosDst2);
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             /*
              * Pump the data thru.
              */
-            rc = RTVfsUtilPumpIoStreams(hVfsIosSrc, hVfsIosDst, (uint32_t)RT_MIN(ObjInfo.cbObject, _1G));
-            if (RT_SUCCESS(rc))
+            vrc = RTVfsUtilPumpIoStreams(hVfsIosSrc, hVfsIosDst, (uint32_t)RT_MIN(ObjInfo.cbObject, _1G));
+            if (RT_SUCCESS(vrc))
             {
-                rc = RTManifestPtIosAddEntryNow(hVfsIosDst);
-                if (RT_SUCCESS(rc))
+                vrc = RTManifestPtIosAddEntryNow(hVfsIosDst);
+                if (RT_SUCCESS(vrc))
                 {
                     RTVfsIoStrmRelease(hVfsIosDst);
@@ -482,7 +482,7 @@
                      */
                     ObjInfo.Attr.fMode &= ~(RTFS_UNIX_IWOTH | RTFS_UNIX_IWGRP);
-                    rc = RTFileSetMode(hFile, ObjInfo.Attr.fMode);
+                    vrc = RTFileSetMode(hFile, ObjInfo.Attr.fMode);
                     /** @todo Windows needs to do more here, I think. */
-                    if (RT_SUCCESS(rc))
+                    if (RT_SUCCESS(vrc))
                     {
                         RTFileClose(hFile);
@@ -490,18 +490,18 @@
                     }
 
-                    RTMsgError("Failed to set the mode of '%s' to %RTfmode: %Rrc", pszDstFilename, ObjInfo.Attr.fMode, rc);
+                    RTMsgError("Failed to set the mode of '%s' to %RTfmode: %Rrc", pszDstFilename, ObjInfo.Attr.fMode, vrc);
                 }
                 else
-                    RTMsgError("RTManifestPtIosAddEntryNow failed for '%s': %Rrc", pszDstFilename, rc);
+                    RTMsgError("RTManifestPtIosAddEntryNow failed for '%s': %Rrc", pszDstFilename, vrc);
             }
             else
-                RTMsgError("RTVfsUtilPumpIoStreams failed for '%s': %Rrc", pszDstFilename, rc);
+                RTMsgError("RTVfsUtilPumpIoStreams failed for '%s': %Rrc", pszDstFilename, vrc);
             RTVfsIoStrmRelease(hVfsIosDst);
         }
         else
-            RTMsgError("RTManifestEntryAddPassthruIoStream failed: %Rrc", rc);
+            RTMsgError("RTManifestEntryAddPassthruIoStream failed: %Rrc", vrc);
     }
     else
-        RTMsgError("RTVfsIoStrmFromRTFile failed: %Rrc", rc);
+        RTMsgError("RTVfsIoStrmFromRTFile failed: %Rrc", vrc);
     RTFileClose(hFile);
     return RTEXITCODE_FAILURE;
@@ -532,7 +532,7 @@
      */
     char szDstPath[RTPATH_MAX];
-    int rc = RTPathAbs(pszDirDst, szDstPath, sizeof(szDstPath) - VBOX_EXTPACK_MAX_MEMBER_NAME_LENGTH - 2);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs('%s',,) failed: %Rrc", pszDirDst, rc);
+    int vrc = RTPathAbs(pszDirDst, szDstPath, sizeof(szDstPath) - VBOX_EXTPACK_MAX_MEMBER_NAME_LENGTH - 2);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs('%s',,) failed: %Rrc", pszDirDst, vrc);
     size_t offDstPath = RTPathStripTrailingSlash(szDstPath);
     szDstPath[offDstPath++] = '/';
@@ -548,6 +548,6 @@
 
     RTMANIFEST hUnpackManifest;
-    rc = RTManifestCreate(0 /*fFlags*/, &hUnpackManifest);
-    if (RT_SUCCESS(rc))
+    vrc = RTManifestCreate(0 /*fFlags*/, &hUnpackManifest);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -562,9 +562,9 @@
             RTVFSOBJ        hVfsObj;
             RTVFSOBJTYPE    enmType;
-            rc = RTVfsFsStrmNext(hTarFss, &pszName, &enmType, &hVfsObj);
-            if (RT_FAILURE(rc))
+            vrc = RTVfsFsStrmNext(hTarFss, &pszName, &enmType, &hVfsObj);
+            if (RT_FAILURE(vrc))
             {
-                if (rc != VERR_EOF)
-                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsFsStrmNext failed: %Rrc", rc);
+                if (vrc != VERR_EOF)
+                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsFsStrmNext failed: %Rrc", vrc);
                 break;
             }
@@ -578,6 +578,6 @@
             {
                 szDstPath[offDstPath] = '\0';
-                rc = RTStrCopy(&szDstPath[offDstPath], sizeof(szDstPath) - offDstPath, pszAdjName);
-                if (RT_SUCCESS(rc))
+                vrc = RTStrCopy(&szDstPath[offDstPath], sizeof(szDstPath) - offDstPath, pszAdjName);
+                if (RT_SUCCESS(vrc))
                 {
                     if (   enmType == RTVFSOBJTYPE_FILE
@@ -592,5 +592,5 @@
                 }
                 else
-                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Name is too long: '%s' (%Rrc)", pszAdjName, rc);
+                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Name is too long: '%s' (%Rrc)", pszAdjName, vrc);
             }
 
@@ -611,12 +611,12 @@
         {
             char szError[RTPATH_MAX];
-            rc = RTManifestEqualsEx(hUnpackManifest, hValidManifest, NULL /*papszIgnoreEntries*/, NULL /*papszIgnoreAttr*/,
-                                    0 /*fFlags*/, szError, sizeof(szError));
-            if (RT_SUCCESS(rc))
+            vrc = RTManifestEqualsEx(hUnpackManifest, hValidManifest, NULL /*papszIgnoreEntries*/, NULL /*papszIgnoreAttr*/,
+                                     0 /*fFlags*/, szError, sizeof(szError));
+            if (RT_SUCCESS(vrc))
                 rcExit = RTEXITCODE_SUCCESS;
-            else if (rc == VERR_NOT_EQUAL && szError[0])
+            else if (vrc == VERR_NOT_EQUAL && szError[0])
                 rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Manifest mismatch: %s", szError);
             else
-                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTManifestEqualsEx failed: %Rrc", rc);
+                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTManifestEqualsEx failed: %Rrc", vrc);
         }
 #if 0
@@ -658,7 +658,7 @@
 
     char szError[8192];
-    int rc = VBoxExtPackValidateTarball(hTarballFile, pszExtPackName, pszTarball, pszTarballDigest,
-                                        szError, sizeof(szError), phValidManifest, NULL /*phXmlFile*/, NULL /*pStrDigest*/);
-    if (RT_FAILURE(rc))
+    int vrc = VBoxExtPackValidateTarball(hTarballFile, pszExtPackName, pszTarball, pszTarballDigest,
+                                         szError, sizeof(szError), phValidManifest, NULL /*phXmlFile*/, NULL /*pStrDigest*/);
+    if (RT_FAILURE(vrc))
     {
         Assert(szError[0]);
@@ -695,7 +695,7 @@
      */
     RTFSOBJINFO ObjInfo;
-    int rc = RTFileQueryInfo(hTarballFile, &ObjInfo, RTFSOBJATTRADD_UNIX);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTFileQueryInfo failed with %Rrc on '%s'", rc, pszTarball);
+    int vrc = RTFileQueryInfo(hTarballFile, &ObjInfo, RTFSOBJATTRADD_UNIX);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTFileQueryInfo failed with %Rrc on '%s'", vrc, pszTarball);
     if (!RTFS_IS_FILE(ObjInfo.Attr.fMode))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Not a regular file: %s", pszTarball);
@@ -704,7 +704,7 @@
     {
         RTFSOBJINFO ObjInfo2;
-        rc = RTFileQueryInfo(hTarballFileOpt, &ObjInfo2, RTFSOBJATTRADD_UNIX);
-        if (RT_FAILURE(rc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTFileQueryInfo failed with %Rrc on --tarball-fd", rc);
+        vrc = RTFileQueryInfo(hTarballFileOpt, &ObjInfo2, RTFSOBJATTRADD_UNIX);
+        if (RT_FAILURE(vrc))
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTFileQueryInfo failed with %Rrc on --tarball-fd", vrc);
         if (   ObjInfo.Attr.u.Unix.INodeIdDevice != ObjInfo2.Attr.u.Unix.INodeIdDevice
             || ObjInfo.Attr.u.Unix.INodeId       != ObjInfo2.Attr.u.Unix.INodeId)
@@ -716,25 +716,25 @@
      */
     char szFinalPath[RTPATH_MAX];
-    rc = RTPathJoin(szFinalPath, sizeof(szFinalPath), pszBaseDir, pszMangledName);
-    if (RT_FAILURE(rc))
+    vrc = RTPathJoin(szFinalPath, sizeof(szFinalPath), pszBaseDir, pszMangledName);
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
-                              "Failed to construct the path to the final extension pack directory: %Rrc", rc);
+                              "Failed to construct the path to the final extension pack directory: %Rrc", vrc);
 
     char szTmpPath[RTPATH_MAX];
-    rc = RTPathJoin(szTmpPath, sizeof(szTmpPath) - 64, pszBaseDir, pszMangledName);
-    if (RT_SUCCESS(rc))
+    vrc = RTPathJoin(szTmpPath, sizeof(szTmpPath) - 64, pszBaseDir, pszMangledName);
+    if (RT_SUCCESS(vrc))
     {
         size_t cchTmpPath = strlen(szTmpPath);
         RTStrPrintf(&szTmpPath[cchTmpPath], sizeof(szTmpPath) - cchTmpPath, "-_-inst-%u", (uint32_t)RTProcSelf());
     }
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
-                              "Failed to construct the path to the temporary extension pack directory: %Rrc", rc);
+                              "Failed to construct the path to the temporary extension pack directory: %Rrc", vrc);
 
     /*
      * Check that they don't exist at this point in time, unless fReplace=true.
      */
-    rc = RTPathQueryInfoEx(szFinalPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-    if (RT_SUCCESS(rc) && RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
+    vrc = RTPathQueryInfoEx(szFinalPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+    if (RT_SUCCESS(vrc) && RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
     {
         if (!fReplace)
@@ -742,14 +742,14 @@
                                   "The extension pack is already installed. You must uninstall the old one first.");
     }
-    else if (RT_SUCCESS(rc))
+    else if (RT_SUCCESS(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
                               "Found non-directory file system object where the extension pack would be installed ('%s')",
                               szFinalPath);
-    else if (rc != VERR_FILE_NOT_FOUND && rc != VERR_PATH_NOT_FOUND)
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Unexpected RTPathQueryInfoEx status code %Rrc for '%s'", rc, szFinalPath);
-
-    rc = RTPathQueryInfoEx(szTmpPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-    if (rc != VERR_FILE_NOT_FOUND && rc != VERR_PATH_NOT_FOUND)
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Unexpected RTPathQueryInfoEx status code %Rrc for '%s'", rc, szFinalPath);
+    else if (vrc != VERR_FILE_NOT_FOUND && vrc != VERR_PATH_NOT_FOUND)
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Unexpected RTPathQueryInfoEx status code %Rrc for '%s'", vrc, szFinalPath);
+
+    vrc = RTPathQueryInfoEx(szTmpPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+    if (vrc != VERR_FILE_NOT_FOUND && vrc != VERR_PATH_NOT_FOUND)
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Unexpected RTPathQueryInfoEx status code %Rrc for '%s'", vrc, szFinalPath);
 
     /*
@@ -762,13 +762,13 @@
      * Because of umask, we have to apply the mode again.
      */
-    rc = RTPathSetMode(pszBaseDir, 0755);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions on '%s': %Rrc", pszBaseDir, rc);
+    vrc = RTPathSetMode(pszBaseDir, 0755);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions on '%s': %Rrc", pszBaseDir, vrc);
 #else
     /** @todo Ownership tricks on windows? */
 #endif
-    rc = RTDirCreate(szTmpPath, 0700, 0);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create temporary directory: %Rrc ('%s')", rc, szTmpPath);
+    vrc = RTDirCreate(szTmpPath, 0700, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create temporary directory: %Rrc ('%s')", vrc, szTmpPath);
 
     RTMANIFEST hValidManifest = NIL_RTMANIFEST;
@@ -784,6 +784,6 @@
     if (rcExit == RTEXITCODE_SUCCESS)
     {
-        rc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
-        if (   RT_FAILURE(rc)
+        vrc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
+        if (   RT_FAILURE(vrc)
             && fReplace
             && RTDirExists(szFinalPath))
@@ -792,12 +792,12 @@
             rcExit = CommonUninstallWorker(szFinalPath);
             if (rcExit == RTEXITCODE_SUCCESS)
-                rc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
+                vrc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
         }
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
             RTMsgInfo("Successfully installed '%s' (%s)", pszName, pszTarball);
         else if (rcExit == RTEXITCODE_SUCCESS)
             rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE,
                                     "Failed to rename the temporary directory to the final one: %Rrc ('%s' -> '%s')",
-                                    rc, szTmpPath, szFinalPath);
+                                    vrc, szTmpPath, szFinalPath);
     }
 
@@ -841,7 +841,7 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
+    int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", vrc);
 
     const char     *pszBaseDir          = NULL;
@@ -895,7 +895,7 @@
                 if (hNative != ValueUnion.u64)
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "The --tarball-fd value is out of range: %#RX64", ValueUnion.u64);
-                rc = RTFileFromNative(&hTarballFileOpt, hNative);
-                if (RT_FAILURE(rc))
-                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "RTFileFromNative failed on --target-fd value: %Rrc", rc);
+                vrc = RTFileFromNative(&hTarballFileOpt, hNative);
+                if (RT_FAILURE(vrc))
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "RTFileFromNative failed on --target-fd value: %Rrc", vrc);
                 break;
             }
@@ -912,7 +912,7 @@
 
                 uint8_t abDigest[RTSHA256_HASH_SIZE];
-                rc = RTSha256FromString(pszTarballDigest, abDigest);
-                if (RT_FAILURE(rc))
-                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Bad SHA-256 string: %Rrc", rc);
+                vrc = RTSha256FromString(pszTarballDigest, abDigest);
+                if (RT_FAILURE(vrc))
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Bad SHA-256 string: %Rrc", vrc);
                 break;
             }
@@ -946,6 +946,6 @@
     RTEXITCODE  rcExit;
     RTFILE      hTarballFile;
-    rc = RTFileOpen(&hTarballFile, pszTarball, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
-    if (RT_SUCCESS(rc))
+    vrc = RTFileOpen(&hTarballFile, pszTarball, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    if (RT_SUCCESS(vrc))
     {
         rcExit = DoInstall2(pszBaseDir, pszCertDir, pszTarball, pszTarballDigest, hTarballFile, hTarballFileOpt,
@@ -954,5 +954,5 @@
     }
     else
-        rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to open the extension pack tarball: %Rrc ('%s')", rc, pszTarball);
+        rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to open the extension pack tarball: %Rrc ('%s')", vrc, pszTarball);
 
     delete pstrMangledName;
@@ -983,7 +983,7 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
+    int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", vrc);
 
     const char     *pszBaseDir = NULL;
@@ -1042,7 +1042,7 @@
     /* Check that it exists. */
     char szExtPackDir[RTPATH_MAX];
-    rc = RTPathJoin(szExtPackDir, sizeof(szExtPackDir), pszBaseDir, strMangledName.c_str());
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct extension pack path: %Rrc", rc);
+    vrc = RTPathJoin(szExtPackDir, sizeof(szExtPackDir), pszBaseDir, strMangledName.c_str());
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct extension pack path: %Rrc", vrc);
 
     if (!RTDirExists(szExtPackDir))
@@ -1079,7 +1079,7 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
+    int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", vrc);
 
     const char     *pszBaseDir = NULL;
@@ -1113,7 +1113,7 @@
      */
     RTDIR hDir;
-    rc = RTDirOpen(&hDir, pszBaseDir);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed open the base directory: %Rrc ('%s')", rc, pszBaseDir);
+    vrc = RTDirOpen(&hDir, pszBaseDir);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed open the base directory: %Rrc ('%s')", vrc, pszBaseDir);
 
     uint32_t    cCleaned = 0;
@@ -1122,9 +1122,9 @@
     {
         RTDIRENTRYEX Entry;
-        rc = RTDirReadEx(hDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-        if (RT_FAILURE(rc))
+        vrc = RTDirReadEx(hDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+        if (RT_FAILURE(vrc))
         {
-            if (rc != VERR_NO_MORE_FILES)
-                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTDirReadEx returns %Rrc", rc);
+            if (vrc != VERR_NO_MORE_FILES)
+                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTDirReadEx returns %Rrc", vrc);
             break;
         }
@@ -1150,6 +1150,6 @@
                  */
                 char szPath[RTPATH_MAX];
-                rc = RTPathJoin(szPath, sizeof(szPath), pszBaseDir, Entry.szName);
-                if (RT_SUCCESS(rc))
+                vrc = RTPathJoin(szPath, sizeof(szPath), pszBaseDir, Entry.szName);
+                if (RT_SUCCESS(vrc))
                 {
                     RTEXITCODE rcExit2 = RemoveExtPackDir(szPath, true /*fTemporary*/);
@@ -1160,5 +1160,5 @@
                 }
                 else
-                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathJoin failed with %Rrc for '%s'", rc, Entry.szName);
+                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathJoin failed with %Rrc for '%s'", vrc, Entry.szName);
                 cCleaned++;
             }
@@ -1205,10 +1205,10 @@
     for (unsigned i = 0; i < RT_ELEMENTS(s_apszPaths); i++)
     {
-        int rc = RTPathJoin(pszPath, cbPath, s_apszPaths[i], pszName);
-        if (RT_SUCCESS(rc))
+        int vrc = RTPathJoin(pszPath, cbPath, s_apszPaths[i], pszName);
+        if (RT_SUCCESS(vrc))
         {
             RTFSOBJINFO ObjInfo;
-            rc = RTPathQueryInfoEx(pszPath, &ObjInfo, RTFSOBJATTRADD_UNIX, RTPATH_F_FOLLOW_LINK);
-            if (RT_SUCCESS(rc))
+            vrc = RTPathQueryInfoEx(pszPath, &ObjInfo, RTFSOBJATTRADD_UNIX, RTPATH_F_FOLLOW_LINK);
+            if (RT_SUCCESS(vrc))
             {
                 if (!(ObjInfo.Attr.fMode & RTFS_UNIX_IWOTH))
@@ -1233,28 +1233,28 @@
 static void CopyFileToStdXxx(RTFILE hSrc, PRTSTREAM pDst, bool fComplain)
 {
-    int rc;
+    int vrc;
     for (;;)
     {
         char abBuf[0x1000];
         size_t cbRead;
-        rc = RTFileRead(hSrc, abBuf, sizeof(abBuf), &cbRead);
-        if (RT_FAILURE(rc))
+        vrc = RTFileRead(hSrc, abBuf, sizeof(abBuf), &cbRead);
+        if (RT_FAILURE(vrc))
         {
-            RTMsgError("RTFileRead failed: %Rrc", rc);
+            RTMsgError("RTFileRead failed: %Rrc", vrc);
             break;
         }
         if (!cbRead)
             break;
-        rc = RTStrmWrite(pDst, abBuf, cbRead);
-        if (RT_FAILURE(rc))
+        vrc = RTStrmWrite(pDst, abBuf, cbRead);
+        if (RT_FAILURE(vrc))
         {
             if (fComplain)
-                RTMsgError("RTStrmWrite failed: %Rrc", rc);
+                RTMsgError("RTStrmWrite failed: %Rrc", vrc);
             break;
         }
     }
-    rc = RTStrmFlush(pDst);
-    if (RT_FAILURE(rc) && fComplain)
-        RTMsgError("RTStrmFlush failed: %Rrc", rc);
+    vrc = RTStrmFlush(pDst);
+    if (RT_FAILURE(vrc) && fComplain)
+        RTMsgError("RTStrmFlush failed: %Rrc", vrc);
 }
 
@@ -1291,13 +1291,13 @@
     Info.hwnd   = NULL;
     Info.lpVerb = L"runas";
-    int rc = RTStrToUtf16(pszExecPath, (PRTUTF16 *)&Info.lpFile);
-    if (RT_SUCCESS(rc))
+    int vrc = RTStrToUtf16(pszExecPath, (PRTUTF16 *)&Info.lpFile);
+    if (RT_SUCCESS(vrc))
     {
         char *pszCmdLine;
-        rc = RTGetOptArgvToString(&pszCmdLine, &papszArgs[cSuArgs + 1], RTGETOPTARGV_CNV_QUOTE_MS_CRT);
-        if (RT_SUCCESS(rc))
+        vrc = RTGetOptArgvToString(&pszCmdLine, &papszArgs[cSuArgs + 1], RTGETOPTARGV_CNV_QUOTE_MS_CRT);
+        if (RT_SUCCESS(vrc))
         {
-            rc = RTStrToUtf16(pszCmdLine, (PRTUTF16 *)&Info.lpParameters);
-            if (RT_SUCCESS(rc))
+            vrc = RTStrToUtf16(pszCmdLine, (PRTUTF16 *)&Info.lpParameters);
+            if (RT_SUCCESS(vrc))
             {
                 Info.lpDirectory = NULL;
@@ -1318,6 +1318,6 @@
                     {
                         uint64_t u64Hwnd;
-                        rc = RTStrToUInt64Ex(pszArg + sizeof("hwnd=") - 1, NULL, 0, &u64Hwnd);
-                        if (RT_SUCCESS(rc))
+                        vrc = RTStrToUInt64Ex(pszArg + sizeof("hwnd=") - 1, NULL, 0, &u64Hwnd);
+                        if (RT_SUCCESS(vrc))
                         {
                             HWND hwnd = (HWND)(uintptr_t)u64Hwnd;
@@ -1385,14 +1385,14 @@
     }
     else
-        RTMsgError("RTStrToUtf16 failed: %Rc", rc);
+        RTMsgError("RTStrToUtf16 failed: %Rc", vrc);
 
 #elif defined(RT_OS_DARWIN)
     RT_NOREF(pszDisplayInfoHack);
     char szIconName[RTPATH_MAX];
-    int rc = RTPathAppPrivateArch(szIconName, sizeof(szIconName));
-    if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szIconName, sizeof(szIconName), "../Resources/virtualbox.png");
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct icon path: %Rrc", rc);
+    int vrc = RTPathAppPrivateArch(szIconName, sizeof(szIconName));
+    if (RT_SUCCESS(vrc))
+        vrc = RTPathAppend(szIconName, sizeof(szIconName), "../Resources/virtualbox.png");
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct icon path: %Rrc", vrc);
 
     AuthorizationRef AuthRef;
@@ -1471,7 +1471,7 @@
      */
     char *pszCmdLine;
-    int rc = RTGetOptArgvToString(&pszCmdLine, &papszArgs[cSuArgs], RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvToString failed: %Rrc", rc);
+    int vrc = RTGetOptArgvToString(&pszCmdLine, &papszArgs[cSuArgs], RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvToString failed: %Rrc", vrc);
 
     /*
@@ -1579,12 +1579,12 @@
          */
         RTPROCESS hProcess;
-        rc = RTProcCreateEx(papszArgs[iSuArg], &papszArgs[iSuArg], RTENV_DEFAULT, 0 /*fFlags*/, NULL /*phStdIn*/,
-                            NULL /*phStdOut*/, NULL /*phStdErr*/, NULL /*pszAsUser*/, NULL /*pszPassword*/, NULL /* pvExtraData*/,
-                            &hProcess);
-        if (RT_SUCCESS(rc))
+        vrc = RTProcCreateEx(papszArgs[iSuArg], &papszArgs[iSuArg], RTENV_DEFAULT, 0 /*fFlags*/, NULL /*phStdIn*/,
+                             NULL /*phStdOut*/, NULL /*phStdErr*/, NULL /*pszAsUser*/, NULL /*pszPassword*/, NULL /* pvExtraData*/,
+                             &hProcess);
+        if (RT_SUCCESS(vrc))
         {
             RTPROCSTATUS Status;
-            rc = RTProcWait(hProcess, RTPROCWAIT_FLAGS_BLOCK, &Status);
-            if (RT_SUCCESS(rc))
+            vrc = RTProcWait(hProcess, RTPROCWAIT_FLAGS_BLOCK, &Status);
+            if (RT_SUCCESS(vrc))
             {
                 if (Status.enmReason == RTPROCEXITREASON_NORMAL)
@@ -1594,8 +1594,8 @@
             }
             else
-                RTMsgError("Error while waiting for '%s': %Rrc", papszArgs[iSuArg], rc);
+                RTMsgError("Error while waiting for '%s': %Rrc", papszArgs[iSuArg], vrc);
         }
         else
-            RTMsgError("Failed to execute '%s': %Rrc", papszArgs[iSuArg], rc);
+            RTMsgError("Failed to execute '%s': %Rrc", papszArgs[iSuArg], vrc);
     }
     RTStrFree(pszCmdLine);
@@ -1628,31 +1628,31 @@
      */
     char szTempDir[RTPATH_MAX - sizeof("/stderr")];
-    int rc = RTPathTemp(szTempDir, sizeof(szTempDir));
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathTemp failed: %Rrc", rc);
-    rc = RTPathAppend(szTempDir, sizeof(szTempDir), "VBoxExtPackHelper-XXXXXX");
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAppend failed: %Rrc", rc);
-    rc = RTDirCreateTemp(szTempDir, 0700);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTDirCreateTemp failed: %Rrc", rc);
+    int vrc = RTPathTemp(szTempDir, sizeof(szTempDir));
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathTemp failed: %Rrc", vrc);
+    vrc = RTPathAppend(szTempDir, sizeof(szTempDir), "VBoxExtPackHelper-XXXXXX");
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAppend failed: %Rrc", vrc);
+    vrc = RTDirCreateTemp(szTempDir, 0700);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTDirCreateTemp failed: %Rrc", vrc);
 
     RTEXITCODE rcExit = RTEXITCODE_FAILURE;
     char szStdOut[RTPATH_MAX];
     char szStdErr[RTPATH_MAX];
-    rc = RTPathJoin(szStdOut, sizeof(szStdOut), szTempDir, "stdout");
-    if (RT_SUCCESS(rc))
-        rc = RTPathJoin(szStdErr, sizeof(szStdErr), szTempDir, "stderr");
-    if (RT_SUCCESS(rc))
+    vrc = RTPathJoin(szStdOut, sizeof(szStdOut), szTempDir, "stdout");
+    if (RT_SUCCESS(vrc))
+        vrc = RTPathJoin(szStdErr, sizeof(szStdErr), szTempDir, "stderr");
+    if (RT_SUCCESS(vrc))
     {
         RTFILE hStdOut;
-        rc = RTFileOpen(&hStdOut, szStdOut, RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE
-                        | (0600 << RTFILE_O_CREATE_MODE_SHIFT));
-        if (RT_SUCCESS(rc))
+        vrc = RTFileOpen(&hStdOut, szStdOut, RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE
+                         | (0600 << RTFILE_O_CREATE_MODE_SHIFT));
+        if (RT_SUCCESS(vrc))
         {
             RTFILE hStdErr;
-            rc = RTFileOpen(&hStdErr, szStdErr, RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE
-                            | (0600 << RTFILE_O_CREATE_MODE_SHIFT));
-            if (RT_SUCCESS(rc))
+            vrc = RTFileOpen(&hStdErr, szStdErr, RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE
+                             | (0600 << RTFILE_O_CREATE_MODE_SHIFT));
+            if (RT_SUCCESS(vrc))
             {
                 /*
@@ -1815,6 +1815,6 @@
 
     RTFSOBJINFO ObjInfo;
-    int rc = RTPathQueryInfoEx(szExecPath, &ObjInfo, RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK);
-    if (RT_FAILURE(rc))
+    int vrc = RTPathQueryInfoEx(szExecPath, &ObjInfo, RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK);
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathQueryInfoEx failed");
 
@@ -1833,16 +1833,16 @@
      */
 #ifdef RT_OS_WINDOWS
-    int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_UTF8_ARGV); /* WinMain gives us UTF-8, see below. */
+    int vrc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_UTF8_ARGV); /* WinMain gives us UTF-8, see below. */
 #else
-    int rc = RTR3InitExe(argc, &argv, 0);
-#endif
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
+    int vrc = RTR3InitExe(argc, &argv, 0);
+#endif
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
 
     SUPR3HardenedVerifyInit();
     RTERRINFOSTATIC ErrInfo;
     RTErrInfoInitStatic(&ErrInfo);
-    rc = SUPR3HardenedVerifySelf(argv[0], true /*fInternal*/, &ErrInfo.Core);
-    if (RT_FAILURE(rc))
+    vrc = SUPR3HardenedVerifySelf(argv[0], true /*fInternal*/, &ErrInfo.Core);
+    if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "%s", ErrInfo.Core.pszMsg);
 
@@ -1875,7 +1875,7 @@
     };
     RTGETOPTSTATE GetState;
-    rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
+    vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", vrc);
     for (;;)
     {
@@ -1943,7 +1943,7 @@
 # ifdef RT_OS_WINDOWS
                 PRTUTF16 pwszName = NULL;
-                rc = RTStrToUtf16(ValueUnion.psz, &pwszName);
-                if (RT_FAILURE(rc))
-                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Error converting '%s' to UTF-16: %Rrc\n", ValueUnion.psz, rc);
+                vrc = RTStrToUtf16(ValueUnion.psz, &pwszName);
+                if (RT_FAILURE(vrc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Error converting '%s' to UTF-16: %Rrc\n", ValueUnion.psz, vrc);
                 FILE *pFile = _wfreopen(pwszName, L"r+", ch == OPT_STDOUT ? stdout : stderr);
                 RTUtf16Free(pwszName);
@@ -1953,6 +1953,6 @@
                 if (!pFile)
                 {
-                    rc = RTErrConvertFromErrno(errno);
-                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "freopen on '%s': %Rrc", ValueUnion.psz, rc);
+                    vrc = RTErrConvertFromErrno(errno);
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "freopen on '%s': %Rrc", ValueUnion.psz, vrc);
                 }
                 break;
@@ -1985,7 +1985,7 @@
     NOREF(hPrevInstance); NOREF(nShowCmd); NOREF(lpCmdLine);
 
-    int rc = RTR3InitExeNoArguments(0);
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
+    int vrc = RTR3InitExeNoArguments(0);
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
 
     LPWSTR pwszCmdLine = GetCommandLineW();
@@ -1994,24 +1994,23 @@
 
     char *pszCmdLine;
-    rc = RTUtf16ToUtf8(pwszCmdLine, &pszCmdLine); /* leaked */
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to convert the command line: %Rrc", rc);
+    vrc = RTUtf16ToUtf8(pwszCmdLine, &pszCmdLine); /* leaked */
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to convert the command line: %Rrc", vrc);
 
     int    cArgs;
     char **papszArgs;
-    rc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszCmdLine, RTGETOPTARGV_CNV_QUOTE_MS_CRT, NULL);
-    if (RT_SUCCESS(rc))
-    {
-
-        rc = main(cArgs, papszArgs);
+    vrc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszCmdLine, RTGETOPTARGV_CNV_QUOTE_MS_CRT, NULL);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = main(cArgs, papszArgs);
 
         RTGetOptArgvFree(papszArgs);
     }
     else
-        rc = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvFromString failed: %Rrc", rc);
+        vrc = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvFromString failed: %Rrc", vrc);
     RTStrFree(pszCmdLine);
 
-    return rc;
-}
-#endif
-
+    return vrc;
+}
+#endif
+
