ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Cope with missing assemblyIdentity elements in manifests.

This commit is contained in:
Alexandre Julliard 2007-07-19 18:13:27 +02:00
parent 272af8fa1e
commit b2b6fc1288
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/ntdll/actctx.c
View File

@ -1174,7 +1174,6 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
{ {
xmlstr_t attr_name, attr_value, elem; xmlstr_t attr_name, attr_value, elem;
BOOL end = FALSE, error, version = FALSE, xmlns = FALSE, ret = TRUE; BOOL end = FALSE, error, version = FALSE, xmlns = FALSE, ret = TRUE;
struct assembly_identity ai;
TRACE("(%p)\n", xmlbuf); TRACE("(%p)\n", xmlbuf);
@ -1224,28 +1223,24 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit) else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit)
return FALSE; return FALSE;
if (!xmlstr_cmp(&elem, ASSEMBLYIDENTITY_ELEM)) if (xmlstr_cmp(&elem, ASSEMBLYIDENTITY_ELEM))
{ {
WARN("expected assemblyIdentity element, got %s\n", debugstr_xmlstr(&elem)); if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE;
return FALSE; ret = next_xml_elem(xmlbuf, &elem);
}
if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) return FALSE; if (expected_ai)
if (expected_ai)
{
/* FIXME: more tests */
if (assembly->type == ASSEMBLY_MANIFEST &&
memcmp(&ai.version, &expected_ai->version, sizeof(ai.version)))
{ {
WARN("wrong version\n"); /* FIXME: more tests */
return FALSE; if (assembly->type == ASSEMBLY_MANIFEST &&
memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version)))
{
FIXME("wrong version\n");
return FALSE;
}
} }
} }
assembly->id = ai; while (ret)
while (ret && (ret = next_xml_elem(xmlbuf, &elem)))
{ {
if (xmlstr_cmp(&elem, ELEM_END(ASSEMBLY_ELEM))) if (xmlstr_cmp(&elem, ELEM_END(ASSEMBLY_ELEM)))
{ {
@ -1281,6 +1276,7 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
WARN("wrong element %s\n", debugstr_xmlstr(&elem)); WARN("wrong element %s\n", debugstr_xmlstr(&elem));
ret = FALSE; ret = FALSE;
} }
if (ret) ret = next_xml_elem(xmlbuf, &elem);
} }
return ret; return ret;