Improve mxml usage (required for future mxml updates)

Author: dmex

ProcessHacker/ProcessHacker.def

@@ -654,6 +654,7 @@ EXPORTS
     mxmlElementGetAttrCount
     mxmlElementGetAttrByIndex
     mxmlElementSetAttr
+    mxmlGetOpaque
     mxmlLoadFd
     mxmlNewOpaque
     mxmlNewElement

phlib/mxml/mxml.h

@@ -230,7 +230,7 @@ extern mxml_node_t	*mxmlGetFirstChild(mxml_node_t *node);
 extern int		mxmlGetInteger(mxml_node_t *node);
 extern mxml_node_t	*mxmlGetLastChild(mxml_node_t *node);
 extern mxml_node_t	*mxmlGetNextSibling(mxml_node_t *node);
-extern const char	*mxmlGetOpaque(mxml_node_t *node);
+PHMXMLAPI extern const char	*mxmlGetOpaque(mxml_node_t *node);
 extern mxml_node_t	*mxmlGetParent(mxml_node_t *node);
 extern mxml_node_t	*mxmlGetPrevSibling(mxml_node_t *node);
 extern double		mxmlGetReal(mxml_node_t *node);

phlib/settings.c

@@ -731,9 +731,11 @@ PPH_STRING PhpGetOpaqueXmlNodeText(
     _In_ mxml_node_t *node
     )
 {
-    if (node->child && node->child->type == MXML_OPAQUE && node->child->value.opaque)
+    PCSTR string;
+
+    if (string = mxmlGetOpaque(node))
     {
-        return PhConvertUtf8ToUtf16(node->child->value.opaque);
+        return PhConvertUtf8ToUtf16((PSTR)string);
     }
     else
     {