From 8592512f2ff6827ca1333728cbf5536be3f79ebe Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 6 Mar 2010 14:29:56 +0000 Subject: [PATCH] [RTL] sync find_query_actctx with wine 1.1.40 svn path=/trunk/; revision=45945 --- reactos/lib/rtl/actctx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reactos/lib/rtl/actctx.c b/reactos/lib/rtl/actctx.c index 896d1fbf069..f7d727099fb 100644 --- a/reactos/lib/rtl/actctx.c +++ b/reactos/lib/rtl/actctx.c @@ -2096,6 +2096,8 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX) { + if (*handle) return STATUS_INVALID_PARAMETER; + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) *handle = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext; } @@ -2104,6 +2106,8 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) ULONG magic; LDR_DATA_TABLE_ENTRY *pldr; + if (!*handle) return STATUS_INVALID_PARAMETER; + LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrFindEntryForAddress( *handle, &pldr )) {