July 2007 - Wine-Commits - list.winehq.org

Eric Pouech : ntdll: Added parsing of the clrClass and clrSurrogate elements in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 3c1f5c6aee858db36ca3b2e4f31d5f6c0604a3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1f5c6aee858db36ca3b2e4f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 18:22:32 2007 +0200 ntdll: Added parsing of the clrClass and clrSurrogate elements in manifests. --- dlls/ntdll/actctx.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 29183af..942713b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -119,6 +119,16 @@ struct entity { WCHAR *name; } class; + struct + { + WCHAR *name; + WCHAR *clsid; + } clrclass; + struct + { + WCHAR *name; + WCHAR *clsid; + } clrsurrogate; } u; }; @@ -175,6 +185,8 @@ struct actctx_loader #define ASSEMBLY_ELEM "assembly" #define ASSEMBLYIDENTITY_ELEM "assemblyIdentity" +#define CLRCLASS_ELEM "clrClass" +#define CLRSURROGATE_ELEM "clrSurrogate" #define COMCLASS_ELEM "comClass" #define COMINTERFACEEXTERNALPROXYSTUB_ELEM "comInterfaceExternalProxyStub" #define COMINTERFACEPROXYSTUB_ELEM "comInterfaceProxyStub" @@ -360,6 +372,14 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); break; + case ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.clsid); + break; + case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); + break; default: FIXME("Unknown entity kind %d\n", entity->kind); } @@ -859,6 +879,68 @@ static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, parse_end_element(xmlbuf); } +static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + struct entity* entity; + + entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION); + if (!entity) return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, NAME_ATTR)) + { + if (!(entity->u.clrclass.name = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, CLSID_ATTR)) + { + if (!(entity->u.clrclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + } + else + { + WARN("wrong attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + return FALSE; + } + } + + if (error || end) return end; + return parse_expect_elem(xmlbuf, ELEM_END(CLRCLASS_ELEM)) && parse_end_element(xmlbuf); +} + +static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + struct entity* entity; + + entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES); + if (!entity) return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, NAME_ATTR)) + { + if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, CLSID_ATTR)) + { + if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr_value))) return FALSE; + } + else + { + WARN("wrong attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + return FALSE; + } + } + + if (error || end) return end; + return parse_expect_elem(xmlbuf, ELEM_END(CLRSURROGATE_ELEM)) && parse_end_element(xmlbuf); +} + static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) { @@ -1110,6 +1192,14 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_file_elem(xmlbuf, assembly); } + else if (xmlstr_cmp(&elem, CLRCLASS_ELEM)) + { + ret = parse_clr_class_elem(xmlbuf, assembly); + } + else if (xmlstr_cmp(&elem, CLRSURROGATE_ELEM)) + { + ret = parse_clr_surrogate_elem(xmlbuf, assembly); + } else { WARN("wrong element %s\n", debugstr_xmlstr(&elem));

1 0

