Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added. ​​bugref:10223

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@95140 cfe28804-0f27-0410-a406-dd0f0b0b656f

1 files changed, 28 insertions, 28 deletions

diff --git a/src/VBox/Main/testcase/tstVBoxAPI.cpp b/src/VBox/Main/testcase/tstVBoxAPI.cpp
index dbec6bc7231..c0c5a21401a 100644
--- a/src/VBox/Main/testcase/tstVBoxAPI.cpp
+++ b/src/VBox/Main/testcase/tstVBoxAPI.cpp
@@ -56,55 +56,55 @@ static HRESULT tstComExpr(HRESULT hrc, const char *pszOperation, int iLine)
 
 static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
 {
-    HRESULT rc;
+    HRESULT hrc;
     Bstr bstrTmp;
     ULONG ulTmp;
 
     RTTestSub(g_hTest, "IVirtualBox::version");
     CHECK_ERROR(pVBox, COMGETTER(Version)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::version");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::version failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::versionNormalized");
     CHECK_ERROR(pVBox, COMGETTER(VersionNormalized)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::versionNormalized");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::versionNormalized failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::revision");
     CHECK_ERROR(pVBox, COMGETTER(Revision)(&ulTmp));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::revision");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::revision failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::packageType");
     CHECK_ERROR(pVBox, COMGETTER(PackageType)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::packageType");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::packageType failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::APIVersion");
     CHECK_ERROR(pVBox, COMGETTER(APIVersion)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::APIVersion");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::APIVersion failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::homeFolder");
     CHECK_ERROR(pVBox, COMGETTER(HomeFolder)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::homeFolder");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::homeFolder failed", __LINE__);
 
     RTTestSub(g_hTest, "IVirtualBox::settingsFilePath");
     CHECK_ERROR(pVBox, COMGETTER(SettingsFilePath)(bstrTmp.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::settingsFilePath");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::settingsFilePath failed", __LINE__);
@@ -112,7 +112,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IGuestOSType> guestOSTypes;
     RTTestSub(g_hTest, "IVirtualBox::guestOSTypes");
     CHECK_ERROR(pVBox, COMGETTER(GuestOSTypes)(ComSafeArrayAsOutParam(guestOSTypes)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::guestOSTypes");
     else
         RTTestFailed(g_hTest, "%d: IVirtualBox::guestOSTypes failed", __LINE__);
@@ -131,7 +131,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
                                      NULL,                          /** Password id */
                                      NULL,                          /** Password */
                                      ptrMachine.asOutParam()));     /** Machine */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::CreateMachine");
     else
     {
@@ -141,7 +141,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
 
     RTTestSub(g_hTest, "IVirtualBox::RegisterMachine");
     CHECK_ERROR(pVBox, RegisterMachine(ptrMachine));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         RTTestPassed(g_hTest, "IVirtualBox::RegisterMachine");
     else
     {
@@ -152,7 +152,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     ComPtr<IHost> host;
     RTTestSub(g_hTest, "IVirtualBox::host");
     CHECK_ERROR(pVBox, COMGETTER(Host)(host.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IHost testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::host");
@@ -163,7 +163,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     ComPtr<ISystemProperties> sysprop;
     RTTestSub(g_hTest, "IVirtualBox::systemProperties");
     CHECK_ERROR(pVBox, COMGETTER(SystemProperties)(sysprop.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add ISystemProperties testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::systemProperties");
@@ -174,7 +174,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IMachine> machines;
     RTTestSub(g_hTest, "IVirtualBox::machines");
     CHECK_ERROR(pVBox, COMGETTER(Machines)(ComSafeArrayAsOutParam(machines)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         bool bFound = FALSE;
         for (size_t i = 0; i < machines.size(); ++i)
@@ -182,8 +182,8 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
             if (machines[i])
             {
                 Bstr tmpName;
-                rc = machines[i]->COMGETTER(Name)(tmpName.asOutParam());
-                if (SUCCEEDED(rc))
+                hrc = machines[i]->COMGETTER(Name)(tmpName.asOutParam());
+                if (SUCCEEDED(hrc))
                 {
                     if (tmpName == tstMachineName)
                     {
@@ -218,7 +218,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IMedium> hardDisks;
     RTTestSub(g_hTest, "IVirtualBox::hardDisks");
     CHECK_ERROR(pVBox, COMGETTER(HardDisks)(ComSafeArrayAsOutParam(hardDisks)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add hardDisks testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::hardDisks");
@@ -229,7 +229,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IMedium> DVDImages;
     RTTestSub(g_hTest, "IVirtualBox::DVDImages");
     CHECK_ERROR(pVBox, COMGETTER(DVDImages)(ComSafeArrayAsOutParam(DVDImages)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add DVDImages testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::DVDImages");
@@ -240,7 +240,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IMedium> floppyImages;
     RTTestSub(g_hTest, "IVirtualBox::floppyImages");
     CHECK_ERROR(pVBox, COMGETTER(FloppyImages)(ComSafeArrayAsOutParam(floppyImages)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add floppyImages testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::floppyImages");
@@ -251,7 +251,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IProgress> progressOperations;
     RTTestSub(g_hTest, "IVirtualBox::progressOperations");
     CHECK_ERROR(pVBox, COMGETTER(ProgressOperations)(ComSafeArrayAsOutParam(progressOperations)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IProgress testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::progressOperations");
@@ -262,7 +262,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     ComPtr<IPerformanceCollector> performanceCollector;
     RTTestSub(g_hTest, "IVirtualBox::performanceCollector");
     CHECK_ERROR(pVBox, COMGETTER(PerformanceCollector)(performanceCollector.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IPerformanceCollector testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::performanceCollector");
@@ -273,7 +273,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<IDHCPServer> DHCPServers;
     RTTestSub(g_hTest, "IVirtualBox::DHCPServers");
     CHECK_ERROR(pVBox, COMGETTER(DHCPServers)(ComSafeArrayAsOutParam(DHCPServers)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IDHCPServers testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::DHCPServers");
@@ -284,7 +284,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeIfaceArray<INATNetwork> NATNetworks;
     RTTestSub(g_hTest, "IVirtualBox::NATNetworks");
     CHECK_ERROR(pVBox, COMGETTER(NATNetworks)(ComSafeArrayAsOutParam(NATNetworks)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add INATNetworks testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::NATNetworks");
@@ -295,7 +295,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     ComPtr<IEventSource> eventSource;
     RTTestSub(g_hTest, "IVirtualBox::eventSource");
     CHECK_ERROR(pVBox, COMGETTER(EventSource)(eventSource.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IEventSource testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::eventSource");
@@ -306,7 +306,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     ComPtr<IExtPackManager> extensionPackManager;
     RTTestSub(g_hTest, "IVirtualBox::extensionPackManager");
     CHECK_ERROR(pVBox, COMGETTER(ExtensionPackManager)(extensionPackManager.asOutParam()));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /** @todo Add IExtPackManager testing here. */
         RTTestPassed(g_hTest, "IVirtualBox::extensionPackManager");
@@ -317,7 +317,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeArray<BSTR> internalNetworks;
     RTTestSub(g_hTest, "IVirtualBox::internalNetworks");
     CHECK_ERROR(pVBox, COMGETTER(InternalNetworks)(ComSafeArrayAsOutParam(internalNetworks)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         RTTestPassed(g_hTest, "IVirtualBox::internalNetworks");
     }
@@ -327,7 +327,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
     com::SafeArray<BSTR> genericNetworkDrivers;
     RTTestSub(g_hTest, "IVirtualBox::genericNetworkDrivers");
     CHECK_ERROR(pVBox, COMGETTER(GenericNetworkDrivers)(ComSafeArrayAsOutParam(genericNetworkDrivers)));
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         RTTestPassed(g_hTest, "IVirtualBox::genericNetworkDrivers");
     }
@@ -340,7 +340,7 @@ static BOOL tstApiIVirtualBox(IVirtualBox *pVBox)
 
 static BOOL tstApiClean(IVirtualBox *pVBox)
 {
-    HRESULT rc;
+    HRESULT hrc;
 
     /** Delete created VM and its files */
     ComPtr<IMachine> machine;