Eric Pouech : ntdll: Added parsing of the description element in
manifests.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 20 06:02:12 CDT 2007
Module: wine
Branch: master
Commit: c496dd4ef805dfcc8bf28741b58d3651603b092f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c496dd4ef805dfcc8bf28741b58d3651603b092f
Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date: Thu Jul 19 17:59:48 2007 +0200
ntdll: Added parsing of the description element in manifests.
---
dlls/ntdll/actctx.c | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 263f125..5abb374 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -173,6 +173,7 @@ struct actctx_loader
#define COMINTERFACEPROXYSTUB_ELEM "comInterfaceProxyStub"
#define DEPENDENCY_ELEM "dependency"
#define DEPENDENTASSEMBLY_ELEM "dependentAssembly"
+#define DESCRIPTION_ELEM "description"
#define FILE_ELEM "file"
#define NOINHERIT_ELEM "noInherit"
#define NOINHERITABLE_ELEM "noInheritable"
@@ -784,6 +785,34 @@ static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll)
return ret;
}
+static BOOL parse_description_elem(xmlbuf_t* xmlbuf)
+{
+ xmlstr_t elem, content;
+ BOOL end = FALSE, ret = TRUE;
+
+ if (!parse_expect_no_attr(xmlbuf, &end) || end ||
+ !parse_text_content(xmlbuf, &content))
+ return FALSE;
+
+ TRACE("Got description %s\n", debugstr_xmlstr(&content));
+
+ while (ret && (ret = next_xml_elem(xmlbuf, &elem)))
+ {
+ if (xmlstr_cmp(&elem, ELEM_END(DESCRIPTION_ELEM)))
+ {
+ ret = parse_end_element(xmlbuf);
+ break;
+ }
+ else
+ {
+ WARN("wrong elem %s\n", debugstr_xmlstr(&elem));
+ ret = FALSE;
+ }
+ }
+
+ return ret;
+}
+
static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf,
struct actctx_loader* acl)
{
@@ -1019,6 +1048,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
ret = parse_end_element(xmlbuf);
break;
}
+ else if (xmlstr_cmp(&elem, DESCRIPTION_ELEM))
+ {
+ ret = parse_description_elem(xmlbuf);
+ }
else if (xmlstr_cmp(&elem, DEPENDENCY_ELEM))
{
ret = parse_dependency_elem(xmlbuf, acl);
More information about the wine-cvs
mailing list