Alexandre Julliard : ntdll: Abstract the entity array type as we need it for assemblies too.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: b96df32560208c824786a8789ed51c80c931ea38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96df32560208c824786a8789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:00:33 2007 +0200 ntdll: Abstract the entity array type as we need it for assemblies too. --- dlls/ntdll/actctx.c | 86 ++++++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5abb374..3ba5494 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -122,13 +122,18 @@ struct entity } u; }; +struct entity_array +{ + struct entity *base; + unsigned int num; + unsigned int allocated; +}; + struct dll_redirect { WCHAR *name; WCHAR *hash; - struct entity *entities; - unsigned int num_entities; - unsigned int allocated_entities; + struct entity_array entities; }; enum assembly_type @@ -302,56 +307,62 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->language ); } -static struct entity* add_entity(struct dll_redirect* dll, DWORD kind) +static struct entity* add_entity(struct entity_array *array, DWORD kind) { struct entity* entity; - if (dll->num_entities == dll->allocated_entities) + if (array->num == array->allocated) { void *ptr; unsigned int new_count; - if (dll->entities) + if (array->base) { - new_count = dll->allocated_entities * 2; + new_count = array->allocated * 2; ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - dll->entities, new_count * sizeof(*dll->entities) ); + array->base, new_count * sizeof(*array->base) ); } else { new_count = 4; - ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*dll->entities) ); + ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*array->base) ); } if (!ptr) return NULL; - dll->entities = ptr; - dll->allocated_entities = new_count; + array->base = ptr; + array->allocated = new_count; } - entity = &dll->entities[dll->num_entities++]; + entity = &array->base[array->num++]; entity->kind = kind; return entity; } -static void free_entity(struct entity* entity) +static void free_entity_array(struct entity_array *array) { - switch (entity->kind) + unsigned int i; + for (i = 0; i < array->num; i++) { - case ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); - break; - case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.iid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.name); - break; - case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.version); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.helpdir); - break; - case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); - break; - default: - FIXME("Unknown entity kind %d\n", entity->kind); + struct entity *entity = &array->base[i]; + switch (entity->kind) + { + case ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); + break; + case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.iid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.name); + break; + case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.version); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.helpdir); + break; + case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); + break; + default: + FIXME("Unknown entity kind %d\n", entity->kind); + } } + RtlFreeHeap( GetProcessHeap(), 0, array->base ); } static BOOL add_dependent_assembly_id(struct actctx_loader* acl, @@ -413,7 +424,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) { if (interlocked_xchg_add( &actctx->ref_count, -1 ) == 1) { - unsigned int i, j, k; + unsigned int i, j; for (i = 0; i < actctx->num_assemblies; i++) { @@ -421,8 +432,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; - for (k = 0; k < dll->num_entities; k++) free_entity(&dll->entities[k]); - RtlFreeHeap( GetProcessHeap(), 0, dll->entities ); + free_entity_array( &dll->entities ); RtlFreeHeap( GetProcessHeap(), 0, dll->name ); RtlFreeHeap( GetProcessHeap(), 0, dll->hash ); } @@ -669,7 +679,7 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -695,7 +705,7 @@ static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redi BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -725,7 +735,7 @@ static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -759,7 +769,7 @@ static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, ret = TRUE; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION); if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; if (end) return FALSE;

1 0

Eric Pouech : ntdll: Added parsing of the binding redirect element in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: e6b3ca09c4d9b09b8ebd6dfde4f3ca761a5499b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b3ca09c4d9b09b8ebd6dfde… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 18:03:47 2007 +0200 ntdll: Added parsing of the binding redirect element in manifests. --- dlls/ntdll/actctx.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 942713b..58b09b2 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -185,6 +185,7 @@ struct actctx_loader #define ASSEMBLY_ELEM "assembly" #define ASSEMBLYIDENTITY_ELEM "assemblyIdentity" +#define BINDINGREDIRECT_ELEM "bindingRedirect" #define CLRCLASS_ELEM "clrClass" #define CLRSURROGATE_ELEM "clrSurrogate" #define COMCLASS_ELEM "comClass" @@ -209,6 +210,8 @@ struct actctx_loader #define LANGUAGE_ATTR "language" #define MANIFESTVERSION_ATTR "manifestVersion" #define NAME_ATTR "name" +#define NEWVERSION_ATTR "newVersion" +#define OLDVERSION_ATTR "oldVersion" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture" #define PUBLICKEYTOKEN_ATTR "publicKeyToken" #define TLBID_ATTR "tlbid" @@ -818,6 +821,33 @@ static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) return ret; } +static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, OLDVERSION_ATTR)) + { + FIXME("Not stored yet oldVersion=%s\n", debugstr_xmlstr(&attr_value)); + } + else if (xmlstr_cmp(&attr_name, NEWVERSION_ATTR)) + { + FIXME("Not stored yet newVersion=%s\n", debugstr_xmlstr(&attr_value)); + } + else + { + WARN("wrong attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + return FALSE; + } + } + + if (error || end) return end; + return parse_expect_elem(xmlbuf, ELEM_END(BINDINGREDIRECT_ELEM)) && parse_end_element(xmlbuf); +} + static BOOL parse_description_elem(xmlbuf_t* xmlbuf) { xmlstr_t elem, content; @@ -966,6 +996,10 @@ static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, ret = parse_end_element(xmlbuf); break; } + else if (xmlstr_cmp(&elem, BINDINGREDIRECT_ELEM)) + { + ret = parse_binding_redirect_elem(xmlbuf); + } else { WARN("wrong elem %s\n", debugstr_xmlstr(&elem));

1 0

Jacek Caban : ntdll: Added parsing of the asmv2:hash element in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 63e4b943a9ec08172caeb9188d84756326dc74e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e4b943a9ec08172caeb9188… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 18:04:32 2007 +0200 ntdll: Added parsing of the asmv2:hash element in manifests. --- dlls/ntdll/actctx.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 58b09b2..df2a66f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -195,6 +195,7 @@ struct actctx_loader #define DEPENDENTASSEMBLY_ELEM "dependentAssembly" #define DESCRIPTION_ELEM "description" #define FILE_ELEM "file" +#define HASH_ELEM "asmv2:hash" #define NOINHERIT_ELEM "noInherit" #define NOINHERITABLE_ELEM "noInheritable" #define TYPELIB_ELEM "typelib" @@ -645,6 +646,25 @@ static BOOL parse_end_element(xmlbuf_t *xmlbuf) return parse_expect_no_attr(xmlbuf, &end) && !end; } +static BOOL parse_unknown_elem(xmlbuf_t *xmlbuf, const char *name) +{ + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, error, ret = TRUE; + + while(next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)); + if(error || end) return end; + + while(ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if(*elem.ptr == '/' && !strncmp(elem.ptr+1, name, elem.len-1)) + break; + else + ret = parse_unknown_elem(xmlbuf, elem.ptr); + } + + return ret && parse_end_element(xmlbuf); +} + static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* actctx, struct assembly_identity* ai) { @@ -1108,6 +1128,11 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) { ret = parse_cominterface_proxy_stub_elem(xmlbuf, dll); } + else if (xmlstr_cmp(&elem, HASH_ELEM)) + { + WARN(HASH_ELEM " (undocumented) not supported\n"); + ret = parse_unknown_elem(xmlbuf, HASH_ELEM); + } else if (xmlstr_cmp(&elem, TYPELIB_ELEM)) { ret = parse_typelib_elem(xmlbuf, dll);

1 0

Eric Pouech : ntdll: Added parsing of the external proxy element in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 21427b2d5a295297a1047906251fd435e7e33727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21427b2d5a295297a10479062… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 18:01:42 2007 +0200 ntdll: Added parsing of the external proxy element in manifests. --- dlls/ntdll/actctx.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 3ba5494..29183af 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -151,6 +151,7 @@ struct assembly struct dll_redirect *dlls; unsigned int num_dlls; unsigned int allocated_dlls; + struct entity_array entities; }; typedef struct _ACTIVATION_CONTEXT @@ -175,6 +176,7 @@ struct actctx_loader #define ASSEMBLY_ELEM "assembly" #define ASSEMBLYIDENTITY_ELEM "assemblyIdentity" #define COMCLASS_ELEM "comClass" +#define COMINTERFACEEXTERNALPROXYSTUB_ELEM "comInterfaceExternalProxyStub" #define COMINTERFACEPROXYSTUB_ELEM "comInterfaceProxyStub" #define DEPENDENCY_ELEM "dependency" #define DEPENDENTASSEMBLY_ELEM "dependentAssembly" @@ -438,6 +440,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) } RtlFreeHeap( GetProcessHeap(), 0, assembly->dlls ); RtlFreeHeap( GetProcessHeap(), 0, assembly->manifest.info ); + free_entity_array( &assembly->entities ); free_assembly_identity(&assembly->id); } RtlFreeHeap( GetProcessHeap(), 0, actctx->config.info ); @@ -823,6 +826,39 @@ static BOOL parse_description_elem(xmlbuf_t* xmlbuf) return ret; } +static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, + struct assembly* assembly) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + struct entity* entity; + + entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); + if (!entity) return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IID_ATTR)) + { + if (!(entity->u.proxy.iid = xmlstrdupW(&attr_value))) return FALSE; + } + if (xmlstr_cmp(&attr_name, NAME_ATTR)) + { + if (!(entity->u.proxy.name = xmlstrdupW(&attr_value))) return FALSE; + } + else + { + WARN("wrong attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + return FALSE; + } + } + + if (error || end) return end; + return parse_expect_elem(xmlbuf, ELEM_END(COMINTERFACEEXTERNALPROXYSTUB_ELEM)) && + parse_end_element(xmlbuf); +} + static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) { @@ -1062,6 +1098,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_description_elem(xmlbuf); } + else if (xmlstr_cmp(&elem, COMINTERFACEEXTERNALPROXYSTUB_ELEM)) + { + ret = parse_com_interface_external_proxy_stub_elem(xmlbuf, assembly); + } else if (xmlstr_cmp(&elem, DEPENDENCY_ELEM)) { ret = parse_dependency_elem(xmlbuf, acl);

