Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ion] 23179: - Move ExGetPreviousMode to \ex, it's not a Ps function - Organize thread.c into private/public functions properly. - Do another pass of formatting fixes and function annotation. - Fix a bug in PspSystemStartup. - Properly hold object references towards a thread that's being created. - Set the Thread->GrantedAccess value. - Update NtOpenThread to use an Access State since these work now and Ob respects them, and also add a special hack present on NT: If the SeDEbugPrivilege is prese

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 09:33:03 2006 New Revision: 23179 URL: http://svn.reactos.org/svn/reactos?rev=23179&view=rev Log: - Move ExGetPreviousMode to \ex, it's not a Ps function - Organize thread.c into private/public functions properly. - Do another pass of formatting fixes and function annotation. - Fix a bug in PspSystemStartup. - Properly hold object references towards a thread that's being created. - Set the Thread->GrantedAccess value. - Update NtOpenThread to use an Access State since these work now and Ob respects them, and also add a special hack present on NT: If the SeDEbugPrivilege is present, then the caller will get full thread access regardless of his rights. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 20 09:33:03 2006 @@ -35,6 +35,7 @@ // - Add security calls where necessary. // - Add tracing. // - Fix crash on shutdown due to possibly incorrect win32k uninitailization. +// - Add failure/race checks for thread creation. // // Ob: // - Possible bug in deferred deletion under Cc Rewrite branch. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Jul 20 09:33:03 2006 @@ -22,6 +22,16 @@ VOID MmPrintMemoryStatistic(VOID); /* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +KPROCESSOR_MODE +NTAPI +ExGetPreviousMode (VOID) +{ + return (KPROCESSOR_MODE)PsGetCurrentThread()->Tcb.PreviousMode; +} /* * @unimplemented 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 Thu Jul 20 09:33:03 2006 @@ -192,6 +192,13 @@ IN PVOID Object ); +LONG +FASTCALL +ObReferenceObjectEx( + IN PVOID Object, + IN ULONG Count +); + VOID NTAPI ObpReapObject( Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jul 20 09:33:03 2006 @@ -15,8 +15,6 @@ /* GLOBALS ******************************************************************/ -extern LIST_ENTRY PsActiveProcessHead; -extern PEPROCESS PsIdleProcess; extern PVOID PspSystemDllEntryPoint; extern PVOID PspSystemDllBase; extern PHANDLE_TABLE PspCidTable; @@ -24,12 +22,12 @@ extern ULONG MmReadClusterSize; POBJECT_TYPE PsThreadType = NULL; -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ VOID NTAPI -PspUserThreadStartup(PKSTART_ROUTINE StartRoutine, - PVOID StartContext) +PspUserThreadStartup(IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext) { PETHREAD Thread; PTEB Teb; @@ -109,8 +107,8 @@ VOID NTAPI -PspSystemThreadStartup(PKSTART_ROUTINE StartRoutine, - PVOID StartContext) +PspSystemThreadStartup(IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext) { PETHREAD Thread; @@ -119,7 +117,7 @@ Thread = PsGetCurrentThread(); /* Make sure the thread isn't gone */ - if (!(Thread->Terminated) || !(Thread->DeadThread)) + if (!(Thread->Terminated) && !(Thread->DeadThread)) { /* Call it the Start Routine */ StartRoutine(StartContext); @@ -329,65 +327,68 @@ /* Notify Thread Creation */ PspRunCreateThreadNotifyRoutines(Thread, TRUE); + /* Reference ourselves as a keep-alive */ + ObReferenceObjectEx(Thread, 2); + /* Suspend the Thread if we have to */ if (CreateSuspended) KeSuspendThread(&Thread->Tcb); /* Check if we were already terminated */ - if (Thread->Terminated) - { - /* Force us to wake up to terminate */ - KeForceResumeThread(&Thread->Tcb); - } - - /* Reference ourselves as a keep-alive */ - ObReferenceObject(Thread); + if (Thread->Terminated) KeForceResumeThread(&Thread->Tcb); /* Insert the Thread into the Object Manager */ - Status = ObInsertObject((PVOID)Thread, + Status = ObInsertObject(Thread, NULL, DesiredAccess, 0, NULL, &hThread); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Wrap in SEH to protect against bad user-mode pointers */ _SEH_TRY { /* Return Cid and Handle */ - if(ClientId) *ClientId = Thread->Cid; + if (ClientId) *ClientId = Thread->Cid; *ThreadHandle = hThread; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; } - /* FIXME: SECURITY */ + /* Set the thread access mask */ + Thread->GrantedAccess = THREAD_ALL_ACCESS; /* Dispatch thread */ OldIrql = KeAcquireDispatcherDatabaseLock (); KiReadyThread(&Thread->Tcb); KeReleaseDispatcherDatabaseLock(OldIrql); + /* Dereference it, leaving only the keep-alive */ + ObDereferenceObject(Thread); + /* Return */ return Status; } +/* PUBLIC FUNCTIONS **********************************************************/ + /* * @implemented */ NTSTATUS NTAPI -PsCreateSystemThread(PHANDLE ThreadHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - HANDLE ProcessHandle, - PCLIENT_ID ClientId, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext) +PsCreateSystemThread(OUT PHANDLE ThreadHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE ProcessHandle, + IN PCLIENT_ID ClientId, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext) { PEPROCESS TargetProcess = NULL; HANDLE Handle = ProcessHandle; @@ -429,8 +430,8 @@ KeEnterCriticalRegion(); /* Get the CID Handle Entry */ - if ((CidEntry = ExMapHandleToPointer(PspCidTable, - ThreadId))) + CidEntry = ExMapHandleToPointer(PspCidTable, ThreadId); + if (CidEntry) { /* Get the Process */ FoundThread = CidEntry->Object; @@ -438,7 +439,7 @@ /* Make sure it's really a process */ if (FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) { - /* Reference and return it */ + /* FIXME: Safe Reference and return it */ ObReferenceObject(FoundThread); *Thread = FoundThread; Status = STATUS_SUCCESS; @@ -447,7 +448,7 @@ /* Unlock the Entry */ ExUnlockHandleTableEntry(PspCidTable, CidEntry); } - + /* Return to caller */ KeLeaveCriticalRegion(); return Status; @@ -460,7 +461,7 @@ NTAPI PsGetCurrentThreadId(VOID) { - return(PsGetCurrentThread()->Cid.UniqueThread); + return PsGetCurrentThread()->Cid.UniqueThread; } /* @@ -580,7 +581,7 @@ NTAPI PsIsThreadTerminating(IN PETHREAD Thread) { - return (Thread->Terminated ? TRUE : FALSE); + return Thread->Terminated ? TRUE : FALSE; } /* @@ -588,9 +589,9 @@ */ BOOLEAN NTAPI -PsIsSystemThread(PETHREAD Thread) -{ - return (Thread->SystemThread ? TRUE: FALSE); +PsIsSystemThread(IN PETHREAD Thread) +{ + return Thread->SystemThread ? TRUE: FALSE; } /* @@ -598,7 +599,7 @@ */ BOOLEAN NTAPI -PsIsThreadImpersonating(PETHREAD Thread) +PsIsThreadImpersonating(IN PETHREAD Thread) { return Thread->ActiveImpersonationInfo; } @@ -608,8 +609,8 @@ */ VOID NTAPI -PsSetThreadHardErrorsAreDisabled(PETHREAD Thread, - BOOLEAN HardErrorsAreDisabled) +PsSetThreadHardErrorsAreDisabled(IN PETHREAD Thread, + IN BOOLEAN HardErrorsAreDisabled) { Thread->HardErrorsAreDisabled = HardErrorsAreDisabled; } @@ -619,8 +620,8 @@ */ VOID NTAPI -PsSetThreadWin32Thread(PETHREAD Thread, - PVOID Win32Thread) +PsSetThreadWin32Thread(IN PETHREAD Thread, + IN PVOID Win32Thread) { Thread->Tcb.Win32Thread = Win32Thread; } @@ -629,7 +630,7 @@ NTAPI NtCreateThread(OUT PHANDLE ThreadHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN HANDLE ProcessHandle, OUT PCLIENT_ID ClientId, IN PCONTEXT ThreadContext, @@ -703,39 +704,41 @@ NtOpenThread(OUT PHANDLE ThreadHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode; + IN PCLIENT_ID ClientId OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); CLIENT_ID SafeClientId; ULONG Attributes = 0; HANDLE hThread = NULL; NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread; BOOLEAN HasObjectName = FALSE; - + ACCESS_STATE AccessState; + AUX_DATA AuxData; PAGED_CODE(); - PreviousMode = KeGetPreviousMode(); - - /* Probe the paraemeters */ - if(PreviousMode != KernelMode) - { + /* Check if we were called from user mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the thread handle */ ProbeForWriteHandle(ThreadHandle); - if(ClientId != NULL) + /* Check for a CID structure */ + if (ClientId) { - ProbeForRead(ClientId, - sizeof(CLIENT_ID), - sizeof(ULONG)); - + /* Probe and capture it */ + ProbeForRead(ClientId, sizeof(CLIENT_ID), sizeof(ULONG)); SafeClientId = *ClientId; ClientId = &SafeClientId; } - /* just probe the object attributes structure, don't capture it - completely. This is done later if necessary */ + /* + * Just probe the object attributes structure, don't capture it + * completely. This is done later if necessary + */ ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); @@ -744,22 +747,47 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; } else { + /* Otherwise just get the data directly */ HasObjectName = (ObjectAttributes->ObjectName != NULL); Attributes = ObjectAttributes->Attributes; } - - if (HasObjectName && ClientId != NULL) - { - /* can't pass both, n object name and a client id */ - return STATUS_INVALID_PARAMETER_MIX; + + /* Can't pass both, fail */ + if ((HasObjectName) && (ClientId)) return STATUS_INVALID_PARAMETER_MIX; + + /* Create an access state */ + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &PsProcessType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if this is a debugger */ + if (SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) + { + /* Did he want full access? */ + if (AccessState.RemainingDesiredAccess & MAXIMUM_ALLOWED) + { + /* Give it to him */ + AccessState.PreviouslyGrantedAccess |= THREAD_ALL_ACCESS; + } + else + { + /* Otherwise just give every other access he could want */ + AccessState.PreviouslyGrantedAccess |= + AccessState.RemainingDesiredAccess; + } + + /* The caller desires nothing else now */ + AccessState.RemainingDesiredAccess = 0; } /* Open by name if one was given */ @@ -769,10 +797,13 @@ Status = ObOpenObjectByName(ObjectAttributes, PsThreadType, PreviousMode, - NULL, - DesiredAccess, + &AccessState, + 0, NULL, &hThread); + + /* Get rid of the access state */ + SeDeleteAccessState(&AccessState); } else if (ClientId) { @@ -780,35 +811,38 @@ if (ClientId->UniqueProcess) { /* Get the Process */ - Status = PsLookupProcessThreadByCid(ClientId, - NULL, - &Thread); + Status = PsLookupProcessThreadByCid(ClientId, NULL, &Thread); } else { /* Get the Process */ - Status = PsLookupThreadByThreadId(ClientId->UniqueThread, - &Thread); - } - - /* Fail if we didn't find anything */ - if(!NT_SUCCESS(Status)) return Status; + Status = PsLookupThreadByThreadId(ClientId->UniqueThread, &Thread); + } + + /* Check if we didn't find anything */ + if (!NT_SUCCESS(Status)) + { + /* Get rid of the access state and return */ + SeDeleteAccessState(&AccessState); + return Status; + } /* Open the Thread Object */ Status = ObOpenObjectByPointer(Thread, Attributes, - NULL, - DesiredAccess, + &AccessState, + 0, PsThreadType, PreviousMode, &hThread); - /* Dereference the thread */ + /* Delete the access state and dereference the thread */ + SeDeleteAccessState(&AccessState); ObDereferenceObject(Thread); } else { - /* neither an object name nor a client id was passed */ + /* Neither an object name nor a client id was passed */ return STATUS_INVALID_PARAMETER_MIX; } @@ -823,6 +857,7 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -832,22 +867,15 @@ return Status; } +/* + * @implemented + */ NTSTATUS NTAPI NtYieldExecution(VOID) { KiDispatchThread(Ready); - return(STATUS_SUCCESS); -} - -/* - * @implemented - */ -KPROCESSOR_MODE -NTAPI -ExGetPreviousMode (VOID) -{ - return (KPROCESSOR_MODE)PsGetCurrentThread()->Tcb.PreviousMode; + return STATUS_SUCCESS; } /* EOF */

18 years, 5 months

[ion] 23178: - More kernel fun.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 07:10:32 2006 New Revision: 23178 URL: http://svn.reactos.org/svn/reactos?rev=23178&view=rev Log: - More kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 20 07:10:32 2006 @@ -9,20 +9,20 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Io: -// - Add support for Fast Dispatch I/O. -// - Verify ShareAccess APIs, XP added some new semantics. -// - Add Access Checks in IopParseDevice. -// - Add validation checks in IoCreateFile. -// - Fix double-reference in IopCreateFile. -// - Add tracing to file.c -// - See why queueing IRPs and cancelling them causes crashes -// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). -// - Add a generic Cleanup/Exception Routine (iofunc). -// - Add probe/alignment checks for Query/Set routines. -// - Add another parameter to IopCleanupFailedIrp. -// - Add support for Fast Dispatch I/O. -// - Add support for some fast-paths when querying/setting data. -// - Add tracing to iofunc.c +// - Add support for Fast Dispatch I/O. +// - Verify ShareAccess APIs, XP added some new semantics. +// - Add Access Checks in IopParseDevice. +// - Add validation checks in IoCreateFile. +// - Fix double-reference in IopCreateFile. +// - Add tracing to file.c +// - See why queueing IRPs and cancelling them causes crashes +// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). +// - Add a generic Cleanup/Exception Routine (iofunc). +// - Add probe/alignment checks for Query/Set routines. +// - Add another parameter to IopCleanupFailedIrp. +// - Add support for Fast Dispatch I/O. +// - Add support for some fast-paths when querying/setting data. +// - Add tracing to iofunc.c // // Ps: // - Use Process Rundown. @@ -34,8 +34,10 @@ // - Generate process cookie for user-more thread. // - Add security calls where necessary. // - Add tracing. +// - Fix crash on shutdown due to possibly incorrect win32k uninitailization. // // Ob: +// - Possible bug in deferred deletion under Cc Rewrite branch. // - Add Directory Lock. // - Use Object Type Mutex/Lock. // - Implement handle database if anyone needs it. @@ -45,4 +47,7 @@ // - 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 +// ///////////////////////////////////////////////////////////////////////////////

18 years, 5 months

[ion] 23177: [AUDIT] - PspGetImagePath: internal to ROS and reads the image path pretty differently from how NT does it. - NtQuery/Set functions: although huge in size, they are just a set of 2-10 line sub-functions which only transfer data from EPROCESS into a usermode structure or vice-versa. Fully documented in Nebett's book, and we have many test cases in the tree which show their clean implementation. - Also, our nice automatgic buffer validation and size checks are 100% Thomas's genius and

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 07:09:40 2006 New Revision: 23177 URL: http://svn.reactos.org/svn/reactos?rev=23177&view=rev Log: [AUDIT] - PspGetImagePath: internal to ROS and reads the image path pretty differently from how NT does it. - NtQuery/Set functions: although huge in size, they are just a set of 2-10 line sub-functions which only transfer data from EPROCESS into a usermode structure or vice-versa. Fully documented in Nebett's book, and we have many test cases in the tree which show their clean implementation. - Also, our nice automatgic buffer validation and size checks are 100% Thomas's genius and not used in NT at all. - Thus, file is clean. Modified: trunk/reactos/ntoskrnl/ps/query.c (props changed) Propchange: trunk/reactos/ntoskrnl/ps/query.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[ion] 23176: - Formatting cleanup and optimizations to NtSetInformationProcess.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 07:05:46 2006 New Revision: 23176 URL: http://svn.reactos.org/svn/reactos?rev=23176&view=rev Log: - Formatting cleanup and optimizations to NtSetInformationProcess. Modified: trunk/reactos/ntoskrnl/ps/query.c 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 Thu Jul 20 07:05:46 2006 @@ -465,7 +465,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -477,7 +477,11 @@ PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ACCESS_MASK Access; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; + HANDLE PortHandle = NULL; + HANDLE TokenHandle = NULL; + PROCESS_SESSION_INFORMATION SessionInfo; + PEPORT ExceptionPort; PAGED_CODE(); /* Verify Information Class validity */ @@ -487,234 +491,200 @@ ProcessInformation, ProcessInformationLength, PreviousMode); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status); - return Status; - } - - switch(ProcessInformationClass) - { - case ProcessSessionInformation: - Access = PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID; - break; - case ProcessExceptionPort: - Access = PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME; - break; - - default: - Access = PROCESS_SET_INFORMATION; - break; - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Check what class this is */ + Access = PROCESS_SET_INFORMATION; + if (ProcessInformationClass == ProcessSessionInformation) + { + /* Setting the Session ID needs a special mask */ + Access |= PROCESS_SET_SESSIONID; + } + else if (ProcessInformationClass == ProcessExceptionPort) + { + /* Setting the exception port needs a special mask */ + Access |= PROCESS_SUSPEND_RESUME; + } + + /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, Access, PsProcessType, PreviousMode, (PVOID*)&Process, NULL); - if (!NT_SUCCESS(Status)) return(Status); - + if (!NT_SUCCESS(Status)) return Status; + + /* Check what kind of information class this is */ switch (ProcessInformationClass) { + /* Quotas and priorities: not implemented */ case ProcessQuotaLimits: case ProcessBasePriority: case ProcessRaisePriority: Status = STATUS_NOT_IMPLEMENTED; break; + /* Error/Exception Port */ case ProcessExceptionPort: - { - HANDLE PortHandle = NULL; - - /* make a safe copy of the buffer on the stack */ + + /* Use SEH for capture */ + _SEH_TRY + { + /* Capture the handle */ + PortHandle = *(PHANDLE)ProcessInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Get the LPC Port */ + Status = ObReferenceObjectByHandle(PortHandle, + 0, + LpcPortObjectType, + PreviousMode, + (PVOID)&ExceptionPort, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Lock the process to be thread-safe! */ + Status = PsLockProcess(Process, FALSE); + if(NT_SUCCESS(Status)) + { + /* Make sure we don't already have a port */ + if (!Process->ExceptionPort) + { + /* Save the exception port */ + Process->ExceptionPort = ExceptionPort; + } + else + { + /* We already have one, fail */ + ObDereferenceObject(ExceptionPort); + Status = STATUS_PORT_ALREADY_SET; + } + + /* Unlock the process */ + PsUnlockProcess(Process); + } + else + { + /* Locking failed, dereference the port */ + ObDereferenceObject(ExceptionPort); + } + break; + + /* Security Token */ + case ProcessAccessToken: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Save the token handle */ + TokenHandle = ((PPROCESS_ACCESS_TOKEN)ProcessInformation)-> + Token; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Assign the actual token */ + Status = PspAssignPrimaryToken(Process, TokenHandle); + break; + + /* Hard error processing */ + case ProcessDefaultHardErrorMode: + + /* Enter SEH for direct buffer read */ + _SEH_TRY + { + /* Update the current mode abd return the previous one */ + InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, + *(PLONG)ProcessInformation); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Session ID */ + case ProcessSessionInformation: + + /* Enter SEH for capture */ + _SEH_TRY + { + /* Capture the caller's buffer */ + SessionInfo = *(PPROCESS_SESSION_INFORMATION)ProcessInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Setting the session id requires the SeTcbPrivilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Can't set the session ID, bail out. */ + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* FIXME - update the session id for the process token */ + Status = PsLockProcess(Process, FALSE); + if (!NT_SUCCESS(Status)) break; + + /* Write the session ID in the EPROCESS */ + Process->Session = SessionInfo.SessionId; + + /* Check if the process also has a PEB */ + if (Process->Peb) + { + /* + * Attach to the process to make sure we're in the right + * context to access the PEB structure + */ + KeAttachProcess(&Process->Pcb); + + /* Enter SEH for write to user-mode PEB */ _SEH_TRY { - PortHandle = *(PHANDLE)ProcessInformation; - Status = STATUS_SUCCESS; + /* Write the session ID */ + Process->Peb->SessionId = SessionInfo.SessionId; } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(NT_SUCCESS(Status)) - { - PEPORT ExceptionPort; - - /* in case we had success reading from the buffer, verify the provided - * LPC port handle - */ - Status = ObReferenceObjectByHandle(PortHandle, - 0, - LpcPortObjectType, - PreviousMode, - (PVOID)&ExceptionPort, - NULL); - if(NT_SUCCESS(Status)) - { - /* lock the process to be thread-safe! */ - - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - /* - * according to "NT Native API" documentation, setting the exception - * port is only permitted once! - */ - if(Process->ExceptionPort == NULL) - { - /* keep the reference to the handle! */ - Process->ExceptionPort = ExceptionPort; - Status = STATUS_SUCCESS; - } - else - { - ObDereferenceObject(ExceptionPort); - Status = STATUS_PORT_ALREADY_SET; - } - PsUnlockProcess(Process); - } - else - { - ObDereferenceObject(ExceptionPort); - } - } - } - break; - } - - case ProcessAccessToken: - { - HANDLE TokenHandle = NULL; - - /* make a safe copy of the buffer on the stack */ - _SEH_TRY - { - TokenHandle = ((PPROCESS_ACCESS_TOKEN)ProcessInformation)->Token; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - /* in case we had success reading from the buffer, perform the actual task */ - Status = PspAssignPrimaryToken(Process, TokenHandle); - } - break; - } - - case ProcessDefaultHardErrorMode: - { - _SEH_TRY - { - InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, - *(PLONG)ProcessInformation); - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessSessionInformation: - { - PROCESS_SESSION_INFORMATION SessionInfo; - Status = STATUS_SUCCESS; - - RtlZeroMemory(&SessionInfo, sizeof(SessionInfo)); - - _SEH_TRY - { - /* copy the structure to the stack */ - SessionInfo = *(PPROCESS_SESSION_INFORMATION)ProcessInformation; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - /* we successfully copied the structure to the stack, continue processing */ - - /* - * setting the session id requires the SeTcbPrivilege! - */ - if(!SeSinglePrivilegeCheck(SeTcbPrivilege, - PreviousMode)) - { - DPRINT1("NtSetInformationProcess: Caller requires the SeTcbPrivilege privilege for setting ProcessSessionInformation!\n"); - /* can't set the session id, bail! */ - Status = STATUS_PRIVILEGE_NOT_HELD; - break; - } - - /* FIXME - update the session id for the process token */ - - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - Process->Session = SessionInfo.SessionId; - - /* Update the session id in the PEB structure */ - if(Process->Peb != NULL) - { - /* we need to attach to the process to make sure we're in the right - context to access the PEB structure */ - KeAttachProcess(&Process->Pcb); - - _SEH_TRY - { - /* FIXME: Process->Peb->SessionId = SessionInfo.SessionId; */ - - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - KeDetachProcess(); - } - - PsUnlockProcess(Process); - } - } - break; - } - + /* Detach from the process */ + KeDetachProcess(); + } + + /* Unlock the process */ + PsUnlockProcess(Process); + break; + + /* Priority class: HACK! */ case ProcessPriorityClass: - { - PROCESS_PRIORITY_CLASS ppc; - - _SEH_TRY - { - ppc = *(PPROCESS_PRIORITY_CLASS)ProcessInformation; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - } - - break; - } - + break; + + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: @@ -725,6 +695,7 @@ Status = STATUS_NOT_IMPLEMENTED; break; + /* Supposedly these are invalid...!? verify! */ case ProcessBasicInformation: case ProcessIoCounters: case ProcessTimes: @@ -736,8 +707,10 @@ default: Status = STATUS_INVALID_INFO_CLASS; } + + /* Dereference and return status */ ObDereferenceObject(Process); - return(Status); + return Status; } /* @@ -907,4 +880,5 @@ ObDereferenceObject(Thread); return(Status); } + /* EOF */

18 years, 5 months

