[PATCH 09/27] [Kernel32]: ActCtx: parsing dependencies in manifests
Eric Pouech
eric.pouech at wanadoo.fr
Mon May 7 14:50:37 CDT 2007
From: Jacek Caban <jacek at codeweavers.com>
---
dlls/kernel32/actctx.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c
index 57ef39e..6de7c76 100644
--- a/dlls/kernel32/actctx.c
+++ b/dlls/kernel32/actctx.c
@@ -287,6 +287,8 @@ done:
#define ASSEMBLY_ELEM "assembly"
#define ASSEMBLYIDENTITY_ELEM "assemblyIdentity"
+#define DEPENDENCY_ELEM "dependency"
+#define DEPENDENTASSEMBLY_ELEM "dependentAssembly"
#define ELEM_END(elem) "/" elem
@@ -494,6 +496,74 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, struct actctx* actctx
return parse_expect_elem(xmlbuf, ELEM_END(ASSEMBLYIDENTITY_ELEM)) && parse_end_element(xmlbuf);
}
+static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf,
+ struct actctx_loader* acl)
+{
+ struct assembly_identity ai;
+ xmlstr_t elem;
+ BOOL end = FALSE, ret = TRUE;
+
+ TRACE("\n");
+
+ if (!parse_expect_no_attr(xmlbuf, &end) || end) return end;
+
+ if (!parse_expect_elem(xmlbuf, ASSEMBLYIDENTITY_ELEM) ||
+ !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai))
+ {
+ ERR("!!\n");
+ return FALSE;
+ }
+
+ /* store the newly found identity for later loading */
+ if (!add_dependent_assembly_id(acl, &ai)) return FALSE;
+
+ while (ret && (ret = next_xml_elem(xmlbuf, &elem)))
+ {
+ if (xmlstr_cmp(&elem, ELEM_END(DEPENDENTASSEMBLY_ELEM)))
+ {
+ ret = parse_end_element(xmlbuf);
+ break;
+ }
+ else
+ {
+ WARN("wrong elem %s\n", debugstr_xmlstr(&elem));
+ ret = FALSE;
+ }
+ }
+
+ return ret;
+}
+
+static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl)
+{
+ xmlstr_t elem;
+ BOOL end = FALSE, ret = TRUE;
+
+ TRACE("\n");
+
+ if (!parse_expect_no_attr(xmlbuf, &end) || end) return end;
+
+ while (ret && (ret = next_xml_elem(xmlbuf, &elem)))
+ {
+ if (xmlstr_cmp(&elem, ELEM_END(DEPENDENCY_ELEM)))
+ {
+ ret = parse_end_element(xmlbuf);
+ break;
+ }
+ else if (xmlstr_cmp(&elem, DEPENDENTASSEMBLY_ELEM))
+ {
+ ret = parse_dependent_assembly_elem(xmlbuf, acl);
+ }
+ else
+ {
+ WARN("wrong element %s\n", debugstr_xmlstr(&elem));
+ ret = FALSE;
+ }
+ }
+
+ return ret;
+}
+
static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
struct assembly* assembly,
struct assembly_identity* expected_ai)
@@ -563,6 +633,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
ret = parse_end_element(xmlbuf);
break;
}
+ else if (xmlstr_cmp(&elem, DEPENDENCY_ELEM))
+ {
+ ret = parse_dependency_elem(xmlbuf, acl);
+ }
else
{
WARN("wrong element %s\n", debugstr_xmlstr(&elem));
More information about the wine-patches
mailing list