MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory xml bugfix related to valid attribute of the Offsets tag

develop
Petr Mrázek 2011-02-14 21:25:02 +01:00
parent 3835ba0f75
commit 6c9652258d
3 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Memory-ng.xml
Unescape Escape View File

@ -2329,6 +2329,12 @@
</Group> </Group>
</Offsets> </Offsets>
</Version> </Version>
<Version name="v0.31.18 linux" os="linux" base="faek">
<MD5 value="884f794d8e89e7d764057c15617c20b1" />
<Offsets valid="false">
</Offsets>
</Version>
</DFHack> </DFHack>

7
library/VersionInfoFactory.cpp
Unescape Escape View File

@ -172,8 +172,6 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target
TiXmlElement* pEntry; TiXmlElement* pEntry;
// we get the <Offsets>, look at the children // we get the <Offsets>, look at the children
pEntry = parent->FirstChildElement(); pEntry = parent->FirstChildElement();
if(!pEntry)
return;
const char *cstr_invalid = parent->Attribute("valid"); const char *cstr_invalid = parent->Attribute("valid");
INVAL_TYPE parent_inval = NOT_SET; INVAL_TYPE parent_inval = NOT_SET;
if(cstr_invalid) if(cstr_invalid)
@ -185,6 +183,11 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target
} }
OffsetGroup * currentGroup = reinterpret_cast<OffsetGroup *> (target); OffsetGroup * currentGroup = reinterpret_cast<OffsetGroup *> (target);
currentGroup->setInvalid(parent_inval); currentGroup->setInvalid(parent_inval);
// we end here if there are no child tags.
if(!pEntry)
return;
breadcrumbs.push_back(groupTriple(pEntry,currentGroup, parent_inval)); breadcrumbs.push_back(groupTriple(pEntry,currentGroup, parent_inval));
} }

96
library/private/Internal.h
Unescape Escape View File

@ -82,54 +82,54 @@ using namespace std;
#include <psapi.h> #include <psapi.h>
#include <tlhelp32.h> #include <tlhelp32.h>
#include <Dbghelp.h> #include <Dbghelp.h>
#pragma comment(lib,"ntdll.lib") typedef LONG NTSTATUS;
#pragma comment(lib,"psapi.lib") #define STATUS_SUCCESS ((NTSTATUS)0x00000000L)
typedef LONG NTSTATUS;
#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) // FIXME: it is uncertain how these map to 64bit
typedef struct _DEBUG_BUFFER
typedef struct _DEBUG_BUFFER { {
HANDLE SectionHandle; HANDLE SectionHandle;
PVOID SectionBase; PVOID SectionBase;
PVOID RemoteSectionBase; PVOID RemoteSectionBase;
ULONG SectionBaseDelta; ULONG SectionBaseDelta;
HANDLE EventPairHandle; HANDLE EventPairHandle;
ULONG Unknown[2]; ULONG Unknown[2];
HANDLE RemoteThreadHandle; HANDLE RemoteThreadHandle;
ULONG InfoClassMask; ULONG InfoClassMask;
ULONG SizeOfInfo; ULONG SizeOfInfo;
ULONG AllocatedSize; ULONG AllocatedSize;
ULONG SectionSize; ULONG SectionSize;
PVOID ModuleInformation; PVOID ModuleInformation;
PVOID BackTraceInformation; PVOID BackTraceInformation;
PVOID HeapInformation; PVOID HeapInformation;
PVOID LockInformation; PVOID LockInformation;
PVOID Reserved[8]; PVOID Reserved[8];
} DEBUG_BUFFER, *PDEBUG_BUFFER; } DEBUG_BUFFER, *PDEBUG_BUFFER;
typedef struct _DEBUG_HEAP_INFORMATION typedef struct _DEBUG_HEAP_INFORMATION
{ {
ULONG Base; // 0×00 ULONG Base; // 0×00
ULONG Flags; // 0×04 ULONG Flags; // 0×04
USHORT Granularity; // 0×08 USHORT Granularity; // 0×08
USHORT Unknown; // 0x0A USHORT Unknown; // 0x0A
ULONG Allocated; // 0x0C ULONG Allocated; // 0x0C
ULONG Committed; // 0×10 ULONG Committed; // 0×10
ULONG TagCount; // 0×14 ULONG TagCount; // 0×14
ULONG BlockCount; // 0×18 ULONG BlockCount; // 0×18
ULONG Reserved[7]; // 0x1C ULONG Reserved[7]; // 0x1C
PVOID Tags; // 0×38 PVOID Tags; // 0×38
PVOID Blocks; // 0x3C PVOID Blocks; // 0x3C
} DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION; } DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION;
// RtlQueryProcessDebugInformation.DebugInfoClassMask constants // RtlQueryProcessDebugInformation.DebugInfoClassMask constants
#define PDI_MODULES 0x01 #define PDI_MODULES 0x01
#define PDI_BACKTRACE 0x02 #define PDI_BACKTRACE 0x02
#define PDI_HEAPS 0x04 #define PDI_HEAPS 0x04
#define PDI_HEAP_TAGS 0x08 #define PDI_HEAP_TAGS 0x08
#define PDI_HEAP_BLOCKS 0x10 #define PDI_HEAP_BLOCKS 0x10
#define PDI_LOCKS 0x20 #define PDI_LOCKS 0x20
extern "C" __declspec(dllimport) NTSTATUS __stdcall RtlQueryProcessDebugInformation( IN ULONG ProcessId, IN ULONG DebugInfoClassMask, IN OUT PDEBUG_BUFFER DebugBuffer); extern "C" __declspec(dllimport) NTSTATUS __stdcall RtlQueryProcessDebugInformation( IN ULONG ProcessId, IN ULONG DebugInfoClassMask, IN OUT PDEBUG_BUFFER DebugBuffer);
extern "C" __declspec(dllimport) PDEBUG_BUFFER __stdcall RtlCreateQueryDebugBuffer( IN ULONG Size, IN BOOLEAN EventPair); extern "C" __declspec(dllimport) PDEBUG_BUFFER __stdcall RtlCreateQueryDebugBuffer( IN ULONG Size, IN BOOLEAN EventPair);
extern "C" __declspec(dllimport) NTSTATUS __stdcall RtlDestroyQueryDebugBuffer( IN PDEBUG_BUFFER DebugBuffer); extern "C" __declspec(dllimport) NTSTATUS __stdcall RtlDestroyQueryDebugBuffer( IN PDEBUG_BUFFER DebugBuffer);
#endif #endif