[ion] 23175: - Major formatting cleanup and optimizations to NtQueryInformationProcess so that it does not burn the eyes of anyone that might attempt to read it.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 04:13:09 2006 New Revision: 23175 URL: http://svn.reactos.org/svn/reactos?rev=23175&view=rev Log: - Major formatting cleanup and optimizations to NtQueryInformationProcess so that it does not burn the eyes of anyone that might attempt to read it. Modified: trunk/reactos/ntoskrnl/ps/query.c 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 Thu Jul 20 04:13:09 2006 @@ -16,10 +16,65 @@ /* Include Information Class Tables */ #include "internal/ps_i.h" -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +/* FIXME: + * This entire API is messed up because: + * 1) Directly pokes SECTION_OBJECT/FILE_OBJECT without special reffing. + * 2) Ignores SeAuditProcessImageFileName stuff added in XP (and ROS). + * 3) Doesn't use ObQueryNameString. + */ +NTSTATUS +NTAPI +PspGetImagePath(IN PEPROCESS Process, + OUT PUNICODE_STRING DstPath, + IN ULONG ProcessInformationLength) +{ + NTSTATUS Status; + ULONG ImagePathLen = 0; + PROS_SECTION_OBJECT Section; + PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); + + Section = (PROS_SECTION_OBJECT)Process->SectionObject; + if ((Section)&& (Section->FileObject)) + { + /* FIXME - check for SEC_IMAGE and/or SEC_FILE instead + of relying on FileObject being != NULL? */ + SrcBuffer = Section->FileObject->FileName.Buffer; + if (SrcBuffer) ImagePathLen = Section->FileObject->FileName.Length; + } + + if (ProcessInformationLength < (sizeof(UNICODE_STRING) + + ImagePathLen + + sizeof(WCHAR))) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + Status = STATUS_SUCCESS; + _SEH_TRY + { + /* copy the string manually, don't use RtlCopyUnicodeString with DstPath! */ + DstPath->Length = ImagePathLen; + DstPath->MaximumLength = ImagePathLen + sizeof(WCHAR); + DstPath->Buffer = DstBuffer; + if (ImagePathLen) RtlCopyMemory(DstBuffer, SrcBuffer, ImagePathLen); + DstBuffer[ImagePathLen / sizeof(WCHAR)] = L'\0'; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Return status */ + return Status; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -27,11 +82,21 @@ IN PROCESSINFOCLASS ProcessInformationClass, OUT PVOID ProcessInformation, IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL) + OUT PULONG ReturnLength OPTIONAL) { PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + ULONG Length = 0; + PPROCESS_BASIC_INFORMATION ProcessBasicInfo = + (PPROCESS_BASIC_INFORMATION)ProcessInformation; + PKERNEL_USER_TIMES ProcessTime = (PKERNEL_USER_TIMES)ProcessInformation; + ULONG HandleCount; + PPROCESS_SESSION_INFORMATION SessionInfo = + (PPROCESS_SESSION_INFORMATION)ProcessInformation; + PVM_COUNTERS VmCounters = (PVM_COUNTERS)ProcessInformation; + PROCESS_DEVICEMAP_INFORMATION DeviceMap; + ULONG Cookie; PAGED_CODE(); /* Check validity of Information Class */ @@ -42,108 +107,113 @@ ProcessInformationLength, ReturnLength, PreviousMode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryInformationProcess() failed, Status: 0x%x\n", Status); - return Status; - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Check if this isn't the cookie class */ if(ProcessInformationClass != ProcessCookie) { + /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, PsProcessType, PreviousMode, (PVOID*)&Process, NULL); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) return Status; } else if(ProcessHandle != NtCurrentProcess()) { - /* retreiving the process cookie is only allowed for the calling process - itself! XP only allowes NtCurrentProcess() as process handles even if a - real handle actually represents the current process. */ + /* + * Retreiving the process cookie is only allowed for the calling process + * itself! XP only allowes NtCurrentProcess() as process handles even if + * a real handle actually represents the current process. + */ return STATUS_INVALID_PARAMETER; } + /* Check the information class */ switch (ProcessInformationClass) { + /* Basic process information */ case ProcessBasicInformation: - { - PPROCESS_BASIC_INFORMATION ProcessBasicInformationP = - (PPROCESS_BASIC_INFORMATION)ProcessInformation; - - _SEH_TRY - { - ProcessBasicInformationP->ExitStatus = Process->ExitStatus; - ProcessBasicInformationP->PebBaseAddress = Process->Peb; - ProcessBasicInformationP->AffinityMask = Process->Pcb.Affinity; - ProcessBasicInformationP->UniqueProcessId = - (ULONG)Process->UniqueProcessId; - ProcessBasicInformationP->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; - ProcessBasicInformationP->BasePriority = - Process->Pcb.BasePriority; - - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_BASIC_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Write all the information from the EPROCESS/KPROCESS */ + ProcessBasicInfo->ExitStatus = Process->ExitStatus; + ProcessBasicInfo->PebBaseAddress = Process->Peb; + ProcessBasicInfo->AffinityMask = Process->Pcb.Affinity; + ProcessBasicInfo->UniqueProcessId = (ULONG)Process-> + UniqueProcessId; + ProcessBasicInfo->InheritedFromUniqueProcessId = + (ULONG)Process->InheritedFromUniqueProcessId; + ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; + + /* Set return length */ + Length = sizeof(PROCESS_BASIC_INFORMATION); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Quote limits and I/O Counters: not implemented */ case ProcessQuotaLimits: case ProcessIoCounters: Status = STATUS_NOT_IMPLEMENTED; break; + /* Timing */ case ProcessTimes: - { - PKERNEL_USER_TIMES ProcessTimeP = (PKERNEL_USER_TIMES)ProcessInformation; - _SEH_TRY - { - ProcessTimeP->CreateTime = Process->CreateTime; - ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; - ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; - ProcessTimeP->ExitTime = Process->ExitTime; - - if (ReturnLength) - { - *ReturnLength = sizeof(KERNEL_USER_TIMES); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Copy time information from EPROCESS/KPROCESS */ + ProcessTime->CreateTime = Process->CreateTime; + ProcessTime->UserTime.QuadPart = Process->Pcb.UserTime * + 100000LL; + ProcessTime->KernelTime.QuadPart = Process->Pcb.KernelTime * + 100000LL; + ProcessTime->ExitTime = Process->ExitTime; + + /* Set the return length */ + Length = sizeof(KERNEL_USER_TIMES); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Process Debug Port */ case ProcessDebugPort: - { - _SEH_TRY - { - *(PHANDLE)ProcessInformation = (Process->DebugPort != NULL ? (HANDLE)-1 : NULL); - if (ReturnLength) - { - *ReturnLength = sizeof(HANDLE); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return whether or not we have a debug port */ + *(PHANDLE)ProcessInformation = (Process->DebugPort ? + (HANDLE)-1 : NULL); + + /* Set the return length*/ + Length = sizeof(HANDLE); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* LDT, WS and VDM Information: not implemented */ case ProcessLdtInformation: case ProcessWorkingSetWatch: case ProcessWx86Information: @@ -151,278 +221,217 @@ break; case ProcessHandleCount: - { - ULONG HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); - - _SEH_TRY - { - *(PULONG)ProcessInformation = HandleCount; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Count the number of handles this process has */ + HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); + + /* Protect write in SEH */ + _SEH_TRY + { + /* Return the count of handles */ + *(PULONG)ProcessInformation = HandleCount; + + /* Set the return length*/ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Session ID for the process */ case ProcessSessionInformation: - { - PPROCESS_SESSION_INFORMATION SessionInfo = (PPROCESS_SESSION_INFORMATION)ProcessInformation; - - _SEH_TRY - { - SessionInfo->SessionId = Process->Session; - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Enter SEH for write safety */ + _SEH_TRY + { + /* Write back the Session ID */ + SessionInfo->SessionId = Process->Session; + + /* Set the return length */ + Length = sizeof(PROCESS_SESSION_INFORMATION); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* WOW64: Not implemented */ case ProcessWow64Information: - DPRINT1("We currently don't support the ProcessWow64Information information class!\n"); Status = STATUS_NOT_IMPLEMENTED; break; + /* Virtual Memory Statistics */ case ProcessVmCounters: - { - PVM_COUNTERS pOut = (PVM_COUNTERS)ProcessInformation; - - _SEH_TRY - { - pOut->PeakVirtualSize = Process->PeakVirtualSize; - /* - * Here we should probably use VirtualSize.LowPart, but due to - * incompatibilities in current headers (no unnamed union), - * I opted for cast. - */ - pOut->VirtualSize = (ULONG)Process->VirtualSize; - pOut->PageFaultCount = Process->Vm.PageFaultCount; - pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - pOut->WorkingSetSize = Process->Vm.WorkingSetSize; - pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; // TODO: Verify! - pOut->QuotaPagedPoolUsage = Process->QuotaUsage[0]; // TODO: Verify! - pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; // TODO: Verify! - pOut->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; // TODO: Verify! - pOut->PagefileUsage = Process->QuotaUsage[2]; - pOut->PeakPagefileUsage = Process->QuotaPeak[2]; - - if (ReturnLength) - { - *ReturnLength = sizeof(VM_COUNTERS); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Enter SEH for write safety */ + _SEH_TRY + { + /* Return data from EPROCESS */ + VmCounters->PeakVirtualSize = Process->PeakVirtualSize; + VmCounters->VirtualSize = Process->VirtualSize; + VmCounters->PageFaultCount = Process->Vm.PageFaultCount; + VmCounters->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + VmCounters->WorkingSetSize = Process->Vm.WorkingSetSize; + VmCounters->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + VmCounters->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + VmCounters->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + VmCounters->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + VmCounters->PagefileUsage = Process->QuotaUsage[2]; + VmCounters->PeakPagefileUsage = Process->QuotaPeak[2]; + + /* Set the return length */ + *ReturnLength = sizeof(VM_COUNTERS); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Hard Error Processing Mode */ case ProcessDefaultHardErrorMode: - { - PULONG HardErrMode = (PULONG)ProcessInformation; - _SEH_TRY - { - *HardErrMode = Process->DefaultHardErrorProcessing; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Enter SEH for writing back data */ + _SEH_TRY + { + /* Write the current processing mode */ + *(PULONG)ProcessInformation = Process-> + DefaultHardErrorProcessing; + + /* Set the return length */ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Priority Boosting status */ case ProcessPriorityBoost: - { - PULONG BoostEnabled = (PULONG)ProcessInformation; - - _SEH_TRY - { - *BoostEnabled = Process->Pcb.DisableBoost ? FALSE : TRUE; - - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Enter SEH for writing back data */ + _SEH_TRY + { + /* Return boost status */ + *(PULONG)ProcessInformation = Process->Pcb.DisableBoost ? + FALSE : TRUE; + + /* Set the return length */ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* DOS Device Map */ case ProcessDeviceMap: - { - PROCESS_DEVICEMAP_INFORMATION DeviceMap; - - ObQueryDeviceMapInformation(Process, &DeviceMap); - - _SEH_TRY - { - *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - + + /* Query the device map information */ + ObQueryDeviceMapInformation(Process, &DeviceMap); + + /* Enter SEH for writing back data */ + _SEH_TRY + { + *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; + + /* Set the return length */ + Length = sizeof(PROCESS_DEVICEMAP_INFORMATION); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Priority class */ case ProcessPriorityClass: - { - PUSHORT Priority = (PUSHORT)ProcessInformation; - - _SEH_TRY - { - *Priority = Process->PriorityClass; - - if (ReturnLength) - { - *ReturnLength = sizeof(USHORT); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } + + /* Enter SEH for writing back data */ + _SEH_TRY + { + /* Return current priority class */ + *(PUSHORT)ProcessInformation = Process->PriorityClass; + + /* Set the return length */ + Length = sizeof(USHORT); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; case ProcessImageFileName: - { - ULONG ImagePathLen = 0; - PROS_SECTION_OBJECT Section; - PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; - PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); - - Section = (PROS_SECTION_OBJECT)Process->SectionObject; - - if (Section != NULL && Section->FileObject != NULL) - { - /* FIXME - check for SEC_IMAGE and/or SEC_FILE instead - of relying on FileObject being != NULL? */ - SrcBuffer = Section->FileObject->FileName.Buffer; - if (SrcBuffer != NULL) - { - ImagePathLen = Section->FileObject->FileName.Length; - } - } - - if(ProcessInformationLength < sizeof(UNICODE_STRING) + ImagePathLen + sizeof(WCHAR)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - _SEH_TRY - { - /* copy the string manually, don't use RtlCopyUnicodeString with DstPath! */ - DstPath->Length = ImagePathLen; - DstPath->MaximumLength = ImagePathLen + sizeof(WCHAR); - DstPath->Buffer = DstBuffer; - if (ImagePathLen != 0) - { - RtlCopyMemory(DstBuffer, - SrcBuffer, - ImagePathLen); - } - DstBuffer[ImagePathLen / sizeof(WCHAR)] = L'\0'; - - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - break; - } - + + /* Get the image path */ + Status = PspGetImagePath(Process, + (PUNICODE_STRING)ProcessInformation, + ProcessInformationLength); + break; + + /* Per-process security cookie */ case ProcessCookie: - { - ULONG Cookie; - - /* receive the process cookie, this is only allowed for the current - process! */ - - Process = PsGetCurrentProcess(); - - Cookie = Process->Cookie; - if(Cookie == 0) - { - LARGE_INTEGER SystemTime; - ULONG NewCookie; - PKPRCB Prcb; - - /* generate a new cookie */ - - KeQuerySystemTime(&SystemTime); - - Prcb = KeGetCurrentPrcb(); - - NewCookie = Prcb->KeSystemCalls ^ Prcb->InterruptTime ^ - SystemTime.u.LowPart ^ SystemTime.u.HighPart; - - /* try to set the new cookie, return the current one if another thread - set it in the meanwhile */ - Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, - NewCookie, - Cookie); - if(Cookie == 0) - { - /* successfully set the cookie */ - Cookie = NewCookie; - } - } - - _SEH_TRY - { - *(PULONG)ProcessInformation = Cookie; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - break; - } - - /* - * Note: The following 10 information classes are verified to not be - * implemented on NT, and do indeed return STATUS_INVALID_INFO_CLASS; - */ + + /* Get the current process and cookie */ + Process = PsGetCurrentProcess(); + Cookie = Process->Cookie; + if(!Cookie) + { + LARGE_INTEGER SystemTime; + ULONG NewCookie; + PKPRCB Prcb; + + /* Generate a new cookie */ + KeQuerySystemTime(&SystemTime); + Prcb = KeGetCurrentPrcb(); + NewCookie = Prcb->KeSystemCalls ^ Prcb->InterruptTime ^ + SystemTime.u.LowPart ^ SystemTime.u.HighPart; + + /* Set the new cookie or return the current one */ + Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, + NewCookie, + Cookie); + if(!Cookie) Cookie = NewCookie; + + /* Set return length */ + Length = sizeof(ULONG); + } + + /* Enter SEH to protect write */ + _SEH_TRY + { + /* Write back the cookie */ + *(PULONG)ProcessInformation = Cookie; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Not yet implemented, or unknown */ case ProcessBasePriority: case ProcessRaisePriority: case ProcessExceptionPort: @@ -437,6 +446,20 @@ Status = STATUS_INVALID_INFO_CLASS; } + /* Protect write with SEH */ + _SEH_TRY + { + /* Check if caller wanted return length */ + if (ReturnLength) *ReturnLength = Length; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* If we referenced the process, dereference it */ if(ProcessInformationClass != ProcessCookie) ObDereferenceObject(Process); return Status; }

18 years, 5 months

[ion] 23174: - Cleanup the mess in query.c by reformatting the code to remove tab/space confusion and 2-space identation. - Removed the InfoClass tables and got rid of the thread semi-infoclass table. Created a real InfoClass stub table for thread information - Moved info class tables to a new header, ps_i.h - Simplified syntax of info class macros so that sizeof() is done automatically for the type/alignment. - Reformatted the tables completely to present them in a plesing, ordered, readable fa

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 20 03:21:19 2006 New Revision: 23174 URL: http://svn.reactos.org/svn/reactos?rev=23174&view=rev Log: - Cleanup the mess in query.c by reformatting the code to remove tab/space confusion and 2-space identation. - Removed the InfoClass tables and got rid of the thread semi-infoclass table. Created a real InfoClass stub table for thread information - Moved info class tables to a new header, ps_i.h - Simplified syntax of info class macros so that sizeof() is done automatically for the type/alignment. - Reformatted the tables completely to present them in a plesing, ordered, readable fashion. - Added some missing info classes. - Added ARRAYSIZE, RTL_NUMBER_OF(V1/V2) and used them in the info code. - *TEMPORARILY* disable NtQuery/SetThreadInformation until next patch when it can be made to work. Added: trunk/reactos/ntoskrnl/include/internal/ps_i.h Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Thu Jul 20 03:21:19 2006 @@ -85,7 +85,15 @@ #define NOTHING #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define TYPE_ALIGNMENT( t ) FIELD_OFFSET( struct { char x; t test; }, test ) - +#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) +#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) +#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) +#endif +#ifdef ENABLE_RTL_NUMBER_OF_V2 +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V2(A) +#else +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) +#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) #define MINCHAR 0x80 #define MAXCHAR 0x7f #define MINSHORT 0x8000 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 Thu Jul 20 03:21:19 2006 @@ -140,11 +140,20 @@ ULONG Flags; } INFORMATION_CLASS_INFO, *PINFORMATION_CLASS_INFO; -#define ICI_SQ_SAME(Size, Alignment, Flags) \ - { Size, Size, Alignment, Alignment, Flags } - -#define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ - { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } +#define ICI_SQ_SAME(Type, Alignment, Flags) \ + { Type, Type, Alignment, Alignment, Flags } + +#define ICI_SQ(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ + { TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags } + +// +// TEMPORARY +// +#define IQS_SAME(Type, Alignment, Flags) \ + { sizeof(Type), sizeof(Type), sizeof(Alignment), sizeof(Alignment), Flags } + +#define IQS(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ + { sizeof(TypeQuery), sizeof(TypeSet), sizeof(AlignmentQuery), sizeof(AlignmentSet), Flags } static __inline NTSTATUS DefaultSetInfoBufferCheck(UINT Class, Added: trunk/reactos/ntoskrnl/include/internal/ps_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/ps_i.h Thu Jul 20 03:21:19 2006 @@ -1,0 +1,607 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ps_i.h +* PURPOSE: Info Classes for the Process Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Thomas Weidenmueller (w3seek(a)reactos.org) +*/ + +// +// Process Information Classes +// +static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = +{ + /* ProcessBasicInformation */ + IQS_SAME + ( + PROCESS_BASIC_INFORMATION, + ULONG, + ICIF_QUERY + ), + + /* ProcessQuotaLimits */ + IQS_SAME + ( + QUOTA_LIMITS, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessIoCounters */ + IQS_SAME + ( + IO_COUNTERS, + ULONG, + ICIF_QUERY + ), + + /* ProcessVmCounters */ + IQS_SAME + ( + VM_COUNTERS, + ULONG, + ICIF_QUERY + ), + + /* ProcessTimes */ + IQS_SAME + ( + KERNEL_USER_TIMES, + ULONG, + ICIF_QUERY + ), + + /* ProcessBasePriority */ + IQS_SAME + ( + KPRIORITY, + ULONG, + ICIF_SET + ), + + /* ProcessRaisePriority */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_SET + ), + + /* ProcessDebugPort */ + IQS_SAME + ( + HANDLE, + ULONG, + ICIF_QUERY + ), + + /* ProcessExceptionPort */ + IQS_SAME + ( + HANDLE, + ULONG, + ICIF_SET + ), + + /* ProcessAccessToken */ + IQS_SAME + ( + PROCESS_ACCESS_TOKEN, + ULONG, + ICIF_SET + ), + + /* ProcessLdtInformation */ + IQS_SAME + ( + UCHAR, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessLdtSize */ + IQS_SAME + ( + UCHAR, + ULONG, + ICIF_SET + ), + + /* ProcessDefaultHardErrorMode */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessIoPortHandlers */ + IQS_SAME + ( + UCHAR, + ULONG, + ICIF_SET + ), + + /* ProcessPooledUsageAndLimits */ + IQS_SAME + ( + POOLED_USAGE_AND_LIMITS, + ULONG, + ICIF_QUERY + ), + + /* ProcessWorkingSetWatch */ + IQS_SAME + ( + PROCESS_WS_WATCH_INFORMATION, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessUserModeIOPL */ + IQS_SAME + ( + UCHAR, + ULONG, + ICIF_SET + ), + + /* ProcessEnableAlignmentFaultFixup */ + IQS_SAME + ( + BOOLEAN, + ULONG, + ICIF_SET + ), + + /* ProcessPriorityClass */ + IQS_SAME + ( + PROCESS_PRIORITY_CLASS, + USHORT, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessWx86Information */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ProcessHandleCount */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ProcessAffinityMask */ + IQS_SAME + ( + KAFFINITY, + ULONG, + ICIF_SET + ), + + /* ProcessPriorityBoost */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessDeviceMap */ + IQS + ( + RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Query), + RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Set), + ULONG, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessSessionInformation */ + IQS_SAME + ( + PROCESS_SESSION_INFORMATION, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ProcessForegroundInformation */ + IQS_SAME + ( + BOOLEAN, + ULONG, + ICIF_SET + ), + + /* ProcessWow64Information */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ProcessImageFileName */ + IQS_SAME + ( + UNICODE_STRING, + ULONG, + ICIF_QUERY | ICIF_SIZE_VARIABLE + ), + + /* ProcessLUIDDeviceMapsEnabled */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessBreakOnTermination */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessDebugObjectHandle */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessDebugFlags */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessHandleTracing */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessIoPriority */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessExecuteFlags */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessTlsInformation */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessCookie */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessImageInformation */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessCycleTime */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessPagePriority */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), + + /* ProcessInstrumentationCallback */ + IQS_SAME + ( + UCHAR, + UCHAR, + 0 + ), +}; + +// +// Thread Information Classes +// +static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = +{ + /* ThreadBasicInformation */ + IQS_SAME + ( + THREAD_BASIC_INFORMATION, + ULONG, + ICIF_QUERY + ), + + /* ThreadTimes */ + IQS_SAME + ( + KERNEL_USER_TIMES, + ULONG, + ICIF_QUERY + ), + + /* ThreadPriority */ + IQS_SAME + ( + KPRIORITY, + ULONG, + ICIF_QUERY + ), + + /* ThreadBasePriority */ + IQS_SAME + ( + LONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadAffinityMask */ + IQS_SAME + ( + KAFFINITY, + ULONG, + ICIF_QUERY + ), + + /* ThreadImpersonationToken */ + IQS_SAME + ( + HANDLE, + ULONG, + ICIF_QUERY + ), + + /* ThreadDescriptorTableEntry */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadEnableAlignmentFaultFixup */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadEventPair_Reusable */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadQuerySetWin32StartAddress */ + IQS_SAME + ( + PVOID, + ULONG, + ICIF_QUERY | ICIF_SET + ), + + /* ThreadZeroTlsCell */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadPerformanceCount */ + IQS_SAME + ( + LARGE_INTEGER, + ULONG, + ICIF_QUERY + ), + + /* ThreadAmILastThread */ + IQS_SAME + ( + BOOLEAN, + BOOLEAN, + ICIF_QUERY + ), + + /* ThreadIdealProcessor */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadPriorityBoost */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadSetTlsArrayAddress */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadIsIoPending */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadHideFromDebugger */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + + /* ThreadPriorityBoost */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadSetTlsArrayAddress */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadIsIoPending */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadHideFromDebugger */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadBreakOnTermination */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadSwitchLegacyState */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadIsTerminated */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadLastSystemCall */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadIoPriority */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadCycleTime */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadPagePriority */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadActualBasePriority */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), + + /* ThreadTebInformation */ + IQS_SAME + ( + ULONG, + ULONG, + ICIF_QUERY + ), + + /* ThreadCSwitchMon */ + IQS_SAME + ( + UCHAR, + UCHAR, + ICIF_QUERY + ), +}; 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 Thu Jul 20 03:21:19 2006 @@ -1,11 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ps/query.c - * PURPOSE: Set/Query Process/Thread Information APIs - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Created File - * David Welch + * PURPOSE: Process Manager: Thread/Process Query/Set Information + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -14,1339 +13,875 @@ #define NDEBUG #include <internal/debug.h> -/* GLOBALS ******************************************************************/ - -static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = -{ - ICI_SQ_SAME( sizeof(PROCESS_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* ProcessBasicInformation */ - ICI_SQ_SAME( sizeof(QUOTA_LIMITS), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessQuotaLimits */ - ICI_SQ_SAME( sizeof(IO_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessIoCounters */ - ICI_SQ_SAME( sizeof(VM_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessVmCounters */ - ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES), sizeof(ULONG), ICIF_QUERY ), /* ProcessTimes */ - ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(ULONG), ICIF_SET ), /* ProcessBasePriority */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET ), /* ProcessRaisePriority */ - ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY ), /* ProcessDebugPort */ - ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_SET ), /* ProcessExceptionPort */ - ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(ULONG), ICIF_SET ), /* ProcessAccessToken */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessLdtSize */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessIoPortHandlers */ - ICI_SQ_SAME( sizeof(POOLED_USAGE_AND_LIMITS), sizeof(ULONG), ICIF_QUERY ), /* ProcessPooledUsageAndLimits */ - ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessWorkingSetWatch */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessUserModeIOPL */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ - ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessPriorityClass */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWx86Information */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessHandleCount */ - ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(ULONG), ICIF_SET ), /* ProcessAffinityMask */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessPriorityBoost */ - - ICI_SQ(/*Q*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Query), /* ProcessDeviceMap */ - /*S*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Set), - /*Q*/ sizeof(ULONG), - /*S*/ sizeof(ULONG), - ICIF_QUERY | ICIF_SET ), - - ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessForegroundInformation */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWow64Information */ - ICI_SQ_SAME( sizeof(UNICODE_STRING), sizeof(ULONG), ICIF_QUERY | ICIF_SIZE_VARIABLE), /* ProcessImageFileName */ - - /* FIXME */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessLUIDDeviceMapsEnabled */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessBreakOnTermination */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessDebugObjectHandle */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessDebugFlags */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessHandleTracing */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessUnknown33 */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessUnknown34 */ - ICI_SQ_SAME( 0, 1, 0 ), /* ProcessUnknown35 */ - - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY), /* ProcessCookie */ -}; - -/* - * FIXME: - * Remove the Implemented value if all functions are implemented. - */ - -static const struct -{ - BOOLEAN Implemented; - ULONG Size; -} QueryInformationData[MaxThreadInfoClass + 1] = -{ - {TRUE, sizeof(THREAD_BASIC_INFORMATION)}, // ThreadBasicInformation - {TRUE, sizeof(KERNEL_USER_TIMES)}, // ThreadTimes - {TRUE, 0}, // ThreadPriority - {TRUE, 0}, // ThreadBasePriority - {TRUE, 0}, // ThreadAffinityMask - {TRUE, 0}, // ThreadImpersonationToken - {FALSE, 0}, // ThreadDescriptorTableEntry - {TRUE, 0}, // ThreadEnableAlignmentFaultFixup - {TRUE, 0}, // ThreadEventPair - {TRUE, sizeof(PVOID)}, // ThreadQuerySetWin32StartAddress - {TRUE, 0}, // ThreadZeroTlsCell - {TRUE, sizeof(LARGE_INTEGER)}, // ThreadPerformanceCount - {TRUE, sizeof(BOOLEAN)}, // ThreadAmILastThread - {TRUE, 0}, // ThreadIdealProcessor - {FALSE, 0}, // ThreadPriorityBoost - {TRUE, 0}, // ThreadSetTlsArrayAddress - {TRUE, sizeof(ULONG)}, // ThreadIsIoPending - {TRUE, 0} // ThreadHideFromDebugger -}; - -static const struct -{ - BOOLEAN Implemented; - ULONG Size; -} SetInformationData[MaxThreadInfoClass + 1] = -{ - {TRUE, 0}, // ThreadBasicInformation - {TRUE, 0}, // ThreadTimes - {TRUE, sizeof(KPRIORITY)}, // ThreadPriority - {TRUE, sizeof(LONG)}, // ThreadBasePriority - {TRUE, sizeof(KAFFINITY)}, // ThreadAffinityMask - {TRUE, sizeof(HANDLE)}, // ThreadImpersonationToken - {TRUE, 0}, // ThreadDescriptorTableEntry - {FALSE, 0}, // ThreadEnableAlignmentFaultFixup - {FALSE, 0}, // ThreadEventPair - {TRUE, sizeof(PVOID)}, // ThreadQuerySetWin32StartAddress - {FALSE, 0}, // ThreadZeroTlsCell - {TRUE, 0}, // ThreadPerformanceCount - {TRUE, 0}, // ThreadAmILastThread - {FALSE, 0}, // ThreadIdealProcessor - {FALSE, 0}, // ThreadPriorityBoost - {FALSE, 0}, // ThreadSetTlsArrayAddress - {TRUE, 0}, // ThreadIsIoPending - {FALSE, 0} // ThreadHideFromDebugger -}; +/* Include Information Class Tables */ +#include "internal/ps_i.h" /* FUNCTIONS *****************************************************************/ /* * @unimplemented */ -NTSTATUS STDCALL -NtQueryInformationProcess(IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL) +NTSTATUS +NTAPI +NtQueryInformationProcess(IN HANDLE ProcessHandle, + IN PROCESSINFOCLASS ProcessInformationClass, + OUT PVOID ProcessInformation, + IN ULONG ProcessInformationLength, + OUT PULONG ReturnLength OPTIONAL) { - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, - PsProcessInfoClass, - sizeof(PsProcessInfoClass) / sizeof(PsProcessInfoClass[0]), - ProcessInformation, - ProcessInformationLength, - ReturnLength, - PreviousMode); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryInformationProcess() failed, Status: 0x%x\n", Status); - return Status; - } - - if(ProcessInformationClass != ProcessCookie) - { - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - } - else if(ProcessHandle != NtCurrentProcess()) - { - /* retreiving the process cookie is only allowed for the calling process + PEPROCESS Process; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check validity of Information Class */ + Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + RTL_NUMBER_OF(PsProcessInfoClass), + ProcessInformation, + ProcessInformationLength, + ReturnLength, + PreviousMode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationProcess() failed, Status: 0x%x\n", Status); + return Status; + } + + if(ProcessInformationClass != ProcessCookie) + { + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + } + else if(ProcessHandle != NtCurrentProcess()) + { + /* retreiving the process cookie is only allowed for the calling process itself! XP only allowes NtCurrentProcess() as process handles even if a real handle actually represents the current process. */ - return STATUS_INVALID_PARAMETER; - } - - switch (ProcessInformationClass) - { - case ProcessBasicInformation: - { - PPROCESS_BASIC_INFORMATION ProcessBasicInformationP = - (PPROCESS_BASIC_INFORMATION)ProcessInformation; - - _SEH_TRY - { - ProcessBasicInformationP->ExitStatus = Process->ExitStatus; - ProcessBasicInformationP->PebBaseAddress = Process->Peb; - ProcessBasicInformationP->AffinityMask = Process->Pcb.Affinity; - ProcessBasicInformationP->UniqueProcessId = - (ULONG)Process->UniqueProcessId; - ProcessBasicInformationP->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; - ProcessBasicInformationP->BasePriority = - Process->Pcb.BasePriority; - - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_BASIC_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessQuotaLimits: - case ProcessIoCounters: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessTimes: - { - PKERNEL_USER_TIMES ProcessTimeP = (PKERNEL_USER_TIMES)ProcessInformation; - _SEH_TRY - { - ProcessTimeP->CreateTime = Process->CreateTime; - ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; - ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; - ProcessTimeP->ExitTime = Process->ExitTime; - - if (ReturnLength) - { - *ReturnLength = sizeof(KERNEL_USER_TIMES); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessDebugPort: - { - _SEH_TRY - { - *(PHANDLE)ProcessInformation = (Process->DebugPort != NULL ? (HANDLE)-1 : NULL); - if (ReturnLength) - { - *ReturnLength = sizeof(HANDLE); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessLdtInformation: - case ProcessWorkingSetWatch: - case ProcessWx86Information: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessHandleCount: - { - ULONG HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); - - _SEH_TRY - { - *(PULONG)ProcessInformation = HandleCount; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessSessionInformation: - { - PPROCESS_SESSION_INFORMATION SessionInfo = (PPROCESS_SESSION_INFORMATION)ProcessInformation; - - _SEH_TRY - { - SessionInfo->SessionId = Process->Session; - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessWow64Information: - DPRINT1("We currently don't support the ProcessWow64Information information class!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessVmCounters: - { - PVM_COUNTERS pOut = (PVM_COUNTERS)ProcessInformation; - - _SEH_TRY - { - pOut->PeakVirtualSize = Process->PeakVirtualSize; - /* - * Here we should probably use VirtualSize.LowPart, but due to - * incompatibilities in current headers (no unnamed union), - * I opted for cast. - */ - pOut->VirtualSize = (ULONG)Process->VirtualSize; - pOut->PageFaultCount = Process->Vm.PageFaultCount; - pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - pOut->WorkingSetSize = Process->Vm.WorkingSetSize; - pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; // TODO: Verify! - pOut->QuotaPagedPoolUsage = Process->QuotaUsage[0]; // TODO: Verify! - pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; // TODO: Verify! - pOut->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; // TODO: Verify! - pOut->PagefileUsage = Process->QuotaUsage[2]; - pOut->PeakPagefileUsage = Process->QuotaPeak[2]; - - if (ReturnLength) - { - *ReturnLength = sizeof(VM_COUNTERS); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessDefaultHardErrorMode: - { - PULONG HardErrMode = (PULONG)ProcessInformation; - _SEH_TRY - { - *HardErrMode = Process->DefaultHardErrorProcessing; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessPriorityBoost: - { - PULONG BoostEnabled = (PULONG)ProcessInformation; - - _SEH_TRY - { - *BoostEnabled = Process->Pcb.DisableBoost ? FALSE : TRUE; - - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessDeviceMap: - { - PROCESS_DEVICEMAP_INFORMATION DeviceMap; - - ObQueryDeviceMapInformation(Process, &DeviceMap); - - _SEH_TRY - { - *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; - if (ReturnLength) - { - *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessPriorityClass: - { - PUSHORT Priority = (PUSHORT)ProcessInformation; - - _SEH_TRY - { - *Priority = Process->PriorityClass; - - if (ReturnLength) - { - *ReturnLength = sizeof(USHORT); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessImageFileName: - { - ULONG ImagePathLen = 0; - PROS_SECTION_OBJECT Section; - PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; - PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); - - Section = (PROS_SECTION_OBJECT)Process->SectionObject; - - if (Section != NULL && Section->FileObject != NULL) - { - /* FIXME - check for SEC_IMAGE and/or SEC_FILE instead - of relying on FileObject being != NULL? */ - SrcBuffer = Section->FileObject->FileName.Buffer; - if (SrcBuffer != NULL) - { - ImagePathLen = Section->FileObject->FileName.Length; - } - } - - if(ProcessInformationLength < sizeof(UNICODE_STRING) + ImagePathLen + sizeof(WCHAR)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - _SEH_TRY - { - /* copy the string manually, don't use RtlCopyUnicodeString with DstPath! */ - DstPath->Length = ImagePathLen; - DstPath->MaximumLength = ImagePathLen + sizeof(WCHAR); - DstPath->Buffer = DstBuffer; - if (ImagePathLen != 0) - { - RtlCopyMemory(DstBuffer, - SrcBuffer, - ImagePathLen); - } - DstBuffer[ImagePathLen / sizeof(WCHAR)] = L'\0'; - - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - break; - } - - case ProcessCookie: - { - ULONG Cookie; - - /* receive the process cookie, this is only allowed for the current - process! */ - - Process = PsGetCurrentProcess(); - - Cookie = Process->Cookie; - if(Cookie == 0) - { - LARGE_INTEGER SystemTime; - ULONG NewCookie; - PKPRCB Prcb; - - /* generate a new cookie */ - - KeQuerySystemTime(&SystemTime); - - Prcb = KeGetCurrentPrcb(); - - NewCookie = Prcb->KeSystemCalls ^ Prcb->InterruptTime ^ - SystemTime.u.LowPart ^ SystemTime.u.HighPart; - - /* try to set the new cookie, return the current one if another thread - set it in the meanwhile */ - Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, - NewCookie, - Cookie); - if(Cookie == 0) - { - /* successfully set the cookie */ - Cookie = NewCookie; - } - } - - _SEH_TRY - { - *(PULONG)ProcessInformation = Cookie; - if (ReturnLength) - { - *ReturnLength = sizeof(ULONG); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - break; - } - - /* - * Note: The following 10 information classes are verified to not be - * implemented on NT, and do indeed return STATUS_INVALID_INFO_CLASS; - */ - case ProcessBasePriority: - case ProcessRaisePriority: - case ProcessExceptionPort: - case ProcessAccessToken: - case ProcessLdtSize: - case ProcessIoPortHandlers: - case ProcessUserModeIOPL: - case ProcessEnableAlignmentFaultFixup: - case ProcessAffinityMask: - case ProcessForegroundInformation: - default: - Status = STATUS_INVALID_INFO_CLASS; - } - - if(ProcessInformationClass != ProcessCookie) - { - ObDereferenceObject(Process); - } - - return Status; + return STATUS_INVALID_PARAMETER; + } + + switch (ProcessInformationClass) + { + case ProcessBasicInformation: + { + PPROCESS_BASIC_INFORMATION ProcessBasicInformationP = + (PPROCESS_BASIC_INFORMATION)ProcessInformation; + + _SEH_TRY + { + ProcessBasicInformationP->ExitStatus = Process->ExitStatus; + ProcessBasicInformationP->PebBaseAddress = Process->Peb; + ProcessBasicInformationP->AffinityMask = Process->Pcb.Affinity; + ProcessBasicInformationP->UniqueProcessId = + (ULONG)Process->UniqueProcessId; + ProcessBasicInformationP->InheritedFromUniqueProcessId = + (ULONG)Process->InheritedFromUniqueProcessId; + ProcessBasicInformationP->BasePriority = + Process->Pcb.BasePriority; + + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_BASIC_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessQuotaLimits: + case ProcessIoCounters: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessTimes: + { + PKERNEL_USER_TIMES ProcessTimeP = (PKERNEL_USER_TIMES)ProcessInformation; + _SEH_TRY + { + ProcessTimeP->CreateTime = Process->CreateTime; + ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; + ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; + ProcessTimeP->ExitTime = Process->ExitTime; + + if (ReturnLength) + { + *ReturnLength = sizeof(KERNEL_USER_TIMES); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessDebugPort: + { + _SEH_TRY + { + *(PHANDLE)ProcessInformation = (Process->DebugPort != NULL ? (HANDLE)-1 : NULL); + if (ReturnLength) + { + *ReturnLength = sizeof(HANDLE); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessLdtInformation: + case ProcessWorkingSetWatch: + case ProcessWx86Information: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessHandleCount: + { + ULONG HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); + + _SEH_TRY + { + *(PULONG)ProcessInformation = HandleCount; + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessSessionInformation: + { + PPROCESS_SESSION_INFORMATION SessionInfo = (PPROCESS_SESSION_INFORMATION)ProcessInformation; + + _SEH_TRY + { + SessionInfo->SessionId = Process->Session; + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessWow64Information: + DPRINT1("We currently don't support the ProcessWow64Information information class!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessVmCounters: + { + PVM_COUNTERS pOut = (PVM_COUNTERS)ProcessInformation; + + _SEH_TRY + { + pOut->PeakVirtualSize = Process->PeakVirtualSize; + /* + * Here we should probably use VirtualSize.LowPart, but due to + * incompatibilities in current headers (no unnamed union), + * I opted for cast. + */ + pOut->VirtualSize = (ULONG)Process->VirtualSize; + pOut->PageFaultCount = Process->Vm.PageFaultCount; + pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + pOut->WorkingSetSize = Process->Vm.WorkingSetSize; + pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; // TODO: Verify! + pOut->QuotaPagedPoolUsage = Process->QuotaUsage[0]; // TODO: Verify! + pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; // TODO: Verify! + pOut->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; // TODO: Verify! + pOut->PagefileUsage = Process->QuotaUsage[2]; + pOut->PeakPagefileUsage = Process->QuotaPeak[2]; + + if (ReturnLength) + { + *ReturnLength = sizeof(VM_COUNTERS); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessDefaultHardErrorMode: + { + PULONG HardErrMode = (PULONG)ProcessInformation; + _SEH_TRY + { + *HardErrMode = Process->DefaultHardErrorProcessing; + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessPriorityBoost: + { + PULONG BoostEnabled = (PULONG)ProcessInformation; + + _SEH_TRY + { + *BoostEnabled = Process->Pcb.DisableBoost ? FALSE : TRUE; + + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessDeviceMap: + { + PROCESS_DEVICEMAP_INFORMATION DeviceMap; + + ObQueryDeviceMapInformation(Process, &DeviceMap); + + _SEH_TRY + { + *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; + if (ReturnLength) + { + *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessPriorityClass: + { + PUSHORT Priority = (PUSHORT)ProcessInformation; + + _SEH_TRY + { + *Priority = Process->PriorityClass; + + if (ReturnLength) + { + *ReturnLength = sizeof(USHORT); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessImageFileName: + { + ULONG ImagePathLen = 0; + PROS_SECTION_OBJECT Section; + PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; + PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); + + Section = (PROS_SECTION_OBJECT)Process->SectionObject; + + if (Section != NULL && Section->FileObject != NULL) + { + /* FIXME - check for SEC_IMAGE and/or SEC_FILE instead + of relying on FileObject being != NULL? */ + SrcBuffer = Section->FileObject->FileName.Buffer; + if (SrcBuffer != NULL) + { + ImagePathLen = Section->FileObject->FileName.Length; + } + } + + if(ProcessInformationLength < sizeof(UNICODE_STRING) + ImagePathLen + sizeof(WCHAR)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + _SEH_TRY + { + /* copy the string manually, don't use RtlCopyUnicodeString with DstPath! */ + DstPath->Length = ImagePathLen; + DstPath->MaximumLength = ImagePathLen + sizeof(WCHAR); + DstPath->Buffer = DstBuffer; + if (ImagePathLen != 0) + { + RtlCopyMemory(DstBuffer, + SrcBuffer, + ImagePathLen); + } + DstBuffer[ImagePathLen / sizeof(WCHAR)] = L'\0'; + + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + break; + } + + case ProcessCookie: + { + ULONG Cookie; + + /* receive the process cookie, this is only allowed for the current + process! */ + + Process = PsGetCurrentProcess(); + + Cookie = Process->Cookie; + if(Cookie == 0) + { + LARGE_INTEGER SystemTime; + ULONG NewCookie; + PKPRCB Prcb; + + /* generate a new cookie */ + + KeQuerySystemTime(&SystemTime); + + Prcb = KeGetCurrentPrcb(); + + NewCookie = Prcb->KeSystemCalls ^ Prcb->InterruptTime ^ + SystemTime.u.LowPart ^ SystemTime.u.HighPart; + + /* try to set the new cookie, return the current one if another thread + set it in the meanwhile */ + Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, + NewCookie, + Cookie); + if(Cookie == 0) + { + /* successfully set the cookie */ + Cookie = NewCookie; + } + } + + _SEH_TRY + { + *(PULONG)ProcessInformation = Cookie; + if (ReturnLength) + { + *ReturnLength = sizeof(ULONG); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + break; + } + + /* + * Note: The following 10 information classes are verified to not be + * implemented on NT, and do indeed return STATUS_INVALID_INFO_CLASS; + */ + case ProcessBasePriority: + case ProcessRaisePriority: + case ProcessExceptionPort: + case ProcessAccessToken: + case ProcessLdtSize: + case ProcessIoPortHandlers: + case ProcessUserModeIOPL: + case ProcessEnableAlignmentFaultFixup: + case ProcessAffinityMask: + case ProcessForegroundInformation: + default: + Status = STATUS_INVALID_INFO_CLASS; + } + + if(ProcessInformationClass != ProcessCookie) ObDereferenceObject(Process); + return Status; } /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI NtSetInformationProcess(IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - IN PVOID ProcessInformation, - IN ULONG ProcessInformationLength) + IN PROCESSINFOCLASS ProcessInformationClass, + IN PVOID ProcessInformation, + IN ULONG ProcessInformationLength) { - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - ACCESS_MASK Access; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - Status = DefaultSetInfoBufferCheck(ProcessInformationClass, - PsProcessInfoClass, - sizeof(PsProcessInfoClass) / sizeof(PsProcessInfoClass[0]), - ProcessInformation, - ProcessInformationLength, - PreviousMode); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationProcess() %d %x %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength); - DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status); - return Status; - } - - switch(ProcessInformationClass) - { - case ProcessSessionInformation: - Access = PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID; - break; - case ProcessExceptionPort: - Access = PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME; - break; - - default: - Access = PROCESS_SET_INFORMATION; - break; - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - Access, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - switch (ProcessInformationClass) - { - case ProcessQuotaLimits: - case ProcessBasePriority: - case ProcessRaisePriority: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessExceptionPort: - { - HANDLE PortHandle = NULL; - - /* make a safe copy of the buffer on the stack */ - _SEH_TRY - { - PortHandle = *(PHANDLE)ProcessInformation; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - PEPORT ExceptionPort; - - /* in case we had success reading from the buffer, verify the provided - * LPC port handle - */ - Status = ObReferenceObjectByHandle(PortHandle, - 0, - LpcPortObjectType, - PreviousMode, - (PVOID)&ExceptionPort, - NULL); - if(NT_SUCCESS(Status)) - { - /* lock the process to be thread-safe! */ - - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - /* - * according to "NT Native API" documentation, setting the exception - * port is only permitted once! - */ - if(Process->ExceptionPort == NULL) - { - /* keep the reference to the handle! */ - Process->ExceptionPort = ExceptionPort; + PEPROCESS Process; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ACCESS_MASK Access; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Verify Information Class validity */ + Status = DefaultSetInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + RTL_NUMBER_OF(PsProcessInfoClass), + ProcessInformation, + ProcessInformationLength, + PreviousMode); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status); + return Status; + } + + switch(ProcessInformationClass) + { + case ProcessSessionInformation: + Access = PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID; + break; + case ProcessExceptionPort: + Access = PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME; + break; + + default: + Access = PROCESS_SET_INFORMATION; + break; + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + Access, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + switch (ProcessInformationClass) + { + case ProcessQuotaLimits: + case ProcessBasePriority: + case ProcessRaisePriority: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessExceptionPort: + { + HANDLE PortHandle = NULL; + + /* make a safe copy of the buffer on the stack */ + _SEH_TRY + { + PortHandle = *(PHANDLE)ProcessInformation; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + PEPORT ExceptionPort; + + /* in case we had success reading from the buffer, verify the provided + * LPC port handle + */ + Status = ObReferenceObjectByHandle(PortHandle, + 0, + LpcPortObjectType, + PreviousMode, + (PVOID)&ExceptionPort, + NULL); + if(NT_SUCCESS(Status)) + { + /* lock the process to be thread-safe! */ + + Status = PsLockProcess(Process, FALSE); + if(NT_SUCCESS(Status)) + { + /* + * according to "NT Native API" documentation, setting the exception + * port is only permitted once! + */ + if(Process->ExceptionPort == NULL) + { + /* keep the reference to the handle! */ + Process->ExceptionPort = ExceptionPort; + Status = STATUS_SUCCESS; + } + else + { + ObDereferenceObject(ExceptionPort); + Status = STATUS_PORT_ALREADY_SET; + } + PsUnlockProcess(Process); + } + else + { + ObDereferenceObject(ExceptionPort); + } + } + } + break; + } + + case ProcessAccessToken: + { + HANDLE TokenHandle = NULL; + + /* make a safe copy of the buffer on the stack */ + _SEH_TRY + { + TokenHandle = ((PPROCESS_ACCESS_TOKEN)ProcessInformation)->Token; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + /* in case we had success reading from the buffer, perform the actual task */ + Status = PspAssignPrimaryToken(Process, TokenHandle); + } + break; + } + + case ProcessDefaultHardErrorMode: + { + _SEH_TRY + { + InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, + *(PLONG)ProcessInformation); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } + + case ProcessSessionInformation: + { + PROCESS_SESSION_INFORMATION SessionInfo; Status = STATUS_SUCCESS; - } - else - { - ObDereferenceObject(ExceptionPort); - Status = STATUS_PORT_ALREADY_SET; - } - PsUnlockProcess(Process); - } - else - { - ObDereferenceObject(ExceptionPort); - } - } - } - break; - } - - case ProcessAccessToken: - { - HANDLE TokenHandle = NULL; - - /* make a safe copy of the buffer on the stack */ - _SEH_TRY - { - TokenHandle = ((PPROCESS_ACCESS_TOKEN)ProcessInformation)->Token; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - /* in case we had success reading from the buffer, perform the actual task */ - Status = PspAssignPrimaryToken(Process, TokenHandle); - } - break; - } - - case ProcessDefaultHardErrorMode: - { - _SEH_TRY - { - InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, - *(PLONG)ProcessInformation); - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - case ProcessSessionInformation: - { - PROCESS_SESSION_INFORMATION SessionInfo; - Status = STATUS_SUCCESS; - - RtlZeroMemory(&SessionInfo, sizeof(SessionInfo)); - - _SEH_TRY - { - /* copy the structure to the stack */ - SessionInfo = *(PPROCESS_SESSION_INFORMATION)ProcessInformation; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - /* we successfully copied the structure to the stack, continue processing */ - - /* - * setting the session id requires the SeTcbPrivilege! - */ - if(!SeSinglePrivilegeCheck(SeTcbPrivilege, - PreviousMode)) - { - DPRINT1("NtSetInformationProcess: Caller requires the SeTcbPrivilege privilege for setting ProcessSessionInformation!\n"); - /* can't set the session id, bail! */ - Status = STATUS_PRIVILEGE_NOT_HELD; - break; - } - - /* FIXME - update the session id for the process token */ - - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - Process->Session = SessionInfo.SessionId; - - /* Update the session id in the PEB structure */ - if(Process->Peb != NULL) - { - /* we need to attach to the process to make sure we're in the right - context to access the PEB structure */ - KeAttachProcess(&Process->Pcb); - - _SEH_TRY - { - /* FIXME: Process->Peb->SessionId = SessionInfo.SessionId; */ - - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - KeDetachProcess(); - } - - PsUnlockProcess(Process); - } - } - break; - } - - case ProcessPriorityClass: - { - PROCESS_PRIORITY_CLASS ppc; - - _SEH_TRY - { - ppc = *(PPROCESS_PRIORITY_CLASS)ProcessInformation; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - } - - break; - } - - case ProcessLdtInformation: - case ProcessLdtSize: - case ProcessIoPortHandlers: - case ProcessWorkingSetWatch: - case ProcessUserModeIOPL: - case ProcessEnableAlignmentFaultFixup: - case ProcessAffinityMask: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessBasicInformation: - case ProcessIoCounters: - case ProcessTimes: - case ProcessPooledUsageAndLimits: - case ProcessWx86Information: - case ProcessHandleCount: - case ProcessWow64Information: - case ProcessDebugPort: - default: - Status = STATUS_INVALID_INFO_CLASS; - } - ObDereferenceObject(Process); - return(Status); -} - - -/********************************************************************** - * NAME INTERNAL - * PiQuerySystemProcessInformation - * - * DESCRIPTION - * Compute the size of a process+thread snapshot as - * expected by NtQuerySystemInformation. - * - * RETURN VALUE - * 0 on error; otherwise the size, in bytes of the buffer - * required to write a full snapshot. - * - * NOTE - * We assume (sizeof (PVOID) == sizeof (ULONG)) holds. - */ -NTSTATUS -PiQuerySystemProcessInformation(PVOID Buffer, - ULONG Size, - PULONG ReqSize) -{ - return STATUS_NOT_IMPLEMENTED; - -#if 0 - PLIST_ENTRY CurrentEntryP; - PEPROCESS CurrentP; - PLIST_ENTRY CurrentEntryT; - PETHREAD CurrentT; - - ULONG RequiredSize = 0L; - BOOLEAN SizeOnly = FALSE; - - ULONG SpiSize = 0L; - - PSYSTEM_PROCESS_INFORMATION pInfoP = (PSYSTEM_PROCESS_INFORMATION) SnapshotBuffer; - PSYSTEM_PROCESS_INFORMATION pInfoPLast = NULL; - PSYSTEM_THREAD_INFO pInfoT = NULL; - - - /* Lock the process list. */ - ExAcquireFastMutex(&PspActiveProcessMutex); - - /* - * Scan the process list. Since the - * list is circular, the guard is false - * after the last process. - */ - for ( CurrentEntryP = PsActiveProcessHead.Flink; - (CurrentEntryP != & PsActiveProcessHead); - CurrentEntryP = CurrentEntryP->Flink - ) - { - /* - * Compute how much space is - * occupied in the snapshot - * by adding this process info. - * (at least one thread). - */ - SpiSizeCurrent = sizeof (SYSTEM_PROCESS_INFORMATION); - RequiredSize += SpiSizeCurrent; - /* - * Do not write process data in the - * buffer if it is too small. - */ - if (TRUE == SizeOnly) continue; - /* - * Check if the buffer can contain - * the full snapshot. - */ - if (Size < RequiredSize) - { - SizeOnly = TRUE; - continue; - } - /* - * Get a reference to the - * process descriptor we are - * handling. - */ - CurrentP = CONTAINING_RECORD( - CurrentEntryP, - EPROCESS, - ProcessListEntry - ); - /* - * Write process data in the buffer. - */ - RtlZeroMemory (pInfoP, sizeof (SYSTEM_PROCESS_INFORMATION)); - /* PROCESS */ - pInfoP->ThreadCount = 0L; - pInfoP->ProcessId = CurrentP->UniqueProcessId; - RtlInitUnicodeString ( - & pInfoP->Name, - CurrentP->ImageFileName - ); - /* THREAD */ - for ( pInfoT = & CurrentP->ThreadSysInfo [0], - CurrentEntryT = CurrentP->ThreadListHead.Flink; - - (CurrentEntryT != & CurrentP->ThreadListHead); - - pInfoT = & CurrentP->ThreadSysInfo [pInfoP->ThreadCount], - CurrentEntryT = CurrentEntryT->Flink - ) - { - /* - * Recalculate the size of the - * information block. - */ - if (0 < pInfoP->ThreadCount) - { - RequiredSize += sizeof (SYSTEM_THREAD_INFORMATION); - } - /* - * Do not write thread data in the - * buffer if it is too small. - */ - if (TRUE == SizeOnly) continue; - /* - * Check if the buffer can contain - * the full snapshot. - */ - if (Size < RequiredSize) - { - SizeOnly = TRUE; - continue; - } - /* - * Get a reference to the - * thread descriptor we are - * handling. - */ - CurrentT = CONTAINING_RECORD( - CurrentEntryT, - KTHREAD, - ThreadListEntry - ); - /* - * Write thread data. - */ - RtlZeroMemory ( - pInfoT, - sizeof (SYSTEM_THREAD_INFORMATION) - ); - pInfoT->KernelTime = CurrentT-> ; /* TIME */ - pInfoT->UserTime = CurrentT-> ; /* TIME */ - pInfoT->CreateTime = CurrentT-> ; /* TIME */ - pInfoT->TickCount = CurrentT-> ; /* ULONG */ - pInfoT->StartEIP = CurrentT-> ; /* ULONG */ - pInfoT->ClientId = CurrentT-> ; /* CLIENT_ID */ - pInfoT->ClientId = CurrentT-> ; /* CLIENT_ID */ - pInfoT->DynamicPriority = CurrentT-> ; /* ULONG */ - pInfoT->BasePriority = CurrentT-> ; /* ULONG */ - pInfoT->nSwitches = CurrentT-> ; /* ULONG */ - pInfoT->State = CurrentT-> ; /* DWORD */ - pInfoT->WaitReason = CurrentT-> ; /* KWAIT_REASON */ - /* - * Count the number of threads - * this process has. - */ - ++ pInfoP->ThreadCount; - } - /* - * Save the size of information - * stored in the buffer for the - * current process. - */ - pInfoP->RelativeOffset = SpiSize; - /* - * Save a reference to the last - * valid information block. - */ - pInfoPLast = pInfoP; - /* - * Compute the offset of the - * SYSTEM_PROCESS_INFORMATION - * descriptor in the snapshot - * buffer for the next process. - */ - (ULONG) pInfoP += SpiSize; - } - /* - * Unlock the process list. - */ - ExReleaseFastMutex ( - & PspActiveProcessMutex - ); - /* - * Return the proper error status code, - * if the buffer was too small. - */ - if (TRUE == SizeOnly) - { - if (NULL != RequiredSize) - { - *pRequiredSize = RequiredSize; - } - return STATUS_INFO_LENGTH_MISMATCH; - } - /* - * Mark the end of the snapshot. - */ - pInfoP->RelativeOffset = 0L; - /* OK */ - return STATUS_SUCCESS; -#endif + + RtlZeroMemory(&SessionInfo, sizeof(SessionInfo)); + + _SEH_TRY + { + /* copy the structure to the stack */ + SessionInfo = *(PPROCESS_SESSION_INFORMATION)ProcessInformation; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + /* we successfully copied the structure to the stack, continue processing */ + + /* + * setting the session id requires the SeTcbPrivilege! + */ + if(!SeSinglePrivilegeCheck(SeTcbPrivilege, + PreviousMode)) + { + DPRINT1("NtSetInformationProcess: Caller requires the SeTcbPrivilege privilege for setting ProcessSessionInformation!\n"); + /* can't set the session id, bail! */ + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* FIXME - update the session id for the process token */ + + Status = PsLockProcess(Process, FALSE); + if(NT_SUCCESS(Status)) + { + Process->Session = SessionInfo.SessionId; + + /* Update the session id in the PEB structure */ + if(Process->Peb != NULL) + { + /* we need to attach to the process to make sure we're in the right + context to access the PEB structure */ + KeAttachProcess(&Process->Pcb); + + _SEH_TRY + { + /* FIXME: Process->Peb->SessionId = SessionInfo.SessionId; */ + + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + KeDetachProcess(); + } + + PsUnlockProcess(Process); + } + } + break; + } + + case ProcessPriorityClass: + { + PROCESS_PRIORITY_CLASS ppc; + + _SEH_TRY + { + ppc = *(PPROCESS_PRIORITY_CLASS)ProcessInformation; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + } + + break; + } + + case ProcessLdtInformation: + case ProcessLdtSize: + case ProcessIoPortHandlers: + case ProcessWorkingSetWatch: + case ProcessUserModeIOPL: + case ProcessEnableAlignmentFaultFixup: + case ProcessAffinityMask: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessBasicInformation: + case ProcessIoCounters: + case ProcessTimes: + case ProcessPooledUsageAndLimits: + case ProcessWx86Information: + case ProcessHandleCount: + case ProcessWow64Information: + case ProcessDebugPort: + default: + Status = STATUS_INVALID_INFO_CLASS; + } + ObDereferenceObject(Process); + return(Status); } /* * @unimplemented */ -NTSTATUS STDCALL -NtSetInformationThread (IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength) +NTSTATUS +NTAPI +NtSetInformationThread(IN HANDLE ThreadHandle, + IN THREADINFOCLASS ThreadInformationClass, + IN PVOID ThreadInformation, + IN ULONG ThreadInformationLength) { - PETHREAD Thread; - union - { - KPRIORITY Priority; - LONG Increment; - KAFFINITY Affinity; - HANDLE Handle; - PVOID Address; - }u; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if (ThreadInformationClass <= MaxThreadInfoClass && - !SetInformationData[ThreadInformationClass].Implemented) + PETHREAD Thread; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + DPRINT1("%s called for: %d\n", __FUNCTION__, ThreadInformationClass); + /* FIXME: This is REALLY wrong. Some types don't need THREAD_SET_INFORMATION */ + /* FIXME: We should also check for certain things before doing the reference */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_INFORMATION, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if (NT_SUCCESS(Status)) { - return STATUS_NOT_IMPLEMENTED; +#if 0 + switch (ThreadInformationClass) + { + case ThreadPriority: + + if (u.Priority < LOW_PRIORITY || u.Priority >= MAXIMUM_PRIORITY) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + KeSetPriorityThread(&Thread->Tcb, u.Priority); + break; + + case ThreadBasePriority: + KeSetBasePriorityThread (&Thread->Tcb, u.Increment); + break; + + case ThreadAffinityMask: + + /* Check if this is valid */ + DPRINT1("%lx, %lx\n", Thread->ThreadsProcess->Pcb.Affinity, u.Affinity); + if ((Thread->ThreadsProcess->Pcb.Affinity & u.Affinity) != + u.Affinity) + { + DPRINT1("Wrong affinity given\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = KeSetAffinityThread(&Thread->Tcb, u.Affinity); + } + break; + + case ThreadImpersonationToken: + Status = PsAssignImpersonationToken (Thread, u.Handle); + break; + + case ThreadQuerySetWin32StartAddress: + Thread->Win32StartAddress = u.Address; + break; + + default: + /* Shoult never occure if the data table is correct */ + KEBUGCHECK(0); + } +#endif + ObDereferenceObject (Thread); } - if (ThreadInformationClass > MaxThreadInfoClass || - SetInformationData[ThreadInformationClass].Size == 0) - { - return STATUS_INVALID_INFO_CLASS; - } - if (ThreadInformationLength != SetInformationData[ThreadInformationClass].Size) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForRead(ThreadInformation, - SetInformationData[ThreadInformationClass].Size, - 1); - RtlCopyMemory(&u.Priority, - ThreadInformation, - SetInformationData[ThreadInformationClass].Size); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - RtlCopyMemory(&u.Priority, - ThreadInformation, - SetInformationData[ThreadInformationClass].Size); - } - - /* FIXME: This is REALLY wrong. Some types don't need THREAD_SET_INFORMATION */ - /* FIXME: We should also check for certain things before doing the reference */ - Status = ObReferenceObjectByHandle (ThreadHandle, - THREAD_SET_INFORMATION, - PsThreadType, - ExGetPreviousMode (), - (PVOID*)&Thread, - NULL); - if (NT_SUCCESS(Status)) - { - switch (ThreadInformationClass) - { - case ThreadPriority: - if (u.Priority < LOW_PRIORITY || u.Priority >= MAXIMUM_PRIORITY) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - KeSetPriorityThread(&Thread->Tcb, u.Priority); - break; - - case ThreadBasePriority: - KeSetBasePriorityThread (&Thread->Tcb, u.Increment); - break; - - case ThreadAffinityMask: - - /* Check if this is valid */ - DPRINT1("%lx, %lx\n", Thread->ThreadsProcess->Pcb.Affinity, u.Affinity); - if ((Thread->ThreadsProcess->Pcb.Affinity & u.Affinity) != - u.Affinity) - { - DPRINT1("Wrong affinity given\n"); - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = KeSetAffinityThread(&Thread->Tcb, u.Affinity); - } - break; - - case ThreadImpersonationToken: - Status = PsAssignImpersonationToken (Thread, u.Handle); - break; - - case ThreadQuerySetWin32StartAddress: - Thread->Win32StartAddress = u.Address; - break; - - default: - /* Shoult never occure if the data table is correct */ - KEBUGCHECK(0); - } - ObDereferenceObject (Thread); - } - - return Status; + + return Status; } /* * @implemented */ -NTSTATUS STDCALL -NtQueryInformationThread (IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength, - OUT PULONG ReturnLength OPTIONAL) +NTSTATUS +NTAPI +NtQueryInformationThread(IN HANDLE ThreadHandle, + IN THREADINFOCLASS ThreadInformationClass, + OUT PVOID ThreadInformation, + IN ULONG ThreadInformationLength, + OUT PULONG ReturnLength OPTIONAL) { - PETHREAD Thread; - union - { - THREAD_BASIC_INFORMATION TBI; - KERNEL_USER_TIMES TTI; - PVOID Address; - LARGE_INTEGER Count; - BOOLEAN Last; - ULONG IsIoPending; - }u; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if (ThreadInformationClass <= MaxThreadInfoClass && - !QueryInformationData[ThreadInformationClass].Implemented) - { - return STATUS_NOT_IMPLEMENTED; - } - if (ThreadInformationClass > MaxThreadInfoClass || - QueryInformationData[ThreadInformationClass].Size == 0) - { - return STATUS_INVALID_INFO_CLASS; - } - if (ThreadInformationLength != QueryInformationData[ThreadInformationClass].Size) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(ThreadInformation, - QueryInformationData[ThreadInformationClass].Size, - 1); - if (ReturnLength != NULL) - { - ProbeForWriteUlong(ReturnLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, - PsThreadType, - ExGetPreviousMode(), - (PVOID*)&Thread, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - switch (ThreadInformationClass) - { - case ThreadBasicInformation: - /* A test on W2K agains ntdll shows NtQueryInformationThread return STATUS_PENDING - * as ExitStatus for current/running thread, while KETHREAD's ExitStatus is - * 0. So do the conversion here: - * -Gunnar */ - u.TBI.ExitStatus = (Thread->ExitStatus == 0) ? STATUS_PENDING : Thread->ExitStatus; - u.TBI.TebBaseAddress = (PVOID)Thread->Tcb.Teb; - u.TBI.ClientId = Thread->Cid; - u.TBI.AffinityMask = Thread->Tcb.Affinity; - u.TBI.Priority = Thread->Tcb.Priority; - u.TBI.BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); - break; - - case ThreadTimes: - u.TTI.KernelTime.QuadPart = Thread->Tcb.KernelTime * 100000LL; - u.TTI.UserTime.QuadPart = Thread->Tcb.UserTime * 100000LL; - u.TTI.CreateTime = Thread->CreateTime; - /*This works*/ - u.TTI.ExitTime = Thread->ExitTime; - break; - - case ThreadQuerySetWin32StartAddress: - u.Address = Thread->Win32StartAddress; - break; - - case ThreadPerformanceCount: - /* Nebbett says this class is always zero */ - u.Count.QuadPart = 0; - break; - - case ThreadAmILastThread: - if (Thread->ThreadsProcess->ThreadListHead.Flink->Flink == - &Thread->ThreadsProcess->ThreadListHead) - { - u.Last = TRUE; - } - else - { - u.Last = FALSE; - } - break; - - case ThreadIsIoPending: - { - KIRQL OldIrql; - - /* Raise the IRQL to protect the IRP list */ - KeRaiseIrql(APC_LEVEL, &OldIrql); - u.IsIoPending = !IsListEmpty(&Thread->IrpList); - KeLowerIrql(OldIrql); - break; - } - - default: - /* Shoult never occure if the data table is correct */ - KEBUGCHECK(0); - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - if (QueryInformationData[ThreadInformationClass].Size) - { - RtlCopyMemory(ThreadInformation, - &u.TBI, - QueryInformationData[ThreadInformationClass].Size); - } - if (ReturnLength != NULL) - { - *ReturnLength = QueryInformationData[ThreadInformationClass].Size; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - if (QueryInformationData[ThreadInformationClass].Size) - { - RtlCopyMemory(ThreadInformation, - &u.TBI, - QueryInformationData[ThreadInformationClass].Size); - } - - if (ReturnLength != NULL) - { - *ReturnLength = QueryInformationData[ThreadInformationClass].Size; - } - } - - ObDereferenceObject(Thread); - return(Status); + PETHREAD Thread; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + DPRINT1("%s called for: %d\n", __FUNCTION__, ThreadInformationClass); + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_QUERY_INFORMATION, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if (!NT_SUCCESS(Status)) return Status; + +#if 0 + switch (ThreadInformationClass) + { + case ThreadBasicInformation: + /* A test on W2K agains ntdll shows NtQueryInformationThread return STATUS_PENDING + * as ExitStatus for current/running thread, while KETHREAD's ExitStatus is + * 0. So do the conversion here: + * -Gunnar */ + u.TBI.ExitStatus = (Thread->ExitStatus == 0) ? STATUS_PENDING : Thread->ExitStatus; + u.TBI.TebBaseAddress = (PVOID)Thread->Tcb.Teb; + u.TBI.ClientId = Thread->Cid; + u.TBI.AffinityMask = Thread->Tcb.Affinity; + u.TBI.Priority = Thread->Tcb.Priority; + u.TBI.BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); + break; + + case ThreadTimes: + u.TTI.KernelTime.QuadPart = Thread->Tcb.KernelTime * 100000LL; + u.TTI.UserTime.QuadPart = Thread->Tcb.UserTime * 100000LL; + u.TTI.CreateTime = Thread->CreateTime; + /*This works*/ + u.TTI.ExitTime = Thread->ExitTime; + break; + + case ThreadQuerySetWin32StartAddress: + u.Address = Thread->Win32StartAddress; + break; + + case ThreadPerformanceCount: + /* Nebbett says this class is always zero */ + u.Count.QuadPart = 0; + break; + + case ThreadAmILastThread: + if (Thread->ThreadsProcess->ThreadListHead.Flink->Flink == + &Thread->ThreadsProcess->ThreadListHead) + { + u.Last = TRUE; + } + else + { + u.Last = FALSE; + } + break; + + case ThreadIsIoPending: + { + KIRQL OldIrql; + + /* Raise the IRQL to protect the IRP list */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + u.IsIoPending = !IsListEmpty(&Thread->IrpList); + KeLowerIrql(OldIrql); + break; + } + + default: + /* Shoult never occure if the data table is correct */ + KEBUGCHECK(0); + } +#endif + ObDereferenceObject(Thread); + return(Status); } /* EOF */

18 years, 5 months

[mbosma] 23172: - Use clipper so we can use a normal instead of a popup window - Fix my old coding style and get rid of main.h - Change he color to pink for alternation

by mbosma＠svn.reactos.org

Author: mbosma Date: Wed Jul 19 14:30:30 2006 New Revision: 23172 URL: http://svn.reactos.org/svn/reactos?rev=23172&view=rev Log: - Use clipper so we can use a normal instead of a popup window - Fix my old coding style and get rid of main.h - Change he color to pink for alternation Removed: trunk/rosapps/demos/ddraw/main.h Modified: trunk/rosapps/demos/ddraw/main.cpp Modified: trunk/rosapps/demos/ddraw/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/main.cpp?rev=2… ============================================================================== --- trunk/rosapps/demos/ddraw/main.cpp (original) +++ trunk/rosapps/demos/ddraw/main.cpp Wed Jul 19 14:30:30 2006 @@ -1,50 +1,59 @@ #include <windows.h> #include <ddraw.h> -#include "main.h" - - -bool Init (void) -{ - DDSURFACEDESC2 ddsd; + +LPDIRECTDRAW7 DirectDraw; +LPDIRECTDRAWSURFACE7 FrontBuffer; +LPDIRECTDRAWCLIPPER Clipper; + +PCHAR DDErrorString (HRESULT hResult); +LONG WINAPI WndProc (HWND hwnd, UINT message, UINT wParam, LONG lParam); + +bool Fullscreen, Running; + + +bool Init (HWND hwnd) +{ + DDSURFACEDESC2 ddsd; + HRESULT hResult; // Create the main object OutputDebugString("=> DirectDrawCreateEx\n"); - ddrval = DirectDrawCreateEx(NULL, (VOID**)&pDD, IID_IDirectDraw7, NULL); - - if (ddrval != DD_OK) - { - MessageBox(0,DDErrorString(ddrval), "DirectDrawCreateEx", 0); + hResult = DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL); + + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "DirectDrawCreateEx", 0); return 0; } - // set fullscreen or not + // Set Fullscreen or windowed mode OutputDebugString("=> DDraw->SetCooperativeLevel\n"); - if(fullscreen) - ddrval = pDD->SetCooperativeLevel (hwnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + if(Fullscreen) + hResult = DirectDraw->SetCooperativeLevel (hwnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); else - ddrval = pDD->SetCooperativeLevel (hwnd, DDSCL_NORMAL); + hResult = DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL); - if (ddrval != DD_OK) - { - MessageBox(0,DDErrorString(ddrval), "DDraw->SetCooperativeLevel", 0); + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "DDraw->SetCooperativeLevel", 0); return 0; } - // set the new resolution - if(fullscreen) + // Set the new resolution + if(Fullscreen) { OutputDebugString("=> DDraw->SetDisplayMode\n"); - ddrval = pDD->SetDisplayMode (800, 600, 32, 0, 0); + hResult = DirectDraw->SetDisplayMode (800, 600, 32, 0, 0); - if (ddrval != DD_OK) + if (hResult != DD_OK) { - MessageBox(0,DDErrorString(ddrval), "DDraw->SetDisplayMode", 0); + MessageBox(0,DDErrorString(hResult), "DDraw->SetDisplayMode", 0); return 0; } } - // create the primary surface + // Create the primary surface memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); ddsd.dwSize = sizeof(DDSURFACEDESC2); @@ -52,49 +61,76 @@ ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; OutputDebugString("=> DDraw->CreateSurface\n"); - ddrval = pDD->CreateSurface(&ddsd, &lpddsPrimary, NULL); - - if (ddrval != DD_OK) - { - MessageBox(0,DDErrorString(ddrval), "DDraw->CreateSurface", 0); + hResult = DirectDraw->CreateSurface(&ddsd, &FrontBuffer, NULL); + + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "DDraw->CreateSurface", 0); return 0; } + // Set up the clipper + OutputDebugString("=> DDraw->CreateClipper\n"); + + hResult = DirectDraw->CreateClipper(0,&Clipper,NULL); + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "DDraw->CreateSurface", 0); + return 0; + } + + OutputDebugString("=> Clipper->SetHWnd\n"); + hResult = Clipper->SetHWnd(0,hwnd); + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "Clipper->SetHWnd", 0); + return 0; + } + + OutputDebugString("=> Suface->SetClipper\n"); + hResult = FrontBuffer->SetClipper(Clipper); + if (hResult != DD_OK) + { + MessageBox(0,DDErrorString(hResult), "FrontBuffer->SetClipper", 0); + return 0; + } + return true; } void Draw (void) { - // make the windows or hole screen green - RECT rect; - GetWindowRect(hwnd, &rect); + // Make the fronbuffer pink DDBLTFX ddbltfx; ddbltfx.dwSize = sizeof(DDBLTFX); - ddbltfx.dwFillColor = RGB(0, 255, 0); + ddbltfx.dwFillColor = RGB(255, 0, 255); OutputDebugString("=> Surface->Blt (DDBLT_COLORFILL)\n"); - - if(fullscreen) - lpddsPrimary->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - else - lpddsPrimary->Blt(&rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + + FrontBuffer->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); } void CleanUp (void) { - if (lpddsPrimary != NULL) + if (Clipper != NULL) + { + OutputDebugString("=> Clipper->Release\n"); + Clipper->Release(); + Clipper = NULL; + } + + if (FrontBuffer != NULL) { OutputDebugString("=> Surface->Release\n"); - lpddsPrimary->Release(); - lpddsPrimary = NULL; - } - - if (pDD != NULL) + FrontBuffer->Release(); + FrontBuffer = NULL; + } + if (DirectDraw != NULL) { OutputDebugString("=> DDraw->Release\n"); - pDD->Release(); - pDD = NULL; + DirectDraw->Release(); + DirectDraw = NULL; } } @@ -104,10 +140,9 @@ MSG msg; WNDCLASS wndclass; - // ask - fullscreen = MessageBox(0, "Do you want to me to run in fullscreen ?", 0, MB_YESNO) == IDYES; - - // create windnow + Fullscreen = MessageBox(0, "Do you want to me to run in Fullscreen ?", 0, MB_YESNO) == IDYES; + + // Create windnow wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; wndclass.cbClsExtra = 0; @@ -117,13 +152,13 @@ wndclass.hCursor = LoadCursor (NULL, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)GetStockObject (LTGRAY_BRUSH); wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = "ddrawdemo"; + wndclass.lpszClassName = "DDrawDemo"; RegisterClass(&wndclass); - hwnd = CreateWindow("ddrawdemo", + HWND hwnd = CreateWindow("DDrawDemo", "ReactOS DirectDraw Demo", - WS_POPUP, + Fullscreen ? WS_POPUP :WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 800, @@ -132,18 +167,18 @@ hInst, NULL); // Inizalize Ddraw - if(Init()) - { - running = true; + if(Init(hwnd)) + { + Running = true; ShowWindow(hwnd, nCmdShow); UpdateWindow(hwnd); } - // Go into main loop - while (running) - { - if(fullscreen) + // Main loop + while (Running) + { + if(Fullscreen) Draw(); if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) @@ -154,7 +189,6 @@ } } - // the end CleanUp(); return 0; @@ -168,7 +202,7 @@ { case WM_PAINT: { - if(!fullscreen) + if(!Fullscreen) Draw(); } break; @@ -177,7 +211,7 @@ switch (wParam) { case VK_ESCAPE: - running=false; + Running=false; return 0; } break; } @@ -192,9 +226,9 @@ return DefWindowProc (hwnd, message, wParam, lParam); } -char* DDErrorString (HRESULT hr) -{ - switch (hr) +PCHAR DDErrorString (HRESULT hResult) +{ + switch (hResult) { case DD_OK: return "DD_OK"; case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; Removed: trunk/rosapps/demos/ddraw/main.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/main.h?rev=231… ============================================================================== --- trunk/rosapps/demos/ddraw/main.h (original) +++ trunk/rosapps/demos/ddraw/main.h (removed) @@ -1,13 +1,0 @@ - -LPDIRECTDRAW7 pDD; -LPDIRECTDRAWSURFACE7 lpddsPrimary; //, lpddsBack; -HRESULT ddrval; -HWND hwnd; - -bool running, fullscreen; - -void ddRelease (); -char* DDErrorString (HRESULT hr); -LONG WINAPI WndProc (HWND hwnd, UINT message, UINT wParam, LONG lParam); - -extern "C" bool HookAPICalls();

18 years, 5 months

[fireball] 23171: Alexey Minnekhanov (minlexx@rambler.ru): - Implement setting of desktop background color. This feature is tested to work in Windows XP, however in ReactOS the setting currently does no effect. - Improve russian translation, also check and fix layout/placement (so that russian words actually fit)

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jul 19 12:45:21 2006 New Revision: 23171 URL: http://svn.reactos.org/svn/reactos?rev=23171&view=rev Log: Alexey Minnekhanov (minlexx(a)rambler.ru): - Implement setting of desktop background color. This feature is tested to work in Windows XP, however in ReactOS the setting currently does no effect. - Improve russian translation, also check and fix layout/placement (so that russian words actually fit) Modified: trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=231… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Wed Jul 19 12:45:21 2006 @@ -1,120 +1,142 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_BACKGROUND DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ôîí" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW, 80, 10, - 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32", LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP, 8, 114, 174, 68 - LTEXT "Âûáåðèòå èçîáðàæåíèå äëÿ ðàáî÷åãî ñòîëà:", - IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&Îáçîð...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 - PUSHBUTTON "&Öâåò...", IDC_COLOR_BUTTON, 188, 167, 50, 15 - LTEXT "Ðàñïîëîæåíèå:", IDC_STATIC, 188, 138, 50, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,80,10,83, + 57,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | + WS_BORDER | WS_TABSTOP,8,114,174,68 + LTEXT "Âûáåðèòå èçîáðàæåíèå äëÿ ðàáî÷åãî ñòîëà:",IDC_STATIC,8, + 103,180,9 + PUSHBUTTON "&Îáçîð...",IDC_BROWSE_BUTTON,188,114,55,15 + PUSHBUTTON "&Öâåò...",IDC_COLOR_BUTTON,188,167,55,15 + LTEXT "Ðàñïîëîæåíèå:",IDC_STATIC,188,138,55,9 + COMBOBOX IDC_PLACEMENT_COMBO,188,149,55,54,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Çàñòàâêà" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 5, 7, 238, 137 - - LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13, 24, 150, 9 + GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY,5,7,238,137 + LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13,24,150,9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - - PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP - PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188, 52, 50, 15 - - CONTROL "&Çàùèòà ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 13, 121, 119, 18 - - LTEXT "&Èíòåðâàë:",IDC_STATIC, 13, 110, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 33, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 52, 109, 12, 12 - LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC, 70, 111, 147, 9 - - GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, 5, 146, 238, 50 + LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | + WS_BORDER | WS_TABSTOP,13,34,170,69 + PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188,34,50,15, + WS_GROUP + PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188,52,50,15 + CONTROL "&Çàùèòà ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,121,119,18 + LTEXT "&Èíòåðâàë:",IDC_STATIC,13,110,35,9 + EDITTEXT IDC_SCREENS_TIMEDELAY,53,109,31,12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME,"msctls_updown32",UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,87,108,13,12 + LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC,109,110,118, + 9 + GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, + 5,146,238,50 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó Ïàðàìåòðû Ïèòàíèÿ.", - IDC_STATIC, 16, 159, 145, 35 - PUSHBUTTON "Ïàðàìåòðû &Ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 + IDC_STATIC,16,159,145,35 + PUSHBUTTON "Ïàðàìåòðû &ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON,157,162,81, + 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_APPEARANCE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Îôîðìëåíèå" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,66, - 90,112,8 + LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,87,114,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_SETTINGS DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Íàñòðîéêè" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Îáëàñòü ýêðàíà",1818,3,120,119,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 33,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 LTEXT "Ìåíüøå",1815,7,130,27,8,NOT WS_GROUP LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + CTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT + WS_GROUP GROUPBOX "&Öâåòà",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 PUSHBUTTON "Äî&ïîëíèòåëüíî...",IDC_SETTINGS_ADVANCED,306,165,56,14 END -IDR_POPUP_MENU MENU DISCARDABLE + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_POPUP_MENU MENU BEGIN - POPUP "" - BEGIN - MENUITEM "&Configure", ID_MENU_CONFIG - MENUITEM "&Preview", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Add", ID_MENU_ADD - MENUITEM "&Delete\tDel", ID_MENU_DELETE - END + POPUP "" + BEGIN + MENUITEM "&Íàñòðîèòü", ID_MENU_CONFIG + MENUITEM "&Ïðåäïðîñìîòð", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Äîáàâèòü", ID_MENU_ADD + MENUITEM "&Óäàëèòü\tDel", ID_MENU_DELETE + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_CPLNAME "Äèñïëåé" + IDS_CPLDESCRIPTION "Âûáåðèòå äèñïëåé ðàáî÷åãî ñòîëà è çàñòàâêó." + IDS_NONE "(íåò)" + IDS_CENTER "Ïî öåíòðó" + IDS_STRETCH "Ðàñòÿíóòü" + IDS_TILE "Ïîâòîðÿòü" END STRINGTABLE BEGIN - IDS_CPLNAME "Äèñïëåé" - IDS_CPLDESCRIPTION "Âûáåðèòå äèñïëåé ðàáî÷åãî ñòîëà è çàñòàâêó." - - IDS_NONE "(íåò)" - IDS_CENTER "Ïî öåíòðó" - IDS_STRETCH "Ðàñòÿíóòü" - IDS_TILE "Ïîâòîðÿòü" + IDS_COLOR_4BIT "16 öâåòîâ" + IDS_COLOR_8BIT "256 öâåòîâ" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - IDS_COLOR_4BIT "16 öâåòîâ" - IDS_COLOR_8BIT "256 öâåòîâ" - IDS_COLOR_16BIT "High Color (16 áèò)" - IDS_COLOR_24BIT "True Color (24 áèòà)" - IDS_COLOR_32BIT "True Color (32 áèòà)" - IDS_PIXEL "%lux%lu òî÷åê" + IDS_COLOR_16BIT "High Color (16 áèò)" + IDS_COLOR_24BIT "True Color (24 áèòà)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_COLOR_32BIT "True Color (32 áèòà)" END + +STRINGTABLE +BEGIN + IDS_PIXEL "%lux%lu òî÷åê" +END + +STRINGTABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Wed Jul 19 12:45:21 2006 @@ -6,6 +6,7 @@ * PURPOSE: Background property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) + * Alexey Minnekhanov (minlexx(a)rambler.ru) */ #include "desk.h" @@ -31,6 +32,7 @@ int g_placementSelection = 0; int g_backgroundSelection = 0; +COLORREF g_backgroundDesktopColor = 0; int g_listViewItemCount = 0; @@ -52,7 +54,7 @@ WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; - TCHAR szFileTypes[MAX_PATH]; + TCHAR szFileTypes[MAX_PATH]; LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; @@ -65,8 +67,8 @@ LONG result; UINT i = 0; BackgroundItem *backgroundItem = NULL; - TCHAR separators[] = TEXT(";"); - TCHAR *token; + TCHAR separators[] = TEXT(";"); + TCHAR *token; GetClientRect(g_hBackgroundList, &clientRect); @@ -76,13 +78,10 @@ dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); (void)ListView_InsertColumn(g_hBackgroundList, 0, &dummy); - + /* Add the "None" item */ - - backgroundItem = &g_backgroundItems[g_listViewItemCount]; - + backgroundItem = &g_backgroundItems[g_listViewItemCount]; backgroundItem->bWallpaper = FALSE; - LoadString(hApplet, IDS_NONE, backgroundItem->szDisplayName, @@ -102,9 +101,7 @@ g_listViewItemCount++; /* Add current wallpaper if any */ - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) @@ -231,7 +228,9 @@ LONG result; BITMAP bitmap; - g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); + g_backgroundDesktopColor = GetSysColor( COLOR_BACKGROUND ); + + g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); @@ -297,7 +296,30 @@ void OnColorButton() { - MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); + CHOOSECOLOR cc; + COLORREF custom_colors[16]; + + cc.lStructSize = sizeof(CHOOSECOLOR); + cc.hwndOwner = g_hBackgroundPage; + cc.hInstance = NULL; + cc.rgbResult = g_backgroundDesktopColor; + + memset(custom_colors, RGB(255,255,255), sizeof(custom_colors)); + + cc.lpCustColors = custom_colors; + cc.Flags = CC_ANYCOLOR | /* Causes the dialog box to display all available colors in the set of basic colors. */ + CC_FULLOPEN | /* opens dialog in full size */ + CC_RGBINIT ; /* init chosen color by rgbResult value */ + cc.lCustData = 0; + cc.lpfnHook = NULL; + cc.lpTemplateName = NULL; + + if( ChooseColor( &cc ) ) + { + g_backgroundDesktopColor = cc.rgbResult; /* save selected color to var */ + PropSheet_Changed( GetParent( g_hBackgroundPage ), g_hBackgroundPage ); /* Apply button will be activated */ + InvalidateRect(g_hBackgroundPreview, NULL, TRUE); /* window will be updated :) */ + } } BOOL CheckListBoxFilename(HWND list, TCHAR *filename) @@ -314,9 +336,9 @@ TCHAR fileTitle[256]; TCHAR filter[MAX_PATH]; BackgroundItem *backgroundItem = NULL; - SHFILEINFO sfi; - LV_ITEM listItem; - + SHFILEINFO sfi; + LV_ITEM listItem; + ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof(OPENFILENAME); @@ -324,7 +346,7 @@ ofn.lpstrFile = filename; LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filter, sizeof(filter) / sizeof(TCHAR)); - + /* Set lpstrFile[0] to '\0' so that GetOpenFileName does not * use the contents of szFile to initialize itself */ ofn.lpstrFile[0] = TEXT('\0'); @@ -337,7 +359,7 @@ ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; if(GetOpenFileName(&ofn) == TRUE) - { + { /* Check if there is already a entry that holds this filename */ if(CheckListBoxFilename(g_hBackgroundList, filename) == TRUE) return; @@ -414,7 +436,11 @@ if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) { - FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); + HBRUSH hBrush = CreateSolidBrush( g_backgroundDesktopColor ); + //HBRUSH hBrushOld = SelectObject( draw->hDC, hBrush ); + FillRect(draw->hDC, &draw->rcItem, hBrush ); + //SelectObject( draw->hDC, hBrushOld ); + DeleteObject( hBrush ); return; } @@ -531,6 +557,30 @@ else { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); + } +} + +void SetDesktopBackColor() +{ + /* change system color */ + INT iElement = COLOR_BACKGROUND; + if(!SetSysColors(1, &iElement, &g_backgroundDesktopColor)) + { + MessageBox(g_hBackgroundPage, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ + TEXT("Error!"), MB_ICONSTOP ); + } + + /* write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ + HKEY hKey = NULL; + if( RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS ) + { + TCHAR clText[16] = {0}; // COLORREF(DWORD) holds colors as := 0x00BBGGRR + DWORD red = (g_backgroundDesktopColor & 0x000000FF); + DWORD green = (g_backgroundDesktopColor & 0x0000FF00) >> 8; + DWORD blue = (g_backgroundDesktopColor & 0x00FF0000) >> 16; + wsprintf( clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ + RegSetValueEx( hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); + RegCloseKey( hKey ); } } @@ -622,7 +672,7 @@ case PSN_APPLY: { SetWallpaper(); - + SetDesktopBackColor(); return TRUE; } break;

18 years, 5 months

[fireball] 23170: Add HKCU\Control Panel\Colors\Background key for storing desktop background color (Windows XP stores it in this key)

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jul 19 12:40:38 2006 New Revision: 23170 URL: http://svn.reactos.org/svn/reactos?rev=23170&view=rev Log: Add HKCU\Control Panel\Colors\Background key for storing desktop background color (Windows XP stores it in this key) Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Wed Jul 19 12:40:38 2006 @@ -5,6 +5,8 @@ HKCU,"Control Panel",,0x00000012 HKCU,"Control Panel\Appearance",,0x00000012 +HKCU,"Control Panel\Colors",,0x00000012 +HKCU,"Control Panel\Colors","Background",0x00000012, "0 128 128" HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000 HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000 HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001

18 years, 5 months

[jimtabor] 23169: User32 Implement MenuTrackKbdMenuBar, it does work but, alt f works but hit alt again goes into a message loop. So hit alt f than esc esc. If hit alt f than alt v or something else the popup menu stays displayed until the program has terminated.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 19 11:10:56 2006 New Revision: 23169 URL: http://svn.reactos.org/svn/reactos?rev=23169&view=rev Log: User32 Implement MenuTrackKbdMenuBar, it does work but, alt f works but hit alt again goes into a message loop. So hit alt f than esc esc. If hit alt f than alt v or something else the popup menu stays displayed until the program has terminated. Modified: trunk/reactos/dll/win32/user32/include/menu.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/menu.h (original) +++ trunk/reactos/dll/win32/user32/include/menu.h Wed Jul 19 11:10:56 2006 @@ -17,6 +17,6 @@ VOID MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); VOID -MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key); +MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); #endif /* __LIB_USER32_INCLUDE_MENU_H */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Jul 19 11:10:56 2006 @@ -766,9 +766,10 @@ LRESULT -DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt) +DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { WINDOWPLACEMENT wp; + POINT Pt; switch (wParam & 0xfff0) { @@ -804,16 +805,24 @@ SendMessageA(hWnd, WM_CLOSE, 0, 0); break; case SC_MOUSEMENU: - MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt); + { + Pt.x = (short)LOWORD(lParam); + Pt.y = (short)HIWORD(lParam); + MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt); + } break; case SC_KEYMENU: - MenuTrackKbdMenuBar(hWnd, wParam, Pt.x); + MenuTrackKbdMenuBar(hWnd, wParam, (WCHAR)lParam); break; case SC_VSCROLL: case SC_HSCROLL: - DefWndTrackScrollBar(hWnd, wParam, Pt); + { + Pt.x = (short)LOWORD(lParam); + Pt.y = (short)HIWORD(lParam); + DefWndTrackScrollBar(hWnd, wParam, Pt); + } break; - + default: /* FIXME: Implement */ UNIMPLEMENTED; @@ -1305,13 +1314,7 @@ } case WM_SYSCOMMAND: - { - POINT Pt; - Pt.x = GET_X_LPARAM(lParam); - Pt.y = GET_Y_LPARAM(lParam); - return (DefWndHandleSysCommand(hWnd, wParam, Pt)); - } - + return (DefWndHandleSysCommand(hWnd, wParam, lParam)); case WM_KEYDOWN: if(wParam == VK_F10) iF10Key = VK_F10; Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Wed Jul 19 11:10:56 2006 @@ -3320,9 +3320,13 @@ fRemove = TRUE; /* Keyboard messages are always removed */ switch(Msg.message) { + case WM_SYSKEYDOWN: case WM_KEYDOWN: switch(Msg.wParam) { + case VK_MENU: + fEndMenu = TRUE; + break; case VK_HOME: case VK_END: if (MenuGetRosMenuInfo(&MenuInfo, Mt.CurrentMenu)) @@ -3408,20 +3412,6 @@ break; } break; /* WM_KEYDOWN */ - - case WM_SYSKEYDOWN: - switch (Msg.wParam) - { - DbgPrint("Menu.c WM_SYSKEYDOWN wPram %d\n",Msg.wParam); - case VK_MENU: - fEndMenu = TRUE; - break; - case VK_LMENU: - fEndMenu = TRUE; - break; - } - break; /* WM_SYSKEYDOWN */ - case WM_CHAR: case WM_SYSCHAR: { @@ -3566,8 +3556,73 @@ VOID -MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key) -{ +MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar) +{ + UINT uItem = NO_SELECTED_ITEM; + HMENU hTrackMenu; + ROSMENUINFO MenuInfo; + UINT wFlags = TPM_ENTERIDLEEX | TPM_LEFTALIGN | TPM_LEFTBUTTON; + + DPRINT("hwnd %p wParam 0x%04x wChar 0x%04x\n", hWnd, wParam, wChar); + + /* find window that has a menu */ + + while (!((GetWindowLongW( hWnd, GWL_STYLE ) & + (WS_CHILD | WS_POPUP)) != WS_CHILD)) + if (!(hWnd = GetAncestor( hWnd, GA_PARENT ))) return; + + /* check if we have to track a system menu */ + + hTrackMenu = GetMenu( hWnd ); + if (!hTrackMenu || IsIconic(hWnd) || wChar == ' ' ) + { + if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return; + hTrackMenu = NtUserGetSystemMenu(hWnd, FALSE); + uItem = 0; + wParam |= HTSYSMENU; /* prevent item lookup */ + } + + if (!IsMenu( hTrackMenu )) return; + + MenuInitTracking( hWnd, hTrackMenu, FALSE, wFlags ); + + if (! MenuGetRosMenuInfo(&MenuInfo, hTrackMenu)) + { + goto track_menu; + } + + if( wChar && wChar != ' ' ) + { + uItem = MenuFindItemByKey( hWnd, &MenuInfo, wChar, (wParam & HTSYSMENU) ); + if ( uItem >= (UINT)(-2) ) + { + if( uItem == (UINT)(-1) ) MessageBeep(0); + /* schedule end of menu tracking */ + wFlags |= TF_ENDMENU; + goto track_menu; + } + } + + MenuSelectItem( hWnd, &MenuInfo, uItem, TRUE, 0 ); + + if (wParam & HTSYSMENU) + { + /* prevent sysmenu activation for managed windows on Alt down/up */ +// if (GetPropA( hwnd, "__wine_x11_managed" )) + wFlags |= TF_ENDMENU; /* schedule end of menu tracking */ + } + else + { + if( uItem == NO_SELECTED_ITEM ) + MenuMoveSelection( hWnd, &MenuInfo, ITEM_NEXT ); + else + PostMessageW( hWnd, WM_KEYDOWN, VK_DOWN, 0L ); + } + +track_menu: + MenuTrackMenu( hTrackMenu, wFlags, 0, 0, hWnd, NULL ); + MenuExitTracking( hWnd ); + }

18 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006