[PATCH v3 1/6] ntdll: Use explicit ACTIVATION_CONTEXT type instead of HANDLE.

18 Jun 2025

From: Zhiyi Zhang zzhang@codeweavers.com
---
 dlls/kernelbase/loader.c | 10 +++-
 dlls/ntdll/actctx.c      | 98 +++++++++++++++++++---------------------
 dlls/ntdll/thread.c      |  3 +-
 include/winternl.h       | 22 ++++-----
 4 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c
index 6d651b0cc9f..eb9c6b8921a 100644
--- a/dlls/kernelbase/loader.c
+++ b/dlls/kernelbase/loader.c
@@ -1173,7 +1173,7 @@ void WINAPI DECLSPEC_HOTPATCH AddRefActCtx( HANDLE context )
  */
 HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxW( PCACTCTXW ctx )
 {
-    HANDLE context;
+    struct _ACTIVATION_CONTEXT *context;
TRACE( "%p %08lx\n", ctx, ctx ? ctx->dwFlags : 0 );
@@ -1225,7 +1225,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindActCtxSectionStringW( DWORD flags, const GUID
  */
 BOOL WINAPI DECLSPEC_HOTPATCH GetCurrentActCtx( HANDLE *pcontext )
 {
-    return set_ntstatus( RtlGetActiveActivationContext( pcontext ));
+    struct _ACTIVATION_CONTEXT *actctx;
+    NTSTATUS status;
+
+    status = RtlGetActiveActivationContext( &actctx );
+    if (status == STATUS_SUCCESS)
+        *pcontext = actctx;
+    return set_ntstatus( status );
 }
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 9828d90d11d..7c8a4e0e1a9 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -1074,11 +1074,11 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai )
     return ret;
 }
-static ACTIVATION_CONTEXT *check_actctx( HANDLE h )
+static ACTIVATION_CONTEXT *check_actctx( ACTIVATION_CONTEXT *actctx )
 {
-    ACTIVATION_CONTEXT *ret = NULL, *actctx = h;
+    ACTIVATION_CONTEXT *ret = NULL;
-    if (!h || h == INVALID_HANDLE_VALUE) return NULL;
+    if (!actctx || actctx == INVALID_HANDLE_VALUE) return NULL;
     __TRY
     {
         if (actctx->magic == ACTCTX_MAGIC) ret = actctx;
@@ -3414,7 +3414,7 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl)
     return status;
 }
-static HANDLE get_current_actctx_no_addref(void)
+static ACTIVATION_CONTEXT * get_current_actctx_no_addref(void)
 {
     ACTIVATION_CONTEXT_STACK *actctx_stack = NtCurrentTeb()->ActivationContextStackPointer;
@@ -3425,36 +3425,36 @@ static HANDLE get_current_actctx_no_addref(void)
 }
/* find the appropriate activation context for RtlQueryInformationActivationContext */
-static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class )
+static NTSTATUS find_query_actctx( ACTIVATION_CONTEXT **actctx, DWORD flags, ULONG class )
 {
     NTSTATUS status = STATUS_SUCCESS;
if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX)
     {
-        if (*handle) return STATUS_INVALID_PARAMETER;
+        if (*actctx) return STATUS_INVALID_PARAMETER;
-        *handle = get_current_actctx_no_addref();
+        *actctx = get_current_actctx_no_addref();
     }
     else if (flags & (QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS|QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE))
     {
         ULONG_PTR magic;
         LDR_DATA_TABLE_ENTRY *pldr;
-        if (!*handle) return STATUS_INVALID_PARAMETER;
+        if (!*actctx) return STATUS_INVALID_PARAMETER;
LdrLockLoaderLock( 0, NULL, &magic );
-        if (!LdrFindEntryForAddress( *handle, &pldr ))
+        if (!LdrFindEntryForAddress( *actctx, &pldr ))
         {
-            if ((flags & QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE) && *handle != pldr->DllBase)
+            if ((flags & QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE) && *actctx != pldr->DllBase)
                 status = STATUS_DLL_NOT_FOUND;
             else
-                *handle = pldr->ActivationContext;
+                *actctx = pldr->ActivationContext;
         }
         else status = STATUS_DLL_NOT_FOUND;
         LdrUnlockLoaderLock( 0, magic );
     }
-    else if (!*handle && (class != ActivationContextBasicInformation))
-        *handle = process_actctx;
+    else if (!*actctx && (class != ActivationContextBasicInformation))
+        *actctx = process_actctx;
return status;
 }
@@ -5227,7 +5227,7 @@ static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *
 void actctx_init(void)
 {
     ACTCTXW ctx;
-    HANDLE handle;
+    ACTIVATION_CONTEXT *actctx;
ctx.cbSize   = sizeof(ctx);
     ctx.lpSource = NULL;
@@ -5235,7 +5235,7 @@ void actctx_init(void)
     ctx.hModule  = NtCurrentTeb()->Peb->ImageBaseAddress;
     ctx.lpResourceName = (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID;
-    if (!RtlCreateActivationContext( &handle, &ctx )) process_actctx = check_actctx(handle);
+    if (!RtlCreateActivationContext( &actctx, &ctx )) process_actctx = check_actctx( actctx );
NtCurrentTeb()->Peb->ActivationContextData = process_actctx;
 }
@@ -5248,7 +5248,7 @@ void actctx_init(void)
  *
  * FIXME: function signature/prototype is wrong
  */
-NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
+NTSTATUS WINAPI RtlCreateActivationContext( ACTIVATION_CONTEXT **new_actctx, const void *ptr )
 {
     const ACTCTXW *pActCtx = ptr;  /* FIXME: not the right structure */
     const WCHAR *directory = NULL;
@@ -5384,7 +5384,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
     if (status == STATUS_SUCCESS) status = parse_depend_manifests(&acl);
     free_depend_manifests( &acl );
-    if (status == STATUS_SUCCESS) *handle = actctx;
+    if (status == STATUS_SUCCESS) *new_actctx = actctx;
     else actctx_release( actctx );
     return status;
@@ -5398,22 +5398,18 @@ error:
 /***********************************************************************
  *		RtlAddRefActivationContext (NTDLL.@)
  */
-void WINAPI RtlAddRefActivationContext( HANDLE handle )
+void WINAPI RtlAddRefActivationContext( ACTIVATION_CONTEXT *actctx )
 {
-    ACTIVATION_CONTEXT *actctx;
-
-    if ((actctx = check_actctx( handle ))) actctx_addref( actctx );
+    if (check_actctx( actctx )) actctx_addref( actctx );
 }
/******************************************************************
  *		RtlReleaseActivationContext (NTDLL.@)
  */
-void WINAPI RtlReleaseActivationContext( HANDLE handle )
+void WINAPI RtlReleaseActivationContext( ACTIVATION_CONTEXT *actctx )
 {
-    ACTIVATION_CONTEXT *actctx;
-
-    if ((actctx = check_actctx( handle ))) actctx_release( actctx );
+    if (check_actctx( actctx )) actctx_release( actctx );
 }
/******************************************************************
@@ -5421,38 +5417,38 @@ void WINAPI RtlReleaseActivationContext( HANDLE handle )
  *
  * FIXME: function prototype might be wrong
  */
-NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle )
+NTSTATUS WINAPI RtlZombifyActivationContext( ACTIVATION_CONTEXT *actctx )
 {
-    FIXME("%p: stub\n", handle);
+    FIXME("%p: stub\n", actctx);
     return STATUS_NOT_IMPLEMENTED;
 }
/******************************************************************
  *		RtlActivateActivationContext (NTDLL.@)
  */
-NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, PULONG_PTR cookie )
+NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, ACTIVATION_CONTEXT *actctx, PULONG_PTR cookie )
 {
-    return RtlActivateActivationContextEx( 0, NtCurrentTeb(), handle, cookie );
+    return RtlActivateActivationContextEx( 0, NtCurrentTeb(), actctx, cookie );
 }
/******************************************************************
  *		RtlActivateActivationContextEx (NTDLL.@)
  */
-NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE handle, ULONG_PTR *cookie )
+NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, ACTIVATION_CONTEXT *actctx, ULONG_PTR *cookie )
 {
     ACTIVATION_CONTEXT_STACK *actctx_stack = teb->ActivationContextStackPointer;
     RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame;
frame = RtlAllocateHeap( GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(*frame) );
     frame->Previous = actctx_stack->ActiveFrame;
-    frame->ActivationContext = handle;
+    frame->ActivationContext = actctx;
     frame->Flags = 0;
     actctx_stack->ActiveFrame = frame;
-    RtlAddRefActivationContext( handle );
+    RtlAddRefActivationContext( actctx );
*cookie = (ULONG_PTR)frame;
-    TRACE( "%p cookie=%Ix\n", handle, *cookie );
+    TRACE( "%p cookie=%Ix\n", actctx, *cookie );
     return STATUS_SUCCESS;
 }
@@ -5522,9 +5518,9 @@ void WINAPI RtlFreeActivationContextStack( ACTIVATION_CONTEXT_STACK *actctx_stac
 /******************************************************************
  *		RtlGetActiveActivationContext (NTDLL.@)
  */
-NTSTATUS WINAPI RtlGetActiveActivationContext( HANDLE *handle )
+NTSTATUS WINAPI RtlGetActiveActivationContext( ACTIVATION_CONTEXT **actctx )
 {
-    RtlAddRefActivationContext( *handle = get_current_actctx_no_addref() );
+    RtlAddRefActivationContext( *actctx = get_current_actctx_no_addref() );
     return STATUS_SUCCESS;
 }
@@ -5532,13 +5528,13 @@ NTSTATUS WINAPI RtlGetActiveActivationContext( HANDLE *handle )
 /******************************************************************
  *		RtlIsActivationContextActive (NTDLL.@)
  */
-BOOLEAN WINAPI RtlIsActivationContextActive( HANDLE handle )
+BOOLEAN WINAPI RtlIsActivationContextActive( ACTIVATION_CONTEXT *actctx )
 {
     ACTIVATION_CONTEXT_STACK *actctx_stack = NtCurrentTeb()->ActivationContextStackPointer;
     RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame;
for (frame = actctx_stack->ActiveFrame; frame; frame = frame->Previous)
-        if (frame->ActivationContext == handle) return TRUE;
+        if (frame->ActivationContext == actctx) return TRUE;
     return FALSE;
 }
@@ -5549,18 +5545,17 @@ BOOLEAN WINAPI RtlIsActivationContextActive( HANDLE handle )
  * Get information about an activation context.
  * FIXME: function signature/prototype may be wrong
  */
-NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst,
+NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, ACTIVATION_CONTEXT *actctx, PVOID subinst,
                                                       ULONG class, PVOID buffer,
                                                       SIZE_T bufsize, SIZE_T *retlen )
 {
-    ACTIVATION_CONTEXT *actctx;
     NTSTATUS status;
-    TRACE("%08lx %p %p %lu %p %Id %p\n", flags, handle,
+    TRACE("%08lx %p %p %lu %p %Id %p\n", flags, actctx,
           subinst, class, buffer, bufsize, retlen);
if (retlen) *retlen = 0;
-    if ((status = find_query_actctx( &handle, flags, class ))) return status;
+    if ((status = find_query_actctx( &actctx, flags, class ))) return status;
switch (class)
     {
@@ -5571,9 +5566,9 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             if (retlen) *retlen = sizeof(*info);
             if (!info || bufsize < sizeof(*info)) return STATUS_BUFFER_TOO_SMALL;
-            info->hActCtx = handle;
+            info->hActCtx = actctx;
             info->dwFlags = 0;  /* FIXME */
-            if (!(flags & QUERY_ACTCTX_FLAG_NO_ADDREF)) RtlAddRefActivationContext( handle );
+            if (!(flags & QUERY_ACTCTX_FLAG_NO_ADDREF)) RtlAddRefActivationContext( actctx );
         }
         break;
@@ -5584,7 +5579,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             SIZE_T len, manifest_len = 0, config_len = 0, appdir_len = 0;
             LPWSTR ptr;
-            if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER;
+            if (!check_actctx(actctx)) return STATUS_INVALID_PARAMETER;
if (actctx->num_assemblies) assembly = actctx->assemblies;
@@ -5639,7 +5634,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             SIZE_T len, id_len = 0, ad_len = 0, path_len = 0;
             LPWSTR ptr;
-            if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER;
+            if (!check_actctx(actctx)) return STATUS_INVALID_PARAMETER;
             if (!subinst) return STATUS_INVALID_PARAMETER;
index = *(DWORD*)subinst;
@@ -5708,7 +5703,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             SIZE_T len, dll_len = 0;
             LPWSTR ptr;
-            if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER;
+            if (!check_actctx(actctx)) return STATUS_INVALID_PARAMETER;
             if (!acqi) return STATUS_INVALID_PARAMETER;
if (acqi->ulAssemblyIndex >= actctx->num_assemblies)
@@ -5752,7 +5747,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             ULONG num_compat_contexts = 0, n;
             SIZE_T len;
-            if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER;
+            if (!check_actctx(actctx)) return STATUS_INVALID_PARAMETER;
if (actctx->num_assemblies) assembly = actctx->assemblies;
@@ -5777,7 +5772,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
             struct assembly *assembly;
             SIZE_T len;
-            if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER;
+            if (!check_actctx(actctx)) return STATUS_INVALID_PARAMETER;
len = sizeof(*acrli);
             if (retlen) *retlen = len;
@@ -5894,11 +5889,10 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex
 /***********************************************************************
  *		RtlQueryActivationContextApplicationSettings (NTDLL.@)
  */
-NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDLE handle, const WCHAR *ns,
+NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, ACTIVATION_CONTEXT *actctx, const WCHAR *ns,
                                                               const WCHAR *settings, WCHAR *buffer,
                                                               SIZE_T size, SIZE_T *written )
 {
-    ACTIVATION_CONTEXT *actctx;
     const WCHAR *res;
if (flags)
@@ -5919,8 +5913,8 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL
     }
     else ns = windowsSettings2005NSW;
-    if (!handle) handle = process_actctx;
-    if (!(actctx = check_actctx( handle ))) return STATUS_INVALID_PARAMETER;
+    if (!actctx) actctx = process_actctx;
+    if (!check_actctx( actctx )) return STATUS_INVALID_PARAMETER;
if (!(res = find_app_settings( actctx, settings, ns ))) return STATUS_SXS_KEY_NOT_FOUND;
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index ee784fb2db2..3d1e6e0f752 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -257,7 +257,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr,
     ULONG flags = suspended ? THREAD_CREATE_FLAGS_CREATE_SUSPENDED : 0;
     ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)];
     PS_ATTRIBUTE_LIST *attr_list = (PS_ATTRIBUTE_LIST *)buffer;
