Changeset 33523 in vbox for trunk

Timestamp:

Oct 27, 2010 4:05:52 PM (14 years ago)

Author:

vboxsync

Message:

ExtPack: -> laptop.

File:

• trunk/src/VBox/Main/ExtPackManagerImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -32 +32 @@
 #include <iprt/process.h>
 #include <iprt/string.h>
+#include <iprt/cpp/xml.h>
 
 #include <VBox/com/array.h>
@@ -48 +49 @@
  */
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-# define VBOX_EXTPACK_HELPER_NAME   "VBoxExtPackHelper.exe"
+# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelper.exe"
 #else
-# define VBOX_EXTPACK_HELPER_NAME   "VBoxExtPackHelper"
+# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelper"
 #endif
+/** @name VBOX_EXTPACK_DESCRIPTION_NAME
+ * The name of the description file in an extension pack.  */
+#define VBOX_EXTPACK_DESCRIPTION_NAME   "ExtPack.xml"
 
 
@@ -143 +147 @@
      * Read the description file.
      */
-
+    char szFile[RTPATH_MAX];
+    vrc = RTPathJoin(szFile, sizeof(szFile), szDir, VBOX_EXTPACK_DESCRIPTION_NAME);
+    AssertLogRelRCReturn(vrc, E_FAIL);
+
+    xml::Document       Doc;
+    xml::XmlFileParser  Parser;
+    try
+    {
+        Parser.read(szFile, Doc);
+        xml::ElementNode *pRoot = Doc.getRootElement();
+        NOREF(pRoot);
+    }
+    catch (xml::XmlError Err)
+    {
+        m->fUsable          = true;
+        m->strWhyUnusable   = tr("");
+    }
 
     return S_OK;
@@ -548 +568 @@
                  * the don't-do-that variety.
                  */
+                const char *pszForcedOpt = a_fForcedRemoval ? "--forced" : NULL;
                 hrc = runSetUidToRootHelper("uninstall",
                                             "--basepath", m->strBasePath.c_str(),
                                             "--name",     strName.c_str(),
+                                            pszForcedOpt, /* Last as it may be NULL. */
                                             NULL);
                 if (SUCCEEDED(hrc))