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

Eric Pouech : ntdll: Added support for the assembly leaves of activation contexts.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 2bc3c39cc0533fa4d03ffcf280af1360c237ad3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc3c39cc0533fa4d03ffcf28… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:54:02 2007 +0200 ntdll: Added support for the assembly leaves of activation contexts. --- dlls/ntdll/actctx.c | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 244 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bc3c39cc0533fa4d03ff…

1 0

Jacek Caban : ntdll: Added parsing of file elements in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 16066acf8708716bb7944d53fe56941dccb4fd26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16066acf8708716bb7944d53f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 17:51:42 2007 +0200 ntdll: Added parsing of file elements in manifests. --- dlls/ntdll/actctx.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f785ae7..352b483 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -94,6 +94,11 @@ struct assembly_identity enum assembly_id_type type; }; +struct dll_redirect +{ + WCHAR *name; +}; + enum assembly_type { APPLICATION_MANIFEST, @@ -105,6 +110,9 @@ struct assembly enum assembly_type type; struct assembly_identity id; struct file_info manifest; + struct dll_redirect *dlls; + unsigned int num_dlls; + unsigned int allocated_dlls; }; typedef struct _ACTIVATION_CONTEXT @@ -130,6 +138,7 @@ struct actctx_loader #define ASSEMBLYIDENTITY_ELEM "assemblyIdentity" #define DEPENDENCY_ELEM "dependency" #define DEPENDENTASSEMBLY_ELEM "dependentAssembly" +#define FILE_ELEM "file" #define ELEM_END(elem) "/" elem @@ -213,6 +222,30 @@ static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_t return assembly; } +static struct dll_redirect* add_dll_redirect(struct assembly* assembly) +{ + if (assembly->num_dlls == assembly->allocated_dlls) + { + void *ptr; + unsigned int new_count; + if (assembly->dlls) + { + new_count = assembly->allocated_dlls * 2; + ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + assembly->dlls, new_count * sizeof(*assembly->dlls) ); + } + else + { + new_count = 4; + ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*assembly->dlls) ); + } + if (!ptr) return NULL; + assembly->dlls = ptr; + assembly->allocated_dlls = new_count; + } + return &assembly->dlls[assembly->num_dlls++]; +} + static void free_assembly_identity(struct assembly_identity *ai) { RtlFreeHeap( GetProcessHeap(), 0, ai->name ); @@ -278,12 +311,19 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) { if (interlocked_xchg_add( &actctx->ref_count, -1 ) == 1) { - unsigned int i; + unsigned int i, j; for (i = 0; i < actctx->num_assemblies; i++) { - RtlFreeHeap( GetProcessHeap(), 0, actctx->assemblies[i].manifest.info ); - free_assembly_identity(&actctx->assemblies[i].id); + struct assembly *assembly = &actctx->assemblies[i]; + for (j = 0; j < assembly->num_dlls; j++) + { + struct dll_redirect *dll = &assembly->dlls[j]; + RtlFreeHeap( GetProcessHeap(), 0, dll->name ); + } + RtlFreeHeap( GetProcessHeap(), 0, assembly->dlls ); + RtlFreeHeap( GetProcessHeap(), 0, assembly->manifest.info ); + free_assembly_identity(&assembly->id); } RtlFreeHeap( GetProcessHeap(), 0, actctx->config.info ); RtlFreeHeap( GetProcessHeap(), 0, actctx->appdir.info ); @@ -560,6 +600,49 @@ static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) return ret; } +static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) +{ + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, error, ret = TRUE; + struct dll_redirect* dll; + + if (!(dll = add_dll_redirect(assembly))) return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, NAME_ATTR)) + { + if (!(dll->name = xmlstrdupW(&attr_value))) return FALSE; + TRACE("name=%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 || !dll->name) return FALSE; + if (end) return TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp(&elem, ELEM_END(FILE_ELEM))) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + WARN("wrong elem %s\n", debugstr_xmlstr(&elem)); + ret = FALSE; + } + } + + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -633,6 +716,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_dependency_elem(xmlbuf, acl); } + else if (xmlstr_cmp(&elem, FILE_ELEM)) + { + ret = parse_file_elem(xmlbuf, assembly); + } else { WARN("wrong element %s\n", debugstr_xmlstr(&elem));

