Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23131: [AUDIT] - notify.c contains trivial (3 or 4 lines of code) implementations of adding a pointer to an array, and then looping said array and calling a pointer. Your grandmother could code this. - Cleanup notify.c and fix the return value of PsSetCreateProcessNotifyRoutine. - Create ps_x.h for inlined Ps routines and put the internal routines which call the registered callbacks in it.
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Tue Jul 18 02:18:44 2006 New Revision: 23131 URL: http://svn.reactos.org/svn/reactos?rev=23131&view=rev Log: [AUDIT] - notify.c contains trivial (3 or 4 lines of code) implementations of adding a pointer to an array, and then looping said array and calling a pointer. Your grandmother could code this. - Cleanup notify.c and fix the return value of PsSetCreateProcessNotifyRoutine. - Create ps_x.h for inlined Ps routines and put the internal routines which call the registered callbacks in it. Added: trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/notify.c (contents, props changed) Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Tue Jul 18 02:18:44 2006 @@ -449,6 +449,15 @@ struct _EPROCESS *Process, PVOID Callback, PVOID Context +); + +// +// Lego Callback +// +typedef +VOID +(NTAPI *PLEGO_NOTIFY_ROUTINE)( + IN PKTHREAD Thread ); #endif Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Tue Jul 18 02:18:44 2006 @@ -7,6 +7,384 @@ struct _EJOB; #include <internal/arch/ps.h> + +/* Top level irp definitions. */ +#define FSRTL_FSP_TOP_LEVEL_IRP (0x01) +#define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) +#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP (0x03) +#define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) +#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) + +#define PSP_MAX_CREATE_THREAD_NOTIFY 8 +#define PSP_MAX_LOAD_IMAGE_NOTIFY 8 +#define PSP_MAX_CREATE_PROCESS_NOTIFY 8 + +VOID +NTAPI +PiInitDefaultLocale(VOID); + +VOID +NTAPI +PiInitProcessManager(VOID); + +VOID +NTAPI +PspShutdownProcessManager(VOID); + +VOID +NTAPI +PsInitThreadManagment(VOID); + +VOID +NTAPI +PsInitProcessManagment(VOID); + +VOID +NTAPI +PsInitIdleThread(VOID); + +VOID +NTAPI +PiTerminateProcessThreads( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PsTerminateCurrentThread(NTSTATUS ExitStatus); + +VOID +NTAPI +PsTerminateOtherThread( + PETHREAD Thread, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PsReleaseThread(PETHREAD Thread); + +VOID +NTAPI +PsBeginThread( + PKSTART_ROUTINE StartRoutine, + PVOID StartContext +); + +VOID +NTAPI +PsBeginThreadWithContextInternal(VOID); + +VOID +NTAPI +PiKillMostProcesses(VOID); + +NTSTATUS +STDCALL +PiTerminateProcess( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PiInitApcManagement(VOID); + +VOID +STDCALL +PiDeleteThread(PVOID ObjectBody); + +VOID +NTAPI +PsReapThreads(VOID); + +VOID +NTAPI +PsInitializeThreadReaper(VOID); + +VOID +NTAPI +PsQueueThreadReap(PETHREAD Thread); + +NTSTATUS +NTAPI +PsInitializeThread( + PEPROCESS Process, + PETHREAD* ThreadPtr, + POBJECT_ATTRIBUTES ObjectAttributes, + KPROCESSOR_MODE AccessMode, + BOOLEAN First +); + +PACCESS_TOKEN +STDCALL +PsReferenceEffectiveToken( + PETHREAD Thread, + PTOKEN_TYPE TokenType, + PUCHAR b, + PSECURITY_IMPERSONATION_LEVEL Level +); + +NTSTATUS +STDCALL +PsOpenTokenOfProcess( + HANDLE ProcessHandle, + PACCESS_TOKEN* Token +); + +VOID +STDCALL +PspTerminateProcessThreads( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +NTSTATUS +NTAPI +PsSuspendThread( + PETHREAD Thread, + PULONG PreviousCount +); + +NTSTATUS +NTAPI +PsResumeThread( + PETHREAD Thread, + PULONG PreviousCount +); + +NTSTATUS +STDCALL +PspAssignPrimaryToken( + PEPROCESS Process, + HANDLE TokenHandle +); + +PETHREAD +NTAPI +PsGetNextProcessThread( + IN PEPROCESS Process, + IN PETHREAD Thread OPTIONAL +); + +VOID +STDCALL +PsExitSpecialApc( + PKAPC Apc, + PKNORMAL_ROUTINE *NormalRoutine, + PVOID *NormalContext, + PVOID *SystemArgument1, + PVOID *SystemArgument2 +); + +NTSTATUS +STDCALL +PspInitializeProcessSecurity( + PEPROCESS Process, + PEPROCESS Parent OPTIONAL +); + +VOID +STDCALL +PspSystemThreadStartup( + PKSTART_ROUTINE StartRoutine, + PVOID StartContext +); + +NTSTATUS +NTAPI +PsInitializeIdleOrFirstThread( + PEPROCESS Process, + PETHREAD* ThreadPtr, + PKSTART_ROUTINE StartRoutine, + KPROCESSOR_MODE AccessMode, + BOOLEAN First +); + +VOID +STDCALL +PiDeleteProcess(PVOID ObjectBody); + +VOID +STDCALL +PspReapRoutine(PVOID Context); + +VOID +STDCALL +PspExitThread(NTSTATUS ExitStatus); + +NTSTATUS +STDCALL +PspTerminateThreadByPointer( + PETHREAD Thread, + NTSTATUS ExitStatus, + BOOLEAN bSelf +); + +NTSTATUS +NTAPI +PsUnfreezeOtherThread(PETHREAD Thread); + +VOID +NTAPI +PsFreezeOtherThread(PETHREAD Thread); + +VOID +NTAPI +PsFreezeProcessThreads(PEPROCESS Process); + +VOID +NTAPI +PsUnfreezeProcessThreads(PEPROCESS Process); + +ULONG +NTAPI +PsEnumThreadsByProcess(PEPROCESS Process); + +PEPROCESS +STDCALL +PsGetNextProcess(PEPROCESS OldProcess); + +VOID +NTAPI +PsApplicationProcessorInit(VOID); + +VOID +NTAPI +PsPrepareForApplicationProcessorInit(ULONG Id); + +VOID +STDCALL +PsIdleThreadMain(PVOID Context); + +VOID +STDCALL +PiSuspendThreadRundownRoutine(PKAPC Apc); + +VOID +STDCALL +PiSuspendThreadKernelRoutine( + PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArguemnt2 +); + +VOID +STDCALL +PiSuspendThreadNormalRoutine( + PVOID NormalContext, + PVOID SystemArgument1, + PVOID SystemArgument2 +); + +VOID +NTAPI +PsInitialiseSuspendImplementation(VOID); + +VOID +STDCALL +PspExitProcess(BOOLEAN LastThread, + PEPROCESS Process); + +VOID +STDCALL +PspDeleteProcess(PVOID ObjectBody); + +VOID +STDCALL +PspDeleteThread(PVOID ObjectBody); + + +NTSTATUS +NTAPI +PsInitWin32Thread(PETHREAD Thread); + +VOID +NTAPI +PsTerminateWin32Process(PEPROCESS Process); + +VOID +NTAPI +PsTerminateWin32Thread(PETHREAD Thread); + +VOID +NTAPI +PsInitialiseW32Call(VOID); + +VOID +NTAPI +INIT_FUNCTION +PsInitJobManagment(VOID); + +VOID +STDCALL +PspInheritQuota( + PEPROCESS Process, + PEPROCESS ParentProcess +); + +VOID +STDCALL +PspDestroyQuotaBlock(PEPROCESS Process); + +NTSTATUS +STDCALL +PspMapSystemDll( + PEPROCESS Process, + PVOID *DllBase +); + +NTSTATUS +STDCALL +PsLocateSystemDll(VOID); + +NTSTATUS +STDCALL +PspGetSystemDllEntryPoints(VOID); + +NTSTATUS +NTAPI +PsLockProcess( + PEPROCESS Process, + BOOLEAN Timeout +); + +VOID +NTAPI +PsUnlockProcess(PEPROCESS Process); + +VOID +NTAPI +PspRemoveProcessFromJob( + IN PEPROCESS Process, + IN PEJOB Job +); + +NTSTATUS +NTAPI +PspDeleteLdt(IN PEPROCESS Process); + +NTSTATUS +NTAPI +PspDeleteVdmObjects(IN PEPROCESS Process); + +VOID +NTAPI +PspDeleteProcessSecurity(IN PEPROCESS Process); + +VOID +NTAPI +PspDeleteThreadSecurity(IN PETHREAD Thread); + +VOID +NTAPI +PspExitProcessFromJob( + IN PEJOB Job, + IN PEPROCESS Process +); extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; @@ -19,400 +397,15 @@ extern FAST_MUTEX PspActiveProcessMutex; extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; - -/* Top level irp definitions. */ -#define FSRTL_FSP_TOP_LEVEL_IRP (0x01) -#define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) -#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP (0x03) -#define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) -#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) - -#define MAX_PROCESS_NOTIFY_ROUTINE_COUNT 8 -#define MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT 8 - -VOID -NTAPI -PiInitDefaultLocale(VOID); - -VOID -NTAPI -PiInitProcessManager(VOID); - -VOID -NTAPI -PspShutdownProcessManager(VOID); - -VOID -NTAPI -PsInitThreadManagment(VOID); - -VOID -NTAPI -PsInitProcessManagment(VOID); - -VOID -NTAPI -PsInitIdleThread(VOID); - -VOID -NTAPI -PiTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsTerminateCurrentThread(NTSTATUS ExitStatus); - -VOID -NTAPI -PsTerminateOtherThread( - PETHREAD Thread, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsReleaseThread(PETHREAD Thread); - -VOID -NTAPI -PsBeginThread( - PKSTART_ROUTINE StartRoutine, - PVOID StartContext -); - -VOID -NTAPI -PsBeginThreadWithContextInternal(VOID); - -VOID -NTAPI -PiKillMostProcesses(VOID); - -NTSTATUS -STDCALL -PiTerminateProcess( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PiInitApcManagement(VOID); - -VOID -STDCALL -PiDeleteThread(PVOID ObjectBody); - -VOID -NTAPI -PsReapThreads(VOID); - -VOID -NTAPI -PsInitializeThreadReaper(VOID); - -VOID -NTAPI -PsQueueThreadReap(PETHREAD Thread); - -NTSTATUS -NTAPI -PsInitializeThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - POBJECT_ATTRIBUTES ObjectAttributes, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); - -PACCESS_TOKEN -STDCALL -PsReferenceEffectiveToken( - PETHREAD Thread, - PTOKEN_TYPE TokenType, - PUCHAR b, - PSECURITY_IMPERSONATION_LEVEL Level -); - -NTSTATUS -STDCALL -PsOpenTokenOfProcess( - HANDLE ProcessHandle, - PACCESS_TOKEN* Token -); - -VOID -STDCALL -PspTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -NTSTATUS -NTAPI -PsSuspendThread( - PETHREAD Thread, - PULONG PreviousCount -); - -NTSTATUS -NTAPI -PsResumeThread( - PETHREAD Thread, - PULONG PreviousCount -); - -NTSTATUS -STDCALL -PspAssignPrimaryToken( - PEPROCESS Process, - HANDLE TokenHandle -); - -PETHREAD -NTAPI -PsGetNextProcessThread( - IN PEPROCESS Process, - IN PETHREAD Thread OPTIONAL -); - -VOID -STDCALL -PsExitSpecialApc( - PKAPC Apc, - PKNORMAL_ROUTINE *NormalRoutine, - PVOID *NormalContext, - PVOID *SystemArgument1, - PVOID *SystemArgument2 -); - -NTSTATUS -STDCALL -PspInitializeProcessSecurity( - PEPROCESS Process, - PEPROCESS Parent OPTIONAL -); - -VOID -STDCALL -PspSystemThreadStartup( - PKSTART_ROUTINE StartRoutine, - PVOID StartContext -); - -NTSTATUS -NTAPI -PsInitializeIdleOrFirstThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - PKSTART_ROUTINE StartRoutine, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); - -VOID -STDCALL -PiDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL -PspReapRoutine(PVOID Context); - -VOID -STDCALL -PspExitThread(NTSTATUS ExitStatus); - -NTSTATUS -STDCALL -PspTerminateThreadByPointer( - PETHREAD Thread, - NTSTATUS ExitStatus, - BOOLEAN bSelf -); - -NTSTATUS -NTAPI -PsUnfreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeProcessThreads(PEPROCESS Process); - -VOID -NTAPI -PsUnfreezeProcessThreads(PEPROCESS Process); - -ULONG -NTAPI -PsEnumThreadsByProcess(PEPROCESS Process); - -PEPROCESS -STDCALL -PsGetNextProcess(PEPROCESS OldProcess); - -VOID -NTAPI -PsApplicationProcessorInit(VOID); - -VOID -NTAPI -PsPrepareForApplicationProcessorInit(ULONG Id); - -VOID -STDCALL -PsIdleThreadMain(PVOID Context); - -VOID -STDCALL -PiSuspendThreadRundownRoutine(PKAPC Apc); - -VOID -STDCALL -PiSuspendThreadKernelRoutine( - PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2 -); - -VOID -STDCALL -PiSuspendThreadNormalRoutine( - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2 -); - -VOID -NTAPI -PsInitialiseSuspendImplementation(VOID); - -VOID -STDCALL -PspExitProcess(BOOLEAN LastThread, - PEPROCESS Process); - -VOID -STDCALL -PspDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL -PspDeleteThread(PVOID ObjectBody); - - -NTSTATUS -NTAPI -PsInitWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsTerminateWin32Process(PEPROCESS Process); - -VOID -NTAPI -PsTerminateWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsInitialiseW32Call(VOID); - -VOID -STDCALL -PspRunCreateThreadNotifyRoutines( - PETHREAD, - BOOLEAN -); - -VOID -STDCALL -PspRunCreateProcessNotifyRoutines( - PEPROCESS, - BOOLEAN -); - -VOID -STDCALL -PspRunLegoRoutine(IN PKTHREAD Thread); - -VOID -NTAPI -INIT_FUNCTION -PsInitJobManagment(VOID); - -VOID -STDCALL -PspInheritQuota( - PEPROCESS Process, - PEPROCESS ParentProcess -); - -VOID -STDCALL -PspDestroyQuotaBlock(PEPROCESS Process); - -NTSTATUS -STDCALL -PspMapSystemDll( - PEPROCESS Process, - PVOID *DllBase -); - -NTSTATUS -STDCALL -PsLocateSystemDll(VOID); - -NTSTATUS -STDCALL -PspGetSystemDllEntryPoints(VOID); - -NTSTATUS -NTAPI -PsLockProcess( - PEPROCESS Process, - BOOLEAN Timeout -); - -VOID -NTAPI -PsUnlockProcess(PEPROCESS Process); - -VOID -NTAPI -PspRemoveProcessFromJob( - IN PEPROCESS Process, - IN PEJOB Job -); - -NTSTATUS -NTAPI -PspDeleteLdt(IN PEPROCESS Process); - -NTSTATUS -NTAPI -PspDeleteVdmObjects(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteProcessSecurity(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteThreadSecurity(IN PETHREAD Thread); - -VOID -NTAPI -PspExitProcessFromJob( - IN PEJOB Job, - IN PEPROCESS Process -); +extern PCREATE_THREAD_NOTIFY_ROUTINE +PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +extern PCREATE_PROCESS_NOTIFY_ROUTINE +PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +extern PLOAD_IMAGE_NOTIFY_ROUTINE +PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +extern PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; +extern ULONG PspThreadNotifyRoutineCount; + +#include "ps_x.h" #endif /* __INCLUDE_INTERNAL_PS_H */ Added: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (added) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Tue Jul 18 02:18:44 2006 @@ -1,0 +1,74 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ps_x.h +* PURPOSE: Intenral Inlined Functions for the Process Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Thomas Weidenmueller (w3seek(a)reactos.org) +*/ + +VOID +FORCEINLINE +PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread, + IN BOOLEAN Create) +{ + ULONG i; + CLIENT_ID Cid = CurrentThread->Cid; + + /* Loop the notify routines */ + for (i = 0; i < PspThreadNotifyRoutineCount; i++) + { + /* Call it */ + PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); + } +} + +VOID +FORCEINLINE +PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess, + IN BOOLEAN Create) +{ + ULONG i; + HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; + HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; + + /* Loop the notify routines */ + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; ++i) + { + /* Make sure it exists */ + if(PspProcessNotifyRoutine[i]) + { + /* Call it */ + PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); + } + } +} + +VOID +FORCEINLINE +PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, + HANDLE ProcessId, + PIMAGE_INFO ImageInfo) +{ + ULONG i; + + /* Loop the notify routines */ + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; ++ i) + { + /* Make sure it exists */ + if (PspLoadImageNotifyRoutine[i]) + { + /* Call it */ + PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); + } + } +} + +VOID +FORCEINLINE +PspRunLegoRoutine(IN PKTHREAD Thread) +{ + /* Call it */ + if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread); +} + Modified: trunk/reactos/ntoskrnl/ps/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/notify.c (original) +++ trunk/reactos/ntoskrnl/ps/notify.c Tue Jul 18 02:18:44 2006 @@ -1,42 +1,36 @@ /* - * 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/notify.c - * PURPOSE: Notifications - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: Process Manager: Callbacks to Registered Clients (Drivers) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -/* GLOBAL *******************************************************************/ +/* GLOBALS *******************************************************************/ -#define MAX_THREAD_NOTIFY_ROUTINE_COUNT 8 +ULONG PspThreadNotifyRoutineCount; +PCREATE_THREAD_NOTIFY_ROUTINE +PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +PCREATE_PROCESS_NOTIFY_ROUTINE +PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +PLOAD_IMAGE_NOTIFY_ROUTINE +PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; -static ULONG PspThreadNotifyRoutineCount = 0; -static PCREATE_THREAD_NOTIFY_ROUTINE -PspThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; - -static PCREATE_PROCESS_NOTIFY_ROUTINE -PspProcessNotifyRoutine[MAX_PROCESS_NOTIFY_ROUTINE_COUNT]; - -static PLOAD_IMAGE_NOTIFY_ROUTINE -PspLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; - -typedef VOID (STDCALL *PLEGO_NOTIFY_ROUTINE)(IN PKTHREAD Thread); -static PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; - -/* FUNCTIONS ***************************************************************/ +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetCreateProcessNotifyRoutine(IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, IN BOOLEAN Remove) { @@ -46,24 +40,24 @@ if (Remove) { /* Loop the routines */ - for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspProcessNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspProcessNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspProcessNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } } else { /* Loop the routines */ - for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) { /* Find an empty one */ - if (PspProcessNotifyRoutine[i] == NULL) + if (!PspProcessNotifyRoutine[i]) { /* Add it */ PspProcessNotifyRoutine[i] = NotifyRoutine; @@ -73,14 +67,14 @@ } /* Nothing found */ - return STATUS_INVALID_PARAMETER; + return Remove ? STATUS_PROCEDURE_NOT_FOUND : STATUS_INVALID_PARAMETER; } /* * @implemented */ ULONG -STDCALL +NTAPI PsSetLegoNotifyRoutine(PVOID LegoNotifyRoutine) { /* Set the System-Wide Lego Routine */ @@ -94,20 +88,20 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for(i=0;i<MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspLoadImageNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspLoadImageNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspLoadImageNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } @@ -119,16 +113,16 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for (i = 0; i < MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT; i++) + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) { /* Find an empty one */ - if (PspLoadImageNotifyRoutine[i] == NULL) + if (!PspLoadImageNotifyRoutine[i]) { /* Add it */ PspLoadImageNotifyRoutine[i] = NotifyRoutine; @@ -144,20 +138,20 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for(i=0;i<MAX_THREAD_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspThreadNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspThreadNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspThreadNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } @@ -169,75 +163,19 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) { - if (PspThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) + /* Make sure we didn't register too many */ + if (PspThreadNotifyRoutineCount >= PSP_MAX_CREATE_THREAD_NOTIFY) { - return(STATUS_INSUFFICIENT_RESOURCES); + /* Fail */ + return STATUS_INSUFFICIENT_RESOURCES; } - PspThreadNotifyRoutine[PspThreadNotifyRoutineCount] = NotifyRoutine; - PspThreadNotifyRoutineCount++; - - return(STATUS_SUCCESS); -} - -VOID -STDCALL -PspRunCreateThreadNotifyRoutines(PETHREAD CurrentThread, - BOOLEAN Create) -{ - ULONG i; - CLIENT_ID Cid = CurrentThread->Cid; - - for (i = 0; i < PspThreadNotifyRoutineCount; i++) - { - PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); - } -} - -VOID -STDCALL -PspRunCreateProcessNotifyRoutines(PEPROCESS CurrentProcess, - BOOLEAN Create) -{ - ULONG i; - HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; - HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; - - for(i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++i) - { - if(PspProcessNotifyRoutine[i]) - { - PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); - } - } -} - -VOID -STDCALL -PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, - HANDLE ProcessId, - PIMAGE_INFO ImageInfo) -{ - ULONG i; - - for (i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++ i) - { - if (PspLoadImageNotifyRoutine[i]) - { - PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); - } - } -} - -VOID -STDCALL -PspRunLegoRoutine(IN PKTHREAD Thread) -{ - /* Call it */ - if (PspLegoNotifyRoutine) (PspLegoNotifyRoutine)(Thread); + /* Register this one */ + PspThreadNotifyRoutine[PspThreadNotifyRoutineCount++] = NotifyRoutine; + return STATUS_SUCCESS; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/notify.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23130: start implement DrvGetDirectDrawInfo it is not complete only around 1/3 is done
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Tue Jul 18 02:14:58 2006 New Revision: 23130 URL: http://svn.reactos.org/svn/reactos?rev=23130&view=rev Log: start implement DrvGetDirectDrawInfo it is not complete only around 1/3 is done Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/screen.c trunk/reactos/drivers/video/displays/framebuf/surface.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 02:14:58 2006 @@ -51,16 +51,17 @@ ppdev->ddpfDisplay.dwGBitMask = ppdev->GreenMask; ppdev->ddpfDisplay.dwBBitMask = ppdev->BlueMask; - switch(ppdev->BitsPerPixel) + ppdev->ddpfDisplay.dwRGBBitCount=ppdev->BitsPerPixel; + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + ppdev->ddpfDisplay.dwFlags = DDPF_RGB; + + switch(ppdev->iDitherFormat) { - case BMF_8BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; - ppdev->ddpfDisplay.dwRGBBitCount=8; - ppdev->ddpfDisplay.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + case BMF_8BPP: + ppdev->ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; break; - case BMF_16BPP: - ppdev->ddpfDisplay.dwRGBBitCount=16; + case BMF_16BPP: switch(ppdev->RedMask) { case 0x7C00: @@ -68,28 +69,23 @@ break; default: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + break; } break; - case BMF_24BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; - ppdev->ddpfDisplay.dwRGBBitCount=24; + case BMF_24BPP: break; case BMF_32BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; - ppdev->ddpfDisplay.dwRGBBitCount=32; + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; break; + default: - /* FIXME unknown pixelformat */ + /* FIXME unknown pixel bits */ + ppdev->ddpfDisplay.dwRGBBitCount=0; break; } - - - //InitDDHAL(ppdev); - - + if (pCallBacks !=NULL) { memset(pCallBacks,0,sizeof(DD_CALLBACKS)); @@ -138,6 +134,52 @@ OUT DWORD *pdwNumFourCCCodes, OUT DWORD *pdwFourCC) { - return FALSE; + PPDEV ppdev = (PPDEV)dhpdev; + + /* rest some data */ + *pdwNumFourCCCodes = 0; + *pdwNumHeaps = 0; + + + + /* + check see if pvmList and pdwFourCC are second call + or frist. Secon call we fill in pHalInfo info + */ + + if(!(pvmList && pdwFourCC)) + { + + /* Calc how much memmory is left on the video cards memmory */ + pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; + + /* fill in some basic info that we need */ + pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwDisplayWidth = ppdev->ScreenWidth; + pHalInfo->vmiData.dwDisplayHeight = ppdev->ScreenHeight; + pHalInfo->vmiData.lDisplayPitch = ppdev->ScreenDelta; + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = ppdev->BitsPerPixel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = ppdev->RedMask; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = ppdev->GreenMask; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = ppdev->BlueMask; + pHalInfo->vmiData.dwOffscreenAlign = 4; + pHalInfo->vmiData.dwZBufferAlign = 4; + pHalInfo->vmiData.dwTextureAlign = 4; + + if ( ppdev->BitsPerPixel == 8 ) + { + pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; + } + + + + + + } + + return TRUE; } Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Tue Jul 18 02:14:58 2006 @@ -63,6 +63,8 @@ #endif /* DirectX Support */ + DWORD iDitherFormat; + ULONG MemHeight; BOOL bDDInitialized; DDPIXELFORMAT ddpfDisplay; DDHALINFO dxHalInfo; Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c Tue Jul 18 02:14:58 2006 @@ -190,6 +190,8 @@ ppdev->ScreenHeight = SelectedMode->VisScreenHeight; ppdev->ScreenDelta = SelectedMode->ScreenStride; ppdev->BitsPerPixel = SelectedMode->BitsPerPlane * SelectedMode->NumberOfPlanes; + + ppdev->MemHeight = SelectedMode->VideoMemoryBitmapHeight; ppdev->RedMask = SelectedMode->RedMask; ppdev->GreenMask = SelectedMode->GreenMask; Modified: trunk/reactos/drivers/video/displays/framebuf/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/surface.c Tue Jul 18 02:14:58 2006 @@ -91,6 +91,8 @@ return FALSE; } + ppdev->iDitherFormat = BitmapType; + ScreenSize.cx = ppdev->ScreenWidth; ScreenSize.cy = ppdev->ScreenHeight; @@ -181,8 +183,9 @@ &ulTemp); if (ppdev->BitsPerPixel == 8) { - IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); + IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); } + return Result; }

1 0

[hpoussin] 23129: - kbdclass/mouclass should be able to return more than one keystroke/mouse move during a IRP_MJ_READ. - Better cleanup in case of error in ClassAddDevice - Registering the interface is optional. Don't fail in case of error.
by hpoussin＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: hpoussin Date: Tue Jul 18 02:13:40 2006 New Revision: 23129 URL: http://svn.reactos.org/svn/reactos?rev=23129&view=rev Log: - kbdclass/mouclass should be able to return more than one keystroke/mouse move during a IRP_MJ_READ. - Better cleanup in case of error in ClassAddDevice - Registering the interface is optional. Don't fail in case of error. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Tue Jul 18 02:13:40 2006 @@ -126,7 +126,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one keyboard */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -375,6 +375,7 @@ ExFreePool(DeviceNameU.Buffer); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags |= DO_BUFFERED_IO; /* FIXME: Why is it needed for 1st stage setup? */ Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -383,13 +384,11 @@ RtlWriteRegistryValue( RTL_REGISTRY_DEVICEMAP, DriverExtension->DeviceBaseName.Buffer, - DeviceNameU.Buffer, + DeviceExtension->DeviceName, REG_SZ, DriverExtension->RegistryPath.Buffer, DriverExtension->RegistryPath.MaximumLength); - ExFreePool(DeviceNameU.Buffer); - if (ClassDO) *ClassDO = Fdo; @@ -397,10 +396,11 @@ } static NTSTATUS -FillOneEntry( +FillEntries( IN PDEVICE_OBJECT ClassDeviceObject, IN PIRP Irp, - IN PKEYBOARD_INPUT_DATA DataStart) + IN PKEYBOARD_INPUT_DATA DataStart, + IN SIZE_T NumberOfEntries) { NTSTATUS Status = STATUS_SUCCESS; @@ -409,7 +409,7 @@ RtlCopyMemory( Irp->AssociatedIrp.SystemBuffer, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } else if (ClassDeviceObject->Flags & DO_DIRECT_IO) { @@ -419,7 +419,7 @@ RtlCopyMemory( DestAddress, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } else Status = STATUS_UNSUCCESSFUL; @@ -431,7 +431,7 @@ RtlCopyMemory( Irp->UserBuffer, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } _SEH_HANDLE { @@ -453,7 +453,6 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - PIO_STACK_LOCATION Stack; ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; @@ -468,31 +467,35 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + /* A read request is waiting for input, so go straight to it */ NTSTATUS Status; + SIZE_T NumberOfEntries; Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; - Stack = IoGetCurrentIrpStackLocation(Irp); - - /* A read request is waiting for input, so go straight to it */ - Status = FillOneEntry( + + NumberOfEntries = MIN( + InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(KEYBOARD_INPUT_DATA)); + + Status = FillEntries( ClassDeviceObject, Irp, - DataStart); + DataStart, + NumberOfEntries); if (NT_SUCCESS(Status)) { /* Go to next packet and complete this request with STATUS_SUCCESS */ Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA); ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + DataStart += NumberOfEntries; + (*ConsumedCount) += NumberOfEntries; + InputCount -= NumberOfEntries; } } @@ -561,11 +564,14 @@ ConnectData.ClassDeviceObject = ClassDO; ConnectData.ClassService = ClassCallback; - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_KEYBOARD_CONNECT, + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_KEYBOARD_CONNECT, PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; Status = IoCallDriver(PortDO, Irp); @@ -593,16 +599,65 @@ return IoStatus.Status; } -/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ -static NTSTATUS -DisconnectPortDriver( +/* Send IOCTL_INTERNAL_*_DISCONNECT to port + destroy the Port DO */ +static VOID +DestroyPortDriver( IN PDEVICE_OBJECT PortDO) { - DPRINT("Disconnecting PortDO %p [%wZ]\n", + PPORT_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + KIRQL OldIrql; + NTSTATUS Status; + + DPRINT("Destroying PortDO %p [%wZ]\n", PortDO, &PortDO->DriverObject->DriverName); - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); - return STATUS_NOT_IMPLEMENTED; + DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; + ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; + DriverExtension = IoGetDriverObjectExtension(PortDO->DriverObject, PortDO->DriverObject); + + /* Send IOCTL_INTERNAL_*_DISCONNECT */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_KEYBOARD_DISCONNECT, + PortDO, + NULL, 0, + NULL, 0, + TRUE, &Event, &IoStatus); + if (Irp) + { + Status = IoCallDriver(PortDO, Irp); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + } + + /* Remove from ClassDeviceExtension->ListHead list */ + KeAcquireSpinLock(&ClassDeviceExtension->ListSpinLock, &OldIrql); + RemoveHeadList(DeviceExtension->ListEntry.Blink); + KeReleaseSpinLock(&ClassDeviceExtension->ListSpinLock, OldIrql); + + /* Remove entry from HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlDeleteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + ClassDeviceExtension->DeviceName); + + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + ObDereferenceObject(PortDO); + + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + ExFreePool(ClassDeviceExtension->PortData); + ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + IoDeleteDevice(DeviceExtension->ClassDO); + } + + IoDeleteDevice(PortDO); } static NTSTATUS NTAPI @@ -679,44 +734,21 @@ } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register interface */ + /* Register interface ; ignore the error (if any) as having + * a registred interface is not so important... */ Status = IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_KEYBOARD, NULL, &DeviceExtension->InterfaceName); - if (Status == STATUS_INVALID_PARAMETER_1) - { - /* The Pdo was a strange one ; maybe it is a legacy device. - * Ignore the error. */ - return STATUS_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - goto cleanup; - } + if (!NT_SUCCESS(Status)) + DeviceExtension->InterfaceName.Length = 0; return STATUS_SUCCESS; cleanup: - if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DisconnectPortDriver(Fdo); - if (DeviceExtension) - { - if (DeviceExtension->LowerDevice) - IoDetachDevice(DeviceExtension->LowerDevice); - if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) - { - PCLASS_DEVICE_EXTENSION ClassDeviceExtension; - ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; - ExFreePool(ClassDeviceExtension->PortData); - /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ - //IoDeleteDevice(DeviceExtension->ClassDO); - } - } if (Fdo) - IoDeleteDevice(Fdo); + DestroyPortDriver(Fdo); return Status; } @@ -726,7 +758,6 @@ IN PIRP Irp) { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -734,29 +765,34 @@ { KIRQL oldIrql; NTSTATUS Status; + SIZE_T NumberOfEntries; + + NumberOfEntries = MIN( + DeviceExtension->InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(KEYBOARD_INPUT_DATA)); KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - Status = FillOneEntry( + Status = FillEntries( DeviceObject, Irp, - &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); + DeviceExtension->PortData, + NumberOfEntries); if (NT_SUCCESS(Status)) { - if (DeviceExtension->InputCount > 1) + if (DeviceExtension->InputCount > NumberOfEntries) { RtlMoveMemory( - &DeviceExtension->PortData[1], &DeviceExtension->PortData[0], - (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); + &DeviceExtension->PortData[NumberOfEntries], + (DeviceExtension->InputCount - NumberOfEntries) * sizeof(KEYBOARD_INPUT_DATA)); } - DeviceExtension->InputCount--; + DeviceExtension->InputCount -= NumberOfEntries; DeviceExtension->ReadIsPending = FALSE; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA); } /* Go to next packet and complete this request */ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Tue Jul 18 02:13:40 2006 @@ -5,6 +5,8 @@ #include <stdio.h> #define MAX_PATH 260 + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) typedef enum { @@ -56,6 +58,7 @@ BOOLEAN ReadIsPending; ULONG InputCount; PKEYBOARD_INPUT_DATA PortData; + LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Tue Jul 18 02:13:40 2006 @@ -123,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one mouse */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -352,6 +352,7 @@ ExFreePool(DeviceNameU.Buffer); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -359,13 +360,11 @@ RtlWriteRegistryValue( RTL_REGISTRY_DEVICEMAP, DriverExtension->DeviceBaseName.Buffer, - DeviceNameU.Buffer, + DeviceExtension->DeviceName, REG_SZ, DriverExtension->RegistryPath.Buffer, DriverExtension->RegistryPath.MaximumLength); - ExFreePool(DeviceNameU.Buffer); - if (ClassDO) *ClassDO = Fdo; @@ -373,10 +372,11 @@ } static NTSTATUS -FillOneEntry( +FillEntries( IN PDEVICE_OBJECT ClassDeviceObject, IN PIRP Irp, - IN PMOUSE_INPUT_DATA DataStart) + IN PMOUSE_INPUT_DATA DataStart, + IN SIZE_T NumberOfEntries) { NTSTATUS Status = STATUS_SUCCESS; @@ -385,7 +385,7 @@ RtlCopyMemory( Irp->AssociatedIrp.SystemBuffer, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } else if (ClassDeviceObject->Flags & DO_DIRECT_IO) { @@ -395,7 +395,7 @@ RtlCopyMemory( DestAddress, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } else Status = STATUS_UNSUCCESSFUL; @@ -407,7 +407,7 @@ RtlCopyMemory( Irp->UserBuffer, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } _SEH_HANDLE { @@ -429,7 +429,6 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - PIO_STACK_LOCATION Stack; ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; @@ -444,31 +443,35 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + /* A read request is waiting for input, so go straight to it */ NTSTATUS Status; + SIZE_T NumberOfEntries; Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; - Stack = IoGetCurrentIrpStackLocation(Irp); - - /* A read request is waiting for input, so go straight to it */ - Status = FillOneEntry( + + NumberOfEntries = MIN( + InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(MOUSE_INPUT_DATA)); + + Status = FillEntries( ClassDeviceObject, Irp, - DataStart); + DataStart, + NumberOfEntries); if (NT_SUCCESS(Status)) { /* Go to next packet and complete this request with STATUS_SUCCESS */ Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(MOUSE_INPUT_DATA); ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + DataStart += NumberOfEntries; + (*ConsumedCount) += NumberOfEntries; + InputCount -= NumberOfEntries; } } @@ -537,11 +540,14 @@ ConnectData.ClassDeviceObject = ClassDO; ConnectData.ClassService = ClassCallback; - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_MOUSE_CONNECT, PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; Status = IoCallDriver(PortDO, Irp); @@ -569,16 +575,65 @@ return IoStatus.Status; } -/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ -static NTSTATUS -DisconnectPortDriver( +/* Send IOCTL_INTERNAL_*_DISCONNECT to port + destroy the Port DO */ +static VOID +DestroyPortDriver( IN PDEVICE_OBJECT PortDO) { - DPRINT("Disconnecting PortDO %p [%wZ]\n", + PPORT_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + KIRQL OldIrql; + NTSTATUS Status; + + DPRINT("Destroying PortDO %p [%wZ]\n", PortDO, &PortDO->DriverObject->DriverName); - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); - return STATUS_NOT_IMPLEMENTED; + DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; + ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; + DriverExtension = IoGetDriverObjectExtension(PortDO->DriverObject, PortDO->DriverObject); + + /* Send IOCTL_INTERNAL_*_DISCONNECT */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_MOUSE_DISCONNECT, + PortDO, + NULL, 0, + NULL, 0, + TRUE, &Event, &IoStatus); + if (Irp) + { + Status = IoCallDriver(PortDO, Irp); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + } + + /* Remove from ClassDeviceExtension->ListHead list */ + KeAcquireSpinLock(&ClassDeviceExtension->ListSpinLock, &OldIrql); + RemoveHeadList(DeviceExtension->ListEntry.Blink); + KeReleaseSpinLock(&ClassDeviceExtension->ListSpinLock, OldIrql); + + /* Remove entry from HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlDeleteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + ClassDeviceExtension->DeviceName); + + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + ObDereferenceObject(PortDO); + + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + ExFreePool(ClassDeviceExtension->PortData); + ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + IoDeleteDevice(DeviceExtension->ClassDO); + } + + IoDeleteDevice(PortDO); } static NTSTATUS NTAPI @@ -655,44 +710,21 @@ } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register interface */ - Status = IoRegisterDeviceInterface( + /* Register interface ; ignore the error (if any) as having + * a registred interface is not so important... */ + IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_MOUSE, NULL, &DeviceExtension->InterfaceName); - if (Status == STATUS_INVALID_PARAMETER_1) - { - /* The Pdo was a strange one ; maybe it is a legacy device. - * Ignore the error. */ - return STATUS_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - goto cleanup; - } + if (!NT_SUCCESS(Status)) + DeviceExtension->InterfaceName.Length = 0; return STATUS_SUCCESS; cleanup: - if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DisconnectPortDriver(Fdo); - if (DeviceExtension) - { - if (DeviceExtension->LowerDevice) - IoDetachDevice(DeviceExtension->LowerDevice); - if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) - { - PCLASS_DEVICE_EXTENSION ClassDeviceExtension; - ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; - ExFreePool(ClassDeviceExtension->PortData); - /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ - // IoDeleteDevice(DeviceExtension->ClassDO); - } - } if (Fdo) - IoDeleteDevice(Fdo); + DestroyPortDriver(Fdo); return Status; } @@ -702,7 +734,6 @@ IN PIRP Irp) { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -710,29 +741,34 @@ { KIRQL oldIrql; NTSTATUS Status; + SIZE_T NumberOfEntries; + + NumberOfEntries = MIN( + DeviceExtension->InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(MOUSE_INPUT_DATA)); KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - Status = FillOneEntry( + Status = FillEntries( DeviceObject, Irp, - &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); + DeviceExtension->PortData, + NumberOfEntries); if (NT_SUCCESS(Status)) { - if (DeviceExtension->InputCount > 1) + if (DeviceExtension->InputCount > NumberOfEntries) { RtlMoveMemory( - &DeviceExtension->PortData[1], &DeviceExtension->PortData[0], - (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); + &DeviceExtension->PortData[NumberOfEntries], + (DeviceExtension->InputCount - NumberOfEntries) * sizeof(MOUSE_INPUT_DATA)); } - DeviceExtension->InputCount--; + DeviceExtension->InputCount -= NumberOfEntries; DeviceExtension->ReadIsPending = FALSE; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(MOUSE_INPUT_DATA); } /* Go to next packet and complete this request */ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Tue Jul 18 02:13:40 2006 @@ -5,6 +5,8 @@ #include <stdio.h> #define MAX_PATH 260 + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) typedef enum { @@ -56,6 +58,7 @@ BOOLEAN ReadIsPending; ULONG InputCount; PMOUSE_INPUT_DATA PortData; + LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */

1 0

[janderwald] 23128: * unlink menu object from window object on destroy
by janderwald＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: janderwald Date: Mon Jul 17 23:16:30 2006 New Revision: 23128 URL: http://svn.reactos.org/svn/reactos?rev=23128&view=rev Log: * unlink menu object from window object on destroy Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Mon Jul 17 23:16:30 2006 @@ -277,6 +277,7 @@ { if(Menu) { + PWINDOW_OBJECT Window; PWINSTATION_OBJECT WindowStation; NTSTATUS Status; @@ -296,6 +297,15 @@ NULL); if(NT_SUCCESS(Status)) { + if (Menu->MenuInfo.Wnd) + { + Window = UserGetWindowObject(Menu->MenuInfo.Wnd); + if (Window) + { + Window->IDMenu = 0;; + } + + } ObmDeleteObject(Menu->MenuInfo.Self, otMenu); ObDereferenceObject(WindowStation); return TRUE;

1 0

[ion] 23127: [FORMATTING] - Cleanup win32.c [AUDIT] - Only function of interest is PsConverToGuiThread, heavily documented at: http://www.windowsitlibrary.com/Content/356/07/1.html http://www.osronline.com/lists_archive/ntdev/thread4614.html http://www.i.u-tokyo.ac.jp/edu/training/ss/lecture/new-documents/Lectures/17-Win32K/Win32K.ppt
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 21:32:58 2006 New Revision: 23127 URL: http://svn.reactos.org/svn/reactos?rev=23127&view=rev Log: [FORMATTING] - Cleanup win32.c [AUDIT] - Only function of interest is PsConverToGuiThread, heavily documented at: http://www.windowsitlibrary.com/Content/356/07/1.html http://www.osronline.com/lists_archive/ntdev/thread4614.html http://www.i.u-tokyo.ac.jp/edu/training/ss/lecture/new-documents/Lectures/1… Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ps/win32.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Jul 17 21:32:58 2006 @@ -310,6 +310,13 @@ IN OUT PKTHREAD Thread ); +PVOID +NTAPI +KeSwitchKernelStack( + IN PVOID StackBase, + IN PVOID StackLimit +); + VOID STDCALL KeRundownThread(VOID); Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Mon Jul 17 21:32:58 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * 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/win32.c - * PURPOSE: win32k support - * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) + * PURPOSE: Process Manager: Win32K Initialization and Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ****************************************************************/ @@ -22,43 +20,7 @@ extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; -#ifndef ALEX_CB_REWRITE -typedef struct _NTW32CALL_SAVED_STATE -{ - ULONG_PTR SavedStackLimit; - PVOID SavedStackBase; - PVOID SavedInitialStack; - PVOID CallerResult; - PULONG CallerResultLength; - PNTSTATUS CallbackStatus; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; -} NTW32CALL_SAVED_STATE, *PNTW32CALL_SAVED_STATE; -#endif - -PVOID -STDCALL -KeSwitchKernelStack( - IN PVOID StackBase, - IN PVOID StackLimit -); - -/* FUNCTIONS ***************************************************************/ - -/* - * @implemented - */ -VOID -STDCALL -PsEstablishWin32Callouts(PWIN32_CALLOUTS_FPNS CalloutData) -{ - PspW32ProcessCallout = CalloutData->ProcessCallout; - PspW32ThreadCallout = CalloutData->ThreadCallout; - ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; - ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; - ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; -} +/* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS NTAPI @@ -134,6 +96,23 @@ return Status; } +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +PsEstablishWin32Callouts(IN PWIN32_CALLOUTS_FPNS CalloutData) +{ + /* Setup the callback pointers */ + PspW32ProcessCallout = CalloutData->ProcessCallout; + PspW32ThreadCallout = CalloutData->ThreadCallout; + ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; + ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; + ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; +} + NTSTATUS STDCALL NtW32Call(IN ULONG RoutineIndex, @@ -145,24 +124,23 @@ PVOID RetResult; ULONG RetResultLength; NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("NtW32Call(RoutineIndex %d, Argument %p, ArgumentLength %d)\n", - RoutineIndex, Argument, ArgumentLength); - - /* must not be called as KernelMode! */ ASSERT(KeGetPreviousMode() != KernelMode); + /* Enter SEH for probing */ _SEH_TRY { + /* Probe arguments */ ProbeForWritePointer(Result); ProbeForWriteUlong(ResultLength); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Make sure we got success */ if (NT_SUCCESS(Status)) { /* Call kernel function */ @@ -171,16 +149,18 @@ ArgumentLength, &RetResult, &RetResultLength); - if (NT_SUCCESS(Status)) { + /* Enter SEH for write back */ _SEH_TRY { + /* Return results to user mode */ *Result = RetResult; *ResultLength = RetResultLength; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; Propchange: trunk/reactos/ntoskrnl/ps/win32.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23126: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time.
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 20:27:13 2006 New Revision: 23126 URL: http://svn.reactos.org/svn/reactos?rev=23126&view=rev Log: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 20:27:13 2006 @@ -776,9 +776,72 @@ } +/* + * @implemented + * + * GDIEntry 5 + */ +BOOL +WINAPI +DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + BOOL Return = FALSE; + + /* Make sure there is one */ + if (pSurfaceLocal->hDDSurface) + { + /* Delete it */ + Return = NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); + pSurfaceLocal->hDDSurface = 0; + } + + return Return; +} + +/* + * @implemented + * + * GDIEntry 6 + */ +BOOL +WINAPI +DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd) +{ + /* Call win32k directly */ + return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); +} + +/* + * @implemented + * + * GDIEntry 7 + */ +HDC +WINAPI +DdGetDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + LPPALETTEENTRY pColorTable) +{ + /* Call win32k directly */ + return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); +} + +/* + * @implemented + * + * GDIEntry 8 + */ +BOOL +WINAPI +DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + /* Call win32k directly */ + return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); +} /* * @unimplemented + * GDIEntry 9 */ HBITMAP STDCALL @@ -796,63 +859,6 @@ /* * @implemented * - * GDIEntry 5 - */ -BOOL -STDCALL -DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) -{ - if (!pSurfaceLocal->hDDSurface) - { - return FALSE; - } - - return NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); -} - -/* - * @implemented - * - * GDIEntry 6 - */ -BOOL -STDCALL -DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, - HWND hWnd) -{ - return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); -} - -/* - * @implemented - * - * GDIEntry 7 - */ -HDC STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -) -{ - return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); -} - -/* - * @implemented - * - * GDIEntry 8 - */ -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -) -{ - return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); -} - - - -/* - * @implemented - * * GDIEntry 10 */ BOOL @@ -865,6 +871,7 @@ pbNewMode); } + /* * @implemented * @@ -903,12 +910,14 @@ * * GDIEntry 12 */ -VOID -STDCALL +VOID +STDCALL DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached) { - NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE) pSurfaceAttached->hDDSurface); + /* Call win32k */ + NtGdiDdUnattachSurface((HANDLE)pSurface->hDDSurface, + (HANDLE)pSurfaceAttached->hDDSurface); } /* @@ -965,20 +974,21 @@ hdc, lpGammaRamp); } - /* * @implemented * * GDIEntry 16 */ -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -) -{ - return TRUE; -} - - - +DWORD +WINAPI +DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2) +{ + /* Always returns success */ + return TRUE; +} + + + +

1 0

[ion] 23125: - Export Ps(S)GetContextThread
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 18:31:15 2006 New Revision: 23125 URL: http://svn.reactos.org/svn/reactos?rev=23125&view=rev Log: - Export Ps(S)GetContextThread Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Jul 17 18:31:15 2006 @@ -894,6 +894,7 @@ PsDereferencePrimaryToken@4 PsDisableImpersonation@8 PsEstablishWin32Callouts@4 +PsGetContextThread@12 PsGetCurrentProcess@0=KeGetCurrentProcess@0 PsGetCurrentProcessId@0 PsGetCurrentProcessSessionId@0 @@ -953,6 +954,7 @@ PsReturnProcessPagedPoolQuota@8 PsRevertToSelf@0 PsRevertThreadToSelf@4 +PsSetContextThread@12 PsSetCreateProcessNotifyRoutine@8 PsSetCreateThreadNotifyRoutine@4 PsSetJobUIRestrictionsClass@8

1 0

[ion] 23124: - Factor out NtSet/GetContextThread implementation into PsGet/SetContexThread, new exported kernel APIs available to drivers, and export them. - If the caller didn't request extended registers, don't probe the full CONTEXT structure. - Use the proper trap frame in the kernel APC responsible for the context read/write. - Always go through the APC instead of directly calling the Ke routine. - Cleanup the code. [AUDIT] - Mark file as clean. The NT APIs are stubs around the Ps APIs whic
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 18:30:53 2006 New Revision: 23124 URL: http://svn.reactos.org/svn/reactos?rev=23124&view=rev Log: - Factor out NtSet/GetContextThread implementation into PsGet/SetContexThread, new exported kernel APIs available to drivers, and export them. - If the caller didn't request extended registers, don't probe the full CONTEXT structure. - Use the proper trap frame in the kernel APC responsible for the context read/write. - Always go through the APC instead of directly calling the Ke routine. - Cleanup the code. [AUDIT] - Mark file as clean. The NT APIs are stubs around the Ps APIs which simply setup an APC and stack context to an APC function that is again, merely a wrapper around the Ke function (which is not in this file). Modified: trunk/reactos/ntoskrnl/ps/debug.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Mon Jul 17 18:30:53 2006 @@ -1,13 +1,11 @@ /* - * 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/debug.c - * PURPOSE: Thread managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Phillip Susi + * PURPOSE: Process Manager: Debugging Support (Set/Get Context) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ - /* INCLUDES ****************************************************************/ @@ -18,291 +16,15 @@ /* GLOBALS *****************************************************************/ /* Thread "Set/Get Context" Context Structure */ -typedef struct _GET_SET_CTX_CONTEXT { +typedef struct _GET_SET_CTX_CONTEXT +{ KAPC Apc; KEVENT Event; + KPROCESSOR_MODE Mode; CONTEXT Context; - KPROCESSOR_MODE Mode; - NTSTATUS Status; } GET_SET_CTX_CONTEXT, *PGET_SET_CTX_CONTEXT; - -/* FUNCTIONS ***************************************************************/ - -/* - * FUNCTION: This routine is called by an APC sent by NtGetContextThread to - * copy the context of a thread into a buffer. - */ -VOID -STDCALL -PspGetOrSetContextKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) -{ - PGET_SET_CTX_CONTEXT GetSetContext; - PKEVENT Event; - PCONTEXT Context; - KPROCESSOR_MODE Mode; - PKTRAP_FRAME TrapFrame; - - TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - - sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); - - /* Get the Context Structure */ - GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); - Context = &GetSetContext->Context; - Event = &GetSetContext->Event; - Mode = GetSetContext->Mode; - - if (TrapFrame->SegCs == KGDT_R0_CODE && Mode != KernelMode) - { - GetSetContext->Status = STATUS_ACCESS_DENIED; - } - else - { - /* Check if it's a set or get */ - if (*SystemArgument1) { - /* Get the Context */ - KeTrapFrameToContext(TrapFrame, NULL, Context); - } else { - /* Set the Context */ - KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); - } - GetSetContext->Status = STATUS_SUCCESS; - } - - /* Notify the Native API that we are done */ - KeSetEvent(Event, IO_NO_INCREMENT, FALSE); -} - -NTSTATUS -STDCALL -NtGetContextThread(IN HANDLE ThreadHandle, - IN OUT PCONTEXT ThreadContext) -{ - PETHREAD Thread; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - GET_SET_CTX_CONTEXT GetSetContext; - NTSTATUS Status = STATUS_SUCCESS; - PCONTEXT SafeThreadContext = NULL; - - PAGED_CODE(); - - /* Check the buffer to be OK */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWrite(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - GetSetContext.Context = *ThreadContext; - SafeThreadContext = &GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } else { - SafeThreadContext = ThreadContext; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_GET_CONTEXT, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check success */ - if(NT_SUCCESS(Status)) { - - /* Check if we're running in the same thread */ - if(Thread == PsGetCurrentThread()) { - /* - * I don't know if trying to get your own context makes much - * sense but we can handle it more efficently. - */ - KeTrapFrameToContext(Thread->Tcb.TrapFrame, NULL, SafeThreadContext); - - } else { - - /* Copy context into GetSetContext if not already done */ - if(PreviousMode == KernelMode) { - GetSetContext.Context = *ThreadContext; - SafeThreadContext = &GetSetContext.Context; - } - - /* Use an APC... Initialize the Event */ - KeInitializeEvent(&GetSetContext.Event, - NotificationEvent, - FALSE); - - /* Set the previous mode */ - GetSetContext.Mode = PreviousMode; - - /* Initialize the APC */ - KeInitializeApc(&GetSetContext.Apc, - &Thread->Tcb, - OriginalApcEnvironment, - PspGetOrSetContextKernelRoutine, - NULL, - NULL, - KernelMode, - NULL); - - /* Queue it as a Get APC */ - if (!KeInsertQueueApc(&GetSetContext.Apc, - (PVOID)1, - NULL, - IO_NO_INCREMENT)) { - - Status = STATUS_THREAD_IS_TERMINATING; - - } else { - - /* Wait for the APC to complete */ - Status = KeWaitForSingleObject(&GetSetContext.Event, - 0, - KernelMode, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - Status = GetSetContext.Status; - } - } - - /* Dereference the thread */ - ObDereferenceObject(Thread); - - /* Check for success and return the Context */ - if(NT_SUCCESS(Status) && SafeThreadContext != ThreadContext) { - _SEH_TRY { - - *ThreadContext = GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - } - - /* Return status */ - return Status; -} - -NTSTATUS -STDCALL -NtSetContextThread(IN HANDLE ThreadHandle, - IN PCONTEXT ThreadContext) -{ - PETHREAD Thread; - GET_SET_CTX_CONTEXT GetSetContext; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - /* Check the buffer to be OK */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForRead(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - - GetSetContext.Context = *ThreadContext; - ThreadContext = &GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_CONTEXT, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check success */ - if(NT_SUCCESS(Status)) { - - /* Check if we're running in the same thread */ - if(Thread == PsGetCurrentThread()) { - - /* - * I don't know if trying to set your own context makes much - * sense but we can handle it more efficently. - */ - KeContextToTrapFrame(ThreadContext, NULL, Thread->Tcb.TrapFrame, ThreadContext->ContextFlags, PreviousMode); - - } else { - - /* Copy context into GetSetContext if not already done */ - if(PreviousMode == KernelMode) - GetSetContext.Context = *ThreadContext; - - /* Use an APC... Initialize the Event */ - KeInitializeEvent(&GetSetContext.Event, - NotificationEvent, - FALSE); - - /* Set the previous mode */ - GetSetContext.Mode = PreviousMode; - - /* Initialize the APC */ - KeInitializeApc(&GetSetContext.Apc, - &Thread->Tcb, - OriginalApcEnvironment, - PspGetOrSetContextKernelRoutine, - NULL, - NULL, - KernelMode, - NULL); - - /* Queue it as a Get APC */ - if (!KeInsertQueueApc(&GetSetContext.Apc, - (PVOID)0, - NULL, - IO_NO_INCREMENT)) { - - Status = STATUS_THREAD_IS_TERMINATING; - - } else { - - /* Wait for the APC to complete */ - Status = KeWaitForSingleObject(&GetSetContext.Event, - 0, - KernelMode, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - Status = GetSetContext.Status; - } - } - - /* Dereference the thread */ - ObDereferenceObject(Thread); - } - - /* Return status */ - return Status; -} +/* PRIVATE FUNCTIONS *********************************************************/ #ifdef DBG VOID @@ -379,4 +101,349 @@ } #endif +VOID +NTAPI +PspGetOrSetContextKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArgument2) +{ + PGET_SET_CTX_CONTEXT GetSetContext; + PKEVENT Event; + PCONTEXT Context; + PKTHREAD Thread; + KPROCESSOR_MODE Mode; + PKTRAP_FRAME TrapFrame; + PAGED_CODE(); + + /* Get the Context Structure */ + GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); + Context = &GetSetContext->Context; + Event = &GetSetContext->Event; + Mode = GetSetContext->Mode; + Thread = Apc->SystemArgument2; + + /* Get the trap frame */ + TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - + sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); + + /* Sanity check */ + ASSERT(((TrapFrame->SegCs & MODE_MASK) != KernelMode) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)); + + /* Check if it's a set or get */ + if (SystemArgument1) + { + /* Get the Context */ + KeTrapFrameToContext(TrapFrame, NULL, Context); + } + else + { + /* Set the Context */ + KeContextToTrapFrame(Context, + NULL, + TrapFrame, + Context->ContextFlags, + Mode); + } + + /* Notify the Native API that we are done */ + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsGetContextThread(IN PETHREAD Thread, + IN OUT PCONTEXT ThreadContext, + IN KPROCESSOR_MODE PreviousMode) +{ + GET_SET_CTX_CONTEXT GetSetContext; + ULONG Size = 0, Flags = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Enter SEH */ + _SEH_TRY + { + /* Set default ength */ + Size = sizeof(CONTEXT); + + /* Read the flags */ + ProbeForReadUlong(&ThreadContext->ContextFlags); + Flags = ThreadContext->ContextFlags; + + /* Check if the caller wanted extended registers */ + if ((Flags & CONTEXT_EXTENDED_REGISTERS) != + CONTEXT_EXTENDED_REGISTERS) + { + /* Cut them out of the size */ + Size = FIELD_OFFSET(CONTEXT, ExtendedRegisters); + } + + /* Check if we came from user mode */ + if (PreviousMode != KernelMode) + { + /* Probe the context */ + ProbeForWrite(ThreadContext, Size, sizeof(ULONG)); + } + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Check if we got success */ + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the wait event */ + KeInitializeEvent(&GetSetContext.Event, NotificationEvent, FALSE); + + /* Set the flags and previous mode */ + GetSetContext.Context.ContextFlags = Flags; + GetSetContext.Mode = PreviousMode; + + /* Check if we're running in the same thread */ + if (Thread == PsGetCurrentThread()) + { + /* Setup APC parameters manually */ + GetSetContext.Apc.SystemArgument1 = NULL; + GetSetContext.Apc.SystemArgument2 = Thread; + + /* Enter a guarded region to simulate APC_LEVEL */ + KeEnterGuardedRegion(); + + /* Manually call the APC */ + PspGetOrSetContextKernelRoutine(&GetSetContext.Apc, + NULL, + NULL, + &GetSetContext.Apc.SystemArgument1, + &GetSetContext.Apc.SystemArgument2); + + /* Leave the guarded region */ + KeLeaveGuardedRegion(); + } + else + { + /* Initialize the APC */ + KeInitializeApc(&GetSetContext.Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PspGetOrSetContextKernelRoutine, + NULL, + NULL, + KernelMode, + NULL); + + /* Queue it as a Get APC */ + if (!KeInsertQueueApc(&GetSetContext.Apc, NULL, Thread, 2)) + { + /* It was already queued, so fail */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Wait for the APC to complete */ + Status = KeWaitForSingleObject(&GetSetContext.Event, + 0, + KernelMode, + FALSE, + NULL); + } + + /* Copy the context */ + RtlMoveMemory(ThreadContext, &GetSetContext.Context, Size); + } + + /* Return status */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsSetContextThread(IN PETHREAD Thread, + IN OUT PCONTEXT ThreadContext, + IN KPROCESSOR_MODE PreviousMode) +{ + GET_SET_CTX_CONTEXT GetSetContext; + ULONG Size = 0, Flags = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Enter SEH */ + _SEH_TRY + { + /* Set default length */ + Size = sizeof(CONTEXT); + + /* Read the flags */ + ProbeForReadUlong(&ThreadContext->ContextFlags); + Flags = ThreadContext->ContextFlags; + + /* Check if the caller wanted extended registers */ + if ((Flags & CONTEXT_EXTENDED_REGISTERS) != + CONTEXT_EXTENDED_REGISTERS) + { + /* Cut them out of the size */ + Size = FIELD_OFFSET(CONTEXT, ExtendedRegisters); + } + + /* Check if we came from user mode */ + if (PreviousMode != KernelMode) + { + /* Probe the context */ + ProbeForRead(ThreadContext, Size, sizeof(ULONG)); + } + + /* Copy the context */ + RtlMoveMemory(&GetSetContext.Context, ThreadContext, Size); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Check if we got success */ + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the wait event */ + KeInitializeEvent(&GetSetContext.Event, NotificationEvent, FALSE); + + /* Set the flags and previous mode */ + GetSetContext.Context.ContextFlags = Flags; + GetSetContext.Mode = PreviousMode; + + /* Check if we're running in the same thread */ + if (Thread == PsGetCurrentThread()) + { + /* Setup APC parameters manually */ + GetSetContext.Apc.SystemArgument1 = UlongToPtr(1); + GetSetContext.Apc.SystemArgument2 = Thread; + + /* Enter a guarded region to simulate APC_LEVEL */ + KeEnterGuardedRegion(); + + /* Manually call the APC */ + PspGetOrSetContextKernelRoutine(&GetSetContext.Apc, + NULL, + NULL, + &GetSetContext.Apc.SystemArgument1, + &GetSetContext.Apc.SystemArgument2); + + /* Leave the guarded region */ + KeLeaveGuardedRegion(); + } + else + { + /* Initialize the APC */ + KeInitializeApc(&GetSetContext.Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PspGetOrSetContextKernelRoutine, + NULL, + NULL, + KernelMode, + NULL); + + /* Queue it as a Get APC */ + if (!KeInsertQueueApc(&GetSetContext.Apc, UlongToPtr(1), Thread, 2)) + { + /* It was already queued, so fail */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Wait for the APC to complete */ + Status = KeWaitForSingleObject(&GetSetContext.Event, + 0, + KernelMode, + FALSE, + NULL); + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtGetContextThread(IN HANDLE ThreadHandle, + IN OUT PCONTEXT ThreadContext) +{ + PETHREAD Thread; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Get the Thread Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_GET_CONTEXT, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + + /* Make sure it's not a system thread */ + if (Thread->SystemThread) + { + /* Fail */ + Status = STATUS_INVALID_HANDLE; + } + else + { + /* Call the kernel API */ + Status = PsGetContextThread(Thread, ThreadContext, PreviousMode); + } + + /* Dereference it and return */ + ObDereferenceObject(Thread); + return Status; +} + +NTSTATUS +NTAPI +NtSetContextThread(IN HANDLE ThreadHandle, + IN PCONTEXT ThreadContext) +{ + PETHREAD Thread; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Get the Thread Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_CONTEXT, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + + /* Make sure it's not a system thread */ + if (Thread->SystemThread) + { + /* Fail */ + Status = STATUS_INVALID_HANDLE; + } + else + { + /* Call the kernel API */ + Status = PsSetContextThread(Thread, ThreadContext, PreviousMode); + } + + /* Dereference it and return */ + ObDereferenceObject(Thread); + return Status; +} + /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/debug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 23123: Merge 22156 to branch.
by hpoussin＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: hpoussin Date: Mon Jul 17 12:58:16 2006 New Revision: 23123 URL: http://svn.reactos.org/svn/reactos?rev=23123&view=rev Log: Merge 22156 to branch. Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Mon Jul 17 12:58:16 2006 @@ -606,11 +606,7 @@ } /* Calculate loss percent */ - if (LostCount > 0) { - Count = (SentCount * 100) / LostCount; - } else { - Count = 0; - } + Count = (LostCount * 100) / SentCount; if (!MinRTTSet) MinRTT = MaxRTT;

