1
0
Fork 0

fixed issue #100 (ntdll redefinition problems)

This commit is contained in:
Mr. eXoDia 2014-05-10 01:23:22 +02:00
parent b4c264ad8b
commit c6826ca65a
3 changed files with 90 additions and 90 deletions

View File

@ -175,55 +175,55 @@ enum STRING_TYPE
enum THREADPRIORITY
{
PriorityIdle = -15,
PriorityAboveNormal = 1,
PriorityBelowNormal = -1,
PriorityHighest = 2,
PriorityLowest = -2,
PriorityNormal = 0,
PriorityTimeCritical = 15,
PriorityUnknown = 0x7FFFFFFF
_PriorityIdle = -15,
_PriorityAboveNormal = 1,
_PriorityBelowNormal = -1,
_PriorityHighest = 2,
_PriorityLowest = -2,
_PriorityNormal = 0,
_PriorityTimeCritical = 15,
_PriorityUnknown = 0x7FFFFFFF
};
enum THREADWAITREASON
{
Executive = 0,
FreePage = 1,
PageIn = 2,
PoolAllocation = 3,
DelayExecution = 4,
Suspended = 5,
UserRequest = 6,
WrExecutive = 7,
WrFreePage = 8,
WrPageIn = 9,
WrPoolAllocation = 10,
WrDelayExecution = 11,
WrSuspended = 12,
WrUserRequest = 13,
WrEventPair = 14,
WrQueue = 15,
WrLpcReceive = 16,
WrLpcReply = 17,
WrVirtualMemory = 18,
WrPageOut = 19,
WrRendezvous = 20,
Spare2 = 21,
Spare3 = 22,
Spare4 = 23,
Spare5 = 24,
WrCalloutStack = 25,
WrKernel = 26,
WrResource = 27,
WrPushLock = 28,
WrMutex = 29,
WrQuantumEnd = 30,
WrDispatchInt = 31,
WrPreempted = 32,
WrYieldExecution = 33,
WrFastMutex = 34,
WrGuardedMutex = 35,
WrRundown = 36,
_Executive = 0,
_FreePage = 1,
_PageIn = 2,
_PoolAllocation = 3,
_DelayExecution = 4,
_Suspended = 5,
_UserRequest = 6,
_WrExecutive = 7,
_WrFreePage = 8,
_WrPageIn = 9,
_WrPoolAllocation = 10,
_WrDelayExecution = 11,
_WrSuspended = 12,
_WrUserRequest = 13,
_WrEventPair = 14,
_WrQueue = 15,
_WrLpcReceive = 16,
_WrLpcReply = 17,
_WrVirtualMemory = 18,
_WrPageOut = 19,
_WrRendezvous = 20,
_Spare2 = 21,
_Spare3 = 22,
_Spare4 = 23,
_Spare5 = 24,
_WrCalloutStack = 25,
_WrKernel = 26,
_WrResource = 27,
_WrPushLock = 28,
_WrMutex = 29,
_WrQuantumEnd = 30,
_WrDispatchInt = 31,
_WrPreempted = 32,
_WrYieldExecution = 33,
_WrFastMutex = 34,
_WrGuardedMutex = 35,
_WrRundown = 36,
};
enum MEMORY_SIZE

View File

@ -40,7 +40,7 @@ void threadclear()
static THREADWAITREASON GetThreadWaitReason(DWORD dwThreadId)
{
return Executive;
return _Executive;
}
static DWORD GetThreadLastError(uint tebAddress)

View File

