From cda052bdd5bfd1cfe53d2d5036d4e593fb7fd89b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 10 Dec 2009 11:54:17 +0000 Subject: [PATCH] [NTDKK] - Don't use PEB::FastPeb(Un)LockRoutine, these members are deprecated since Windows 2003, use RtlEnter/LeaveCriticalSection instead. svn path=/branches/ros-amd64-bringup/; revision=44521 --- reactos/dll/ntdll/ldr/startup.c | 2 -- reactos/dll/ntdll/rtl/libsupp.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/reactos/dll/ntdll/ldr/startup.c b/reactos/dll/ntdll/ldr/startup.c index c52c4354baf..11101294c51 100644 --- a/reactos/dll/ntdll/ldr/startup.c +++ b/reactos/dll/ntdll/ldr/startup.c @@ -343,8 +343,6 @@ LdrpInit2(PCONTEXT Context, /* initalize peb lock support */ RtlInitializeCriticalSection(&PebLock); Peb->FastPebLock = &PebLock; - Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; - Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; /* initialize tls bitmaps */ RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE); diff --git a/reactos/dll/ntdll/rtl/libsupp.c b/reactos/dll/ntdll/rtl/libsupp.c index 5fdcb68788e..b3e3a499497 100644 --- a/reactos/dll/ntdll/rtl/libsupp.c +++ b/reactos/dll/ntdll/rtl/libsupp.c @@ -88,7 +88,7 @@ VOID NTAPI RtlAcquirePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); + RtlEnterCriticalSection(Peb->FastPebLock); } /* @@ -98,7 +98,7 @@ VOID NTAPI RtlReleasePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); + RtlLeaveCriticalSection(Peb->FastPebLock); } /*