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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxCAPI.cpp (modified) (17 diffs)
• tstCAPIGlue.c (modified) (26 diffs)

trunk/src/VBox/Main/cbinding/VBoxCAPI.cpp

@@ -229 +229 @@
 #else /* !VBOX_WITH_XPCOM */
     VARTYPE vt = VT_UNKNOWN;
-    HRESULT rc = SafeArrayGetVartype(psa, &vt);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = SafeArrayGetVartype(psa, &vt);
+    if (FAILED(hrc))
+        return hrc;
     if (vt == VT_BSTR)
     {
@@ -238 +238 @@
          * behavior between COM and XPCOM without this kind of trickery. */
         void *pData;
-        rc = SafeArrayAccessData(psa, &pData);
-        if (FAILED(rc))
-            return rc;
+        hrc = SafeArrayAccessData(psa, &pData);
+        if (FAILED(hrc))
+            return hrc;
         ULONG cbElement = VBoxVTElemSize(vt);
         if (!cbElement)
@@ -265 +265 @@
     pData = psa->pv;
 #else /* !VBOX_WITH_XPCOM */
-    HRESULT rc = SafeArrayAccessData(psa, &pData);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = SafeArrayAccessData(psa, &pData);
+    if (FAILED(hrc))
+        return hrc;
 #endif /* !VBOX_WITH_XPCOM */
     memcpy(pData, pv, cb);
@@ -305 +305 @@
     cElements = psa->c;
 #else /* !VBOX_WITH_XPCOM */
-    HRESULT rc = SafeArrayAccessData(psa, &pData);
-    if (FAILED(rc))
+    HRESULT hrc = SafeArrayAccessData(psa, &pData);
+    if (FAILED(hrc))
     {
         *ppv = NULL;
         if (pcb)
             *pcb = 0;
-        return rc;
+        return hrc;
     }
     cElements = psa->rgsabound[0].cElements;
@@ -343 +343 @@
 {
     ULONG mypcb;
-    HRESULT rc = VBoxSafeArrayCopyOutParamHelper((void **)ppaObj, &mypcb, VT_UNKNOWN, psa);
-    if (FAILED(rc))
+    HRESULT hrc = VBoxSafeArrayCopyOutParamHelper((void **)ppaObj, &mypcb, VT_UNKNOWN, psa);
+    if (FAILED(hrc))
     {
         if (pcObj)
             *pcObj = 0;
-        return rc;
+        return hrc;
     }
     ULONG cElements = mypcb / sizeof(void *);
@@ -404 +404 @@
         sessionIID = IID_ISession;
 
-    HRESULT rc = com::Initialize(VBOX_COM_INIT_F_DEFAULT | VBOX_COM_INIT_F_NO_COM_PATCHING);
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: COM/XPCOM could not be initialized! rc=%Rhrc\n", rc));
+    HRESULT hrc = com::Initialize(VBOX_COM_INIT_F_DEFAULT | VBOX_COM_INIT_F_NO_COM_PATCHING);
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: COM/XPCOM could not be initialized! hrc=%Rhrc\n", hrc));
         VBoxComUninitialize();
         return;
@@ -413 +413 @@
 
 #ifdef VBOX_WITH_XPCOM
-    rc = NS_GetMainEventQ(&g_EventQueue);
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not get XPCOM event queue! rc=%Rhrc\n", rc));
+    hrc = NS_GetMainEventQ(&g_EventQueue);
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not get XPCOM event queue! hrc=%Rhrc\n", hrc));
         VBoxComUninitialize();
         return;
@@ -424 +424 @@
 #ifdef VBOX_WITH_XPCOM
     nsIComponentManager *pManager;
-    rc = NS_GetComponentManager(&pManager);
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not get component manager! rc=%Rhrc\n", rc));
+    hrc = NS_GetComponentManager(&pManager);
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not get component manager! hrc=%Rhrc\n", hrc));
         VBoxComUninitialize();
         return;
     }
 
-    rc = pManager->CreateInstanceByContractID(NS_VIRTUALBOX_CONTRACTID,
-                                              nsnull,
-                                              virtualBoxIID,
-                                              (void **)&g_VirtualBox);
+    hrc = pManager->CreateInstanceByContractID(NS_VIRTUALBOX_CONTRACTID,
+                                               nsnull,
+                                               virtualBoxIID,
+                                               (void **)&g_VirtualBox);
 #else /* !VBOX_WITH_XPCOM */
     IVirtualBoxClient *pVirtualBoxClient;
-    rc = CoCreateInstance(CLSID_VirtualBoxClient, NULL, CLSCTX_INPROC_SERVER, IID_IVirtualBoxClient, (void **)&pVirtualBoxClient);
-    if (SUCCEEDED(rc))
+    hrc = CoCreateInstance(CLSID_VirtualBoxClient, NULL, CLSCTX_INPROC_SERVER, IID_IVirtualBoxClient, (void **)&pVirtualBoxClient);
+    if (SUCCEEDED(hrc))
     {
         IVirtualBox *pVirtualBox;
-        rc = pVirtualBoxClient->get_VirtualBox(&pVirtualBox);
-        if (SUCCEEDED(rc))
+        hrc = pVirtualBoxClient->get_VirtualBox(&pVirtualBox);
+        if (SUCCEEDED(hrc))
         {
-            rc = pVirtualBox->QueryInterface(virtualBoxIID, (void **)&g_VirtualBox);
+            hrc = pVirtualBox->QueryInterface(virtualBoxIID, (void **)&g_VirtualBox);
             pVirtualBox->Release();
         }
@@ -451 +451 @@
     }
 #endif /* !VBOX_WITH_XPCOM */
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not instantiate VirtualBox object! rc=%Rhrc\n",rc));
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not instantiate VirtualBox object! hrc=%Rhrc\n",hrc));
 #ifdef VBOX_WITH_XPCOM
         pManager->Release();
@@ -465 +465 @@
 
 #ifdef VBOX_WITH_XPCOM
-    rc = pManager->CreateInstanceByContractID(NS_SESSION_CONTRACTID,
-                                              nsnull,
-                                              sessionIID,
-                                              (void **)&g_Session);
+    hrc = pManager->CreateInstanceByContractID(NS_SESSION_CONTRACTID, nsnull, sessionIID, (void **)&g_Session);
 #else /* !VBOX_WITH_XPCOM */
-    rc = CoCreateInstance(CLSID_Session, NULL, CLSCTX_INPROC_SERVER, sessionIID, (void **)&g_Session);
-#endif /* !VBOX_WITH_XPCOM */
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not instantiate Session object! rc=%Rhrc\n",rc));
+    hrc = CoCreateInstance(CLSID_Session, NULL, CLSCTX_INPROC_SERVER, sessionIID, (void **)&g_Session);
+#endif /* !VBOX_WITH_XPCOM */
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not instantiate Session object! hrc=%Rhrc\n",hrc));
 #ifdef VBOX_WITH_XPCOM
         pManager->Release();
@@ -568 +565 @@
 VBoxGetException(IErrorInfo **ppException)
 {
-    HRESULT rc;
+    HRESULT hrc;
 
     *ppException = NULL;
@@ -574 +571 @@
 #ifdef VBOX_WITH_XPCOM
     nsIServiceManager *mgr = NULL;
-    rc = NS_GetServiceManager(&mgr);
-    if (FAILED(rc) || !mgr)
-        return rc;
+    hrc = NS_GetServiceManager(&mgr);
+    if (FAILED(hrc) || !mgr)
+        return hrc;
 
     IID esid = NS_IEXCEPTIONSERVICE_IID;
     nsIExceptionService *es = NULL;
-    rc = mgr->GetServiceByContractID(NS_EXCEPTIONSERVICE_CONTRACTID, esid, (void **)&es);
-    if (FAILED(rc) || !es)
+    hrc = mgr->GetServiceByContractID(NS_EXCEPTIONSERVICE_CONTRACTID, esid, (void **)&es);
+    if (FAILED(hrc) || !es)
     {
         mgr->Release();
-        return rc;
+        return hrc;
     }
 
     nsIExceptionManager *em;
-    rc = es->GetCurrentExceptionManager(&em);
-    if (FAILED(rc) || !em)
+    hrc = es->GetCurrentExceptionManager(&em);
+    if (FAILED(hrc) || !em)
     {
         es->Release();
         mgr->Release();
-        return rc;
+        return hrc;
     }
 
     nsIException *ex;
-    rc = em->GetCurrentException(&ex);
-    if (FAILED(rc))
+    hrc = em->GetCurrentException(&ex);
+    if (FAILED(hrc))
     {
         em->Release();
         es->Release();
         mgr->Release();
-        return rc;
+        return hrc;
     }
 
@@ -612 +609 @@
 #else /* !VBOX_WITH_XPCOM */
     IErrorInfo *ex;
-    rc = ::GetErrorInfo(0, &ex);
-    if (FAILED(rc))
-        return rc;
+    hrc = ::GetErrorInfo(0, &ex);
+    if (FAILED(hrc))
+        return hrc;
 
     *ppException = ex;
 #endif /* !VBOX_WITH_XPCOM */
 
-    return rc;
+    return hrc;
 }
 
@@ -625 +622 @@
 VBoxClearException(void)
 {
-    HRESULT rc;
+    HRESULT hrc;
 
 #ifdef VBOX_WITH_XPCOM
     nsIServiceManager *mgr = NULL;
-    rc = NS_GetServiceManager(&mgr);
-    if (FAILED(rc) || !mgr)
-        return rc;
+    hrc = NS_GetServiceManager(&mgr);
+    if (FAILED(hrc) || !mgr)
+        return hrc;
 
     IID esid = NS_IEXCEPTIONSERVICE_IID;
     nsIExceptionService *es = NULL;
-    rc = mgr->GetServiceByContractID(NS_EXCEPTIONSERVICE_CONTRACTID, esid, (void **)&es);
-    if (FAILED(rc) || !es)
+    hrc = mgr->GetServiceByContractID(NS_EXCEPTIONSERVICE_CONTRACTID, esid, (void **)&es);
+    if (FAILED(hrc) || !es)
     {
         mgr->Release();
-        return rc;
+        return hrc;
     }
 
     nsIExceptionManager *em;
-    rc = es->GetCurrentExceptionManager(&em);
-    if (FAILED(rc) || !em)
+    hrc = es->GetCurrentExceptionManager(&em);
+    if (FAILED(hrc) || !em)
     {
         es->Release();
         mgr->Release();
-        return rc;
-    }
-
-    rc = em->SetCurrentException(NULL);
+        return hrc;
+    }
+
+    hrc = em->SetCurrentException(NULL);
     em->Release();
     es->Release();
     mgr->Release();
 #else /* !VBOX_WITH_XPCOM */
-    rc = ::SetErrorInfo(0, NULL);
-#endif /* !VBOX_WITH_XPCOM */
-
-    return rc;
+    hrc = ::SetErrorInfo(0, NULL);
+#endif /* !VBOX_WITH_XPCOM */
+
+    return hrc;
 }
 
