Changeset 63705 in vbox

Timestamp:

Sep 2, 2016 7:38:00 PM (8 years ago)

Author:

vboxsync

Message:

BugReport(bugref:7809): Use RTProcGetExecutablePath instead of argv0, fall back to creating VirtualBox if VirtualBoxClient is not registered.

File:

• trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp

@@ -601 +601 @@
     try
     {
-        /* Figure out full path to VBoxManage */
-        char *pszVBoxBin = RTStrDup(argv[0]);
-        if (!pszVBoxBin)
-            throw RTCError("Out of memory\n");
-        RTPathStripFilename(pszVBoxBin);
-        g_pszVBoxManage = RTPathJoinA(pszVBoxBin, VBOXMANAGE);
+        /* Figure out the full path to VBoxManage */
+        char szVBoxBin[RTPATH_MAX];
+        if (!RTProcGetExecutablePath(szVBoxBin, sizeof(szVBoxBin)))
+            throw RTCError("RTProcGetExecutablePath failed\n");
+        RTPathStripFilename(szVBoxBin);
+        g_pszVBoxManage = RTPathJoinA(szVBoxBin, VBOXMANAGE);
         if (!g_pszVBoxManage)
             throw RTCError("Out of memory\n");
-        RTStrFree(pszVBoxBin);
 
         handleComError(com::Initialize(), "Failed to initialize COM");
@@ -624 +623 @@
             if (SUCCEEDED(hr))
                 hr = virtualBoxClient->COMGETTER(VirtualBox)(virtualBox.asOutParam());
+            else if (hr == REGDB_E_CLASSNOTREG)
+                hr = virtualBox.createLocalObject(CLSID_VirtualBox);
             if (FAILED(hr))
                 RTStrmPrintf(g_pStdErr, "WARNING: Failed to create the VirtualBox object (hr=0x%x)\n", hr);