Changeset 60271 in vbox for trunk/src/VBox

Timestamp:

Mar 31, 2016 10:03:02 AM (9 years ago)

Author:

vboxsync

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

106312

Message:

Main/initterm: HRESULT / IPRT status code mixup

File:

• trunk/src/VBox/Main/glue/initterm.cpp (modified) (2 diffs)

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

@@ -265 +265 @@
             if (RT_SUCCESS(vrc))
 #  ifndef VBOX_IN_32_ON_64_MAIN_API
-                rc = RTPathAppend(szPath, sizeof(szPath),
-                                     RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion,
-                                                 ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion)
-                                  >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/)
-                                  ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll");
+                vrc = RTPathAppend(szPath, sizeof(szPath),
+                                      RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion,
+                                                  ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion)
+                                   >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/)
+                                   ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll");
 #  else
-                rc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");
+                vrc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");
 #  endif
             if (RT_SUCCESS(vrc))
@@ -284 +284 @@
                         DECLCALLBACKMEMBER(uint32_t, pfnRegUpdate)(void);
                     } u;
-                    rc = RTLdrGetSymbol(hMod, "VbpsUpdateRegistrations", &u.pv);
-                    if (RT_SUCCESS(rc))
+                    vrc = RTLdrGetSymbol(hMod, "VbpsUpdateRegistrations", &u.pv);
+                    if (RT_SUCCESS(vrc))
                         u.pfnRegUpdate();
                     /* Just keep it loaded. */