Alexandre Julliard : ntdll:
Add parsing of the processor architecture in manifests.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 20 06:02:06 CDT 2007
Module: wine
Branch: master
Commit: a5130f4e7280ffed6112f8ebe17eddb46a595ce6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5130f4e7280ffed6112f8ebe17eddb46a595ce6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jul 19 17:45:49 2007 +0200
ntdll: Add parsing of the processor architecture in manifests.
---
dlls/ntdll/actctx.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 1f7d90b..1723ed5 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -89,6 +89,7 @@ enum assembly_id_type
struct assembly_identity
{
WCHAR *name;
+ WCHAR *arch;
struct version version;
enum assembly_id_type type;
};
@@ -133,6 +134,7 @@ struct actctx_loader
#define MANIFESTVERSION_ATTR "manifestVersion"
#define NAME_ATTR "name"
#define TYPE_ATTR "type"
+#define PROCESSORARCHITECTURE_ATTR "processorArchitecture"
#define XMLNS_ATTR "xmlns"
#define MANIFEST_NAMESPACE "urn:schemas-microsoft-com:asm.v1"
@@ -211,6 +213,7 @@ static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_t
static void free_assembly_identity(struct assembly_identity *ai)
{
RtlFreeHeap( GetProcessHeap(), 0, ai->name );
+ RtlFreeHeap( GetProcessHeap(), 0, ai->arch );
}
static ACTIVATION_CONTEXT *check_actctx( HANDLE h )
@@ -401,6 +404,10 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a
}
ai->type = TYPE_WIN32;
}
+ else if (xmlstr_cmp(&attr_name, PROCESSORARCHITECTURE_ATTR))
+ {
+ if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE;
+ }
else
{
WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name),
More information about the wine-cvs
mailing list