@ -41,25 +41,25 @@ void ThreadView::updateThreadList()
QString priorityString;
switch(threadList.list[i].Priority)
{
case PriorityIdle:
case _PriorityIdle:
priorityString="Idle";
break;
case PriorityAboveNormal:
case _PriorityAboveNormal:
priorityString="AboveNormal";
break;
case PriorityBelowNormal:
case _PriorityBelowNormal:
priorityString="BelowNormal";
break;
case PriorityHighest:
case _PriorityHighest:
priorityString="Highest";
break;
case PriorityLowest:
case _PriorityLowest:
priorityString="Lowest";
break;
case PriorityNormal:
case _PriorityNormal:
priorityString="Normal";
break;
case PriorityTimeCritical:
case _PriorityTimeCritical:
priorityString="TimeCritical";
break;
default:
@ -70,115 +70,115 @@ void ThreadView::updateThreadList()
QString waitReasonString;
switch(threadList.list[i].WaitReason)
{
case Executive:
case _Executive:
waitReasonString="Executive";
break;
case FreePage:
case _FreePage:
waitReasonString="FreePage";
break;
case PageIn:
case _PageIn:
waitReasonString="PageIn";
break;
case PoolAllocation:
case _PoolAllocation:
waitReasonString="PoolAllocation";
break;
case DelayExecution:
case _DelayExecution:
waitReasonString="DelayExecution";
break;
case Suspended:
case _Suspended:
waitReasonString="Suspended";
break;
case UserRequest:
case _UserRequest:
waitReasonString="UserRequest";
break;
case WrExecutive:
case _WrExecutive:
waitReasonString="WrExecutive";
break;
case WrFreePage:
case _WrFreePage:
waitReasonString="WrFreePage";
break;
case WrPageIn:
case _WrPageIn:
waitReasonString="WrPageIn";
break;
case WrPoolAllocation:
case _WrPoolAllocation:
waitReasonString="WrPoolAllocation";
break;
case WrDelayExecution:
case _WrDelayExecution:
waitReasonString="WrDelayExecution";
break;
case WrSuspended:
case _WrSuspended:
waitReasonString="WrSuspended";
break;
case WrUserRequest:
case _WrUserRequest:
waitReasonString="WrUserRequest";
break;
case WrEventPair:
case _WrEventPair:
waitReasonString="WrEventPair";
break;
case WrQueue:
case _WrQueue:
waitReasonString="WrQueue";
break;
case WrLpcReceive:
case _WrLpcReceive:
waitReasonString="WrLpcReceive";
break;
case WrLpcReply:
case _WrLpcReply:
waitReasonString="WrLpcReply";
break;
case WrVirtualMemory:
case _WrVirtualMemory:
waitReasonString="WrVirtualMemory";
break;
case WrPageOut:
case _WrPageOut:
waitReasonString="WrPageOut";
break;
case WrRendezvous:
case _WrRendezvous:
waitReasonString="WrRendezvous";
break;
case Spare2:
case _Spare2:
waitReasonString="Spare2";
break;
case Spare3:
case _Spare3:
waitReasonString="Spare3";
break;
case Spare4:
case _Spare4:
waitReasonString="Spare4";
break;
case Spare5:
case _Spare5:
waitReasonString="Spare5";
break;
case WrCalloutStack:
case _WrCalloutStack:
waitReasonString="WrCalloutStack";
break;
case WrKernel:
case _WrKernel:
waitReasonString="WrKernel";
break;
case WrResource:
case _WrResource:
waitReasonString="WrResource";
break;
case WrPushLock:
case _WrPushLock:
waitReasonString="WrPushLock";
break;
case WrMutex:
case _WrMutex:
waitReasonString="WrMutex";
break;
case WrQuantumEnd:
case _WrQuantumEnd:
waitReasonString="WrQuantumEnd";
break;
case WrDispatchInt:
case _WrDispatchInt:
waitReasonString="WrDispatchInt";
break;
case WrPreempted:
case _WrPreempted:
waitReasonString="WrPreempted";
break;
case WrYieldExecution:
case _WrYieldExecution:
waitReasonString="WrYieldExecution";
break;
case WrFastMutex:
case _WrFastMutex:
waitReasonString="WrFastMutex";
break;
case WrGuardedMutex:
case _WrGuardedMutex:
waitReasonString="WrGuardedMutex";
break;
case WrRundown:
case _WrRundown:
waitReasonString="WrRundown";
break;
default: