Improve mxml usage (required for future mxml updates)

Author: dmex

ProcessHacker/ProcessHacker.def

@@ -651,6 +651,8 @@ EXPORTS
 
 ; mxml
     mxmlDelete
+    mxmlElementGetAttrCount
+    mxmlElementGetAttrByIndex
     mxmlElementSetAttr
     mxmlLoadFd
     mxmlNewOpaque

phlib/mxml/mxml.h

@@ -205,8 +205,8 @@ PHMXMLAPI extern void		mxmlDelete(mxml_node_t *node);
 PHMXMLAPI extern void		mxmlElementDeleteAttr(mxml_node_t *node,
                                   const char *name);
 PHMXMLAPI extern const char	*mxmlElementGetAttr(mxml_node_t *node, const char *name);
-extern const char       *mxmlElementGetAttrByIndex(mxml_node_t *node, int idx, const char **name);
-extern int              mxmlElementGetAttrCount(mxml_node_t *node);
+PHMXMLAPI extern const char       *mxmlElementGetAttrByIndex(mxml_node_t *node, int idx, const char **name);
+PHMXMLAPI extern int              mxmlElementGetAttrCount(mxml_node_t *node);
 PHMXMLAPI extern void		mxmlElementSetAttr(mxml_node_t *node, const char *name,
                                const char *value);
 extern void		mxmlElementSetAttrf(mxml_node_t *node, const char *name,

phlib/settings.c

@@ -790,14 +790,11 @@ NTSTATUS PhLoadSettings(
     while (currentNode)
     {
         PPH_STRING settingName = NULL;
+        PCSTR elementValue;
 
-        if (
-            currentNode->type == MXML_ELEMENT &&
-            currentNode->value.element.num_attrs >= 1 &&
-            _stricmp(currentNode->value.element.attrs[0].name, "name") == 0
-            )
+        if (elementValue = mxmlElementGetAttr(currentNode, "name"))
         {
-            settingName = PhConvertUtf8ToUtf16(currentNode->value.element.attrs[0].value);
+            settingName = PhConvertUtf8ToUtf16((PSTR)elementValue);
         }
 
         if (settingName)

plugins/UserNotes/db.c

@@ -239,25 +239,32 @@ NTSTATUS LoadDb(
         PPH_STRING collapse = NULL;
         PPH_STRING affinityMask = NULL;
 
-        if (currentNode->type == MXML_ELEMENT &&
-            currentNode->value.element.num_attrs >= 2)
+        if (mxmlElementGetAttrCount(currentNode) >= 2)
         {
-            for (INT i = 0; i < currentNode->value.element.num_attrs; i++)
+            for (INT i = 0; i < mxmlElementGetAttrCount(currentNode); i++)
             {
-                if (_stricmp(currentNode->value.element.attrs[i].name, "tag") == 0)
-                    PhMoveReference(&tag, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "name") == 0)
-                    PhMoveReference(&name, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "priorityclass") == 0)
-                    PhMoveReference(&priorityClass, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "iopriorityplusone") == 0)
-                    PhMoveReference(&ioPriorityPlusOne, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "backcolor") == 0)
-                    PhMoveReference(&backColor, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "collapse") == 0)
-                    PhMoveReference(&collapse, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
-                else if (_stricmp(currentNode->value.element.attrs[i].name, "affinity") == 0)
-                    PhMoveReference(&affinityMask, PhConvertUtf8ToUtf16(currentNode->value.element.attrs[i].value));
+                PSTR elementName;
+                PSTR elementValue;
+
+                elementValue = (PSTR)mxmlElementGetAttrByIndex(currentNode, i, &elementName);
+
+                if (!(elementName && elementValue))
+                    continue;
+
+                if (_stricmp(elementName, "tag") == 0)
+                    PhMoveReference(&tag, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "name") == 0)
+                    PhMoveReference(&name, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "priorityclass") == 0)
+                    PhMoveReference(&priorityClass, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "iopriorityplusone") == 0)
+                    PhMoveReference(&ioPriorityPlusOne, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "backcolor") == 0)
+                    PhMoveReference(&backColor, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "collapse") == 0)
+                    PhMoveReference(&collapse, PhConvertUtf8ToUtf16(elementValue));
+                else if (_stricmp(elementName, "affinity") == 0)
+                    PhMoveReference(&affinityMask, PhConvertUtf8ToUtf16(elementValue));
             }
         }