Changeset 49130 in vbox for trunk/src

Timestamp:

Oct 16, 2013 11:57:15 AM (11 years ago)

Author:

vboxsync

Message:

Main/ExtPackManagerImpl: internal method to get the full path of a module.

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackManagerImpl.h (modified) (2 diffs)
• src-all/ExtPackManagerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/ExtPackManagerImpl.h

@@ -149 +149 @@
     HRESULT     checkVrde(void);
     HRESULT     getVrdpLibraryName(Utf8Str *a_pstrVrdeLibrary);
+    HRESULT     getLibraryName(const char *a_pszModuleName, Utf8Str *a_pstrLibrary);
     bool        wantsToBeDefaultVrde(void) const;
     HRESULT     refresh(bool *pfCanDelete);
@@ -232 +233 @@
     HRESULT     checkVrdeExtPack(Utf8Str const *a_pstrExtPack);
     int         getVrdeLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrVrdeLibrary);
+    HRESULT     getLibraryPathForExtPack(const char *a_pszModuleName, Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrLibrary);
     HRESULT     getDefaultVrdeExtPack(Utf8Str *a_pstrExtPack);
     bool        isExtPackUsable(const char *a_pszExtPack);

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -1112 +1112 @@
                            m->Desc.strVrdeModule.c_str(), m->Desc.strName.c_str());
     }
+    return hrc;
+}
+
+/**
+ * Resolves the path to the module.
+ *
+ * @returns S_OK or COM error status with error information.
+ * @param   a_pszModuleName  The library.
+ * @param   a_pstrLibrary  Where to return the path on success.
+ *
+ * @remarks Caller holds the extension manager lock for reading, no locking
+ *          necessary.
+ */
+HRESULT ExtPack::getLibraryName(const char *a_pszModuleName, Utf8Str *a_pstrLibrary)
+{
+    HRESULT hrc;
+    if (findModule(a_pszModuleName, NULL, VBOXEXTPACKMODKIND_R3,
+                   a_pstrLibrary, NULL /*a_pfNative*/, NULL /*a_pObjInfo*/))
+        hrc = S_OK;
+    else
+        hrc = setError(E_FAIL, tr("Failed to locate the module '%s' in extension pack '%s'"),
+                       a_pszModuleName, m->Desc.strName.c_str());
     return hrc;
 }
@@ -3079 +3101 @@
 
 /**
+ * Gets the full path to the specified library of the specified extension pack.
+ *
+ * @returns S_OK if a path is returned, COM error status and message return if
+ *          not.
+ * @param   a_pszModuleName     The library.
+ * @param   a_pstrExtPack       The extension pack.
+ * @param   a_pstrVrdeLibrary   Where to return the path.
+ */
+HRESULT ExtPackManager::getLibraryPathForExtPack(const char *a_pszModuleName, Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrLibrary)
+{
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
+        ExtPack *pExtPack = findExtPack(a_pstrExtPack->c_str());
+        if (pExtPack)
+            hrc = pExtPack->getLibraryName(a_pszModuleName, a_pstrLibrary);
+        else
+            hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No extension pack by the name '%s' was found"), a_pstrExtPack->c_str());
+    }
+
+    return hrc;
+}
+
+/**
  * Gets the name of the default VRDE extension pack.
  *