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

View File

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

View File

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