@@ -679 +676 @@
         virtualBoxClientIID = IID_IVirtualBoxClient;
 
-    HRESULT rc = com::Initialize(VBOX_COM_INIT_F_DEFAULT | VBOX_COM_INIT_F_NO_COM_PATCHING);
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: COM/XPCOM could not be initialized! rc=%Rhrc\n", rc));
+    HRESULT hrc = com::Initialize(VBOX_COM_INIT_F_DEFAULT | VBOX_COM_INIT_F_NO_COM_PATCHING);
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: COM/XPCOM could not be initialized! hrc=%Rhrc\n", hrc));
         VBoxClientUninitialize();
-        return rc;
-    }
-
-#ifdef VBOX_WITH_XPCOM
-    rc = NS_GetMainEventQ(&g_EventQueue);
-    if (NS_FAILED(rc))
-    {
-        Log(("Cbinding: Could not get XPCOM event queue! rc=%Rhrc\n", rc));
+        return hrc;
+    }
+
+#ifdef VBOX_WITH_XPCOM
+    hrc = NS_GetMainEventQ(&g_EventQueue);
+    if (NS_FAILED(hrc))
+    {
+        Log(("Cbinding: Could not get XPCOM event queue! hrc=%Rhrc\n", hrc));
         VBoxClientUninitialize();
-        return rc;
+        return hrc;
     }
 #endif /* VBOX_WITH_XPCOM */
@@ -699 +696 @@
 #ifdef VBOX_WITH_XPCOM
     nsIComponentManager *pManager;
-    rc = NS_GetComponentManager(&pManager);
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not get component manager! rc=%Rhrc\n", rc));
+    hrc = NS_GetComponentManager(&pManager);
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not get component manager! hrc=%Rhrc\n", hrc));
         VBoxClientUninitialize();
-        return rc;
-    }
-
-    rc = pManager->CreateInstanceByContractID(NS_VIRTUALBOXCLIENT_CONTRACTID,
-                                              nsnull,
-                                              virtualBoxClientIID,
-                                              (void **)ppVirtualBoxClient);
+        return hrc;
+    }
+
+    hrc = pManager->CreateInstanceByContractID(NS_VIRTUALBOXCLIENT_CONTRACTID,
+                                               nsnull,
+                                               virtualBoxClientIID,
+                                               (void **)ppVirtualBoxClient);
 #else /* !VBOX_WITH_XPCOM */
-    rc = CoCreateInstance(CLSID_VirtualBoxClient, NULL, CLSCTX_INPROC_SERVER, virtualBoxClientIID, (void **)ppVirtualBoxClient);
-#endif /* !VBOX_WITH_XPCOM */
-    if (FAILED(rc))
-    {
-        Log(("Cbinding: Could not instantiate VirtualBoxClient object! rc=%Rhrc\n",rc));
+    hrc = CoCreateInstance(CLSID_VirtualBoxClient, NULL, CLSCTX_INPROC_SERVER, virtualBoxClientIID, (void **)ppVirtualBoxClient);
+#endif /* !VBOX_WITH_XPCOM */
+    if (FAILED(hrc))
+    {
+        Log(("Cbinding: Could not instantiate VirtualBoxClient object! hrc=%Rhrc\n",hrc));
 #ifdef VBOX_WITH_XPCOM
         pManager->Release();
@@ -722 +719 @@
 #endif /* VBOX_WITH_XPCOM */
         VBoxClientUninitialize();
-        return rc;
+        return hrc;
     }
 

trunk/src/VBox/Main/cbinding/tstCAPIGlue.c

@@ -136 +136 @@
 {
     VBoxEventType_T evType;
-    HRESULT rc;
+    HRESULT hrc;
 
     if (!event)
@@ -145 +145 @@
 
     evType = VBoxEventType_Invalid;
-    rc = IEvent_get_Type(event, &evType);
-    if (FAILED(rc))
-    {
-        printf("cannot get event type, rc=%#x\n", (unsigned)rc);
+    hrc = IEvent_get_Type(event, &evType);
+    if (FAILED(hrc))
+    {
+        printf("cannot get event type, hrc=%#x\n", (unsigned)hrc);
         return S_OK;
     }
@@ -170 +170 @@
             IStateChangedEvent *ev = NULL;
             enum MachineState state;
-            rc = IEvent_QueryInterface(event, &IID_IStateChangedEvent, (void **)&ev);
-            if (FAILED(rc))
+            hrc = IEvent_QueryInterface(event, &IID_IStateChangedEvent, (void **)&ev);
+            if (FAILED(hrc))
             {
-                printf("cannot get StateChangedEvent interface, rc=%#x\n", (unsigned)rc);
+                printf("cannot get StateChangedEvent interface, hrc=%#x\n", (unsigned)hrc);
                 return S_OK;
             }
@@ -181 +181 @@
                 return S_OK;
             }
-            rc = IStateChangedEvent_get_State(ev, &state);
-            if (FAILED(rc))
-                printf("warning: cannot get state, rc=%#x\n", (unsigned)rc);
+            hrc = IStateChangedEvent_get_State(ev, &state);
+            if (FAILED(hrc))
+                printf("warning: cannot get state, hrc=%#x\n", (unsigned)hrc);
             IStateChangedEvent_Release(ev);
             printf("OnStateChanged: %s\n", GetStateName(state));
@@ -392 +392 @@
 static HRESULT LoadTypeInfo(REFIID riid, ITypeInfo **pTInfo)
 {
-    HRESULT rc;
+    HRESULT hrc;
     ITypeLib *pTypeLib;
-    rc = LoadRegTypeLib(&LIBID_VirtualBox, 1 /* major */, 0 /* minor */, 0 /* lcid */, &pTypeLib);
-    if (FAILED(rc))
-        return rc;
-    rc = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, pTInfo);
+    hrc = LoadRegTypeLib(&LIBID_VirtualBox, 1 /* major */, 0 /* minor */, 0 /* lcid */, &pTypeLib);
+    if (FAILED(hrc))
+        return hrc;
+    hrc = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, pTInfo);
 
     /* No longer need access to the type lib, release it. */
     ITypeLib_Release(pTypeLib);
 
-    return rc;
+    return hrc;
 }
 #endif