-    HANDLE handle, actctx;
+    struct _ACTIVATION_CONTEXT *actctx;
+    HANDLE handle;
     TEB *teb;
     ULONG ret;
     NTSTATUS status;
diff --git a/include/winternl.h b/include/winternl.h
index 86f5f4e5480..e8a0b6ef5c6 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -3812,7 +3812,7 @@ typedef struct _LDR_DATA_TABLE_ENTRY
     SHORT               TlsIndex;
     LIST_ENTRY          HashLinks;
     ULONG               TimeDateStamp;
-    HANDLE              ActivationContext;
+    struct _ACTIVATION_CONTEXT *ActivationContext;
     void*               Lock;
     LDR_DDAG_NODE*      DdagNode;
     LIST_ENTRY          NodeModuleLink;
@@ -4700,8 +4700,8 @@ NTSYSAPI BYTE      WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK,BYTE);
 NTSYSAPI BYTE      WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE);
 NTSYSAPI void      WINAPI RtlAcquireSRWLockExclusive(RTL_SRWLOCK*);
 NTSYSAPI void      WINAPI RtlAcquireSRWLockShared(RTL_SRWLOCK*);
-NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*);
-NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContextEx(ULONG,TEB*,HANDLE,ULONG_PTR*);
+NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContext(DWORD,struct _ACTIVATION_CONTEXT *,ULONG_PTR*);
+NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContextEx(ULONG,TEB*,struct _ACTIVATION_CONTEXT *,ULONG_PTR*);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID);
@@ -4715,7 +4715,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOO
 NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL);
 NTSYSAPI NTSTATUS  WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddProcessTrustLabelAce(PACL,DWORD,DWORD,PSID,DWORD,DWORD);
-NTSYSAPI void      WINAPI RtlAddRefActivationContext(HANDLE);
+NTSYSAPI void      WINAPI RtlAddRefActivationContext(struct _ACTIVATION_CONTEXT *);
 NTSYSAPI PVOID     WINAPI RtlAddVectoredContinueHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
 NTSYSAPI PVOID     WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
 NTSYSAPI PVOID     WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD);
