Commit a81535d8 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

ntdll/actctx: Accept empty assembly elements.

parent a14c6b73
......@@ -2521,7 +2521,6 @@ static void test_actctx(void)
/* Empty <assembly/> element. */
create_manifest_file("empty_assembly.manifest", empty_assembly_manifest, -1, NULL, NULL);
handle = test_create("empty_assembly.manifest");
todo_wine
ok(handle != INVALID_HANDLE_VALUE, "Failed to create activation context.\n");
DeleteFileA("empty_assembly.manifest");
if (handle != INVALID_HANDLE_VALUE)
......
......@@ -2708,12 +2708,15 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly,
}
}
if (end || !version)
if (!version)
{
set_error( xmlbuf );
return;
}
if (end)
return;
while (next_xml_elem(xmlbuf, &elem, parent))
{
if (assembly->type == APPLICATION_MANIFEST && xml_elem_cmp(&elem, L"noInherit", asmv1W))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment