Commit a22dcd1a authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

ntdll: Added parsing of public key token in manifests.

parent 2bc3c39c
...@@ -90,6 +90,7 @@ struct assembly_identity ...@@ -90,6 +90,7 @@ struct assembly_identity
{ {
WCHAR *name; WCHAR *name;
WCHAR *arch; WCHAR *arch;
WCHAR *public_key;
struct version version; struct version version;
enum assembly_id_type type; enum assembly_id_type type;
}; };
...@@ -181,6 +182,7 @@ struct actctx_loader ...@@ -181,6 +182,7 @@ struct actctx_loader
#define MANIFESTVERSION_ATTR "manifestVersion" #define MANIFESTVERSION_ATTR "manifestVersion"
#define NAME_ATTR "name" #define NAME_ATTR "name"
#define PROCESSORARCHITECTURE_ATTR "processorArchitecture" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture"
#define PUBLICKEYTOKEN_ATTR "publicKeyToken"
#define TLBID_ATTR "tlbid" #define TLBID_ATTR "tlbid"
#define TYPE_ATTR "type" #define TYPE_ATTR "type"
#define VERSION_ATTR "version" #define VERSION_ATTR "version"
...@@ -287,6 +289,7 @@ static void free_assembly_identity(struct assembly_identity *ai) ...@@ -287,6 +289,7 @@ static void free_assembly_identity(struct assembly_identity *ai)
{ {
RtlFreeHeap( GetProcessHeap(), 0, ai->name ); RtlFreeHeap( GetProcessHeap(), 0, ai->name );
RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); RtlFreeHeap( GetProcessHeap(), 0, ai->arch );
RtlFreeHeap( GetProcessHeap(), 0, ai->public_key );
} }
static struct entity* add_entity(struct dll_redirect* dll, DWORD kind) static struct entity* add_entity(struct dll_redirect* dll, DWORD kind)
...@@ -627,6 +630,10 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a ...@@ -627,6 +630,10 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a
{ {
if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE; if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE;
} }
else if (xmlstr_cmp(&attr_name, PUBLICKEYTOKEN_ATTR))
{
if (!(ai->public_key = xmlstrdupW(&attr_value))) return FALSE;
}
else else
{ {
WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name),
......
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