@@ -4754,7 +4754,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlCopySecurityDescriptor(PSECURITY_DESCRIPTOR,PSECURI
 NTSYSAPI BOOLEAN   WINAPI RtlCopySid(DWORD,PSID,PSID);
 NTSYSAPI void      WINAPI RtlCopyUnicodeString(UNICODE_STRING*,const UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateAcl(PACL,DWORD,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlCreateActivationContext(HANDLE*,const void*);
+NTSYSAPI NTSTATUS  WINAPI RtlCreateActivationContext(struct _ACTIVATION_CONTEXT **,const void*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateAtomTable(ULONG,RTL_ATOM_TABLE*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateEnvironment(BOOLEAN, PWSTR*);
 NTSYSAPI HANDLE    WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_PARAMETERS);
@@ -4862,7 +4862,7 @@ NTSYSAPI void      WINAPI RtlFreeUnicodeString(PUNICODE_STRING);
 NTSYSAPI void      WINAPI RtlFreeUserStack(void*);
 NTSYSAPI NTSTATUS  WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetAce(PACL,DWORD,LPVOID *);
-NTSYSAPI NTSTATUS  WINAPI RtlGetActiveActivationContext(HANDLE*);
+NTSYSAPI NTSTATUS  WINAPI RtlGetActiveActivationContext(struct _ACTIVATION_CONTEXT **);
 NTSYSAPI NTSTATUS  WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL,LPDWORD);
 NTSYSAPI ULONG     WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR);
@@ -4932,7 +4932,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlInitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
 NTSYSAPI NTSTATUS  WINAPI RtlInt64ToUnicodeString(ULONGLONG,ULONG,UNICODE_STRING *);
 NTSYSAPI NTSTATUS  WINAPI RtlIntegerToChar(ULONG,ULONG,ULONG,PCHAR);
 NTSYSAPI NTSTATUS  WINAPI RtlIntegerToUnicodeString(ULONG,ULONG,UNICODE_STRING *);
-NTSYSAPI BOOLEAN   WINAPI RtlIsActivationContextActive(HANDLE);
+NTSYSAPI BOOLEAN   WINAPI RtlIsActivationContextActive(struct _ACTIVATION_CONTEXT *);
 NTSYSAPI BOOL      WINAPI RtlIsCriticalSectionLocked(RTL_CRITICAL_SECTION *);
 NTSYSAPI BOOL      WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTION *);
 NTSYSAPI BOOLEAN   WINAPI RtlIsCurrentProcess(HANDLE);
@@ -4979,14 +4979,14 @@ NTSYSAPI void      WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*);
 NTSYSAPI BOOLEAN   WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN);
 NTSYSAPI void      WINAPI RtlProcessFlsData(void*,ULONG);
 NTSYSAPI void      WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*);
-NTSYSAPI NTSTATUS  WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*);
+NTSYSAPI NTSTATUS  WINAPI RtlQueryActivationContextApplicationSettings(DWORD,struct _ACTIVATION_CONTEXT *,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryEnvironmentVariable(WCHAR*,const WCHAR*,SIZE_T,WCHAR*,SIZE_T,SIZE_T*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS);
-NTSYSAPI NTSTATUS  WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*);
+NTSYSAPI NTSTATUS  WINAPI RtlQueryInformationActivationContext(ULONG,struct _ACTIVATION_CONTEXT *,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryInformationActiveActivationContext(ULONG,PVOID,SIZE_T,SIZE_T *);
 NTSYSAPI NTSTATUS  WINAPI RtlQueryPackageIdentity(HANDLE,WCHAR*,SIZE_T*,WCHAR*,SIZE_T*,BOOLEAN*);
 NTSYSAPI BOOL      WINAPI RtlQueryPerformanceCounter(LARGE_INTEGER*);
@@ -5003,7 +5003,7 @@ NTSYSAPI void      WINAPI RtlRbInsertNodeEx(RTL_RB_TREE*,RTL_BALANCED_NODE*,BOOL
 NTSYSAPI void      WINAPI RtlRbRemoveNode(RTL_RB_TREE*,RTL_BALANCED_NODE*);
 NTSYSAPI PVOID     WINAPI RtlReAllocateHeap(HANDLE,ULONG,PVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(RtlFreeHeap,3);
 NTSYSAPI NTSTATUS  WINAPI RtlRegisterWait(PHANDLE,HANDLE,RTL_WAITORTIMERCALLBACKFUNC,PVOID,ULONG,ULONG);
-NTSYSAPI void      WINAPI RtlReleaseActivationContext(HANDLE);
+NTSYSAPI void      WINAPI RtlReleaseActivationContext(struct _ACTIVATION_CONTEXT *);
 NTSYSAPI void      WINAPI RtlReleasePath(PWSTR);
 NTSYSAPI void      WINAPI RtlReleasePebLock(void);
 NTSYSAPI void      WINAPI RtlReleaseRelativeName(RTL_RELATIVE_NAME*);
@@ -5100,7 +5100,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*);
 NTSYSAPI NTSTATUS  WINAPI RtlWow64GetSharedInfoProcess(HANDLE,BOOLEAN*,WOW64INFO*);
 NTSYSAPI NTSTATUS  WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*);
 NTSYSAPI NTSTATUS  WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG);
-NTSYSAPI NTSTATUS  WINAPI RtlZombifyActivationContext(HANDLE);
+NTSYSAPI NTSTATUS  WINAPI RtlZombifyActivationContext(struct _ACTIVATION_CONTEXT *);
 NTSYSAPI NTSTATUS  WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlpNtMakeTemporaryKey(HANDLE);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8326

    

2025

2024

2023

2022

[PATCH v3 1/6] ntdll: Use explicit ACTIVATION_CONTEXT type instead of HANDLE.