Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 23806: Implement Slim Reader/Writer (SRW) locks: - Implement AcquireSRWLockExclusive(), AcquireSRWLockShared(), InitializeSRWLock(), ReleaseSRWLockExclusive(), ReleaseSRWLockShared() - NOTE: Some versions of GCC have a code generation bug with specially aligned structures on the stack. If compiled with such a compiler, the code might trigger special assertions. Pushlocks are also affected by this compiler bug. - NOTE: The algorithms are most likely not the same as in Windows. Applicatio
by weiden＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: weiden Date: Wed Aug 30 23:02:42 2006 New Revision: 23806 URL: http://svn.reactos.org/svn/reactos?rev=23806&view=rev Log: Implement Slim Reader/Writer (SRW) locks: - Implement AcquireSRWLockExclusive(), AcquireSRWLockShared(), InitializeSRWLock(), ReleaseSRWLockExclusive(), ReleaseSRWLockShared() - NOTE: Some versions of GCC have a code generation bug with specially aligned structures on the stack. If compiled with such a compiler, the code might trigger special assertions. Pushlocks are also affected by this compiler bug. - NOTE: The algorithms are most likely not the same as in Windows. Applications are supposed to treat the lock variables as opaque data, therefore it shouldn't matter. Added: trunk/reactos/lib/rtl/srw.c (with props) Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Aug 30 23:02:42 2006 @@ -295,6 +295,8 @@ RtlAcquirePebLock@0 RtlAcquireResourceExclusive@8 RtlAcquireResourceShared@8 +RtlAcquireSRWLockExclusive@4 +RtlAcquireSRWLockShared@4 RtlAddAccessAllowedAce@16 RtlAddAccessAllowedAceEx@20 RtlAddAccessAllowedObjectAce@28 @@ -513,6 +515,7 @@ RtlInitializeResource@4 ;RtlInitializeRXact RtlInitializeSid@12 +RtlInitializeSRWLock@4 RtlInsertElementGenericTable@16 RtlInsertElementGenericTableAvl@16 RtlInsertElementGenericTableFull@24 @@ -612,6 +615,8 @@ RtlReleasePebLock@0 RtlReleaseRelativeName@4 RtlReleaseResource@4 +RtlReleaseSRWLockExclusive@4 +RtlReleaseSRWLockShared@4 ;RtlRemoteCall RtlRemoveVectoredExceptionHandler@4 RtlResetRtlTranslations@4 Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Wed Aug 30 23:02:42 2006 @@ -30,6 +30,8 @@ ; LIBRARY KERNEL32.DLL EXPORTS +AcquireSRWLockExclusive(a)4=NTDLL.RtlAcquireSRWLockExclusive +AcquireSRWLockShared(a)4=NTDLL.RtlAcquireSRWLockShared ActivateActCtx@8 AddAtomA@4 AddAtomW@4 @@ -587,6 +589,7 @@ InitializeCriticalSection@4 InitializeCriticalSectionAndSpinCount@8 InitializeSListHead(a)4=NTDLL.RtlInitializeSListHead +InitializeSRWLock(a)4=NTDLL.RtlInitializeSRWLock InterlockedCompareExchange@12 InterlockedDecrement@4 InterlockedExchange@8 @@ -749,6 +752,8 @@ ReleaseActCtx@4 ReleaseMutex@4 ReleaseSemaphore@12 +ReleaseSRWLockExclusive(a)4=NTDLL.RtlReleaseSRWLockExclusive +ReleaseSRWLockShared(a)4=NTDLL.RtlReleaseSRWLockShared RemoveDirectoryA@4 RemoveDirectoryW@4 ;RemoveLocalAlternateComputerNameA Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Aug 30 23:02:42 2006 @@ -540,6 +540,9 @@ #define CREATE_EVENT_INITIAL_SET 0x2 #define CREATE_MUTEX_INITIAL_OWNER 0x1 #define CREATE_WAITABLE_TIMER_MANUAL_RESET 0x1 +#define SRWLOCK_INIT RTL_SRWLOCK_INIT +#define CONDITION_VARIABLE_INIT RTL_CONDITION_VARIABLE_INIT +#define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED #endif #ifndef RC_INVOKED @@ -1053,6 +1056,9 @@ DWORD MemberLevel; DWORD Flags; } JOB_SET_ARRAY, *PJOB_SET_ARRAY; +#if (_WIN32_WINNT >= 0x0600) +typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK; +#endif typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID); typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID); typedef VOID (WINAPI *PFLS_CALLBACK_FUNCTION)(PVOID); @@ -1093,6 +1099,10 @@ BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,PDWORD,PDWORD,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); +VOID WINAPI AcquireSRWLockShared(PSRWLOCK); +#endif #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR*); #endif @@ -1659,6 +1669,9 @@ BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); #if !defined(__WINDDK_H) && _WIN32_WINNT >= 0x0501 VOID WINAPI InitializeSListHead(PSLIST_HEADER); +#endif +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI InitializeSRWLock(PSRWLOCK); #endif #ifndef __INTERLOCKED_DECLARED #define __INTERLOCKED_DECLARED @@ -1842,6 +1855,10 @@ #endif BOOL WINAPI ReleaseMutex(HANDLE); BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI ReleaseSRWLockExclusive(PSRWLOCK); +VOID WINAPI ReleaseSRWLockShared(PSRWLOCK); +#endif BOOL WINAPI RemoveDirectoryA(LPCSTR); BOOL WINAPI RemoveDirectoryW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Aug 30 23:02:42 2006 @@ -2626,6 +2626,19 @@ } RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION; #endif +#define RTL_SRWLOCK_INIT {0} +typedef struct _RTL_SRWLOCK +{ + PVOID Ptr; +} RTL_SRWLOCK, *PRTL_SRWLOCK; + +#define RTL_CONDITION_VARIABLE_INIT {0} +#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1 +typedef struct _RTL_CONDITION_VARIABLE +{ + PVOID Ptr; +} RTL_CONDITION_VARIABLE, *PRTL_CONDITION_VARIABLE; + typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)( struct _EXCEPTION_POINTERS *ExceptionInfo Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=238… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Wed Aug 30 23:02:42 2006 @@ -84,6 +84,7 @@ <file>security.c</file> <file>sid.c</file> <file>sprintf.c</file> + <file>srw.c</file> <file>swprintf.c</file> <file>splaytree.c</file> <file>thread.c</file> Added: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=23806&vi… ============================================================================== --- trunk/reactos/lib/rtl/srw.c (added) +++ trunk/reactos/lib/rtl/srw.c Wed Aug 30 23:02:42 2006 @@ -1,0 +1,832 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Slim Reader/Writer (SRW) Routines + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * NOTES: The algorithms used in this implementation + * may be different from Vista's implementation. + * Since applications should treat the RTL_SRWLOCK + * structure as opaque data, it should not matter. + * The algorithms are probably not as optimized. + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FIXME *********************************************************************/ + +/* FIXME: Interlocked functions that need to be made into a public header */ +FORCEINLINE +LONG +InterlockedAnd(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = InterlockedCompareExchange((PLONG)Target, + i & Set, + i); + + } while (i != j); + + return j; +} + +FORCEINLINE +LONG +InterlockedOr(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = InterlockedCompareExchange((PLONG)Target, + i | Set, + i); + + } while (i != j); + + return j; +} + +/* FUNCTIONS *****************************************************************/ + +#ifdef _WIN64 +#define InterlockedBitTestAndSetPointer(ptr,val) InterlockedBitTestAndSet64((PLONGLONG)ptr,(LONGLONG)val) +#define InterlockedAddPointer(ptr,val) InterlockedAdd64((PLONGLONG)ptr,(LONGLONG)val) +#define InterlockedAndPointer(ptr,val) InterlockedAnd64((PLONGLONG)ptr,(LONGLONG)val) +#define InterlockedOrPointer(ptr,val) InterlockedOr64((PLONGLONG)ptr,(LONGLONG)val) +#else +#define InterlockedBitTestAndSetPointer(ptr,val) InterlockedBitTestAndSet((PLONG)ptr,(LONG)val) +#define InterlockedAddPointer(ptr,val) InterlockedAdd((PLONG)ptr,(LONG)val) +#define InterlockedAndPointer(ptr,val) InterlockedAnd((PLONG)ptr,(LONG)val) +#define InterlockedOrPointer(ptr,val) InterlockedOr((PLONG)ptr,(LONG)val) +#endif + +#define RTL_SRWLOCK_OWNED_BIT 0 +#define RTL_SRWLOCK_CONTENDED_BIT 1 +#define RTL_SRWLOCK_SHARED_BIT 2 +#define RTL_SRWLOCK_CONTENTION_LOCK_BIT 3 +#define RTL_SRWLOCK_OWNED (1 << RTL_SRWLOCK_OWNED_BIT) +#define RTL_SRWLOCK_CONTENDED (1 << RTL_SRWLOCK_CONTENDED_BIT) +#define RTL_SRWLOCK_SHARED (1 << RTL_SRWLOCK_SHARED_BIT) +#define RTL_SRWLOCK_CONTENTION_LOCK (1 << RTL_SRWLOCK_CONTENTION_LOCK_BIT) +#define RTL_SRWLOCK_MASK (RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED | \ + RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) +#define RTL_SRWLOCK_BITS 4 + +#if defined(__GNUC__) +/* This macro will cause the code to assert if compiled with a buggy + version of GCC that doesn't align the wait blocks properly on the stack! */ +#define ASSERT_SRW_WAITBLOCK(ptr) \ + ASSERT(((ULONG_PTR)ptr & ((1 << RTL_SRWLOCK_BITS) - 1)) == 0) +#else +#define ASSERT_SRW_WAITBLOCK(ptr) +#endif + +typedef struct _RTLP_SRWLOCK_SHARED_WAKE +{ + LONG Wake; + volatile struct _RTLP_SRWLOCK_SHARED_WAKE *Next; +} volatile RTLP_SRWLOCK_SHARED_WAKE, *PRTLP_SRWLOCK_SHARED_WAKE; + +typedef struct _RTLP_SRWLOCK_WAITBLOCK +{ + /* SharedCount is the number of shared acquirers. */ + LONG SharedCount; + + /* Last points to the last wait block in the chain. The value + is only valid when read from the first wait block. */ + volatile struct _RTLP_SRWLOCK_WAITBLOCK *Last; + + /* Next points to the next wait block in the chain. */ + volatile struct _RTLP_SRWLOCK_WAITBLOCK *Next; + + union + { + /* Wake is only valid for exclusive wait blocks */ + LONG Wake; + /* The wake chain is only valid for shared wait blocks */ + struct + { + PRTLP_SRWLOCK_SHARED_WAKE SharedWakeChain; + PRTLP_SRWLOCK_SHARED_WAKE LastSharedWake; + }; + }; + + BOOLEAN Exclusive; +} volatile RTLP_SRWLOCK_WAITBLOCK, *PRTLP_SRWLOCK_WAITBLOCK; + + +static VOID +NTAPI +RtlpReleaseWaitBlockLockExclusive(IN OUT PRTL_SRWLOCK SRWLock, + IN PRTLP_SRWLOCK_WAITBLOCK FirstWaitBlock) +{ + PRTLP_SRWLOCK_WAITBLOCK Next; + LONG_PTR NewValue; + + /* NOTE: We're currently in an exclusive lock in contended mode. */ + + Next = FirstWaitBlock->Next; + if (Next != NULL) + { + /* There's more blocks chained, we need to update the pointers + in the next wait block and update the wait block pointer. */ + NewValue = (LONG_PTR)Next | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; + if (!FirstWaitBlock->Exclusive) + { + /* The next wait block has to be an exclusive lock! */ + ASSERT(Next->Exclusive); + + /* Save the shared count */ + Next->SharedCount = FirstWaitBlock->SharedCount; + + NewValue |= RTL_SRWLOCK_SHARED; + } + + Next->Last = FirstWaitBlock->Last; + } + else + { + /* Convert the lock to a simple lock. */ + if (FirstWaitBlock->Exclusive) + NewValue = RTL_SRWLOCK_OWNED; + else + { + ASSERT(FirstWaitBlock->SharedCount > 0); + + NewValue = ((LONG_PTR)FirstWaitBlock->SharedCount << RTL_SRWLOCK_BITS) | + RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; + } + } + + (void)InterlockedExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue); + + if (FirstWaitBlock->Exclusive) + { + (void)InterlockedOr(&FirstWaitBlock->Wake, + TRUE); + } + else + { + PRTLP_SRWLOCK_SHARED_WAKE WakeChain, Next; + + /* If we were the first one to acquire the shared + lock, we now need to wake all others... */ + WakeChain = FirstWaitBlock->SharedWakeChain; + do + { + Next = WakeChain->Next; + + (void)InterlockedOr((PLONG)&WakeChain->Wake, + TRUE); + + WakeChain = Next; + } while (WakeChain != NULL); + } +} + + +static VOID +NTAPI +RtlpReleaseWaitBlockLockLastShared(IN OUT PRTL_SRWLOCK SRWLock, + IN PRTLP_SRWLOCK_WAITBLOCK FirstWaitBlock) +{ + PRTLP_SRWLOCK_WAITBLOCK Next; + LONG_PTR NewValue; + + /* NOTE: We're currently in a shared lock in contended mode. */ + + /* The next acquirer to be unwaited *must* be an exclusive lock! */ + ASSERT(FirstWaitBlock->Exclusive); + + Next = FirstWaitBlock->Next; + if (Next != NULL) + { + /* There's more blocks chained, we need to update the pointers + in the next wait block and update the wait block pointer. */ + NewValue = (LONG_PTR)Next | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; + + Next->Last = FirstWaitBlock->Last; + } + else + { + /* Convert the lock to a simple exclusive lock. */ + NewValue = RTL_SRWLOCK_OWNED; + } + + (void)InterlockedExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue); + + (void)InterlockedOr(&FirstWaitBlock->Wake, + TRUE); +} + + +static VOID +NTAPI +RtlpReleaseWaitBlockLock(IN OUT PRTL_SRWLOCK SRWLock) +{ + InterlockedAndPointer(&SRWLock->Ptr, + ~RTL_SRWLOCK_CONTENTION_LOCK); +} + + +static PRTLP_SRWLOCK_WAITBLOCK +NTAPI +RtlpAcquireWaitBlockLock(IN OUT PRTL_SRWLOCK SRWLock) +{ + LONG_PTR PrevValue; + PRTLP_SRWLOCK_WAITBLOCK WaitBlock; + + while (1) + { + PrevValue = InterlockedOrPointer(&SRWLock->Ptr, + RTL_SRWLOCK_CONTENTION_LOCK); + + if (!(PrevValue & RTL_SRWLOCK_CONTENTION_LOCK)) + break; + + YieldProcessor(); + } + + if (!(PrevValue & RTL_SRWLOCK_CONTENDED) || + (PrevValue & ~RTL_SRWLOCK_MASK) == 0) + { + /* Too bad, looks like the wait block was removed in the + meanwhile, unlock again */ + RtlpReleaseWaitBlockLock(SRWLock); + return NULL; + } + + WaitBlock = (PRTLP_SRWLOCK_WAITBLOCK)(PrevValue & ~RTL_SRWLOCK_MASK); + + ASSERT_SRW_WAITBLOCK(WaitBlock); + return WaitBlock; +} + + +static VOID +NTAPI +RtlpAcquireSRWLockExclusiveWait(IN OUT PRTL_SRWLOCK SRWLock, + IN PRTLP_SRWLOCK_WAITBLOCK WaitBlock) +{ + LONG_PTR CurrentValue; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + if (!(CurrentValue & RTL_SRWLOCK_SHARED)) + { + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + if (WaitBlock->Wake != 0) + { + /* Our wait block became the first one + in the chain, we own the lock now! */ + break; + } + } + else + { + /* The last wait block was removed and/or we're + finally a simple exclusive lock. This means we + don't need to wait anymore, we acquired the lock! */ + break; + } + } + + YieldProcessor(); + } +} + + +static VOID +NTAPI +RtlpAcquireSRWLockSharedWait(IN OUT PRTL_SRWLOCK SRWLock, + IN OUT PRTLP_SRWLOCK_WAITBLOCK FirstWait OPTIONAL, + IN OUT PRTLP_SRWLOCK_SHARED_WAKE WakeChain) +{ + if (FirstWait != NULL) + { + while (WakeChain->Wake == 0) + { + YieldProcessor(); + } + } + else + { + LONG_PTR CurrentValue; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + if (CurrentValue & RTL_SRWLOCK_SHARED) + { + /* The RTL_SRWLOCK_OWNED bit always needs to be set when + RTL_SRWLOCK_SHARED is set! */ + ASSERT(CurrentValue & RTL_SRWLOCK_OWNED); + + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + if (WakeChain->Wake != 0) + { + /* Our wait block became the first one + in the chain, we own the lock now! */ + break; + } + } + else + { + /* The last wait block was removed and/or we're + finally a simple shared lock. This means we + don't need to wait anymore, we acquired the lock! */ + break; + } + } + + YieldProcessor(); + } + } +} + + +VOID +NTAPI +RtlInitializeSRWLock(OUT PRTL_SRWLOCK SRWLock) +{ + SRWLock->Ptr = NULL; +} + + +VOID +NTAPI +RtlAcquireSRWLockShared(IN OUT PRTL_SRWLOCK SRWLock) +{ + __ALIGNED(16) RTLP_SRWLOCK_WAITBLOCK StackWaitBlock; + RTLP_SRWLOCK_SHARED_WAKE SharedWake; + LONG_PTR CurrentValue, NewValue; + PRTLP_SRWLOCK_WAITBLOCK First, Shared, FirstWait; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + + if (CurrentValue & RTL_SRWLOCK_SHARED) + { + /* NOTE: It is possible that the RTL_SRWLOCK_OWNED bit is set! */ + + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + /* There's other waiters already, lock the wait blocks and + increment the shared count */ + First = RtlpAcquireWaitBlockLock(SRWLock); + if (First != NULL) + { + FirstWait = NULL; + + if (First->Exclusive) + { + /* We need to setup a new wait block! Although + we're currently in a shared lock and we're acquiring + a shared lock, there are exclusive locks queued. We need + to wait until those are released. */ + Shared = First->Last; + + if (Shared->Exclusive) + { + StackWaitBlock.Exclusive = FALSE; + StackWaitBlock.SharedCount = 1; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.SharedWakeChain = &SharedWake; + + Shared->Next = &StackWaitBlock; + First->Last = &StackWaitBlock; + + Shared = &StackWaitBlock; + FirstWait = &StackWaitBlock; + } + else + { + Shared->LastSharedWake->Next = &SharedWake; + Shared->SharedCount++; + } + } + else + { + Shared = First; + Shared->LastSharedWake->Next = &SharedWake; + Shared->SharedCount++; + } + + SharedWake.Next = NULL; + SharedWake.Wake = 0; + + Shared->LastSharedWake = &SharedWake; + + ASSERT_SRW_WAITBLOCK(Shared); + + RtlpReleaseWaitBlockLock(SRWLock); + + RtlpAcquireSRWLockSharedWait(SRWLock, + FirstWait, + &SharedWake); + + /* Successfully incremented the shared count, we acquired the lock */ + break; + } + } + else + { + /* This is a fastest path, just increment the number of + current shared locks */ + + /* Since the RTL_SRWLOCK_SHARED bit is set, the RTL_SRWLOCK_OWNED bit also has + to be set! */ + + ASSERT(CurrentValue & RTL_SRWLOCK_OWNED); + + NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; + NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); + + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + /* Successfully incremented the shared count, we acquired the lock */ + break; + } + } + } + else + { + if (CurrentValue & RTL_SRWLOCK_OWNED) + { + /* The resource is currently acquired exclusively */ + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + SharedWake.Next = NULL; + SharedWake.Wake = 0; + + /* There's other waiters already, lock the wait blocks and + increment the shared count. If the last block in the chain + is an exclusive lock, add another block. */ + + StackWaitBlock.Exclusive = FALSE; + StackWaitBlock.SharedCount = 0; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.SharedWakeChain = &SharedWake; + + First = RtlpAcquireWaitBlockLock(SRWLock); + if (First != NULL) + { + Shared = First->Last; + if (Shared->Exclusive) + { + Shared->Next = &StackWaitBlock; + First->Last = &StackWaitBlock; + + Shared = &StackWaitBlock; + FirstWait = &StackWaitBlock; + } + else + { + FirstWait = NULL; + Shared->LastSharedWake->Next = &SharedWake; + } + + ASSERT_SRW_WAITBLOCK(Shared); + + Shared->SharedCount++; + Shared->LastSharedWake = &SharedWake; + + RtlpReleaseWaitBlockLock(SRWLock); + + RtlpAcquireSRWLockSharedWait(SRWLock, + FirstWait, + &SharedWake); + + /* Successfully incremented the shared count, we acquired the lock */ + break; + } + } + else + { + SharedWake.Next = NULL; + SharedWake.Wake = 0; + + /* We need to setup the first wait block. Currently an exclusive lock is + held, change the lock to contended mode. */ + StackWaitBlock.Exclusive = FALSE; + StackWaitBlock.SharedCount = 1; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.SharedWakeChain = &SharedWake; + StackWaitBlock.LastSharedWake = &SharedWake; + + ASSERT_SRW_WAITBLOCK(&StackWaitBlock); + + NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + RtlpAcquireSRWLockSharedWait(SRWLock, + &StackWaitBlock, + &SharedWake); + + /* Successfully set the shared count, we acquired the lock */ + break; + } + } + } + else + { + /* This is a fast path, we can simply try to set the shared count to 1 */ + NewValue = (1 << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; + + /* The RTL_SRWLOCK_CONTENDED bit should never be set if neither the + RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ + ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); + + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + /* Successfully set the shared count, we acquired the lock */ + break; + } + } + } + + YieldProcessor(); + } +} + + +VOID +NTAPI +RtlReleaseSRWLockShared(IN OUT PRTL_SRWLOCK SRWLock) +{ + LONG_PTR CurrentValue, NewValue; + PRTLP_SRWLOCK_WAITBLOCK WaitBlock; + BOOLEAN LastShared; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + + if (CurrentValue & RTL_SRWLOCK_SHARED) + { + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + /* There's a wait block, we need to wake a pending + exclusive acquirer if this is the last shared release */ + WaitBlock = RtlpAcquireWaitBlockLock(SRWLock); + if (WaitBlock != NULL) + { + LastShared = (--WaitBlock->SharedCount == 0); + + if (LastShared) + RtlpReleaseWaitBlockLockLastShared(SRWLock, + WaitBlock); + else + RtlpReleaseWaitBlockLock(SRWLock); + + /* We released the lock */ + break; + } + } + else + { + /* This is a fast path, we can simply decrement the shared + count and store the pointer */ + NewValue = CurrentValue >> RTL_SRWLOCK_BITS; + + if (--NewValue != 0) + { + NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; + } + + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + /* Successfully released the lock */ + break; + } + } + } + else + { + /* The RTL_SRWLOCK_SHARED bit has to be present now, + even in the contended case! */ + RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED); + } + + YieldProcessor(); + } +} + + +VOID +NTAPI +RtlAcquireSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock) +{ + __ALIGNED(16) RTLP_SRWLOCK_WAITBLOCK StackWaitBlock; + PRTLP_SRWLOCK_WAITBLOCK First, Last; + + if (InterlockedBitTestAndSetPointer(&SRWLock->Ptr, + RTL_SRWLOCK_OWNED_BIT)) + { + LONG_PTR CurrentValue, NewValue; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + + if (CurrentValue & RTL_SRWLOCK_SHARED) + { + /* A shared lock is being held right now. We need to add a wait block! */ + + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + goto AddWaitBlock; + } + else + { + /* There are no wait blocks so far, we need to add ourselves as the first + wait block. We need to keep the shared count! */ + StackWaitBlock.Exclusive = TRUE; + StackWaitBlock.SharedCount = CurrentValue >> RTL_SRWLOCK_BITS; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.Wake = 0; + + ASSERT_SRW_WAITBLOCK(&StackWaitBlock); + + NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; + + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + RtlpAcquireSRWLockExclusiveWait(SRWLock, + &StackWaitBlock); + + /* Successfully acquired the exclusive lock */ + break; + } + } + } + else + { + if (CurrentValue & RTL_SRWLOCK_OWNED) + { + /* An exclusive lock is being held right now. We need to add a wait block! */ + + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { +AddWaitBlock: + StackWaitBlock.Exclusive = TRUE; + StackWaitBlock.SharedCount = 0; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.Wake = 0; + + ASSERT_SRW_WAITBLOCK(&StackWaitBlock); + + First = RtlpAcquireWaitBlockLock(SRWLock); + if (First != NULL) + { + Last = First->Last; + Last->Next = &StackWaitBlock; + First->Last = &StackWaitBlock; + + RtlpReleaseWaitBlockLock(SRWLock); + + RtlpAcquireSRWLockExclusiveWait(SRWLock, + &StackWaitBlock); + + /* Successfully acquired the exclusive lock */ + break; + } + } + else + { + /* There are no wait blocks so far, we need to add ourselves as the first + wait block. We need to keep the shared count! */ + StackWaitBlock.Exclusive = TRUE; + StackWaitBlock.SharedCount = 0; + StackWaitBlock.Next = NULL; + StackWaitBlock.Last = &StackWaitBlock; + StackWaitBlock.Wake = 0; + + ASSERT_SRW_WAITBLOCK(&StackWaitBlock); + + NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + RtlpAcquireSRWLockExclusiveWait(SRWLock, + &StackWaitBlock); + + /* Successfully acquired the exclusive lock */ + break; + } + } + } + else + { + if (!InterlockedBitTestAndSetPointer(&SRWLock->Ptr, + RTL_SRWLOCK_OWNED_BIT)) + { + /* We managed to get hold of a simple exclusive lock! */ + break; + } + } + } + + YieldProcessor(); + } + } +} + + +VOID +NTAPI +RtlReleaseSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock) +{ + LONG_PTR CurrentValue, NewValue; + PRTLP_SRWLOCK_WAITBLOCK WaitBlock; + + while (1) + { + CurrentValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + + if (!(CurrentValue & RTL_SRWLOCK_OWNED)) + { + RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED); + } + + if (!(CurrentValue & RTL_SRWLOCK_SHARED)) + { + if (CurrentValue & RTL_SRWLOCK_CONTENDED) + { + /* There's a wait block, we need to wake the next pending + acquirer (exclusive or shared) */ + WaitBlock = RtlpAcquireWaitBlockLock(SRWLock); + if (WaitBlock != NULL) + { + RtlpReleaseWaitBlockLockExclusive(SRWLock, + WaitBlock); + + /* We released the lock */ + break; + } + } + else + { + /* This is a fast path, we can simply clear the RTL_SRWLOCK_OWNED + bit. All other bits should be 0 now because this is a simple + exclusive lock and no one is waiting. */ + + ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); + + NewValue = 0; + if (InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) + { + /* We released the lock */ + break; + } + } + } + else + { + /* The RTL_SRWLOCK_SHARED bit must not be present now, + not even in the contended case! */ + RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED); + } + + YieldProcessor(); + } +} Propchange: trunk/reactos/lib/rtl/srw.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 23805: Fix MsiGetFeatureStateA/W and MsiGetComponentStateA/W prototypes
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Wed Aug 30 22:08:21 2006 New Revision: 23805 URL: http://svn.reactos.org/svn/reactos?rev=23805&view=rev Log: Fix MsiGetFeatureStateA/W and MsiGetComponentStateA/W prototypes Modified: trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/include/psdk/msiquery.h Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/install.c (original) +++ trunk/reactos/dll/win32/msi/install.c Wed Aug 30 22:08:21 2006 @@ -580,7 +580,7 @@ /*********************************************************************** * MsiGetFeatureStateA (MSI.@) */ -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature, +UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { LPWSTR szwFeature = NULL; @@ -595,7 +595,7 @@ return rc; } -UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPWSTR szFeature, +UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIFEATURE *feature; @@ -618,7 +618,7 @@ /*********************************************************************** * MsiGetFeatureStateW (MSI.@) */ -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPWSTR szFeature, +UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIPACKAGE* package; @@ -653,7 +653,7 @@ /*********************************************************************** * MsiGetComponentStateA (MSI.@) */ -UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPSTR szComponent, +UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { LPWSTR szwComponent= NULL; @@ -684,7 +684,7 @@ return ERROR_SUCCESS; } -UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPWSTR szComponent, +UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSICOMPONENT *comp; @@ -727,7 +727,7 @@ /*********************************************************************** * MsiGetComponentStateW (MSI.@) */ -UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPWSTR szComponent, +UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIPACKAGE* package; Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h (original) +++ trunk/reactos/dll/win32/msi/msipriv.h Wed Aug 30 22:08:21 2006 @@ -393,8 +393,8 @@ extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * ); extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* ); extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); -extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); -extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); /* for deformating */ Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re… ============================================================================== --- trunk/reactos/include/psdk/msiquery.h (original) +++ trunk/reactos/include/psdk/msiquery.h Wed Aug 30 22:08:21 2006 @@ -189,14 +189,14 @@ UINT WINAPI MsiDatabaseCommit(MSIHANDLE); /* install state */ -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*); #define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState) UINT WINAPI MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE); UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE); #define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState) -UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*); #define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState) MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR);

1 0

[greatlrd] 23804: Kill inline asm code compete in RtlUlongByteSwap for it doing swap wrong. we go back using the C version. Thanks Fireball
by greatlrd＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: greatlrd Date: Wed Aug 30 21:51:36 2006 New Revision: 23804 URL: http://svn.reactos.org/svn/reactos?rev=23804&view=rev Log: Kill inline asm code compete in RtlUlongByteSwap for it doing swap wrong. we go back using the C version. Thanks Fireball Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/mem.c?rev=23804&r1… ============================================================================== --- trunk/reactos/lib/rtl/mem.c (original) +++ trunk/reactos/lib/rtl/mem.c Wed Aug 30 21:51:36 2006 @@ -208,14 +208,7 @@ IN ULONG Source ) { -#if defined(__i386__) && defined(__GNUC__) - ULONG ret; -__asm__("bswap %0" : "=r" (ret) : "0" (Source) ); - return ret; -#else - return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); -#endif }

1 0

[ion] 23803: - Fix KeRaiseUserException (can't use "return" from SEH_HANDLE).
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 21:01:58 2006 New Revision: 23803 URL: http://svn.reactos.org/svn/reactos?rev=23803&view=rev Log: - Fix KeRaiseUserException (can't use "return" from SEH_HANDLE). Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Wed Aug 30 21:01:58 2006 @@ -812,27 +812,32 @@ NTAPI KeRaiseUserException(IN NTSTATUS ExceptionCode) { + NTSTATUS Status = STATUS_SUCCESS; ULONG OldEip; - PKTHREAD Thread = KeGetCurrentThread(); + PTEB Teb = KeGetCurrentThread()->Teb; + PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame; /* Make sure we can access the TEB */ _SEH_TRY { - Thread->Teb->ExceptionCode = ExceptionCode; + /* Set the exception code */ + Teb->ExceptionCode = ExceptionCode; } _SEH_HANDLE { - return(ExceptionCode); + /* Save exception code */ + Status = ExceptionCode; } _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Get the old EIP */ - OldEip = Thread->TrapFrame->Eip; + OldEip = TrapFrame->Eip; /* Change it to the user-mode dispatcher */ - Thread->TrapFrame->Eip = (ULONG_PTR)KeRaiseUserExceptionDispatcher; + TrapFrame->Eip = (ULONG_PTR)KeRaiseUserExceptionDispatcher; /* Return the old EIP */ - return((NTSTATUS)OldEip); -} - + return (NTSTATUS)OldEip; +} +

1 0

[ion] 23802: - Some fixes to KiDispatchException: Add support for forwarding exception back to user-mode, protect against V86 or invalid-stack faults, handle stack overflow exception while handling usermode exception (Thanks KJK for the SEH_FILTER help). Decrement EIP by one when hitting an INT3, to get the correct address. - Remove two associated kernel fun entries.
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 20:58:12 2006 New Revision: 23802 URL: http://svn.reactos.org/svn/reactos?rev=23802&view=rev Log: - Some fixes to KiDispatchException: Add support for forwarding exception back to user-mode, protect against V86 or invalid-stack faults, handle stack overflow exception while handling usermode exception (Thanks KJK for the SEH_FILTER help). Decrement EIP by one when hitting an INT3, to get the correct address. - Remove two associated kernel fun entries. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Aug 30 20:58:12 2006 @@ -25,9 +25,7 @@ // - Use Object Type Mutex/Lock. // // Ke: -// - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). // - Get rid of KiRosPrintAddress and use KiDumpParameterImages instead. -// - Forward exceptions to user-mode debugger. // - Sanitize some context fields during conversions. // - Implement stack fault and segment fault handlers. // - Implement kernel-mode GPF handler, possibly fixing below: Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Wed Aug 30 20:58:12 2006 @@ -24,6 +24,17 @@ { /* FIXME: Implement */ } + +BOOLEAN +NTAPI +DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord, + IN BOOLEAN DebugPort, + IN BOOLEAN SecondChance) +{ + /* FIXME: Implement */ + return FALSE; +} + NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Wed Aug 30 20:58:12 2006 @@ -20,6 +20,14 @@ IN PEPROCESS Parent ); +BOOLEAN +NTAPI +DbgkForwardException( + IN PEXCEPTION_RECORD ExceptionRecord, + IN BOOLEAN DebugPort, + IN BOOLEAN SecondChance +); + extern POBJECT_TYPE DbgkDebugObjectType; #endif Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Wed Aug 30 20:58:12 2006 @@ -691,13 +691,6 @@ ULONG FrameCount ); -ULONG -STDCALL -KeRosGetStackFrames( - PULONG Frames, - ULONG FrameCount -); - VOID NTAPI KiSetSystemTime(PLARGE_INTEGER NewSystemTime); Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Wed Aug 30 20:58:12 2006 @@ -15,6 +15,22 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +_SEH_DEFINE_LOCALS(KiCopyInfo) +{ + volatile EXCEPTION_RECORD SehExceptRecord; +}; + +_SEH_FILTER(KiCopyInformation) +{ + _SEH_ACCESS_LOCALS(KiCopyInfo); + + /* Copy the exception records and return to the handler */ + RtlMoveMemory((PVOID)&_SEH_VAR(SehExceptRecord), + _SEH_GetExceptionPointers()->ExceptionRecord, + sizeof(EXCEPTION_RECORD)); + return EXCEPTION_EXECUTE_HANDLER; +} VOID INIT_FUNCTION @@ -588,7 +604,8 @@ KD_CONTINUE_TYPE Action; ULONG_PTR Stack, NewStack; ULONG Size; - BOOLEAN UserDispatch = FALSE; + EXCEPTION_RECORD LocalExceptRecord; + _SEH_DECLARE_LOCALS(KiCopyInfo); /* Increase number of Exception Dispatches */ KeGetCurrentPrcb()->KeExceptionDispatchCount++; @@ -596,16 +613,32 @@ /* Set the context flags */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; - /* Check if User Mode */ - if (PreviousMode == UserMode) + /* Check if User Mode or if the debugger isenabled */ + if ((PreviousMode == UserMode) || (KdDebuggerEnabled)) { /* Add the FPU Flag */ Context.ContextFlags |= CONTEXT_FLOATING_POINT; - if (KeI386FxsrPresent) Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + + /* Check for NPX Support */ + if (KeI386FxsrPresent) + { + /* Save those too */ + Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + } } /* Get a Context */ KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); + + /* Fix up EIP */ + if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) + { + /* Decrement EIP by one */ + Context.Eip--; + } + + ASSERT(!((PreviousMode == KernelMode) && + (Context.EFlags & EFLAGS_V86_MASK))); /* Handle kernel-mode first, it's simpler */ if (PreviousMode == KernelMode) @@ -625,11 +658,7 @@ if (Action == kdContinue) goto Handled; /* If the Debugger couldn't handle it, dispatch the exception */ - if (RtlDispatchException(ExceptionRecord, &Context)) - { - /* It was handled by an exception handler, continue */ - goto Handled; - } + if (RtlDispatchException(ExceptionRecord, &Context)) goto Handled; } /* This is a second-chance exception, only for the debugger */ @@ -644,12 +673,11 @@ if (Action == kdContinue) goto Handled; /* Third strike; you're out */ - KEBUGCHECKWITHTF(KMODE_EXCEPTION_NOT_HANDLED, - ExceptionRecord->ExceptionCode, - (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1], - TrapFrame); + KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, + ExceptionRecord->ExceptionCode, + (ULONG_PTR)ExceptionRecord->ExceptionAddress, + ExceptionRecord->ExceptionInformation[0], + ExceptionRecord->ExceptionInformation[1]); } else { @@ -668,27 +696,39 @@ if (Action == kdContinue) goto Handled; /* FIXME: Forward exception to user mode debugger */ + if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) goto Exit; /* Set up the user-stack */ +DispatchToUser: _SEH_TRY { + /* Make sure we have a valid SS and that this isn't V86 mode */ + if ((TrapFrame->HardwareSegSs != (KGDT_R3_DATA | RPL_MASK)) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)) + { + /* Raise an exception instead */ + LocalExceptRecord.ExceptionCode = STATUS_ACCESS_VIOLATION; + LocalExceptRecord.ExceptionFlags = 0; + LocalExceptRecord.NumberParameters = 0; + RtlRaiseException(&LocalExceptRecord); + } + /* Align context size and get stack pointer */ Size = (sizeof(CONTEXT) + 3) & ~3; Stack = (Context.Esp & ~3) - Size; - DPRINT("Stack: %lx\n", Stack); /* Probe stack and copy Context */ ProbeForWrite((PVOID)Stack, Size, sizeof(ULONG)); RtlCopyMemory((PVOID)Stack, &Context, sizeof(CONTEXT)); /* Align exception record size and get stack pointer */ - Size = (sizeof(EXCEPTION_RECORD) - - (EXCEPTION_MAXIMUM_PARAMETERS - ExceptionRecord->NumberParameters) * - sizeof(ULONG) + 3) & ~3; + Size = (sizeof(EXCEPTION_RECORD) - + (EXCEPTION_MAXIMUM_PARAMETERS - + ExceptionRecord->NumberParameters) * + sizeof(ULONG) + 3) & ~3; NewStack = Stack - Size; - DPRINT("NewStack: %lx\n", NewStack); - - /* Probe stack and copy exception record. Don't forget to add the two params */ + + /* Probe stack and copy exception record */ ProbeForWrite((PVOID)(NewStack - 2 * sizeof(ULONG_PTR)), Size + 2 * sizeof(ULONG_PTR), sizeof(ULONG)); @@ -699,34 +739,59 @@ *(PULONG_PTR)(NewStack - 2 * sizeof(ULONG_PTR)) = NewStack; /* Set new Stack Pointer */ + KiSsToTrapFrame(TrapFrame, KGDT_R3_DATA); KiEspToTrapFrame(TrapFrame, NewStack - 2 * sizeof(ULONG_PTR)); + + /* Force correct segments */ + TrapFrame->SegCs = KGDT_R3_CODE | RPL_MASK; + TrapFrame->SegDs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegEs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegFs = KGDT_R3_TEB | RPL_MASK; + TrapFrame->SegGs = 0; /* Set EIP to the User-mode Dispathcer */ TrapFrame->Eip = (ULONG)KeUserExceptionDispatcher; - UserDispatch = TRUE; _SEH_LEAVE; } - _SEH_HANDLE - { - /* Do second-chance */ + _SEH_EXCEPT(KiCopyInformation) + { + /* Check if we got a stack overflow and raise that instead */ + if (_SEH_VAR(SehExceptRecord).ExceptionCode == + STATUS_STACK_OVERFLOW) + { + /* Copy the exception address and record */ + _SEH_VAR(SehExceptRecord).ExceptionAddress = + ExceptionRecord->ExceptionAddress; + RtlMoveMemory(ExceptionRecord, + (PVOID)&_SEH_VAR(SehExceptRecord), + sizeof(EXCEPTION_RECORD)); + + /* Do the exception again */ + goto DispatchToUser; + } } _SEH_END; } - /* If we dispatch to user, return now */ - if (UserDispatch) return; - - /* FIXME: Forward the exception to the debugger for 2nd chance */ - - /* 3rd strike, kill the thread */ - DPRINT1("Unhandled UserMode exception, terminating thread\n"); - ZwTerminateThread(NtCurrentThread(), ExceptionRecord->ExceptionCode); - KEBUGCHECKWITHTF(KMODE_EXCEPTION_NOT_HANDLED, - ExceptionRecord->ExceptionCode, - (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1], - TrapFrame); + /* Try second chance */ + if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) + { + /* Handled, get out */ + goto Exit; + } + else if (DbgkForwardException(ExceptionRecord, FALSE, TRUE)) + { + /* Handled, get out */ + goto Exit; + } + + /* 3rd strike, kill the process */ + ZwTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); + KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, + ExceptionRecord->ExceptionCode, + (ULONG_PTR)ExceptionRecord->ExceptionAddress, + ExceptionRecord->ExceptionInformation[0], + ExceptionRecord->ExceptionInformation[1]); } Handled: @@ -736,6 +801,7 @@ TrapFrame, Context.ContextFlags, PreviousMode); +Exit: return; }

1 0

[ekohl] 23801: - fix indentation and remove trailing whitespace - StartServiceA/W: terminate argument buffer with a double zero.
by ekohl＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ekohl Date: Wed Aug 30 14:53:37 2006 New Revision: 23801 URL: http://svn.reactos.org/svn/reactos?rev=23801&view=rev Log: - fix indentation and remove trailing whitespace - StartServiceA/W: terminate argument buffer with a double zero. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Wed Aug 30 14:53:37 2006 @@ -442,8 +442,7 @@ if (!lpServiceNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); } @@ -455,8 +454,7 @@ if (!lpDisplayNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); } @@ -468,8 +466,7 @@ if (!lpBinaryPathNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); } @@ -481,8 +478,7 @@ if (!lpLoadOrderGroupW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); } @@ -502,8 +498,7 @@ if (!lpDependenciesW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); } @@ -515,8 +510,7 @@ if (!lpServiceStartNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); } @@ -528,8 +522,7 @@ if (!lpPasswordW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - - goto cleanup; + goto cleanup; } MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); } @@ -549,34 +542,26 @@ lpPasswordW); cleanup: - if (lpServiceNameW !=NULL) - { - HeapFree(GetProcessHeap(), 0, lpServiceNameW); - } + if (lpServiceNameW !=NULL) + HeapFree(GetProcessHeap(), 0, lpServiceNameW); + if (lpDisplayNameW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpDisplayNameW); - } - if (lpBinaryPathNameW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); - } - if (lpLoadOrderGroupW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); - } - if (lpDependenciesW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpDependenciesW); - } - if (lpServiceStartNameW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); - } - if (lpPasswordW != NULL) - { - HeapFree(GetProcessHeap(), 0, lpPasswordW); - } + HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + + if (lpBinaryPathNameW != NULL) + HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + + if (lpLoadOrderGroupW != NULL) + HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); + + if (lpDependenciesW != NULL) + HeapFree(GetProcessHeap(), 0, lpDependenciesW); + + if (lpServiceStartNameW != NULL) + HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); + + if (lpPasswordW != NULL) + HeapFree(GetProcessHeap(), 0, lpPasswordW); return RetVal; } @@ -1982,6 +1967,7 @@ { dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); } + dwBufSize++; DPRINT1("dwBufSize: %lu\n", dwBufSize); lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); @@ -1997,6 +1983,7 @@ strcpy(lpStr, lpServiceArgVectors[i]); lpStr += (strlen(lpServiceArgVectors[i]) + 1); } + *lpStr = 0; dwError = ScmrStartServiceA(BindingHandle, (unsigned int)hService, @@ -2038,6 +2025,7 @@ { dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); } + dwBufSize += sizeof(WCHAR); DPRINT1("dwBufSize: %lu\n", dwBufSize); lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); @@ -2053,6 +2041,7 @@ wcscpy(lpStr, lpServiceArgVectors[i]); lpStr += (wcslen(lpServiceArgVectors[i]) + 1); } + *lpStr = 0; dwError = ScmrStartServiceW(BindingHandle, (unsigned int)hService,

1 0

[hpoussin] 23800: Add missing includes in .rc file Sort them in alphabetical order
by hpoussin＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: hpoussin Date: Wed Aug 30 14:40:59 2006 New Revision: 23800 URL: http://svn.reactos.org/svn/reactos?rev=23800&view=rev Log: Add missing includes in .rc file Sort them in alphabetical order Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Wed Aug 30 14:40:59 2006 @@ -107,22 +107,26 @@ "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n" "#endif\r\n" "\r\n" + "#include ""explorer-cz.rc""\r\n" + "#include ""explorer-de.rc""\r\n" "#include ""explorer-en.rc""\r\n" - "#include ""explorer-de.rc""\r\n" "#include ""explorer-es.rc""\r\n" - "#include ""explorer-sv.rc""\r\n" + "#include ""explorer-fr.rc""\r\n" + "#include ""explorer-gr.rc""\r\n" + "#include ""explorer-hu.rc""\r\n" + "#include ""explorer-it.rc""\r\n" + "#include ""explorer-jp.rc""\r\n" + "#include ""explorer-nl.rc""\r\n" + "#include ""explorer-no.rc""\r\n" "#include ""explorer-pl.rc""\r\n" "#include ""explorer-pt.rc""\r\n" - "#include ""explorer-cz.rc""\r\n" "#include ""explorer-ro.rc""\r\n" "#include ""explorer-ru.rc""\r\n" - "#include ""explorer-jp.rc""\r\n" - "#include ""explorer-hu.rc""\r\n" + "#include ""explorer-sv.rc""\r\n" "#include ""explorer-uk.rc""\r\n" - "#include ""explorer-nl.rc""\r\n" - "#include ""explorer-it.rc""\r\n" "\r\n" "#ifndef __WINDRES__\r\n" + "#include ""explorer-bn.rc""\r\n" "#include ""explorer-cn.rc""\r\n" "#endif\r\n" "\0"

1 0

[greatlrd] 23799: Implement RtlRandomEx by copy RtlRandom code. ms have two different implement, One random is faster that other, (in some doc I read (maybe from osr) some year ago), the RtlRandomEx is not document in the free ddk/sdk, but it is include in ddk/ifs kit, according the doc.
by greatlrd＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: greatlrd Date: Wed Aug 30 14:13:01 2006 New Revision: 23799 URL: http://svn.reactos.org/svn/reactos?rev=23799&view=rev Log: Implement RtlRandomEx by copy RtlRandom code. ms have two different implement, One random is faster that other, (in some doc I read (maybe from osr) some year ago), the RtlRandomEx is not document in the free ddk/sdk, but it is include in ddk/ifs kit, according the doc. Modified: trunk/reactos/lib/rtl/random.c Modified: trunk/reactos/lib/rtl/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/random.c?rev=23799… ============================================================================== --- trunk/reactos/lib/rtl/random.c (original) +++ trunk/reactos/lib/rtl/random.c Wed Aug 30 14:13:01 2006 @@ -83,16 +83,26 @@ } /* -* @unimplemented +* @implemented */ ULONG NTAPI -RtlRandomEx( - PULONG Seed +RtlRandomEx( IN OUT PULONG Seed ) { - UNIMPLEMENTED; - return 0; + ULONG Rand; + int Pos; + ULONG Result; + + PAGED_CODE_RTL(); + + Rand = (*Seed * 0x7fffffed + 0x7fffffc3) % 0x7fffffff; + *Seed = (Rand * 0x7fffffed + 0x7fffffc3) % 0x7fffffff; + Pos = *Seed & 0x7f; + Result = SavedValue[Pos]; + SavedValue[Pos] = Rand; + + return Result; }

1 0

[janderwald] 23798: * remove useless cast
by janderwald＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: janderwald Date: Wed Aug 30 13:45:08 2006 New Revision: 23798 URL: http://svn.reactos.org/svn/reactos?rev=23798&view=rev Log: * remove useless cast Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Wed Aug 30 13:45:08 2006 @@ -252,8 +252,8 @@ if (Unicode) { Ret = ((FONTENUMPROCW) EnumProc)( - (LPLOGFONTW)&Info[i].EnumLogFontEx, - (LPTEXTMETRICW)&Info[i].NewTextMetricEx, + &Info[i].EnumLogFontEx, + &Info[i].NewTextMetricEx, Info[i].FontType, lParam); } else @@ -268,8 +268,8 @@ NewTextMetricExW2A(&NewTextMetricExA, &Info[i].NewTextMetricEx); Ret = ((FONTENUMPROCA) EnumProc)( - (LPLOGFONTA)&EnumLogFontExA, - (LPTEXTMETRICA)&NewTextMetricExA, + &EnumLogFontExA, + &NewTextMetricExA, Info[i].FontType, lParam); } }

1 0

[janderwald] 23797: - fix definition of FONTENUMPROC
by janderwald＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: janderwald Date: Wed Aug 30 13:17:47 2006 New Revision: 23797 URL: http://svn.reactos.org/svn/reactos?rev=23797&view=rev Log: - fix definition of FONTENUMPROC Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Wed Aug 30 13:17:47 2006 @@ -2525,8 +2525,8 @@ typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM); -typedef int (CALLBACK *OLDFONTENUMPROCA)(const LOGFONTA*,const TEXTMETRICA*,DWORD,LPARAM); -typedef int (CALLBACK *OLDFONTENUMPROCW)(const LOGFONTW*,const TEXTMETRICW*,DWORD,LPARAM); +typedef int (CALLBACK *OLDFONTENUMPROCA)(ENUMLOGFONTEXA*,NEWTEXTMETRICEXA*,DWORD,LPARAM); +typedef int (CALLBACK *OLDFONTENUMPROCW)(ENUMLOGFONTEXW*,NEWTEXTMETRICEXW*,DWORD,LPARAM); typedef OLDFONTENUMPROCA FONTENUMPROCA; typedef OLDFONTENUMPROCW FONTENUMPROCW; typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs