Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LDR][NDK] Fix inconsistent Cookie type (#6188)

Browse source 
Make LdrUnlockLoaderLock Cookie type consistent with LdrLockLoaderLock
and LdrpMakeCookie functions.

In addition:
* Adjustment of the formatting string for ULONG_PTR;
* ntdll.spec: specify ptr for 2nd parameter of LdrUnlockLoaderLock:
  This is a parameter whose length is pointer-like, platform-dependent.

Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito@reactos.org>
This commit is contained in:
Elliot Killick 2023-12-23 16:13:47 -05:00 • committed by GitHub
parent fcaa38c705
commit 932aef40f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dll/ntdll/def/ntdll.spec
View file

@ -184,7 +184,7 @@
@ stdcall LdrUnloadAlternateResourceModule(ptr) @ stdcall LdrUnloadAlternateResourceModule(ptr)
@ stub -version=0x600+ LdrUnloadAlternateResourceModuleEx @ stub -version=0x600+ LdrUnloadAlternateResourceModuleEx
@ stdcall LdrUnloadDll(ptr) @ stdcall LdrUnloadDll(ptr)
@ stdcall LdrUnlockLoaderLock(long long) @ stdcall LdrUnlockLoaderLock(long ptr)
@ stdcall -stub -version=0x600+ LdrUnregisterDllNotification(ptr) @ stdcall -stub -version=0x600+ LdrUnregisterDllNotification(ptr)
@ stdcall LdrVerifyImageMatchesChecksum(ptr long long long) @ stdcall LdrVerifyImageMatchesChecksum(ptr long long long)
@ stdcall -stub -version=0x600+ LdrVerifyImageMatchesChecksumEx(ptr ptr) @ stdcall -stub -version=0x600+ LdrVerifyImageMatchesChecksumEx(ptr ptr)

4
dll/ntdll/ldr/ldrapi.c
View file

@ -100,11 +100,11 @@ NTSTATUS
NTAPI NTAPI
LdrUnlockLoaderLock( LdrUnlockLoaderLock(
_In_ ULONG Flags, _In_ ULONG Flags,
_In_opt_ ULONG Cookie) _In_opt_ ULONG_PTR Cookie)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("LdrUnlockLoaderLock(%x %x)\n", Flags, Cookie); DPRINT("LdrUnlockLoaderLock(%x %Ix)\n", Flags, Cookie);
/* Check for valid flags */ /* Check for valid flags */
if (Flags & ~LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) if (Flags & ~LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS)

2
sdk/include/ndk/ldrfuncs.h
View file

@ -119,7 +119,7 @@ NTSTATUS
NTAPI NTAPI
LdrUnlockLoaderLock( LdrUnlockLoaderLock(
_In_ ULONG Flags, _In_ ULONG Flags,
_In_opt_ ULONG Cookie _In_opt_ ULONG_PTR Cookie
); );
BOOLEAN BOOLEAN