1 0

Eric Pouech : ntdll: Added parsing of the description element in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: c496dd4ef805dfcc8bf28741b58d3651603b092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c496dd4ef805dfcc8bf28741b… Author: Eric Pouech <eric.pouech(a)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);

1 0

Eric Pouech : ntdll: Added parsing of the language attribute in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 699b5e74dec48f2cd71b51570867c40ff3a7ec51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699b5e74dec48f2cd71b51570… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:59:28 2007 +0200 ntdll: Added parsing of the language attribute in manifests. --- dlls/ntdll/actctx.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1f60767..263f125 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -91,6 +91,7 @@ struct assembly_identity WCHAR *name; WCHAR *arch; WCHAR *public_key; + WCHAR *language; struct version version; enum assembly_id_type type; }; @@ -185,6 +186,7 @@ struct actctx_loader #define HASHALG_ATTR "hashalg" #define HELPDIR_ATTR "helpdir" #define IID_ATTR "iid" +#define LANGUAGE_ATTR "language" #define MANIFESTVERSION_ATTR "manifestVersion" #define NAME_ATTR "name" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture" @@ -296,6 +298,7 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->name ); RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); RtlFreeHeap( GetProcessHeap(), 0, ai->public_key ); + RtlFreeHeap( GetProcessHeap(), 0, ai->language ); } static struct entity* add_entity(struct dll_redirect* dll, DWORD kind) @@ -641,6 +644,12 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a { if (!(ai->public_key = xmlstrdupW(&attr_value))) return FALSE; } + else if (xmlstr_cmp(&attr_name, LANGUAGE_ATTR)) + { + WARN("Unsupported yet language attribute (%s)\n", + debugstr_xmlstr(&attr_value)); + if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name),

