Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 15:46:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL] actctx: When probing a dll for a manifest, use the first manifest id present,

Browse source 
instead of always searching for CREATEPROCESS_MANIFEST_RESOURCE_ID.
CORE-9519
This commit is contained in:
Mark Jansen 2018-09-24 23:59:57 +02:00
parent 50ae3dd409
commit 57ed670b5a
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 74 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

78
sdk/lib/rtl/actctx.c
View file

@ -2947,6 +2947,65 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb
return status; return status;
} }
IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( IMAGE_RESOURCE_DIRECTORY *dir,
LPCWSTR name, void *root,
int want_dir );
IMAGE_RESOURCE_DIRECTORY *find_first_entry( IMAGE_RESOURCE_DIRECTORY *dir,
void *root, int want_dir );
static IMAGE_RESOURCE_DIRECTORY *find_first_id_entry( IMAGE_RESOURCE_DIRECTORY *dir,
void *root, int want_dir )
{
const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1);
int pos;
for (pos = dir->NumberOfNamedEntries; pos < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; pos++)
{
if (!entry[pos].DataIsDirectory == !want_dir)
return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory);
}
return NULL;
}
static NTSTATUS search_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai,
LPCWSTR filename, LPCWSTR directory, BOOL shared,
HANDLE hModule, ULONG lang )
{
ULONG size;
PVOID root, ptr;
IMAGE_RESOURCE_DIRECTORY *resdirptr;
IMAGE_RESOURCE_DATA_ENTRY *entry;
NTSTATUS status;
root = RtlImageDirectoryEntryToData(hModule, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size);
if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND;
if (size < sizeof(*resdirptr)) return STATUS_RESOURCE_DATA_NOT_FOUND;
resdirptr = root;
if (!(ptr = find_entry_by_name(resdirptr, (LPCWSTR)RT_MANIFEST, root, 1)))
return STATUS_RESOURCE_TYPE_NOT_FOUND;
resdirptr = ptr;
if (!(ptr = find_first_id_entry(resdirptr, root, 1)))
return STATUS_RESOURCE_TYPE_NOT_FOUND;
resdirptr = ptr;
if (!(ptr = find_first_entry(resdirptr, root, 0)))
return STATUS_RESOURCE_TYPE_NOT_FOUND;
entry = ptr;
status = LdrAccessResource(hModule, entry, &ptr, NULL);
if (status == STATUS_SUCCESS)
status = parse_manifest(acl, ai, filename, directory, shared, ptr, entry->Size);
return status;
}
static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai, static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai,
LPCWSTR filename, LPCWSTR directory, BOOL shared, LPCWSTR filename, LPCWSTR directory, BOOL shared,
HANDLE file, LPCWSTR resname, ULONG lang ) HANDLE file, LPCWSTR resname, ULONG lang )
@ -2958,8 +3017,16 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem
NTSTATUS status; NTSTATUS status;
SIZE_T count; SIZE_T count;
void *base; void *base;
WCHAR resnameBuf[20];
LPCWSTR resptr = resname;
DPRINT( "looking for res %S in %S\n", resname, filename ); if ((!((ULONG_PTR)resname >> 16)))
{
sprintfW(resnameBuf, L"#%u", (ULONG_PTR)resname);
resptr = resnameBuf;
}
DPRINT( "looking for res %S in %S\n", resptr, filename ? filename : L"<NULL>");
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = 0;
@ -2984,7 +3051,10 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem
if (RtlImageNtHeader(base)) /* we got a PE file */ if (RtlImageNtHeader(base)) /* we got a PE file */
{ {
HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */ HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */
status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); if (resname)
status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang );
else
status = search_manifest_in_module(acl, ai, filename, directory, shared, module, lang);
} }
else status = STATUS_INVALID_IMAGE_FORMAT; else status = STATUS_INVALID_IMAGE_FORMAT;
@ -3308,7 +3378,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl,
if (!status) if (!status)
{ {
status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file,
(LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); (LPCWSTR)0, 0 );
NtClose( file ); NtClose( file );
break; break;
} }
@ -5098,7 +5168,7 @@ RtlCreateActivationContext(IN ULONG Flags,
status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory, status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory,
pActCtx->hModule, pActCtx->lpResourceName ); pActCtx->hModule, pActCtx->lpResourceName );
} }
else if (pActCtx->lpSource) else if (pActCtx->lpSource && pActCtx->lpResourceName)
{ {
status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, FALSE, status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, FALSE,
file, pActCtx->lpResourceName, lang ); file, pActCtx->lpResourceName, lang );