1 0

Jacek Caban : ntdll: Add parsing of dependencies in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 5efd2a35bd1d36fec3bb95582d801ed2623bc7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efd2a35bd1d36fec3bb95582… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 17:50:45 2007 +0200 ntdll: Add parsing of dependencies in manifests. --- dlls/ntdll/actctx.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index d46f77c..f785ae7 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -128,6 +128,8 @@ struct actctx_loader #define ASSEMBLY_ELEM "assembly" #define ASSEMBLYIDENTITY_ELEM "assemblyIdentity" +#define DEPENDENCY_ELEM "dependency" +#define DEPENDENTASSEMBLY_ELEM "dependentAssembly" #define ELEM_END(elem) "/" elem @@ -493,6 +495,71 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a return parse_expect_elem(xmlbuf, ELEM_END(ASSEMBLYIDENTITY_ELEM)) && parse_end_element(xmlbuf); } +static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, + struct actctx_loader* acl) +{ + struct assembly_identity ai; + xmlstr_t elem; + BOOL end = FALSE, ret = TRUE; + + TRACE("\n"); + + if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + + if (!parse_expect_elem(xmlbuf, ASSEMBLYIDENTITY_ELEM) || + !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) + return FALSE; + + /* store the newly found identity for later loading */ + if (!add_dependent_assembly_id(acl, &ai)) return FALSE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp(&elem, ELEM_END(DEPENDENTASSEMBLY_ELEM))) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + WARN("wrong elem %s\n", debugstr_xmlstr(&elem)); + ret = FALSE; + } + } + + return ret; +} + +static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) +{ + xmlstr_t elem; + BOOL end = FALSE, ret = TRUE; + + TRACE("\n"); + + if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp(&elem, ELEM_END(DEPENDENCY_ELEM))) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, DEPENDENTASSEMBLY_ELEM)) + { + ret = parse_dependent_assembly_elem(xmlbuf, acl); + } + else + { + WARN("wrong element %s\n", debugstr_xmlstr(&elem)); + ret = FALSE; + } + } + + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -562,6 +629,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, ret = parse_end_element(xmlbuf); break; } + else if (xmlstr_cmp(&elem, DEPENDENCY_ELEM)) + { + ret = parse_dependency_elem(xmlbuf, acl); + } else { WARN("wrong element %s\n", debugstr_xmlstr(&elem));

1 0

Alexandre Julliard : ntdll: Add infrastructure for loading manifest dependencies ( based on a patch by Eric Pouech).
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: c5bf0947f605cefd9ddfc205e3418d083ce8e8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf0947f605cefd9ddfc205e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 17:50:11 2007 +0200 ntdll: Add infrastructure for loading manifest dependencies (based on a patch by Eric Pouech). --- dlls/ntdll/actctx.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1d06356..d46f77c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -217,6 +217,42 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); } +static BOOL add_dependent_assembly_id(struct actctx_loader* acl, + struct assembly_identity* ai) +{ + /* FIXME: should check that the passed ai isn't already in the list */ + if (acl->num_dependencies == acl->allocated_dependencies) + { + void *ptr; + unsigned int new_count; + if (acl->dependencies) + { + new_count = acl->allocated_dependencies * 2; + ptr = RtlReAllocateHeap(GetProcessHeap(), 0, acl->dependencies, + new_count * sizeof(acl->dependencies[0])); + } + else + { + new_count = 4; + ptr = RtlAllocateHeap(GetProcessHeap(), 0, new_count * sizeof(acl->dependencies[0])); + } + if (!ptr) return FALSE; + acl->dependencies = ptr; + acl->allocated_dependencies = new_count; + } + acl->dependencies[acl->num_dependencies++] = *ai; + + return TRUE; +} + +static void free_depend_manifests(struct actctx_loader* acl) +{ + unsigned int i; + for (i = 0; i < acl->num_dependencies; i++) + free_assembly_identity(&acl->dependencies[i]); + RtlFreeHeap(GetProcessHeap(), 0, acl->dependencies); +} + static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *actctx = h; @@ -802,6 +838,85 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, return status; } +static NTSTATUS lookup_assembly(struct actctx_loader* acl, + struct assembly_identity* ai) +{ + static const WCHAR dotDllW[] = {'.','d','l','l',0}; + unsigned int i; + WCHAR *buffer, *p; + NTSTATUS status; + UNICODE_STRING nameW; + HANDLE file; + + /* FIXME: add support for language specific lookup */ + + nameW.Buffer = NULL; + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, + (strlenW(acl->actctx->appdir.info) + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) + return STATUS_NO_MEMORY; + + /* lookup in appdir\name.dll + * appdir\name.manifest + * appdir\name\name.dll + * appdir\name\name.manifest + */ + strcpyW( buffer, acl->actctx->appdir.info ); + p = buffer + strlenW(buffer); + for (i = 0; i < 2; i++) + { + *p++ = '\\'; + strcpyW( p, ai->name ); + p += strlenW(p); + + strcpyW( p, dotDllW ); + if (RtlDosPathNameToNtPathName_U( buffer, &nameW, NULL, NULL )) + { + status = open_nt_file( &file, &nameW ); + if (!status) + { + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, file, + (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + NtClose( file ); + break; + } + RtlFreeUnicodeString( &nameW ); + } + + strcpyW( p, dotManifestW ); + if (RtlDosPathNameToNtPathName_U( buffer, &nameW, NULL, NULL )) + { + status = open_nt_file( &file, &nameW ); + if (!status) + { + status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, file ); + NtClose( file ); + break; + } + RtlFreeUnicodeString( &nameW ); + } + } + RtlFreeUnicodeString( &nameW ); + return STATUS_SXS_ASSEMBLY_NOT_FOUND; +} + +static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) +{ + NTSTATUS status = STATUS_SUCCESS; + unsigned int i; + + for (i = 0; i < acl->num_dependencies; i++) + { + if (lookup_assembly(acl, &acl->dependencies[i]) != STATUS_SUCCESS) + { + FIXME( "Could not find assembly %s\n", debugstr_w(acl->dependencies[i].name) ); + status = STATUS_SXS_CANT_GEN_ACTCTX; + break; + } + } + /* FIXME should now iterate through all refs */ + return status; +} + /*********************************************************************** * RtlCreateActivationContext (NTDLL.@) @@ -913,6 +1028,10 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) if (file) NtClose( file ); RtlFreeUnicodeString( &nameW ); + + if (status == STATUS_SUCCESS) status = parse_depend_manifests(&acl); + free_depend_manifests( &acl ); + if (status == STATUS_SUCCESS) *handle = actctx; else actctx_release( actctx ); return status;

1 0

Alexandre Julliard : ntdll: Add parsing of the version in manifests ( based on a patch by Jacek Caban).
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 5b0ab20787e36bf6a7e86a20eb730d69b59510e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0ab20787e36bf6a7e86a20e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 17:47:33 2007 +0200 ntdll: Add parsing of the version in manifests (based on a patch by Jacek Caban). --- dlls/ntdll/actctx.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1723ed5..1d06356 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -134,6 +134,7 @@ struct actctx_loader #define MANIFESTVERSION_ATTR "manifestVersion" #define NAME_ATTR "name" #define TYPE_ATTR "type" +#define VERSION_ATTR "version" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture" #define XMLNS_ATTR "xmlns" @@ -353,6 +354,38 @@ static BOOL parse_xml_header(xmlbuf_t* xmlbuf) return FALSE; } +static BOOL parse_version(const xmlstr_t *str, struct version *version) +{ + unsigned int ver[4]; + unsigned int pos; + const char *curr; + + /* major.minor.build.revision */ + ver[0] = ver[1] = ver[2] = ver[3] = pos = 0; + for (curr = str->ptr; curr < str->ptr + str->len; curr++) + { + if (*curr >= '0' && *curr <= '9') + { + ver[pos] = ver[pos] * 10 + *curr - '0'; + if (ver[pos] >= 0x10000) goto error; + } + else if (*curr == '.') + { + if (++pos >= 4) goto error; + } + else goto error; + } + version->major = ver[0]; + version->minor = ver[1]; + version->build = ver[2]; + version->revision = ver[3]; + return TRUE; + +error: + FIXME( "Wrong version definition in manifest file (%s)\n", debugstr_xmlstr(str) ); + return FALSE; +} + static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const char* name) { xmlstr_t elem; @@ -404,6 +437,10 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a } ai->type = TYPE_WIN32; } + else if (xmlstr_cmp(&attr_name, VERSION_ATTR)) + { + if (!parse_version(&attr_value, &ai->version)) return FALSE; + } else if (xmlstr_cmp(&attr_name, PROCESSORARCHITECTURE_ATTR)) { if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE;

1 0

Jacek Caban : ntdll: Beginnings of manifest parsing.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: c0e7cd9d93f1b497db7fcb51d1d0a7c5fe2b1952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e7cd9d93f1b497db7fcb51d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 17:44:20 2007 +0200 ntdll: Beginnings of manifest parsing. --- dlls/ntdll/actctx.c | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 334 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e7cd9d93f1b497db7fc…

1 0

Alexandre Julliard : ntdll: Add parsing of the processor architecture in manifests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: a5130f4e7280ffed6112f8ebe17eddb46a595ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5130f4e7280ffed6112f8ebe… Author: Alexandre Julliard <julliard(a)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),

1 0

Alexandre Julliard : kernel32: Move activation context creation to ntdll ( based on a patch by Eric Pouech).
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 64f6fdc57e930bbc9a218232bf4804f6872ccb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f6fdc57e930bbc9a218232b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 17:01:04 2007 +0200 kernel32: Move activation context creation to ntdll (based on a patch by Eric Pouech). --- dlls/kernel32/actctx.c | 79 +++------------------------ dlls/ntdll/Makefile.in | 1 + dlls/ntdll/actctx.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 6 +- include/winternl.h | 5 ++- 5 files changed, 154 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f6fdc57e930bbc9a218…

1 0

Eric Pouech : ntdll: Added basic structures for storing activation context assembly information .
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 5f92f1f90113f2cac731243d89c841f8d4d11751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f92f1f90113f2cac731243d8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jul 19 17:09:09 2007 +0200 ntdll: Added basic structures for storing activation context assembly information. --- dlls/ntdll/actctx.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 2595061..74aeba0 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -50,13 +50,95 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); #define ACTCTX_MAGIC 0xC07E3E11 +struct file_info +{ + ULONG type; + WCHAR *info; +}; + +struct version +{ + USHORT major; + USHORT minor; + USHORT build; + USHORT revision; +}; + +struct assembly_identity +{ + WCHAR *name; + struct version version; +}; + +enum assembly_type +{ + APPLICATION_MANIFEST, + ASSEMBLY_MANIFEST +}; + +struct assembly +{ + enum assembly_type type; + struct assembly_identity id; + struct file_info manifest; +}; + typedef struct _ACTIVATION_CONTEXT { ULONG magic; int ref_count; + struct file_info config; + struct file_info appdir; + struct assembly *assemblies; + unsigned int num_assemblies; + unsigned int allocated_assemblies; } ACTIVATION_CONTEXT; +static WCHAR *strdupW(const WCHAR* str) +{ + WCHAR* ptr; + + if (!str) return NULL; + if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR)))) + return NULL; + return strcpyW(ptr, str); +} + +static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_type at) +{ + struct assembly *assembly; + + if (actctx->num_assemblies == actctx->allocated_assemblies) + { + void *ptr; + unsigned int new_count; + if (actctx->assemblies) + { + new_count = actctx->allocated_assemblies * 2; + ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + actctx->assemblies, new_count * sizeof(*assembly) ); + } + else + { + new_count = 4; + ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*assembly) ); + } + if (!ptr) return NULL; + actctx->assemblies = ptr; + actctx->allocated_assemblies = new_count; + } + + assembly = &actctx->assemblies[actctx->num_assemblies++]; + assembly->type = at; + return assembly; +} + +static void free_assembly_identity(struct assembly_identity *ai) +{ + RtlFreeHeap( GetProcessHeap(), 0, ai->name ); +} + static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *actctx = h; @@ -80,6 +162,16 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) { if (interlocked_xchg_add( &actctx->ref_count, -1 ) == 1) { + unsigned int i; + + for (i = 0; i < actctx->num_assemblies; i++) + { + RtlFreeHeap( GetProcessHeap(), 0, actctx->assemblies[i].manifest.info ); + free_assembly_identity(&actctx->assemblies[i].id); + } + RtlFreeHeap( GetProcessHeap(), 0, actctx->config.info ); + RtlFreeHeap( GetProcessHeap(), 0, actctx->appdir.info ); + RtlFreeHeap( GetProcessHeap(), 0, actctx->assemblies ); actctx->magic = 0; RtlFreeHeap( GetProcessHeap(), 0, actctx ); } @@ -97,6 +189,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) { const ACTCTXW *pActCtx = ptr; /* FIXME: not the right structure */ ACTIVATION_CONTEXT *actctx; + struct assembly *assembly; TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); @@ -104,14 +197,35 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL)) return STATUS_INVALID_PARAMETER; - if (!(actctx = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*actctx) ))) + if (!(actctx = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*actctx) ))) return STATUS_NO_MEMORY; actctx->magic = ACTCTX_MAGIC; actctx->ref_count = 1; + if (!(assembly = add_assembly( actctx, APPLICATION_MANIFEST ))) goto error; + if (!(assembly->id.name = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) ))) + goto error; + assembly->id.version.major = 1; + assembly->id.version.minor = 0; + assembly->id.version.build = 0; + assembly->id.version.revision = 0; + assembly->manifest.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE; + assembly->manifest.info = NULL; + + actctx->config.type = ACTIVATION_CONTEXT_PATH_TYPE_NONE; + actctx->config.info = NULL; + actctx->appdir.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE; + if (pActCtx->dwFlags & ACTCTX_FLAG_APPLICATION_NAME_VALID) + actctx->appdir.info = strdupW( pActCtx->lpApplicationName ); + *handle = actctx; return STATUS_SUCCESS; + +error: + RtlFreeHeap( GetProcessHeap(), 0, assembly ); + RtlFreeHeap( GetProcessHeap(), 0, actctx ); + return STATUS_NO_MEMORY; }

1 0

Alexandre Julliard : ntdll: Move private data to make room in the TEB for the activation context data.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 44c9758d05a76244b88d13426feb5eff43c69417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c9758d05a76244b88d13426… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 16:56:10 2007 +0200 ntdll: Move private data to make room in the TEB for the activation context data. --- dlls/ntdll/ntdll_misc.h | 34 +++++++++++++++++----------------- dlls/ntdll/signal_i386.c | 6 +++--- dlls/ntdll/thread.c | 15 ++++++--------- include/thread.h | 6 +++--- include/winternl.h | 21 ++++++++++++++++++--- tools/winebuild/relay.c | 2 +- 6 files changed, 48 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44c9758d05a76244b88d1…

1 0