1 0

Eric Pouech : ntdll: Added parsing of the inheritance flags in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 61582576515b20757eea444fb2c16f966c6c0a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=61582576515b20757eea444fb… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:57:38 2007 +0200 ntdll: Added parsing of the inheritance flags in manifests. --- dlls/ntdll/actctx.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 0e2ab50..1f60767 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -141,6 +141,7 @@ struct assembly enum assembly_type type; struct assembly_identity id; struct file_info manifest; + BOOL no_inherit; struct dll_redirect *dlls; unsigned int num_dlls; unsigned int allocated_dlls; @@ -172,6 +173,8 @@ struct actctx_loader #define DEPENDENCY_ELEM "dependency" #define DEPENDENTASSEMBLY_ELEM "dependentAssembly" #define FILE_ELEM "file" +#define NOINHERIT_ELEM "noInherit" +#define NOINHERITABLE_ELEM "noInheritable" #define TYPELIB_ELEM "typelib" #define WINDOWCLASS_ELEM "windowClass" @@ -837,6 +840,24 @@ static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) return ret; } +static BOOL parse_noinherit_elem(xmlbuf_t* xmlbuf) +{ + BOOL end = FALSE; + + if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; + return end || + (parse_expect_elem(xmlbuf, ELEM_END(NOINHERIT_ELEM)) && parse_end_element(xmlbuf)); +} + +static BOOL parse_noinheritable_elem(xmlbuf_t* xmlbuf) +{ + BOOL end = FALSE; + + if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; + return end || + (parse_expect_elem(xmlbuf, ELEM_END(NOINHERITABLE_ELEM)) && parse_end_element(xmlbuf)); +} + static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) { xmlstr_t attr_name, attr_value, elem; @@ -946,6 +967,21 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (error || end || !xmlns || !version) return FALSE; if (!next_xml_elem(xmlbuf, &elem)) return FALSE; + if (assembly->type == APPLICATION_MANIFEST && xmlstr_cmp(&elem, NOINHERIT_ELEM)) + { + if (!parse_noinherit_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) + return FALSE; + assembly->no_inherit = TRUE; + } + + if (xmlstr_cmp(&elem, NOINHERITABLE_ELEM)) + { + if (!parse_noinheritable_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) + return FALSE; + } + else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit) + return FALSE; + if (!xmlstr_cmp(&elem, ASSEMBLYIDENTITY_ELEM)) { WARN("expected assemblyIdentity element, got %s\n", debugstr_xmlstr(&elem));

1 0

Eric Pouech : ntdll: Added parsing of hash attributes in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: b6d7b855dff2e8074b8c257995559795e5ab7eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d7b855dff2e8074b8c25799… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:57:13 2007 +0200 ntdll: Added parsing of hash attributes in manifests. --- dlls/ntdll/actctx.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 18a4001..0e2ab50 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -124,6 +124,7 @@ struct entity struct dll_redirect { WCHAR *name; + WCHAR *hash; struct entity *entities; unsigned int num_entities; unsigned int allocated_entities; @@ -177,6 +178,8 @@ struct actctx_loader #define ELEM_END(elem) "/" elem #define CLSID_ATTR "clsid" +#define HASH_ATTR "hash" +#define HASHALG_ATTR "hashalg" #define HELPDIR_ATTR "helpdir" #define IID_ATTR "iid" #define MANIFESTVERSION_ATTR "manifestVersion" @@ -414,6 +417,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) for (k = 0; k < dll->num_entities; k++) free_entity(&dll->entities[k]); RtlFreeHeap( GetProcessHeap(), 0, dll->entities ); RtlFreeHeap( GetProcessHeap(), 0, dll->name ); + RtlFreeHeap( GetProcessHeap(), 0, dll->hash ); } RtlFreeHeap( GetProcessHeap(), 0, assembly->dlls ); RtlFreeHeap( GetProcessHeap(), 0, assembly->manifest.info ); @@ -848,6 +852,15 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) if (!(dll->name = xmlstrdupW(&attr_value))) return FALSE; TRACE("name=%s\n", debugstr_xmlstr(&attr_value)); } + else if (xmlstr_cmp(&attr_name, HASH_ATTR)) + { + if (!(dll->hash = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, HASHALG_ATTR)) + { + if (!xmlstr_cmp(&attr_value, "SHA1")) + FIXME("hashalg should be SHA1, got %s\n", debugstr_xmlstr(&attr_value)); + } else { WARN("wrong attr %s=%s\n", debugstr_xmlstr(&attr_name),

1 0

Eric Pouech : ntdll: Added parsing of public key token in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: a22dcd1ad0b628b2e414bc8d6cbfa97ea87ab001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22dcd1ad0b628b2e414bc8d6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:54:53 2007 +0200 ntdll: Added parsing of public key token 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 e73cdaa..18a4001 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -90,6 +90,7 @@ struct assembly_identity { WCHAR *name; WCHAR *arch; + WCHAR *public_key; struct version version; enum assembly_id_type type; }; @@ -181,6 +182,7 @@ struct actctx_loader #define MANIFESTVERSION_ATTR "manifestVersion" #define NAME_ATTR "name" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture" +#define PUBLICKEYTOKEN_ATTR "publicKeyToken" #define TLBID_ATTR "tlbid" #define TYPE_ATTR "type" #define VERSION_ATTR "version" @@ -287,6 +289,7 @@ static void free_assembly_identity(struct assembly_identity *ai) { RtlFreeHeap( GetProcessHeap(), 0, ai->name ); RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); + RtlFreeHeap( GetProcessHeap(), 0, ai->public_key ); } 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 { 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 { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name),

1 0