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

[RTL] actctx: Use the new RosGetProcessCompatVersion.

Browse source
This commit is contained in:
Mark Jansen 2018-04-09 18:55:59 +02:00
parent d49004352f
commit 9aa26b9c23
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 11 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#include <rtl.h> #include <rtl.h>
#include <ntstrsafe.h> #include <ntstrsafe.h>
#include <compat_undoc.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -4935,9 +4936,6 @@ void actctx_init(void)
HANDLE handle; HANDLE handle;
WCHAR buffer[1024]; WCHAR buffer[1024];
NTSTATUS Status; NTSTATUS Status;
BOOLEAN bForwardCompatible = FALSE;
ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)];
SIZE_T SizeRequired;
ctx.cbSize = sizeof(ctx); ctx.cbSize = sizeof(ctx);
ctx.lpSource = NULL; ctx.lpSource = NULL;
@ -4950,36 +4948,21 @@ void actctx_init(void)
process_actctx = check_actctx(handle); process_actctx = check_actctx(handle);
} }
/* FIXME: use RosGetProcessCompatVersion when PR419 gets merged */
Status = RtlQueryInformationActivationContext(RTL_QUERY_ACTIVATION_CONTEXT_FLAG_NO_ADDREF,
NULL,
NULL,
CompatibilityInformationInActivationContext,
Buffer,
sizeof(Buffer),
&SizeRequired);
if (NT_SUCCESS(Status))
{
ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo;
ContextCompatInfo = (ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*)Buffer;
DPRINT("RtlQueryInformationActivationContext for CompatibilityInformationInActivationContext suceeded\n");
/* No Compatibility elements present, bail out */
if (ContextCompatInfo->ElementCount != 0)
{
DPRINT1("Found compatibility information in exe manifest (%d). Attempting to activate forward compatibility!\n", ContextCompatInfo->ElementCount);
bForwardCompatible = TRUE;
}
}
ctx.dwFlags = 0; ctx.dwFlags = 0;
ctx.hModule = NULL; ctx.hModule = NULL;
ctx.lpResourceName = NULL; ctx.lpResourceName = NULL;
ctx.lpSource = buffer; ctx.lpSource = buffer;
RtlStringCchCopyW(buffer, 1024, SharedUserData->NtSystemRoot); RtlStringCchCopyW(buffer, RTL_NUMBER_OF(buffer), SharedUserData->NtSystemRoot);
if (!bForwardCompatible)
RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\systemcompatible.manifest"); if (RosGetProcessCompatVersion())
{
RtlStringCchCatW(buffer, RTL_NUMBER_OF(buffer), L"\\winsxs\\manifests\\forwardcompatible.manifest");
}
else else
RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\forwardcompatible.manifest"); {
RtlStringCchCatW(buffer, RTL_NUMBER_OF(buffer), L"\\winsxs\\manifests\\systemcompatible.manifest");
}
Status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle); Status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {