Skip to content

W
wine-fonts
Commit c44d0f0b authored by André Hentschel's avatar André Hentschel Committed by Vitaly Lipatov
Browse files
Options

ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889
parent 464fec3b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
dlls/ntdll/actctx.c
View file @ c44d0f0b
...@@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); ...@@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx);
/* we don't want to include winuser.h */ /* we don't want to include winuser.h */
#define RT_MANIFEST ((ULONG_PTR)24) #define RT_MANIFEST ((ULONG_PTR)24)
#define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) #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 */ /* from oaidl.h */
typedef enum tagLIBFLAGS { typedef enum tagLIBFLAGS {
...@@ -3331,8 +3333,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, ...@@ -3331,8 +3333,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl,
status = open_nt_file( &file, &nameW ); status = open_nt_file( &file, &nameW );
if (!status) if (!status)
{ {
status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, INT rid;
(LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); 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 ); NtClose( file );
if (status == STATUS_SUCCESS) if (status == STATUS_SUCCESS)
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment