[PATCH 0/1] MR8247: ntdll: Implement RtlQueryInformationActiveActivationContext().
For React Native. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/actctx.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/rtl.c | 17 +++++++++++++++++ include/winternl.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 206dd8a1819..d717f0315d0 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5799,6 +5799,16 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle return STATUS_SUCCESS; } +/****************************************************************** + * RtlQueryInformationActiveActivationContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryInformationActiveActivationContext( ULONG class, PVOID buffer, + SIZE_T buffer_size, SIZE_T *return_length ) +{ + return RtlQueryInformationActivationContext( QUERY_ACTCTX_FLAG_NO_ADDREF, get_current_actctx_no_addref(), + NULL, class, buffer, buffer_size, return_length ); +} + /*********************************************************************** * RtlFindActivationContextSectionString (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2b3450f9899..4e36bfe2662 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -943,7 +943,7 @@ @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) -@ stub RtlQueryInformationActiveActivationContext +@ stdcall RtlQueryInformationActiveActivationContext(long ptr long ptr) @ stub RtlQueryInterfaceMemoryStream @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) @ stdcall RtlQueryPerformanceCounter(ptr) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index f5db5cdc6e2..4669831f13f 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -121,6 +121,7 @@ static void (WINAPI *pRtlInitializeGenericTable)(RTL_GENERIC_TABLE *, PRTL_ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *); static void * (WINAPI *pRtlLookupElementGenericTable)(PRTL_GENERIC_TABLE, void *); static ULONG (WINAPI *pRtlNumberGenericTableElements)(PRTL_GENERIC_TABLE); +static NTSTATUS (WINAPI *pRtlQueryInformationActiveActivationContext)(ULONG,PVOID,SIZE_T,SIZE_T *); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); @@ -193,6 +194,7 @@ static void InitFunctionPtrs(void) pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName"); pRtlLookupElementGenericTable = (void *)GetProcAddress(hntdll, "RtlLookupElementGenericTable"); pRtlNumberGenericTableElements = (void *)GetProcAddress(hntdll, "RtlNumberGenericTableElements"); + pRtlQueryInformationActiveActivationContext = (void *)GetProcAddress(hntdll, "RtlQueryInformationActiveActivationContext"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); @@ -5476,6 +5478,20 @@ static void test_RtlDeriveCapabilitySidsFromName(void) free( group_sid ); } +static void test_RtlQueryInformationActiveActivationContext(void) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basic; + NTSTATUS status; + SIZE_T size; + + status = pRtlQueryInformationActiveActivationContext( ActivationContextBasicInformation, &basic, + sizeof(basic), &size ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + ok( size == sizeof(ACTIVATION_CONTEXT_BASIC_INFORMATION), "Size mismatch.\n" ); + ok( basic.dwFlags == 0, "Got unexpected flags %#lx.\n", basic.dwFlags ); + ok( !basic.hActCtx, "Got unexpected handle.\n" ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -5546,4 +5562,5 @@ START_TEST(rtl) test_RtlGetElementGenericTable(); test_RtlCreateServiceSid(); test_RtlDeriveCapabilitySidsFromName(); + test_RtlQueryInformationActiveActivationContext(); } diff --git a/include/winternl.h b/include/winternl.h index aa19907dc25..86f5f4e5480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4987,6 +4987,7 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PU 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 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*); NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8247
Nikolay Sivov (@nsivov) commented about dlls/ntdll/actctx.c:
return STATUS_SUCCESS; }
+/****************************************************************** + * RtlQueryInformationActiveActivationContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryInformationActiveActivationContext( ULONG class, PVOID buffer, + SIZE_T buffer_size, SIZE_T *return_length ) +{ + return RtlQueryInformationActivationContext( QUERY_ACTCTX_FLAG_NO_ADDREF, get_current_actctx_no_addref(), + NULL, class, buffer, buffer_size, return_length ); +}
This doesn't look right. Why would it use NO_ADDREF? I think you only need QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247#note_105811
Nikolay Sivov (@nsivov) commented about dlls/ntdll/tests/rtl.c:
free( group_sid ); }
+static void test_RtlQueryInformationActiveActivationContext(void) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basic; + NTSTATUS status; + SIZE_T size; + + status = pRtlQueryInformationActiveActivationContext( ActivationContextBasicInformation, &basic, + sizeof(basic), &size ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + ok( size == sizeof(ACTIVATION_CONTEXT_BASIC_INFORMATION), "Size mismatch.\n" ); + ok( basic.dwFlags == 0, "Got unexpected flags %#lx.\n", basic.dwFlags ); + ok( !basic.hActCtx, "Got unexpected handle.\n" ); +}
This doesn't check much if you don't have an active context, that's why hActCtx is NULL I think. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247#note_105812
On Mon Jun 9 09:09:10 2025 +0000, Nikolay Sivov wrote:
This doesn't look right. Why would it use NO_ADDREF? I think you only need QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX. This has the same behavior as using QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX. I will use QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX instead.
``` /* find the appropriate activation context for RtlQueryInformationActivationContext */ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) { NTSTATUS status = STATUS_SUCCESS; if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX) { if (*handle) return STATUS_INVALID_PARAMETER; *handle = get_current_actctx_no_addref(); } ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247#note_105814
On Mon Jun 9 09:09:10 2025 +0000, Nikolay Sivov wrote:
This doesn't check much if you don't have an active context, that's why hActCtx is NULL I think. Yeah, the test is to test that the function prototype is correct. I will add more tests.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247#note_105816
On Mon Jun 9 09:28:19 2025 +0000, Zhiyi Zhang wrote:
This has the same behavior as using QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX. I will use QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX instead. ``` /* find the appropriate activation context for RtlQueryInformationActivationContext */ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) { NTSTATUS status = STATUS_SUCCESS; if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX) { if (*handle) return STATUS_INVALID_PARAMETER; *handle = get_current_actctx_no_addref(); } ``` USE_ACTIVE_ACTCTX does not imply NO_ADDREF. NO_ADDREF is for returned handles.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8247#note_105818
participants (3)
-
Nikolay Sivov (＠nsivov) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)