From: André Hentschel nerv@dawncrow.de
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889 Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/ntdll/actctx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 106fea80a3..25c2dccb8c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -57,6 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)16)
/* from oaidl.h */ typedef enum tagLIBFLAGS { @@ -3304,8 +3306,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, - (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + INT rid; + for (rid = MINIMUM_RESERVED_MANIFEST_RESOURCE_ID; + rid <= MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID; rid++) + { + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, + (LPCWSTR)(ULONG_PTR)rid, 0 ); + if (status == STATUS_SUCCESS) break; + } NtClose( file ); if (status == STATUS_SUCCESS) break;
Alistair Leslie-Hughes leslie_alistair@hotmail.com writes:
From: André Hentschel nerv@dawncrow.de
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889 Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com
dlls/ntdll/actctx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
This still needs tests.
-
Alexandre Julliard -
Alistair Leslie-Hughes