@@ -465 +465 @@
 {
     IConsole *console = NULL;
-    HRESULT rc;
-
-    rc = ISession_get_Console(session, &console);
-    if ((SUCCEEDED(rc)) && console)
+    HRESULT hrc;
+
+    hrc = ISession_get_Console(session, &console);
+    if (SUCCEEDED(hrc) && console)
     {
         IEventSource *es = NULL;
-        rc = IConsole_get_EventSource(console, &es);
-        if (SUCCEEDED(rc) && es)
+        hrc = IConsole_get_EventSource(console, &es);
+        if (SUCCEEDED(hrc) && es)
         {
             static const ULONG s_auInterestingEvents[] =
@@ -514 +514 @@
                 IEventListenerDemo_AddRef(consoleListener);
 
-                rc = IEventSource_RegisterListener(es, (IEventListener *)consoleListener,
-                                                   ComSafeArrayAsInParam(interestingEventsSA),
-                                                   1 /* active */);
-                if (SUCCEEDED(rc))
+                hrc = IEventSource_RegisterListener(es, (IEventListener *)consoleListener,
+                                                    ComSafeArrayAsInParam(interestingEventsSA),
+                                                    1 /* active */);
+                if (SUCCEEDED(hrc))
                 {
                     /* Just wait here for events, no easy way to do this better
@@ -569 +569 @@
 {
     IConsole *console = NULL;
-    HRESULT rc;
-
-    rc = ISession_get_Console(session, &console);
-    if (SUCCEEDED(rc) && console)
+    HRESULT hrc;
+
+    hrc = ISession_get_Console(session, &console);
+    if (SUCCEEDED(hrc) && console)
     {
         IEventSource *es = NULL;
-        rc = IConsole_get_EventSource(console, &es);
-        if (SUCCEEDED(rc) && es)
+        hrc = IConsole_get_EventSource(console, &es);
+        if (SUCCEEDED(hrc) && es)
         {
             static const ULONG s_auInterestingEvents[] =
@@ -609 +609 @@
                                                         sizeof(s_auInterestingEvents));
 
-            rc = IEventSource_CreateListener(es, &consoleListener);
-            if (SUCCEEDED(rc) && consoleListener)
+            hrc = IEventSource_CreateListener(es, &consoleListener);
+            if (SUCCEEDED(hrc) && consoleListener)
             {
-                rc = IEventSource_RegisterListener(es, consoleListener,
-                                                   ComSafeArrayAsInParam(interestingEventsSA),
-                                                   0 /* passive */);
-                if (SUCCEEDED(rc))
+                hrc = IEventSource_RegisterListener(es, consoleListener,
+                                                    ComSafeArrayAsInParam(interestingEventsSA),
+                                                    0 /* passive */);
+                if (SUCCEEDED(hrc))
                 {
                     /* Just wait here for events, no easy way to do this better
@@ -630 +630 @@
                     {
                         IEvent *ev = NULL;
-                        rc = IEventSource_GetEvent(es, consoleListener, 250, &ev);
-                        if (FAILED(rc))
+                        hrc = IEventSource_GetEvent(es, consoleListener, 250, &ev);
+                        if (FAILED(hrc))
                         {
-                            printf("Failed getting event: %#x\n", (unsigned)rc);
+                            printf("Failed getting event: %#x\n", (unsigned)hrc);
                             g_fStop = 1;
                             continue;
@@ -640 +640 @@
                         if (!ev)
                             continue;
-                        rc = EventListenerDemoProcessEvent(ev);
-                        if (FAILED(rc))
+                        hrc = EventListenerDemoProcessEvent(ev);
+                        if (FAILED(hrc))
                         {
-                            printf("Failed processing event: %#x\n", (unsigned)rc);
+                            printf("Failed processing event: %#x\n", (unsigned)hrc);
                             g_fStop = 1;
                             /* finish processing the event */
                         }
-                        rc = IEventSource_EventProcessed(es, consoleListener, ev);
-                        if (FAILED(rc))
+                        hrc = IEventSource_EventProcessed(es, consoleListener, ev);
+                        if (FAILED(hrc))
                         {
-                            printf("Failed to mark event as processed: %#x\n", (unsigned)rc);
+                            printf("Failed to mark event as processed: %#x\n", (unsigned)hrc);
                             g_fStop = 1;
                             /* continue with event release */
@@ -689 +689 @@
  * @param   pszExecutable   string with the executable name
  * @param   pszErrorMsg     string containing the code location specific error message
- * @param   rc              COM/XPCOM result code
+ * @param   hrc             COM/XPCOM result code
  */
-static void PrintErrorInfo(const char *pszExecutable, const char *pszErrorMsg, HRESULT rc)
+static void PrintErrorInfo(const char *pszExecutable, const char *pszErrorMsg, HRESULT hrc)
 {
     IErrorInfo *ex;
-    HRESULT rc2;
-    fprintf(stderr, "%s: %s (rc=%#010x)\n", pszExecutable, pszErrorMsg, (unsigned)rc);
-    rc2 = g_pVBoxFuncs->pfnGetException(&ex);
-    if (SUCCEEDED(rc2) && ex)
+    HRESULT hrc2;
+    fprintf(stderr, "%s: %s (hrc=%#010x)\n", pszExecutable, pszErrorMsg, (unsigned)hrc);
+    hrc2 = g_pVBoxFuncs->pfnGetException(&ex);
+    if (SUCCEEDED(hrc2) && ex)
     {
         IVirtualBoxErrorInfo *ei;
-        rc2 = IErrorInfo_QueryInterface(ex, &IID_IVirtualBoxErrorInfo, (void **)&ei);
-        if (SUCCEEDED(rc2) && ei != NULL)
+        hrc2 = IErrorInfo_QueryInterface(ex, &IID_IVirtualBoxErrorInfo, (void **)&ei);
+        if (SUCCEEDED(hrc2) && ei != NULL)
         {
             /* got extended error info, maybe multiple infos */
@@ -729 +729 @@
                 g_pVBoxFuncs->pfnUtf8Free(text);
 
-                rc2 = IVirtualBoxErrorInfo_get_Next(ei, &ei_next);
-                if (FAILED(rc2))
+                hrc2 = IVirtualBoxErrorInfo_get_Next(ei, &ei_next);
+                if (FAILED(hrc2))
                     ei_next = NULL;
                 IVirtualBoxErrorInfo_Release(ei);
@@ -752 +752 @@
 static void startVM(const char *argv0, IVirtualBox *virtualBox, ISession *session, BSTR id)
 {
-    HRESULT rc;
+    HRESULT hrc;
     IMachine  *machine    = NULL;
     IProgress *progress   = NULL;
@@ -759 +759 @@
     SAFEARRAY *groupsSA = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
 
-    rc = IVirtualBox_FindMachine(virtualBox, id, &machine);
-    if (FAILED(rc) || !machine)
-    {
-        PrintErrorInfo(argv0, "Error: Couldn't get the Machine reference", rc);
+    hrc = IVirtualBox_FindMachine(virtualBox, id, &machine);
+    if (FAILED(hrc) || !machine)
+    {
+        PrintErrorInfo(argv0, "Error: Couldn't get the Machine reference", hrc);
         return;
     }
 
-    rc = IMachine_get_Groups(machine, ComSafeArrayAsOutTypeParam(groupsSA, BSTR));
-    if (SUCCEEDED(rc))
+    hrc = IMachine_get_Groups(machine, ComSafeArrayAsOutTypeParam(groupsSA, BSTR));
+    if (SUCCEEDED(hrc))
     {
         BSTR *groups = NULL;
@@ -792 +792 @@
 
     g_pVBoxFuncs->pfnUtf8ToUtf16("gui", &sessionType);
-    rc = IMachine_LaunchVMProcess(machine, session, sessionType, ComSafeArrayAsInParam(env), &progress);
+    hrc = IMachine_LaunchVMProcess(machine, session, sessionType, ComSafeArrayAsInParam(env), &progress);
     g_pVBoxFuncs->pfnUtf16Free(sessionType);
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         BOOL completed;
@@ -802 +802 @@
         IProgress_WaitForCompletion(progress, -1);
 
-        rc = IProgress_get_Completed(progress, &completed);
-        if (FAILED(rc))
+        hrc = IProgress_get_Completed(progress, &completed);
+        if (FAILED(hrc))
             fprintf(stderr, "Error: GetCompleted status failed\n");
 
@@ -837 +837 @@
     }
     else
-        PrintErrorInfo(argv0, "Error: LaunchVMProcess failed", rc);
+        PrintErrorInfo(argv0, "Error: LaunchVMProcess failed", hrc);
 
     /* It's important to always release resources. */
@@ -852 +852 @@
 static void listVMs(const char *argv0, IVirtualBox *virtualBox, ISession *session)
 {
-    HRESULT rc;
+    HRESULT hrc;
     SAFEARRAY *machinesSA = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
     IMachine **machines = NULL;
@@ -862 +862 @@
      * Get the list of all registered VMs.
      */
-    rc = IVirtualBox_get_Machines(virtualBox, ComSafeArrayAsOutIfaceParam(machinesSA, IMachine *));
-    if (FAILED(rc))
-    {
-        PrintErrorInfo(argv0, "could not get list of machines", rc);
+    hrc = IVirtualBox_get_Machines(virtualBox, ComSafeArrayAsOutIfaceParam(machinesSA, IMachine *));
+    if (FAILED(hrc))
+    {
+        PrintErrorInfo(argv0, "could not get list of machines", hrc);
         return;
     }
@@ -1012 +1012 @@
     BSTR        versionUtf16     = NULL;
     BSTR        homefolderUtf16  = NULL;
-    HRESULT     rc;     /* Result code of various function (method) calls. */
+    HRESULT     hrc;     /* Result code of various function (method) calls. */
     (void)argc;
 
@@ -1040 +1040 @@
     printf("----------------------------------------------------\n");
 
-    rc = IVirtualBoxClient_get_VirtualBox(vboxclient, &vbox);
-    if (FAILED(rc) || !vbox)
-    {
-        PrintErrorInfo(argv[0], "FATAL: could not get VirtualBox reference", rc);
+    hrc = IVirtualBoxClient_get_VirtualBox(vboxclient, &vbox);
+    if (FAILED(hrc) || !vbox)
+    {
+        PrintErrorInfo(argv[0], "FATAL: could not get VirtualBox reference", hrc);
         return EXIT_FAILURE;
     }
-    rc = IVirtualBoxClient_get_Session(vboxclient, &session);
-    if (FAILED(rc) || !session)
-    {
-        PrintErrorInfo(argv[0], "FATAL: could not get Session reference", rc);
+    hrc = IVirtualBoxClient_get_Session(vboxclient, &session);
+    if (FAILED(hrc) || !session)
+    {
+        PrintErrorInfo(argv[0], "FATAL: could not get Session reference", hrc);
         return EXIT_FAILURE;
     }
@@ -1055 +1055 @@
 #ifdef USE_ACTIVE_EVENT_LISTENER
 # ifdef WIN32
-    rc = LoadTypeInfo(&IID_IEventListener, &g_pTInfoIEventListener);
-    if (FAILED(rc) || !g_pTInfoIEventListener)
-    {
-        PrintErrorInfo(argv[0], "FATAL: could not get type information for IEventListener", rc);
+    hrc = LoadTypeInfo(&IID_IEventListener, &g_pTInfoIEventListener);
+    if (FAILED(hrc) || !g_pTInfoIEventListener)
+    {
+        PrintErrorInfo(argv[0], "FATAL: could not get type information for IEventListener", hrc);
         return EXIT_FAILURE;
     }
@@ -1071 +1071 @@
 
     /* 1. Revision */
-    rc = IVirtualBox_get_Revision(vbox, &revision);
-    if (SUCCEEDED(rc))
+    hrc = IVirtualBox_get_Revision(vbox, &revision);
+    if (SUCCEEDED(hrc))
         printf("\tRevision: %u\n", (unsigned)revision);
     else
-        PrintErrorInfo(argv[0], "GetRevision() failed", rc);
+        PrintErrorInfo(argv[0], "GetRevision() failed", hrc);
 
     /* 2. Version */
-    rc = IVirtualBox_get_Version(vbox, &versionUtf16);
-    if (SUCCEEDED(rc))
+    hrc = IVirtualBox_get_Version(vbox, &versionUtf16);
+    if (SUCCEEDED(hrc))
     {
         char *version = NULL;
@@ -1088 +1088 @@
     }
     else
-        PrintErrorInfo(argv[0], "GetVersion() failed", rc);
+        PrintErrorInfo(argv[0], "GetVersion() failed", hrc);
 
     /* 3. Home Folder */
-    rc = IVirtualBox_get_HomeFolder(vbox, &homefolderUtf16);
-    if (SUCCEEDED(rc))
+    hrc = IVirtualBox_get_HomeFolder(vbox, &homefolderUtf16);
+    if (SUCCEEDED(hrc))
     {
         char *homefolder = NULL;
@@ -1101 +1101 @@
     }
     else
-        PrintErrorInfo(argv[0], "GetHomeFolder() failed", rc);
+        PrintErrorInfo(argv[0], "GetHomeFolder() failed", hrc);
 
     listVMs(argv[0], vbox, session);