Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23233: - ImperstionationLocale -> ImpersonationLocale. - Implement PspWriteTebImpersonationInfo for setting the impersonation locale and impersonation status in the TEB (since User-mode needs to read this value and we don't want to NtQueryInformationThread for it each time to read the ETHERAD flag). - Complete the implementation of PspSetPrimaryToken to recalculate a process's access rights to itself based on a new primary token. - Reorganize ps.h header like ob.h and io.h, implement Traci
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 09:43:28 2006 New Revision: 23233 URL: http://svn.reactos.org/svn/reactos?rev=23233&view=rev Log: - ImperstionationLocale -> ImpersonationLocale. - Implement PspWriteTebImpersonationInfo for setting the impersonation locale and impersonation status in the TEB (since User-mode needs to read this value and we don't want to NtQueryInformationThread for it each time to read the ETHERAD flag). - Complete the implementation of PspSetPrimaryToken to recalculate a process's access rights to itself based on a new primary token. - Reorganize ps.h header like ob.h and io.h, implement Tracing support but not the tracing itself yet. - Get rid of some deprecated cruft. Removed: trunk/reactos/ntoskrnl/include/internal/arch/ps.h Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Jul 23 09:43:28 2006 @@ -780,7 +780,7 @@ ULONG SoftPatchPtr1; ULONG SoftPatchPtr2; PVOID *TlsExpansionSlots; - ULONG ImpersionationLocale; + ULONG ImpersonationLocale; ULONG IsImpersonating; PVOID NlsCache; PVOID pShimData; Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sun Jul 23 09:43:28 2006 @@ -30,8 +30,6 @@ // - Add security calls where necessary. // - Add tracing. // - Add failure/race checks for thread creation. -// - Complete PspSetPrimaryToken. -// - Update TEB Security information when impersonating. // // Ob: // - Possible bug in deferred deletion under Cc Rewrite branch. Removed: trunk/reactos/ntoskrnl/include/internal/arch/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/ps.h (removed) @@ -1,13 +1,0 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H - -#ifdef _M_IX86 -#define KiArchContextSwitch KiSwapContext -#define KiArchInitThreadWithContext Ke386InitThreadWithContext -#else -#error "Unknown processor" -#endif - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H */ - -/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Sun Jul 23 09:43:28 2006 @@ -5,6 +5,7 @@ * PURPOSE: Internal header for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ + // // Define this if you want debugging support // Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sun Jul 23 09:43:28 2006 @@ -1,61 +1,160 @@ -#ifndef __INCLUDE_INTERNAL_PS_H -#define __INCLUDE_INTERNAL_PS_H - -/* Forward declarations. */ -struct _KTHREAD; -struct _KTRAPFRAME; -struct _EJOB; - -#include <internal/arch/ps.h> - -/* Top level irp definitions. */ -#define FSRTL_FSP_TOP_LEVEL_IRP (0x01) -#define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) -#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP (0x03) -#define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) -#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) - +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ps.h +* PURPOSE: Internal header for the Process Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +// +// Define this if you want debugging support +// +#define _PS_DEBUG_ 0x00 + +// +// These define the Debug Masks Supported +// +#define PS_THREAD_DEBUG 0x01 +#define PS_PROCESS_DEBUG 0x02 +#define PS_SECURITY_DEBUG 0x04 +#define PS_JOB_DEBUG 0x08 +#define PS_NOTIFICATIONS_DEBUG 0x10 +#define PS_WIN32K_DEBUG 0x20 +#define PS_STATE_DEBUG 0x40 +#define PS_QUOTA_DEBUG 0x80 + +// +// Debug/Tracing support +// +#if _PS_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define PSTRACE DbgPrintEx +#else +#define PSTRACE(x, ...) \ + if (x & PspTraceLevel) DbgPrint(__VA_ARGS__) +#endif +#else +#define PSTRACE(x, ...) DPRINT(__VA_ARGS__) +#endif + +// +// Maximum Count of Notification Routines +// #define PSP_MAX_CREATE_THREAD_NOTIFY 8 #define PSP_MAX_LOAD_IMAGE_NOTIFY 8 #define PSP_MAX_CREATE_PROCESS_NOTIFY 8 +// +// Maximum Job Scheduling Classes +// #define PSP_JOB_SCHEDULING_CLASSES 10 -VOID -NTAPI -PspShutdownProcessManager(VOID); - -VOID -NTAPI -PsInitThreadManagment(VOID); - -VOID -INIT_FUNCTION -NTAPI -PiInitProcessManager(VOID); - -VOID -NTAPI -PsInitProcessManagment(VOID); - -VOID -NTAPI -PsInitIdleThread(VOID); - +// +// Initialization Functions +// +VOID +NTAPI +PspShutdownProcessManager( + VOID +); + +VOID +INIT_FUNCTION +NTAPI +PsInitThreadManagment( + VOID +); + +VOID +INIT_FUNCTION +NTAPI +PiInitProcessManager( + VOID +); + +VOID +INIT_FUNCTION +NTAPI +PsInitProcessManagment( + VOID +); + +VOID +INIT_FUNCTION +NTAPI +PsInitIdleThread( + VOID +); + +NTSTATUS +NTAPI +PsInitializeIdleOrFirstThread( + IN PEPROCESS Process, + OUT PETHREAD* ThreadPtr, + IN PKSTART_ROUTINE StartRoutine, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN First +); + +VOID +NTAPI +INIT_FUNCTION +PsInitJobManagment( + VOID +); + +// +// Utility Routines +// +PETHREAD +NTAPI +PsGetNextProcessThread( + IN PEPROCESS Process, + IN PETHREAD Thread OPTIONAL +); + +PEPROCESS +NTAPI +PsGetNextProcess( + IN PEPROCESS OldProcess OPTIONAL +); + +NTSTATUS +NTAPI +PspMapSystemDll( + IN PEPROCESS Process, + OUT PVOID *DllBase +); + +NTSTATUS +NTAPI +PsLocateSystemDll( + VOID +); + +NTSTATUS +NTAPI +PspGetSystemDllEntryPoints( + VOID +); + +// +// Security Routines +// PACCESS_TOKEN -STDCALL +NTAPI PsReferenceEffectiveToken( - PETHREAD Thread, - PTOKEN_TYPE TokenType, - PUCHAR b, - PSECURITY_IMPERSONATION_LEVEL Level -); - -NTSTATUS -STDCALL + IN PETHREAD Thread, + OUT PTOKEN_TYPE TokenType, + OUT PUCHAR b, + OUT PSECURITY_IMPERSONATION_LEVEL Level +); + +NTSTATUS +NTAPI PsOpenTokenOfProcess( - HANDLE ProcessHandle, - PACCESS_TOKEN* Token + IN HANDLE ProcessHandle, + OUT PACCESS_TOKEN* Token ); NTSTATUS @@ -66,15 +165,30 @@ IN PTOKEN Token OPTIONAL ); -PETHREAD -NTAPI -PsGetNextProcessThread( - IN PEPROCESS Process, - IN PETHREAD Thread OPTIONAL -); - -VOID -STDCALL +NTSTATUS +NTAPI +PspInitializeProcessSecurity( + IN PEPROCESS Process, + IN PEPROCESS Parent OPTIONAL +); + +VOID +NTAPI +PspDeleteProcessSecurity( + IN PEPROCESS Process +); + +VOID +NTAPI +PspDeleteThreadSecurity( + IN PETHREAD Thread +); + +// +// Reaping and Deletion +// +VOID +NTAPI PsExitSpecialApc( PKAPC Apc, PKNORMAL_ROUTINE *NormalRoutine, @@ -83,121 +197,95 @@ PVOID *SystemArgument2 ); -NTSTATUS -STDCALL -PspInitializeProcessSecurity( - PEPROCESS Process, - PEPROCESS Parent OPTIONAL -); - -VOID -STDCALL +VOID +NTAPI +PspReapRoutine( + IN PVOID Context +); + +VOID +NTAPI +PspExitThread( + IN NTSTATUS ExitStatus +); + +NTSTATUS +NTAPI +PspTerminateThreadByPointer( + IN PETHREAD Thread, + IN NTSTATUS ExitStatus, + IN BOOLEAN bSelf +); + +VOID +NTAPI +PspExitProcess( + IN BOOLEAN LastThread, + IN PEPROCESS Process +); + +VOID +NTAPI +PspDeleteProcess( + IN PVOID ObjectBody +); + +VOID +NTAPI +PspDeleteThread( + IN PVOID ObjectBody +); + +// +// Thread/Process Startup +// +VOID +NTAPI PspSystemThreadStartup( PKSTART_ROUTINE StartRoutine, PVOID StartContext ); -NTSTATUS -NTAPI -PsInitializeIdleOrFirstThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - PKSTART_ROUTINE StartRoutine, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); - -VOID -STDCALL -PspReapRoutine(PVOID Context); - -VOID -STDCALL -PspExitThread(NTSTATUS ExitStatus); - -NTSTATUS -STDCALL -PspTerminateThreadByPointer( - PETHREAD Thread, - NTSTATUS ExitStatus, - BOOLEAN bSelf -); - -PEPROCESS -STDCALL -PsGetNextProcess(PEPROCESS OldProcess); - -VOID -STDCALL -PsIdleThreadMain(PVOID Context); - -VOID -STDCALL -PspExitProcess(BOOLEAN LastThread, - PEPROCESS Process); - -VOID -STDCALL -PspDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL -PspDeleteThread(PVOID ObjectBody); - -VOID -NTAPI -INIT_FUNCTION -PsInitJobManagment(VOID); - -VOID -STDCALL +VOID +NTAPI +PsIdleThreadMain( + IN PVOID Context +); + +// +// Quota Support +// +VOID +NTAPI PspInheritQuota( - PEPROCESS Process, - PEPROCESS ParentProcess -); - -VOID -STDCALL -PspDestroyQuotaBlock(PEPROCESS Process); - -NTSTATUS -STDCALL -PspMapSystemDll( - PEPROCESS Process, - PVOID *DllBase -); - -NTSTATUS -STDCALL -PsLocateSystemDll(VOID); - -NTSTATUS -STDCALL -PspGetSystemDllEntryPoints(VOID); - -VOID -NTAPI -PspRemoveProcessFromJob( - IN PEPROCESS Process, - IN PEJOB Job -); - -NTSTATUS -NTAPI -PspDeleteLdt(IN PEPROCESS Process); - -NTSTATUS -NTAPI -PspDeleteVdmObjects(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteProcessSecurity(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteThreadSecurity(IN PETHREAD Thread); - + IN PEPROCESS Process, + IN PEPROCESS ParentProcess +); + +VOID +NTAPI +PspDestroyQuotaBlock( + IN PEPROCESS Process +); + +// +// VDM Support +// +NTSTATUS +NTAPI +PspDeleteLdt( + IN PEPROCESS Process +); + +NTSTATUS +NTAPI +PspDeleteVdmObjects( + IN PEPROCESS Process +); + +// +// Job Routines +// VOID NTAPI PspExitProcessFromJob( @@ -205,6 +293,17 @@ IN PEPROCESS Process ); +VOID +NTAPI +PspRemoveProcessFromJob( + IN PEPROCESS Process, + IN PEJOB Job +); + +// +// Global data inside the Process Manager +// +extern ULONG PspTraceLevel; extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; extern LIST_ENTRY PspReaperListHead; @@ -231,6 +330,8 @@ extern PVOID PspSystemDllBase; extern BOOLEAN PspUseJobSchedulingClasses; extern CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES]; + +// +// Inlined Functions +// #include "ps_x.h" - -#endif /* __INCLUDE_INTERNAL_PS_H */ Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Sun Jul 23 09:43:28 2006 @@ -187,7 +187,7 @@ /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ DPRINT("You are : %x, swapping to: %x\n", OldThread, CurrentThread); - KiArchContextSwitch(CurrentThread); + KiSwapContext(CurrentThread); DPRINT("You are : %x, swapped from: %x\n", OldThread, CurrentThread); return; } @@ -841,11 +841,11 @@ _SEH_TRY { /* Initalize the Thread Context */ - KiArchInitThreadWithContext(Thread, - SystemRoutine, - StartRoutine, - StartContext, - Context); + Ke386InitThreadWithContext(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); } _SEH_HANDLE { Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sun Jul 23 09:43:28 2006 @@ -99,6 +99,75 @@ NTSTATUS NTAPI +PspWriteTebImpersonationInfo(IN PETHREAD Thread, + IN PETHREAD CurrentThread) +{ + PEPROCESS Process; + PTEB Teb; + BOOLEAN Attached = FALSE; + BOOLEAN IsImpersonating; + KAPC_STATE ApcState; + PAGED_CODE(); + + /* Sanity check */ + ASSERT(CurrentThread == PsGetCurrentThread()); + + /* Get process and TEB */ + Process = Thread->ThreadsProcess; + Teb = Thread->Tcb.Teb; + if (Teb) + { + /* Check if we're not in the right process */ + if (Thread->Tcb.ApcState.Process != &Process->Pcb) + { + /* Attach to the process */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + /* Check if we're in a different thread */ + if (Thread != CurrentThread) + { + /* Acquire thread rundown protection */ + ExAcquireRundownProtection(&Thread->RundownProtect); + } + + /* Check if the thread is impersonating */ + IsImpersonating = Thread->ActiveImpersonationInfo; + if (IsImpersonating) + { + /* Set TEB data */ + Teb->ImpersonationLocale = -1; + Teb->IsImpersonating = 1; + } + else + { + /* Set TEB data */ + Teb->ImpersonationLocale = 0; + Teb->IsImpersonating = 0; + } + + /* Set new flag */ + Thread->ActiveImpersonationInfo = TRUE; + + /* Check if we're in a different thread */ + if (Thread != CurrentThread) + { + /* Release protection */ + ExReleaseRundownProtection(&Thread->RundownProtect); + } + + /* Dettach */ + if (Attached) KeUnstackDetachProcess(&ApcState); + } + + /* Return to caller */ + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI PspAssignPrimaryToken(IN PEPROCESS Process, IN PTOKEN Token) { @@ -129,7 +198,10 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); BOOLEAN IsChild; - NTSTATUS Status; + NTSTATUS Status, AccessStatus; + BOOLEAN Result, SdAllocated; + PSECURITY_DESCRIPTOR SecurityDescriptor; + SECURITY_SUBJECT_CONTEXT SubjectContext; /* Make sure we got a handle */ if (TokenHandle) @@ -171,14 +243,42 @@ if (NT_SUCCESS(Status)) { /* - * The idea here is that we need to completely reverify - * if the process still has access to itself under this new - * token, by doing an SeAccessCheck with the Primary Token and - * the SD of the Process (ObGetObjectSecurity). - * In the really twisted case where we lose access to ourselves, - * we would set Process->GrantedAccess to 0. + * We need to completely reverify if the process still has access to + * itself under this new token. */ - DPRINT1("Process security not complete\n"); + Status = ObGetObjectSecurity(Process, + &SecurityDescriptor, + &SdAllocated); + if (NT_SUCCESS(Status)) + { + /* Setup the security context */ + SubjectContext.ProcessAuditId = Process; + SubjectContext.PrimaryToken = PsReferencePrimaryToken(Process); + SubjectContext.ClientToken = NULL; + + /* Do the access check */ + Result = SeAccessCheck(SecurityDescriptor, + &SubjectContext, + FALSE, + MAXIMUM_ALLOWED, + 0, + NULL, + &PsProcessType->TypeInfo.GenericMapping, + PreviousMode, + &Process->GrantedAccess, + &AccessStatus); + + /* Dereference the token and let go the SD */ + ObFastDereferenceObject(&Process->Token, + SubjectContext.PrimaryToken); + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + + /* Remove access if it failed */ + if (!Result) Process->GrantedAccess = 0; + } + + /* Dereference the process */ + ObDereferenceObject(Process); } /* Dereference the token */ @@ -437,6 +537,9 @@ /* Dereference the impersonation token */ if (Token) ObDereferenceObject(Token); + + /* Write impersonation info to the TEB */ + PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); } /* @@ -529,8 +632,10 @@ PspUnlockThreadSecurityExclusive(Thread); } + /* Write impersonation info to the TEB */ + PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); + /* Dereference the token and return success */ - ObReferenceObject(Token); if (OldToken) ObDereferenceObject(OldToken); return STATUS_SUCCESS; }

1 0

[ion] 23232: [AUDIT] - The entire /kd directory is clear. We do not implement any Kd support in ReactOS, and I very much doubt someone implemented GDB or BOCHS support based reverse-engineering NT since NT happens not to have a GDB/BOCHS stub built-in (what a surprise!).
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 09:43:00 2006 New Revision: 23232 URL: http://svn.reactos.org/svn/reactos?rev=23232&view=rev Log: [AUDIT] - The entire /kd directory is clear. We do not implement any Kd support in ReactOS, and I very much doubt someone implemented GDB or BOCHS support based reverse-engineering NT since NT happens not to have a GDB/BOCHS stub built-in (what a surprise!). Modified: trunk/reactos/ntoskrnl/kd/kdinit.c (props changed) trunk/reactos/ntoskrnl/kd/kdio.c (props changed) trunk/reactos/ntoskrnl/kd/kdmain.c (props changed) trunk/reactos/ntoskrnl/kd/wrappers/bochs.c (props changed) trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c (contents, props changed) Propchange: trunk/reactos/ntoskrnl/kd/kdinit.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kd/kdio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kd/kdmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Sun Jul 23 09:43:00 2006 @@ -86,7 +86,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -#include <internal/ps.h> /************************************************************************/ /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ Propchange: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 23231: - CT_ACTIVE_IMPERSTIONATION_INFO_BIT -> CT_ACTIVE_IMPERSONATION_INFO_BIT - Added Process and Thread locking inlined functions for Ps Security functions. - Thread safety is your friend! Huge rework of almost all the functions in ps/security.c to use the process/thread pushlocks and use interlocked operations when dealing with the ActiveImpersonationInfo thread flag. - Added PAGED_CODE(). - Added checks for Processes with Jobs for the day that will happen. - PsAssignImpersoonationToke
by ion＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ion Date: Sun Jul 23 02:57:42 2006 New Revision: 23231 URL: http://svn.reactos.org/svn/reactos?rev=23231&view=rev Log: - CT_ACTIVE_IMPERSTIONATION_INFO_BIT -> CT_ACTIVE_IMPERSONATION_INFO_BIT - Added Process and Thread locking inlined functions for Ps Security functions. - Thread safety is your friend! Huge rework of almost all the functions in ps/security.c to use the process/thread pushlocks and use interlocked operations when dealing with the ActiveImpersonationInfo thread flag. - Added PAGED_CODE(). - Added checks for Processes with Jobs for the day that will happen. - PsAssignImpersoonationToken with a NULL token handle means simply to revert to self. - Don't ignore the HandleAttributes in NtOpenProcessTokenEx. - Use SeTokenType to make sure the token passed is an impersonation token. - Remove some fixed bugs in krnlfun.c, add more TODOs. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Jul 23 02:57:42 2006 @@ -163,7 +163,7 @@ #define CT_TERMINATED_BIT 0x1 #define CT_DEAD_THREAD_BIT 0x2 #define CT_HIDE_FROM_DEBUGGER_BIT 0x4 -#define CT_ACTIVE_IMPERSTIONATION_INFO_BIT 0x8 +#define CT_ACTIVE_IMPERSONATION_INFO_BIT 0x8 #define CT_SYSTEM_THREAD_BIT 0x10 #define CT_HARD_ERRORS_ARE_DISABLED_BIT 0x20 #define CT_BREAK_ON_TERMINATION_BIT 0x40 Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sun Jul 23 02:57:42 2006 @@ -25,14 +25,13 @@ // - Add tracing to iofunc.c // // Ps: -// - Use Process/Thread Rundown. -// - Use Process Pushlock Locks. -// - Use Security Locks in security.c // - Figure out why processes don't die. // - Generate process cookie for user-more thread. // - Add security calls where necessary. // - Add tracing. // - Add failure/race checks for thread creation. +// - Complete PspSetPrimaryToken. +// - Update TEB Security information when impersonating. // // Ob: // - Possible bug in deferred deletion under Cc Rewrite branch. Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sun Jul 23 02:57:42 2006 @@ -17,6 +17,7 @@ #include "i386/v86m.h" #include "ob.h" #include "mm.h" +#include "ex.h" #include "ps.h" #include "cc.h" #include "io.h" @@ -24,7 +25,6 @@ #include "se.h" #include "ldr.h" #include "kd.h" -#include "ex.h" #include "fsrtl.h" #include "lpc.h" #include "rtl.h" Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Sun Jul 23 02:57:42 2006 @@ -84,3 +84,90 @@ if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread); } +VOID +FORCEINLINE +PspLockProcessSecurityShared(IN PEPROCESS Process) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Process */ + ExAcquirePushLockShared(&Process->ProcessLock); +} + +VOID +FORCEINLINE +PspUnlockProcessSecurityShared(IN PEPROCESS Process) +{ + /* Unlock the Process */ + ExReleasePushLockShared(&Process->ProcessLock); + + /* Leave Critical Region */ + KeLeaveCriticalRegion(); +} + +VOID +FORCEINLINE +PspLockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Process */ + ExAcquirePushLockExclusive(&Process->ProcessLock); +} + +VOID +FORCEINLINE +PspUnlockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Unlock the Process */ + ExReleasePushLockExclusive(&Process->ProcessLock); + + /* Leave Critical Region */ + KeLeaveCriticalRegion(); +} + +VOID +FORCEINLINE +PspLockThreadSecurityShared(IN PETHREAD Thread) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Thread */ + ExAcquirePushLockShared(&Thread->ThreadLock); +} + +VOID +FORCEINLINE +PspUnlockThreadSecurityShared(IN PETHREAD Thread) +{ + /* Unlock the Thread */ + ExReleasePushLockShared(&Thread->ThreadLock); + + /* Leave Critical Region */ + KeLeaveCriticalRegion(); +} + +VOID +FORCEINLINE +PspLockThreadSecurityExclusive(IN PETHREAD Thread) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Thread */ + ExAcquirePushLockExclusive(&Thread->ThreadLock); +} + +VOID +FORCEINLINE +PspUnlockThreadSecurityExclusive(IN PETHREAD Thread) +{ + /* Unlock the Process */ + ExReleasePushLockExclusive(&Thread->ThreadLock); + + /* Leave Critical Thread */ + KeLeaveCriticalRegion(); +} Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sun Jul 23 02:57:42 2006 @@ -16,58 +16,12 @@ /* PRIVATE FUNCTIONS *********************************************************/ -/* FIXME: Turn into Macro */ VOID NTAPI -PspLockProcessSecurityShared(IN PEPROCESS Process) -{ - /* Enter a Critical Region */ - KeEnterCriticalRegion(); - - /* Lock the Process */ - ExAcquirePushLockShared(&Process->ProcessLock); -} - -/* FIXME: Turn into Macro */ -VOID -NTAPI -PspUnlockProcessSecurityShared(IN PEPROCESS Process) -{ - /* Unlock the Process */ - ExReleasePushLockShared(&Process->ProcessLock); - - /* Leave Critical Region */ - KeLeaveCriticalRegion(); -} - -/* FIXME: Turn into Macro */ -VOID -NTAPI -PspLockProcessSecurityExclusive(IN PEPROCESS Process) -{ - /* Enter a Critical Region */ - KeEnterCriticalRegion(); - - /* Lock the Process */ - ExAcquirePushLockExclusive(&Process->ProcessLock); -} - -/* FIXME: Turn into Macro */ -VOID -NTAPI -PspUnlockProcessSecurityExclusive(IN PEPROCESS Process) -{ - /* Unlock the Process */ - ExReleasePushLockExclusive(&Process->ProcessLock); - - /* Leave Critical Region */ - KeLeaveCriticalRegion(); -} - -VOID -NTAPI PspDeleteProcessSecurity(IN PEPROCESS Process) { + PAGED_CODE(); + /* Check if we have a token */ if (Process->Token.Object) { @@ -81,6 +35,8 @@ NTAPI PspDeleteThreadSecurity(IN PETHREAD Thread) { + PAGED_CODE(); + /* Check if we have active impersonation info */ if (Thread->ActiveImpersonationInfo) { @@ -93,7 +49,8 @@ { /* Free it */ ExFreePool(Thread->ImpersonationInfo); - Thread->ActiveImpersonationInfo = FALSE; + InterlockedAnd(&Thread->CrossThreadFlags, + ~CT_ACTIVE_IMPERSONATION_INFO_BIT); Thread->ImpersonationInfo = NULL; } } @@ -103,6 +60,7 @@ PspInitializeProcessSecurity(IN PEPROCESS Process, IN PEPROCESS Parent OPTIONAL) { + PAGED_CODE(); NTSTATUS Status = STATUS_SUCCESS; PTOKEN NewToken, ParentToken; @@ -113,7 +71,10 @@ ParentToken = PsReferencePrimaryToken(Parent); /* Duplicate it */ - Status = SeSubProcessToken(ParentToken, &NewToken, TRUE, 0); + Status = SeSubProcessToken(ParentToken, + &NewToken, + TRUE, + 0);//MmGetSessionId(Process)); /* Dereference the Parent */ ObFastDereferenceObject(&Parent->Token, ParentToken); @@ -124,13 +85,9 @@ else { #ifdef SCHED_REWRITE - PTOKEN BootToken; - - /* No parent, this is the Initial System Process. Assign Boot Token */ - BootToken = SepCreateSystemProcessToken(); - BootToken->TokenInUse = TRUE; - Process->Token = BootToken; - ObReferenceObject(BootToken); + /* No parent, assign the Boot Token */ + ObInitializeFastReference(&Process->Token, NULL); + SeAssignPrimaryToken(Process, PspBootAccessToken); #else DPRINT1("PspInitializeProcessSecurity called with no parent.\n"); #endif @@ -289,7 +246,7 @@ { /* Reference it by handle and dereference the pointer */ Status = ObOpenObjectByPointer(Token, - 0, + HandleAttributes, NULL, DesiredAccess, SepTokenObjectType, @@ -327,6 +284,7 @@ PsReferencePrimaryToken(PEPROCESS Process) { PACCESS_TOKEN Token; + PAGED_CODE(); /* Fast Reference the Token */ Token = ObFastReferenceObject(&Process->Token); @@ -358,6 +316,7 @@ { PEPROCESS Process; NTSTATUS Status; + PAGED_CODE(); /* Get the Token */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -366,7 +325,7 @@ ExGetPreviousMode(), (PVOID*)&Process, NULL); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Reference the token and dereference the process */ *Token = PsReferencePrimaryToken(Process); @@ -388,28 +347,38 @@ PACCESS_TOKEN Token; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; NTSTATUS Status; + PAGED_CODE(); /* Check if we were given a handle */ - if (TokenHandle) - { - /* Get the token object */ - Status = ObReferenceObjectByHandle(TokenHandle, - TOKEN_IMPERSONATE, - SepTokenObjectType, - KeGetPreviousMode(), - (PVOID*)&Token, - NULL); - if (!NT_SUCCESS(Status)) return(Status); - - /* Get the impersionation level */ - ImpersonationLevel = SeTokenImpersonationLevel(Token); - } - else - { - /* Otherwise, clear values */ - Token = NULL; - ImpersonationLevel = 0; - } + if (!TokenHandle) + { + /* Undo impersonation */ + PsRevertThreadToSelf(Thread); + return STATUS_SUCCESS; + } + + /* Get the token object */ + Status = ObReferenceObjectByHandle(TokenHandle, + TOKEN_IMPERSONATE, + SepTokenObjectType, + KeGetPreviousMode(), + (PVOID*)&Token, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + /* Make sure it's an impersonation token */ + if (SeTokenType(Token) != TokenImpersonation) + { + /* Fail */ + ObDereferenceObject(Token); + return STATUS_BAD_TOKEN_TYPE; + } + + /* Check if this is a job, which we don't support yet */ + if (Thread->ThreadsProcess->Job) KEBUGCHECK(0); + + /* Get the impersionation level */ + ImpersonationLevel = SeTokenImpersonationLevel(Token); /* Call the impersonation API */ Status = PsImpersonateClient(Thread, @@ -431,6 +400,7 @@ PsRevertToSelf(VOID) { /* Call the per-thread API */ + PAGED_CODE(); PsRevertThreadToSelf(PsGetCurrentThread()); } @@ -441,13 +411,32 @@ NTAPI PsRevertThreadToSelf(IN PETHREAD Thread) { + PTOKEN Token = NULL; + PAGED_CODE(); + /* Make sure we had impersonation information */ if (Thread->ActiveImpersonationInfo) { - /* Dereference the impersonation token and set it as false */ - ObDereferenceObject (Thread->ImpersonationInfo->Token); - Thread->ActiveImpersonationInfo = FALSE; - } + /* Lock the thread security */ + PspLockThreadSecurityExclusive(Thread); + + /* Make sure it's still active */ + if (Thread->ActiveImpersonationInfo) + { + /* Disable impersonation */ + InterlockedAnd(&Thread->CrossThreadFlags, + ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + + /* Get the token */ + Token = Thread->ImpersonationInfo->Token; + } + + /* Release thread security */ + PspUnlockThreadSecurityExclusive(Thread); + } + + /* Dereference the impersonation token */ + if (Token) ObDereferenceObject(Token); } /* @@ -462,6 +451,8 @@ IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { PPS_IMPERSONATION_INFORMATION Impersonation; + PTOKEN OldToken = NULL; + PAGED_CODE(); /* Check if we don't have a token */ if (!Token) @@ -469,52 +460,78 @@ /* Make sure we're impersonating */ if (Thread->ActiveImpersonationInfo) { - /* Disable impersonation and check for token */ - Thread->ActiveImpersonationInfo = FALSE; - if (Thread->ImpersonationInfo->Token) + /* We seem to be, lock the thread */ + PspLockThreadSecurityExclusive(Thread); + + /* Make sure we're still impersonating */ + if (Thread->ActiveImpersonationInfo) { - /* Dereference it */ - ObDereferenceObject(Thread->ImpersonationInfo->Token); + /* Disable impersonation */ + InterlockedAnd(&Thread->CrossThreadFlags, + ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + + /* Get the token */ + OldToken = Thread->ImpersonationInfo->Token; } - } - - /* Return success */ - return STATUS_SUCCESS; - } - - /* Check if we have active impersonation */ - if (Thread->ActiveImpersonationInfo) - { - /* Reuse the block and reference the token */ + + /* Unlock the process */ + PspUnlockThreadSecurityExclusive(Thread); + } + } + else + { + /* Check if we have impersonation info */ Impersonation = Thread->ImpersonationInfo; - if (Impersonation->Token) ObDereferenceObject(Impersonation->Token); - } - else if (Thread->ImpersonationInfo) - { - /* It's not active, but we can still reuse the block */ - Impersonation = Thread->ImpersonationInfo; - } - else - { - /* We need to allocate a new one */ - Impersonation = ExAllocatePoolWithTag(PagedPool, - sizeof(*Impersonation), - TAG_PS_IMPERSONATION); - if (!Impersonation) return STATUS_INSUFFICIENT_RESOURCES; - - /* Update the pointer */ - Thread->ImpersonationInfo = Impersonation; - } - - /* Now fill it out */ - Impersonation->ImpersonationLevel = ImpersonationLevel; - Impersonation->CopyOnOpen = CopyOnOpen; - Impersonation->EffectiveOnly = EffectiveOnly; - Impersonation->Token = Token; - Thread->ActiveImpersonationInfo = TRUE; - - /* Reference the token and return success */ - ObReferenceObject(Impersonation->Token); + if (!Impersonation) + { + /* We need to allocate a new one */ + Impersonation = ExAllocatePoolWithTag(PagedPool, + sizeof(*Impersonation), + TAG_PS_IMPERSONATION); + if (!Impersonation) return STATUS_INSUFFICIENT_RESOURCES; + + /* Update the pointer */ + if (InterlockedCompareExchangePointer(&Thread->ImpersonationInfo, + Impersonation, + NULL)) + { + /* Someone beat us to it, free our copy */ + ExFreePool(Impersonation); + } + } + + /* Check if this is a job, which we don't support yet */ + if (Thread->ThreadsProcess->Job) KEBUGCHECK(0); + + /* Lock thread security */ + PspLockThreadSecurityExclusive(Thread); + + /* Check if we're impersonating */ + if (Thread->ActiveImpersonationInfo) + { + /* Get the token */ + OldToken = Impersonation->Token; + } + else + { + /* Otherwise, enable impersonation */ + InterlockedOr(&Thread->CrossThreadFlags, + CT_ACTIVE_IMPERSONATION_INFO_BIT); + } + + /* Now fill it out */ + Impersonation->ImpersonationLevel = ImpersonationLevel; + Impersonation->CopyOnOpen = CopyOnOpen; + Impersonation->EffectiveOnly = EffectiveOnly; + Impersonation->Token = Token; + + /* Unlock the thread */ + PspUnlockThreadSecurityExclusive(Thread); + } + + /* Dereference the token and return success */ + ObReferenceObject(Token); + if (OldToken) ObDereferenceObject(OldToken); return STATUS_SUCCESS; } @@ -529,12 +546,13 @@ OUT PSECURITY_IMPERSONATION_LEVEL Level) { PEPROCESS Process; - PACCESS_TOKEN Token; + PACCESS_TOKEN Token = NULL; + PAGED_CODE(); /* Check if we don't have impersonation info */ + Process = Thread->ThreadsProcess; if (!Thread->ActiveImpersonationInfo) { - Process = Thread->ThreadsProcess; *TokenType = TokenPrimary; *EffectiveOnly = FALSE; @@ -556,14 +574,24 @@ } else { - /* Get the token */ - Token = Thread->ImpersonationInfo->Token; - ObReferenceObject(Token); - - /* Return data to caller */ - *TokenType = TokenImpersonation; - *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; - *Level = Thread->ImpersonationInfo->ImpersonationLevel; + /* Lock the Process */ + PspLockProcessSecurityShared(Process); + + /* Make sure impersonation is still active */ + if (Thread->ActiveImpersonationInfo) + { + /* Get the token */ + Token = Thread->ImpersonationInfo->Token; + ObReferenceObject(Token); + + /* Return data to caller */ + *TokenType = TokenImpersonation; + *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; + *Level = Thread->ImpersonationInfo->ImpersonationLevel; + } + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); } /* Return the token */ @@ -580,17 +608,31 @@ OUT PBOOLEAN EffectiveOnly, OUT PSECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { + PTOKEN Token = NULL; + PAGED_CODE(); + /* If we don't have impersonation info, just quit */ if (!Thread->ActiveImpersonationInfo) return NULL; - /* Return data from caller */ - *ImpersonationLevel = Thread->ImpersonationInfo->ImpersonationLevel; - *CopyOnOpen = Thread->ImpersonationInfo->CopyOnOpen; - *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; - - /* Reference the token and return it */ - ObReferenceObject(Thread->ImpersonationInfo->Token); - return Thread->ImpersonationInfo->Token; + /* Lock the thread */ + PspLockThreadSecurityShared(Thread); + + /* Make sure we still have active impersonation */ + if (Thread->ActiveImpersonationInfo) + { + /* Return data from caller */ + ObReferenceObject(Thread->ImpersonationInfo->Token); + *ImpersonationLevel = Thread->ImpersonationInfo->ImpersonationLevel; + *CopyOnOpen = Thread->ImpersonationInfo->CopyOnOpen; + *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; + + /* Set the token */ + Token = Thread->ImpersonationInfo->Token; + } + + /* Unlock thread and return impersonation token */ + PspUnlockThreadSecurityShared(Thread); + return Token; } #undef PsDereferenceImpersonationToken @@ -601,6 +643,8 @@ NTAPI PsDereferenceImpersonationToken(IN PACCESS_TOKEN ImpersonationToken) { + PAGED_CODE(); + /* If we got a token, dereference it */ if (ImpersonationToken) ObDereferenceObject(ImpersonationToken); } @@ -613,6 +657,8 @@ NTAPI PsDereferencePrimaryToken(IN PACCESS_TOKEN PrimaryToken) { + PAGED_CODE(); + /* Dereference the token*/ ObDereferenceObject(PrimaryToken); } @@ -625,29 +671,52 @@ PsDisableImpersonation(IN PETHREAD Thread, IN PSE_IMPERSONATION_STATE ImpersonationState) { - PPS_IMPERSONATION_INFORMATION Impersonation; + PPS_IMPERSONATION_INFORMATION Impersonation = NULL; + LONG NewValue, OldValue; + PAGED_CODE(); /* Check if we don't have impersonation */ - if (!Thread->ActiveImpersonationInfo) - { - /* Clear everything */ - ImpersonationState->Token = NULL; - ImpersonationState->CopyOnOpen = FALSE; - ImpersonationState->EffectiveOnly = FALSE; - ImpersonationState->Level = SecurityAnonymous; - return FALSE; - } - - /* Copy the old state */ - Impersonation = Thread->ImpersonationInfo; - ImpersonationState->Token = Impersonation->Token; - ImpersonationState->CopyOnOpen = Impersonation->CopyOnOpen; - ImpersonationState->EffectiveOnly = Impersonation->EffectiveOnly; - ImpersonationState->Level = Impersonation->ImpersonationLevel; - - /* Disable impersonation and return true */ - Thread->ActiveImpersonationInfo = FALSE; - return TRUE; + if (Thread->ActiveImpersonationInfo) + { + /* Lock thread security */ + PspLockThreadSecurityExclusive(Thread); + + /* Disable impersonation */ + OldValue = Thread->CrossThreadFlags; + do + { + /* Attempt to change the flag */ + NewValue = + InterlockedCompareExchange(&Thread->CrossThreadFlags, + OldValue &~ + CT_ACTIVE_IMPERSONATION_INFO_BIT, + OldValue); + } while (NewValue != OldValue); + + /* Did someone disable behind our back? */ + if (!(NewValue & CT_ACTIVE_IMPERSONATION_INFO_BIT)) + { + /* Copy the old state */ + Impersonation = Thread->ImpersonationInfo; + ImpersonationState->Token = Impersonation->Token; + ImpersonationState->CopyOnOpen = Impersonation->CopyOnOpen; + ImpersonationState->EffectiveOnly = Impersonation->EffectiveOnly; + ImpersonationState->Level = Impersonation->ImpersonationLevel; + } + + /* Unlock thread security */ + PspUnlockThreadSecurityExclusive(Thread); + + /* If we had impersonation info, return true */ + if (Impersonation) return TRUE; + } + + /* Clear everything */ + ImpersonationState->Token = NULL; + ImpersonationState->CopyOnOpen = FALSE; + ImpersonationState->EffectiveOnly = FALSE; + ImpersonationState->Level = SecurityAnonymous; + return FALSE; } /* @@ -658,15 +727,47 @@ PsRestoreImpersonation(IN PETHREAD Thread, IN PSE_IMPERSONATION_STATE ImpersonationState) { - /* Call the impersonation API */ - PsImpersonateClient(Thread, - ImpersonationState->Token, - ImpersonationState->CopyOnOpen, - ImpersonationState->EffectiveOnly, - ImpersonationState->Level); + PTOKEN Token = NULL; + PPS_IMPERSONATION_INFORMATION Impersonation; + PAGED_CODE(); + + /* Lock thread security */ + PspLockThreadSecurityExclusive(Thread); + + /* Get the impersonation info */ + Impersonation = Thread->ImpersonationInfo; + + /* Check if we're impersonating */ + if (Thread->ActiveImpersonationInfo) + { + /* Get the token */ + Token = Impersonation->Token; + } + + /* Check if we have an impersonation state */ + if (ImpersonationState) + { + /* Fill out the impersonation info */ + Impersonation->ImpersonationLevel = ImpersonationState->Level; + Impersonation->CopyOnOpen = ImpersonationState->CopyOnOpen; + Impersonation->EffectiveOnly = ImpersonationState->EffectiveOnly; + Impersonation->Token = ImpersonationState->Token; + + /* Enable impersonation */ + InterlockedOr(&Thread->CrossThreadFlags, CT_ACTIVE_IMPERSONATION_INFO_BIT); + } + else + { + /* Disable impersonation */ + InterlockedAnd(&Thread->CrossThreadFlags, + ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + } + + /* Unlock the thread */ + PspUnlockThreadSecurityExclusive(Thread); /* Dereference the token */ - ObDereferenceObject(ImpersonationState->Token); + if (Token) ObDereferenceObject(Token); } NTSTATUS

1 0

[frik85] 23230: Add software patent setting to build config template. Implement the setting in freetype2 (rbuild file).
by frik85＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: frik85 Date: Sat Jul 22 23:38:18 2006 New Revision: 23230 URL: http://svn.reactos.org/svn/reactos?rev=23230&view=rev Log: Add software patent setting to build config template. Implement the setting in freetype2 (rbuild file). Modified: trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Sat Jul 22 23:38:18 2006 @@ -53,4 +53,13 @@ --> <property name="DBG" value="1" /> + + +<property name="NSWPAT" value="0" /> + </rbuild> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Jul 22 23:38:18 2006 @@ -60,4 +60,13 @@ --> <property name="GDB" value="0" /> + + +<property name="NSWPAT" value="0" /> + </rbuild> Modified: trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/deve… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h (original) +++ trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h Sat Jul 22 23:38:18 2006 @@ -436,7 +436,7 @@ /* Do not #undef this macro here, since the build system might */ /* define it for certain configurations only. */ /* */ -#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER +/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ /*************************************************************************/ Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Sat Jul 22 23:38:18 2006 @@ -6,6 +6,9 @@ <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> <define name="__USE_W32API" /> + <if property="NSWPAT" value="1"> + <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" /> + </if> <library>ntoskrnl</library> <library>hal</library> <directory name="i386">

1 0

[ion] 23229: - Implement KiRecalculateDueTime to handle cases where a timeout wait has been interupted by an APC or alerted, and it needs to be recalculated in the relative case. (This fixes the "contact alex" bugcheck).
by ion＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ion Date: Sat Jul 22 21:19:09 2006 New Revision: 23229 URL: http://svn.reactos.org/svn/reactos?rev=23229&view=rev Log: - Implement KiRecalculateDueTime to handle cases where a timeout wait has been interupted by an APC or alerted, and it needs to be recalculated in the relative case. (This fixes the "contact alex" bugcheck). Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 22 21:19:09 2006 @@ -45,8 +45,5 @@ // - Use pushlocks for handle implementation. // - Figure out why cmd.exe won't close anymore. // -// Ke: -// - Add code for interval recalulation when wait interrupted by an APC -// /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Sat Jul 22 21:19:09 2006 @@ -156,6 +156,24 @@ } // +// Recalculates the due time +// +PLARGE_INTEGER +FORCEINLINE +KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime, + IN PLARGE_INTEGER DueTime, + IN OUT PLARGE_INTEGER NewDueTime) +{ + /* Don't do anything for absolute waits */ + if (OriginalDueTime->QuadPart >= 0) return OriginalDueTime; + + /* Otherwise, query the interrupt time and recalculate */ + NewDueTime->QuadPart = KeQueryInterruptTime(); + NewDueTime->QuadPart -= DueTime->QuadPart; + return NewDueTime; +} + +// // Determines wether a thread should be added to the wait list // #define KiCheckThreadStackSwap(WaitMode, Thread, Swappable) \ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Sat Jul 22 21:19:09 2006 @@ -249,6 +249,8 @@ PKWAIT_BLOCK WaitBlock; PKTIMER Timer; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Timeout; + LARGE_INTEGER DueTime, NewDueTime; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -396,7 +398,15 @@ &Timer->Header.WaitListHead; /* Create Timer */ - KiInsertTimer(Timer, *Timeout); + if (!KiInsertTimer(Timer, *Timeout)) + { + /* FIXME */ + DPRINT1("If you see thie message contact Alex ASAP\n"); + KEBUGCHECK(0); + } + + /* Set timer due time */ + DueTime.QuadPart = Timer->DueTime.QuadPart; } /* Close the loop */ @@ -431,8 +441,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Sat Jul 22 21:19:09 2006 @@ -275,6 +275,8 @@ PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Interval; + LARGE_INTEGER DueTime, NewDueTime; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -334,6 +336,9 @@ WaitStatus = STATUS_SUCCESS; break; } + + /* Save due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; /* Handle Kernel Queues */ if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue); @@ -360,9 +365,10 @@ return WaitStatus; } - /* Check if we had a timeout */ - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Interval = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } /* Acquire again the lock */ @@ -392,6 +398,8 @@ PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + LARGE_INTEGER DueTime, NewDueTime; + PLARGE_INTEGER OriginalDueTime = Timeout; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -506,6 +514,9 @@ WaitStatus = STATUS_TIMEOUT; goto DontWait; } + + /* Set the current due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; } else { @@ -538,8 +549,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } } @@ -583,6 +596,8 @@ ULONG WaitIndex; NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Timeout; + LARGE_INTEGER DueTime, NewDueTime; /* Set the Current Thread */ CurrentThread = KeGetCurrentThread(); @@ -781,6 +796,9 @@ WaitStatus = STATUS_TIMEOUT; goto DontWait; } + + /* Set the current due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; } /* Insert into Object's Wait List*/ @@ -819,8 +837,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } /* Acquire again the lock */

1 0

[turner] 23228: Fix typo.
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 21:03:00 2006 New Revision: 23228 URL: http://svn.reactos.org/svn/reactos?rev=23228&view=rev Log: Fix typo. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 21:03:00 2006 @@ -1592,7 +1592,7 @@ STDCALL GetProgmanWindow(VOID) { - return (HWND)NtUserGetThreadState(THREADSTATE_PROGRAMWINDOW); + return (HWND)NtUserGetThreadState(THREADSTATE_PROGMANWINDOW); } /*

1 0

[turner] 23227: Partially implement: NtUserCallHwndOpt NtUserGetThreadState Implement GetProgmanWindow GetTaskmanWindow This is (kinda)part of bug 1668
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 20:50:23 2006 New Revision: 23227 URL: http://svn.reactos.org/svn/reactos?rev=23227&view=rev Log: Partially implement: NtUserCallHwndOpt NtUserGetThreadState Implement GetProgmanWindow GetTaskmanWindow This is (kinda)part of bug 1668 Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 20:50:23 2006 @@ -1586,25 +1586,23 @@ } /* - * @unimplemented + * @implemented */ HWND STDCALL GetProgmanWindow(VOID) { - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented + return (HWND)NtUserGetThreadState(THREADSTATE_PROGRAMWINDOW); +} + +/* + * @implemented */ HWND STDCALL GetTaskmanWindow(VOID) { - UNIMPLEMENTED; - return FALSE; + return (HWND)NtUserGetThreadState(THREADSTATE_TASKMANWINDOW); } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Jul 22 20:50:23 2006 @@ -8,6 +8,8 @@ { HANDLE hKernelHeap; WCHAR szDesktopName[1]; + HWND hTaskManWindow; + HWND hProgmanWindow; } DESKTOP, *PDESKTOP; typedef struct _CALLPROC @@ -1117,6 +1119,8 @@ #define THREADSTATE_GETTHREADINFO (0) #define THREADSTATE_FOCUSWINDOW (1) #define THREADSTATE_INSENDMESSAGE (2) +#define THREADSTATE_PROGMANWINDOW (3) +#define THREADSTATE_TASKMANWINDOW (4) DWORD NTAPI NtUserGetThreadState( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 22 20:50:23 2006 @@ -856,19 +856,11 @@ switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - /* - * FIXME - * Nothing too hard...validate the hWnd and save it in the Desktop Info - */ - DPRINT1("HWNDOPT_ROUTINE_SETPROGMANWINDOW UNIMPLEMENTED\n"); + GetW32ThreadInfo()->Desktop->hProgmanWindow = Param; break; case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - /* - * FIXME - * Nothing too hard...validate the hWnd and save it in the Desktop Info - */ - DPRINT1("HWNDOPT_ROUTINE_SETTASKMANWINDOW UNIMPLEMENTED\n"); + GetW32ThreadInfo()->Desktop->hTaskManWindow = Param; break; } @@ -902,6 +894,10 @@ case THREADSTATE_FOCUSWINDOW: RETURN( (DWORD)IntGetThreadFocusWindow()); + case THREADSTATE_PROGMANWINDOW: + RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hProgmanWindow); + case THREADSTATE_TASKMANWINDOW: + RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hTaskManWindow); } RETURN( 0);

1 0

[ion] 23226: - Give winlogon SE_ASSIGNPRIMARYTOKEN_PRIVILEGE because it was lacking it and would fail under this kernel patch. - PspAssignPrimaryToken was good enough for actually *assigning* the token, but when NtSetInfoProcess is called with ProcessPrimaryToken, we want to do a lot more then just randomly assigning it. Added PspSetPrimaryToken which first verifies if the token being assigned is a child token and if not, checks for SeAssignPrimaryTokenPrivilege. Also added a fixme for more code
by ion＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ion Date: Sat Jul 22 20:03:12 2006 New Revision: 23226 URL: http://svn.reactos.org/svn/reactos?rev=23226&view=rev Log: - Give winlogon SE_ASSIGNPRIMARYTOKEN_PRIVILEGE because it was lacking it and would fail under this kernel patch. - PspAssignPrimaryToken was good enough for actually *assigning* the token, but when NtSetInfoProcess is called with ProcessPrimaryToken, we want to do a lot more then just randomly assigning it. Added PspSetPrimaryToken which first verifies if the token being assigned is a child token and if not, checks for SeAssignPrimaryTokenPrivilege. Also added a fixme for more code that's needed, to actually re-calculate the process's granted access towards itself. Also added thread-safety. Modified: trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Sat Jul 22 20:03:12 2006 @@ -534,6 +534,7 @@ LPSTR lpCmdLine, int nShowCmd) { + BOOLEAN Old; #if SUPPORT_CONSOLESTART // WCHAR LoginName[255]; // WCHAR Password[255]; @@ -554,6 +555,9 @@ ExitProcess(0); return 0; } + + /* Get privilege */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); #if START_LSASS if (StartProcess(L"StartLsass")) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Sat Jul 22 20:03:12 2006 @@ -33,6 +33,7 @@ #include <winwlx.h> #include <rtlfuncs.h> #include <exfuncs.h> +#include <setypes.h> #include <reactos/winlogon.h> Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sat Jul 22 20:03:12 2006 @@ -59,10 +59,11 @@ ); NTSTATUS -STDCALL -PspAssignPrimaryToken( - PEPROCESS Process, - HANDLE TokenHandle +NTAPI +PspSetPrimaryToken( + IN PEPROCESS Process, + IN HANDLE TokenHandle OPTIONAL, + IN PTOKEN Token OPTIONAL ); PETHREAD Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h Sat Jul 22 20:03:12 2006 @@ -130,6 +130,13 @@ ); NTSTATUS +NTAPI +SeIsTokenChild( + IN PTOKEN Token, + OUT PBOOLEAN IsChild +); + +NTSTATUS STDCALL SepCreateImpersonationTokenDacl( PTOKEN Token, Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Jul 22 20:03:12 2006 @@ -581,7 +581,7 @@ if (!NT_SUCCESS(Status)) break; /* Assign the actual token */ - Status = PspAssignPrimaryToken(Process, TokenHandle); + Status = PspSetPrimaryToken(Process, TokenHandle, NULL); break; /* Hard error processing */ Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sat Jul 22 20:03:12 2006 @@ -25,7 +25,7 @@ KeEnterCriticalRegion(); /* Lock the Process */ - //ExAcquirePushLockShared(&Process->ProcessLock); + ExAcquirePushLockShared(&Process->ProcessLock); } /* FIXME: Turn into Macro */ @@ -34,7 +34,31 @@ PspUnlockProcessSecurityShared(IN PEPROCESS Process) { /* Unlock the Process */ - //ExReleasePushLockShared(&Process->ProcessLock); + ExReleasePushLockShared(&Process->ProcessLock); + + /* Leave Critical Region */ + KeLeaveCriticalRegion(); +} + +/* FIXME: Turn into Macro */ +VOID +NTAPI +PspLockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Process */ + ExAcquirePushLockExclusive(&Process->ProcessLock); +} + +/* FIXME: Turn into Macro */ +VOID +NTAPI +PspUnlockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Unlock the Process */ + ExReleasePushLockExclusive(&Process->ProcessLock); /* Leave Critical Region */ KeLeaveCriticalRegion(); @@ -119,25 +143,89 @@ NTSTATUS NTAPI PspAssignPrimaryToken(IN PEPROCESS Process, - IN HANDLE TokenHandle) -{ - PACCESS_TOKEN Token, OldToken; + IN PTOKEN Token) +{ + PACCESS_TOKEN OldToken; NTSTATUS Status; - - /* Reference the Token */ - Status = ObReferenceObjectByHandle(TokenHandle, - TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, - KeGetPreviousMode(), - (PVOID*)&Token, - NULL); - if (!NT_SUCCESS(Status)) return Status; + PAGED_CODE(); + + /* Lock the process */ + PspLockProcessSecurityExclusive(Process); /* Exchange them */ Status = SeExchangePrimaryToken(Process, Token, &OldToken); - /* Derefernece Tokens and Return */ + /* Release the lock */ + PspUnlockProcessSecurityExclusive(Process); + + /* Dereference Tokens and Return */ + if (NT_SUCCESS(Status)) ObDereferenceObject(OldToken); ObDereferenceObject(Token); + return Status; +} + +NTSTATUS +NTAPI +PspSetPrimaryToken(IN PEPROCESS Process, + IN HANDLE TokenHandle OPTIONAL, + IN PTOKEN Token OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN IsChild; + NTSTATUS Status; + + /* Make sure we got a handle */ + if (TokenHandle) + { + /* Reference it */ + Status = ObReferenceObjectByHandle(TokenHandle, + TOKEN_ASSIGN_PRIMARY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Check if this is a child */ + Status = SeIsTokenChild(Token, &IsChild); + if (!NT_SUCCESS(Status)) + { + /* Failed, dereference */ + if (TokenHandle) ObDereferenceObject(Token); + return Status; + } + + /* Check if this was an independent token */ + if (!IsChild) + { + /* Make sure we have the privilege to assign a new one */ + if (!SeSinglePrivilegeCheck(SeAssignPrimaryTokenPrivilege, + PreviousMode)) + { + /* Failed, dereference */ + if (TokenHandle) ObDereferenceObject(Token); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + /* Assign the token */ + Status = PspAssignPrimaryToken(Process, Token); + if (NT_SUCCESS(Status)) + { + /* + * The idea here is that we need to completely reverify + * if the process still has access to itself under this new + * token, by doing an SeAccessCheck with the Primary Token and + * the SD of the Process (ObGetObjectSecurity). + * In the really twisted case where we lose access to ourselves, + * we would set Process->GrantedAccess to 0. + */ + DPRINT1("Process security not complete\n"); + } + + /* Dereference the token */ + if (TokenHandle) ObDereferenceObject(Token); return Status; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Sat Jul 22 20:03:12 2006 @@ -366,6 +366,36 @@ /* Return status */ return Status; +} + +NTSTATUS +NTAPI +SeIsTokenChild(IN PTOKEN Token, + OUT PBOOLEAN IsChild) +{ + PTOKEN ProcessToken; + LUID ProcessLuid, CallerLuid; + + /* Assume failure */ + *IsChild = FALSE; + + /* Reference the process token */ + ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + + /* Get the ID */ + ProcessLuid = ProcessToken->TokenId; + + /* Dereference the token */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); + + /* Get our LUID */ + CallerLuid = Token->TokenId; + + /* Compare the LUIDs */ + if (RtlEqualLuid(&CallerLuid, &ProcessLuid)) *IsChild = TRUE; + + /* Return success */ + return STATUS_SUCCESS; } /*

1 0

[ekohl] 23225: Implement CM_Get_Next_Log_Conf[_Ex] and add PNP_GetNextLogConf stub.
by ekohl＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ekohl Date: Sat Jul 22 18:45:14 2006 New Revision: 23225 URL: http://svn.reactos.org/svn/reactos?rev=23225&view=rev Log: Implement CM_Get_Next_Log_Conf[_Ex] and add PNP_GetNextLogConf stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sat Jul 22 18:45:14 2006 @@ -1284,7 +1284,7 @@ } -/* Function 42 */ +/* Function 44 */ CONFIGRET PNP_GetFirstLogConf(handle_t BindingHandle, wchar_t *DeviceInstance, @@ -1299,6 +1299,27 @@ *pulLogConfTag = 0; /* FIXME */ DPRINT1("PNP_GetFirstLogConf() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 45 */ +CONFIGRET +PNP_GetNextLogConf(handle_t BindingHandle, + wchar_t *DeviceInstance, + ULONG ulLogConfType, + ULONG ulCurrentTag, + ULONG *pulNextTag, + ULONG ulFlags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_GetNextLogConf() called\n"); + + *pulNextTag = 0; /* FIXME */ + + DPRINT1("PNP_GetNextLogConf() done (returns %lx)\n", ret); return ret; } Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sat Jul 22 18:45:14 2006 @@ -25,14 +25,12 @@ ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA @@ -133,8 +131,8 @@ ;CM_Get_Hardware_Profile_Info_ExW ;CM_Get_Log_Conf_Priority ;CM_Get_Log_Conf_Priority_Ex -;CM_Get_Next_Log_Conf -;CM_Get_Next_Log_Conf_Ex +CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf +CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex ;CM_Get_Next_Res_Des ;CM_Get_Next_Res_Des_Ex CM_Get_Parent=SETUPAPI.CM_Get_Parent Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sat Jul 22 18:45:14 2006 @@ -2159,6 +2159,91 @@ return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName, ulHardwareProfile, pulValue, 0); +} + + +/*********************************************************************** + * CM_Get_Next_Log_Conf [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Log_Conf( + PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", plcLogConf, lcLogConf, ulFlags); + return CM_Get_Next_Log_Conf_Ex(plcLogConf, lcLogConf, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Next_Log_Conf_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( + PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags, + HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + PLOG_CONF_INFO pLogConfInfo; + PLOG_CONF_INFO pNewLogConfInfo; + ULONG ulNewTag; + LPWSTR lpDevInst; + CONFIGRET ret; + + FIXME("%p %p %lx %lx\n", plcLogConf, lcLogConf, ulFlags, hMachine); + + if (plcLogConf) + *plcLogConf = 0; + + pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; + if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + return CR_INVALID_LOG_CONF; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_GetNextLogConf(BindingHandle, + lpDevInst, + pLogConfInfo->ulFlags, + pLogConfInfo->ulTag, + &ulNewTag, + 0); + if (ret != CR_SUCCESS) + return ret; + + if (plcLogConf) + { + pNewLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO)); + if (pNewLogConfInfo == NULL) + return CR_OUT_OF_MEMORY; + + pNewLogConfInfo->ulMagic = LOG_CONF_MAGIC; + pNewLogConfInfo->dnDevInst = pLogConfInfo->dnDevInst; + pNewLogConfInfo->ulFlags = pLogConfInfo->ulFlags; + pNewLogConfInfo->ulTag = ulNewTag; + + *plcLogConf = (LOG_CONF)pNewLogConfInfo; + } + + return CR_SUCCESS; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sat Jul 22 18:45:14 2006 @@ -111,8 +111,8 @@ @ stub CM_Get_Hardware_Profile_Info_ExW @ stub CM_Get_Log_Conf_Priority @ stub CM_Get_Log_Conf_Priority_Ex -@ stub CM_Get_Next_Log_Conf -@ stub CM_Get_Next_Log_Conf_Ex +@ stdcall CM_Get_Next_Log_Conf(ptr ptr long) +@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) @ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex @ stdcall CM_Get_Parent(ptr long long) Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Sat Jul 22 18:45:14 2006 @@ -219,6 +219,14 @@ [out] ULONG *pulLogConfTag, [in] ULONG ulFlags); + /* Function 45 */ + CONFIGRET PNP_GetNextLogConf(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] ULONG ulLogConfType, + [in] ULONG ulCurrentTag, + [out] ULONG *pulNextTag, + [in] ULONG ulFlags); + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, [in] unsigned long Flags); Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sat Jul 22 18:45:14 2006 @@ -307,6 +307,8 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( DEVINSTID_A, ULONG, PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( DEVINSTID_W, ULONG, PULONG, ULONG, HMACHINE ); #define CM_Get_HW_Prof_Flags_Ex WINELIB_NAME_AW(CM_Get_HW_Prof_Flags_Ex) +CONFIGRET WINAPI CM_Get_Next_Log_Conf( PLOG_CONF, LOG_CONF, ULONG ); +CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( PLOG_CONF, LOG_CONF, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Sibling( PDEVINST, DEVINST, ULONG );

1 0

[jimtabor] 23224: Fix for TrackMouseEvent by Dmitry Timoshkov, wine port.
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 11:04:44 2006 New Revision: 23224 URL: http://svn.reactos.org/svn/reactos?rev=23224&view=rev Log: Fix for TrackMouseEvent by Dmitry Timoshkov, wine port. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Sat Jul 22 11:04:44 2006 @@ -38,11 +38,10 @@ typedef struct __TRACKINGLIST { TRACKMOUSEEVENT tme; POINT pos; /* center of hover rectangle */ - INT iHoverTime; /* elapsed time the cursor has been inside of the hover rect */ } _TRACKINGLIST; -static _TRACKINGLIST TrackingList[10]; -static int iTrackMax = 0; +/* FIXME: move tracking stuff into a per thread data */ +static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ @@ -715,113 +714,96 @@ return ret; } - static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { - int i = 0; POINT pos; POINT posClient; HWND hwnd; - INT nonclient; INT hoverwidth = 0, hoverheight = 0; RECT client; GetCursorPos(&pos); hwnd = WindowFromPoint(pos); - SystemParametersInfoA(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); - SystemParametersInfoA(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); - - /* loop through tracking events we are processing */ - while (i < iTrackMax) { - if (TrackingList[i].tme.dwFlags & TME_NONCLIENT) { - nonclient = 1; +// SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); + hoverwidth = 4; +// SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); + hoverheight = 4; + + /* see if this tracking event is looking for TME_LEAVE and that the */ + /* mouse has left the window */ + if (tracking_info.tme.dwFlags & TME_LEAVE) + { + if (tracking_info.tme.hwndTrack != hwnd) + { + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + else + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } - else { - nonclient = 0; - } - - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (TrackingList[i].tme.dwFlags & TME_LEAVE) { - if (TrackingList[i].tme.hwndTrack != hwnd) { - if (nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + else + { + GetClientRect(hwnd, &client); + MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); + if (PtInRect(&client, pos)) + { + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + { + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } - else { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - } - - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; } - else { - GetClientRect(hwnd, &client); - MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); - if(PtInRect(&client, pos)) { - if (nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; - } - } - else { - if (!nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; - } + else + { + if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + { + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } } } - - /* see if we are tracking hovering for this hwnd */ - if(TrackingList[i].tme.dwFlags & TME_HOVER) { - /* add the timer interval to the hovering time */ - TrackingList[i].iHoverTime+=iTimerInterval; - - /* has the cursor moved outside the rectangle centered around pos? */ - if((abs(pos.x - TrackingList[i].pos.x) > (hoverwidth / 2.0)) - || (abs(pos.y - TrackingList[i].pos.y) > (hoverheight / 2.0))) - { - /* record this new position as the current position and reset */ - /* the iHoverTime variable to 0 */ - TrackingList[i].pos = pos; - TrackingList[i].iHoverTime = 0; - } - - /* has the mouse hovered long enough? */ - if(TrackingList[i].iHoverTime <= TrackingList[i].tme.dwHoverTime) - { - posClient.x = pos.x; - posClient.y = pos.y; - ScreenToClient(hwnd, &posClient); - if (nonclient) { - PostMessageW(TrackingList[i].tme.hwndTrack, WM_NCMOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - else { - PostMessageW(TrackingList[i].tme.hwndTrack, WM_MOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - - /* stop tracking mouse hover */ - TrackingList[i].tme.dwFlags ^= TME_HOVER; - } + } + + /* see if we are tracking hovering for this hwnd */ + if (tracking_info.tme.dwFlags & TME_HOVER) + { + /* has the cursor moved outside the rectangle centered around pos? */ + if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2.0)) || + (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2.0))) + { + /* record this new position as the current position and reset */ + /* the iHoverTime variable to 0 */ + tracking_info.pos = pos; } - - /* see if we are still tracking TME_HOVER or TME_LEAVE for this entry */ - if((TrackingList[i].tme.dwFlags & TME_HOVER) || - (TrackingList[i].tme.dwFlags & TME_LEAVE)) { - i++; - } else { /* remove this entry from the tracking list */ - TrackingList[i] = TrackingList[--iTrackMax]; + else + { + posClient.x = pos.x; + posClient.y = pos.y; + ScreenToClient(hwnd, &posClient); + + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + get_key_state(), MAKELPARAM( posClient.x, posClient.y )); + else + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + get_key_state(), MAKELPARAM( posClient.x, posClient.y )); + + /* stop tracking mouse hover */ + tracking_info.tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if(iTrackMax == 0) { + if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + memset(&tracking_info, 0, sizeof(tracking_info)); + KillTimer(0, timer); timer = 0; } @@ -857,171 +839,77 @@ TrackMouseEvent( LPTRACKMOUSEEVENT ptme) { - DWORD flags = 0; - int i = 0; - BOOL cancel = 0, hover = 0, leave = 0, query = 0, nonclient = 0, inclient = 0; HWND hwnd; POINT pos; - RECT client; - - - pos.x = 0; - pos.y = 0; - SetRectEmpty(&client); - - DPRINT("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + DWORD hover_time; + + TRACE("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { - DPRINT("wrong TRACKMOUSEEVENT size from app\n"); - SetLastError(ERROR_INVALID_PARAMETER); /* FIXME not sure if this is correct */ + WARN("wrong TRACKMOUSEEVENT size from app\n"); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - flags = ptme->dwFlags; + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ + if (ptme->dwFlags & TME_QUERY ) + { + *ptme = tracking_info.tme; + + return TRUE; /* return here, TME_QUERY is retrieving information */ + } + + if (!IsWindow(ptme->hwndTrack)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + hover_time = ptme->dwHoverTime; /* if HOVER_DEFAULT was specified replace this with the systems current value */ - if(ptme->dwHoverTime == HOVER_DEFAULT) - SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &(ptme->dwHoverTime), 0); + if (hover_time == HOVER_DEFAULT || hover_time == 0) +// SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + hover_time = 400; GetCursorPos(&pos); hwnd = WindowFromPoint(pos); - if ( flags & TME_CANCEL ) { - flags &= ~ TME_CANCEL; - cancel = 1; - } - - if ( flags & TME_HOVER ) { - flags &= ~ TME_HOVER; - hover = 1; - } - - if ( flags & TME_LEAVE ) { - flags &= ~ TME_LEAVE; - leave = 1; - } - - if ( flags & TME_NONCLIENT ) { - flags &= ~ TME_NONCLIENT; - nonclient = 1; - } - - /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if ( flags & TME_QUERY ) { - flags &= ~ TME_QUERY; - query = 1; - i = 0; - - /* Find the tracking list entry with the matching hwnd */ - while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) { - i++; - } - - /* hwnd found, fill in the ptme struct */ - if(i < iTrackMax) - *ptme = TrackingList[i].tme; - else - ptme->dwFlags = 0; - - return TRUE; /* return here, TME_QUERY is retrieving information */ - } - - if ( flags ) - DPRINT("Unknown flag(s) %08lx\n", flags ); - - if(cancel) { - /* find a matching hwnd if one exists */ - i = 0; - - while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) { - i++; - } - - if(i < iTrackMax) { - TrackingList[i].tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); + if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) + FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); + + if (ptme->dwFlags & TME_CANCEL) + { + if (tracking_info.tme.hwndTrack == ptme->hwndTrack) + { + tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); /* if we aren't tracking on hover or leave remove this entry */ - if(!((TrackingList[i].tme.dwFlags & TME_HOVER) || - (TrackingList[i].tme.dwFlags & TME_LEAVE))) + if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - TrackingList[i] = TrackingList[--iTrackMax]; - - if(iTrackMax == 0) { - KillTimer(0, timer); - timer = 0; - } + memset(&tracking_info, 0, sizeof(tracking_info)); + + KillTimer(0, timer); + timer = 0; } } } else { - /* see if hwndTrack isn't the current window */ - if(ptme->hwndTrack != hwnd) { - if(leave) { - if(nonclient) { - PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0); - } - else { - PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0); - } - } - } else { - GetClientRect(ptme->hwndTrack, &client); - MapWindowPoints(ptme->hwndTrack, NULL, (LPPOINT)&client, 2); - if(PtInRect(&client, pos)) { - inclient = 1; - } - if(nonclient && inclient) { - PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0); - return TRUE; - } - else if(!nonclient && !inclient) { - PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0); - return TRUE; - } - - /* See if this hwnd is already being tracked and update the tracking flags */ - for(i = 0; i < iTrackMax; i++) { - if(TrackingList[i].tme.hwndTrack == ptme->hwndTrack) { - TrackingList[i].tme.dwFlags = 0; - - if(hover) { - TrackingList[i].tme.dwFlags |= TME_HOVER; - TrackingList[i].tme.dwHoverTime = ptme->dwHoverTime; - } - - if(leave) - TrackingList[i].tme.dwFlags |= TME_LEAVE; - - if(nonclient) - TrackingList[i].tme.dwFlags |= TME_NONCLIENT; - - /* reset iHoverTime as per winapi specs */ - TrackingList[i].iHoverTime = 0; - - return TRUE; - } - } - - /* if the tracking list is full return FALSE */ - if (iTrackMax == sizeof (TrackingList) / sizeof(*TrackingList)) { - return FALSE; - } - + if (ptme->hwndTrack == hwnd) + { /* Adding new mouse event to the tracking list */ - TrackingList[iTrackMax].tme = *ptme; + tracking_info.tme = *ptme; + tracking_info.tme.dwHoverTime = hover_time; /* Initialize HoverInfo variables even if not hover tracking */ - TrackingList[iTrackMax].iHoverTime = 0; - TrackingList[iTrackMax].pos = pos; - - iTrackMax++; - - if (!timer) { - timer = SetTimer(0, 0, iTimerInterval, TrackMouseEventProc); - } + tracking_info.pos = pos; + + if (!timer) + timer = SetTimer(0, 0, hover_time, TrackMouseEventProc); } } return TRUE; + } /* EOF */

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