diff -r 7fdc9a71d314 -r 8ad140f3dd41 memspy/Driver/Kernel/Include/MemSpyDriverObjectIx.h --- a/memspy/Driver/Kernel/Include/MemSpyDriverObjectIx.h Wed Sep 15 13:53:27 2010 +0300 +++ b/memspy/Driver/Kernel/Include/MemSpyDriverObjectIx.h Wed Oct 13 16:17:58 2010 +0300 @@ -126,8 +126,8 @@ // common operations RMemSpyObjectIx(); - //static void Wait(); - //static void Signal(); + static void Wait(); + static void Signal(); inline TInt Count() { return iCount; } @@ -137,7 +137,7 @@ public: // uncommon operations DObject* operator[](TInt aIndex); - TBool Find(DObject* aObject); + TInt At(DObject* aObject); private: TRWSpinLock iRWL; @@ -171,11 +171,11 @@ public: DObject* At(TInt aHandle,TInt aUniqueID); DObject* At(TInt aHandle); - TBool Find(DObject* aObject); + TInt At(DObject* aObject); TInt Count(DObject* aObject); DObject* operator[](TInt aIndex); - //static void Wait( DMemSpyObjectIx* aObjectIndex ); - //static void Signal( DMemSpyObjectIx* aObjectIndex ); + static void Wait( DMemSpyObjectIx* aObjectIndex ); + static void Signal( DMemSpyObjectIx* aObjectIndex ); inline TInt Count(); inline TInt ActiveCount(); @@ -206,24 +206,24 @@ #if MCL_ROBJECTIX_DUPLICATION #define MemSpyObjectIx RMemSpyObjectIx - //#define MemSpyObjectIx_Wait( IX ) RMemSpyObjectIx::Wait() - //#define MemSpyObjectIx_Signal( IX ) RMemSpyObjectIx::Signal() + #define MemSpyObjectIx_Wait( IX ) RMemSpyObjectIx::Wait() + #define MemSpyObjectIx_Signal( IX ) RMemSpyObjectIx::Signal() #define MemSpyObjectIx_GetHandlePointer_Thread( DTHREAD ) reinterpret_cast< MemSpyObjectIx* >( &DTHREAD.iHandles ) #define MemSpyObjectIx_GetHandlePointer_Process( DPROCESS ) reinterpret_cast< MemSpyObjectIx* >( &DPROCESS.iHandles ) #elif MCL_DOBJECTIX_DUPLICATION #define MemSpyObjectIx DMemSpyObjectIx - //#define MemSpyObjectIx_Wait( IX ) DMemSpyObjectIx::Wait( IX ) - //#define MemSpyObjectIx_Signal( IX ) DMemSpyObjectIx::Signal( IX ) + #define MemSpyObjectIx_Wait( IX ) DMemSpyObjectIx::Wait( IX ) + #define MemSpyObjectIx_Signal( IX ) DMemSpyObjectIx::Signal( IX ) #define MemSpyObjectIx_GetHandlePointer_Thread( DTHREAD ) reinterpret_cast< MemSpyObjectIx* >( DTHREAD.iHandles ) #define MemSpyObjectIx_GetHandlePointer_Process( DPROCESS ) reinterpret_cast< MemSpyObjectIx* >( DPROCESS.iHandles ) #else #define MemSpyObjectIx DObjectIx - //#define MemSpyObjectIx_Wait( IX ) - //#define MemSpyObjectIx_Signal( IX ) + #define MemSpyObjectIx_Wait( IX ) + #define MemSpyObjectIx_Signal( IX ) #define MemSpyObjectIx_IsValid_Thread( DTHREAD ) ( DTHREAD.iHandles != NULL ) #define MemSpyObjectIx_IsValid_Process( DPROCESS ) ( DPROCESS.iHandles != NULL ) #define MemSpyObjectIx_GetHandlePointer_Thread( DTHREAD ) reinterpret_cast< MemSpyObjectIx* >( DTHREAD.iHandles ) @@ -231,7 +231,4 @@ #endif -#define MemSpyObjectIx_HandleLookupLock() NKern::LockSystem() -#define MemSpyObjectIx_HandleLookupUnlock() NKern::UnlockSystem() - #endif