1 0

[greatlrd] 23122: patch from LMH1 : Bug#: 1674 : Norwegian translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 12:20:16 2006 New Revision: 23122 URL: http://svn.reactos.org/svn/reactos?rev=23122&view=rev Log: patch from LMH1 : Bug#: 1674 : Norwegian translation Added: trunk/reactos/base/system/expand/No.rc (with props) Modified: trunk/reactos/base/system/expand/expand.rc Added: trunk/reactos/base/system/expand/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/No.rc?r… ============================================================================== --- trunk/reactos/base/system/expand/No.rc (added) +++ trunk/reactos/base/system/expand/No.rc Mon Jul 17 12:20:16 2006 @@ -1,0 +1,16 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS Fil ekstrakterings Verktøy Versjon 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Bruk: %s innfil [utfil]\n" + +IDS_FAILS "LZCopy mislykket: retur ble %ld\n" +} Propchange: trunk/reactos/base/system/expand/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/expand/expand.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… ============================================================================== --- trunk/reactos/base/system/expand/expand.rc (original) +++ trunk/reactos/base/system/expand/expand.rc Mon Jul 17 12:20:16 2006 @@ -12,3 +12,5 @@ #include "Sv.rc" #include "Hu.rc" #include "Gr.rc" +#include "No.rc" +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs