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

Fix compilation undex MSVC/Windows.

develop
Petr Mrázek 2010-04-19 00:56:22 +02:00
parent 96b42f8ac1
commit 5b28ac3b59
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dfhack/DFProcess-windows-SHM.cpp
Unescape Escape View File

@ -52,7 +52,7 @@ class SHMProcess::Private
~Private(){};
memory_info * memdescriptor;
DFWindow * window;
SHMProcess * q;
SHMProcess * self;
uint32_t process_ID;
char *shm_addr;
HANDLE DFSVMutex;
@ -281,7 +281,7 @@ SHMProcess::SHMProcess(uint32_t PID, vector <memory_info *> & known_versions)
: d(new Private())
{
d->process_ID = PID;
d->q = this;
d->self = this;
// attach the SHM
if(!attach())
{
@ -344,9 +344,9 @@ bool SHMProcess::Private::validate(vector <memory_info *> & known_versions)
uint32_t base = (uint32_t)hmod;
// read from this process
uint32_t pe_offset = q->readDWord(base+0x3C);
q->read(base + pe_offset , sizeof(pe_header), (uint8_t *)&pe_header);
q->read(base + pe_offset+ sizeof(pe_header), sizeof(sections) , (uint8_t *)&sections );
uint32_t pe_offset = self->readDWord(base+0x3C);
self->read(base + pe_offset , sizeof(pe_header), (uint8_t *)&pe_header);
self->read(base + pe_offset+ sizeof(pe_header), sizeof(sections) , (uint8_t *)&sections );
// iterate over the list of memory locations
vector<memory_info *>::iterator it;
@ -366,7 +366,7 @@ bool SHMProcess::Private::validate(vector <memory_info *> & known_versions)
memory_info *m = new memory_info(**it);
m->RebaseAll(base);
memdescriptor = m;
m->setParentProcess(this);
m->setParentProcess(self);
identified = true;
cerr << "identified " << m->getVersion() << endl;
CloseHandle(hProcess);

6
dfhack/include/DFCommonInternal.h
Unescape Escape View File

@ -22,11 +22,13 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "DFGlobal.h"
#ifndef DFCOMMONINTERNAL_H_INCLUDED
#define DFCOMMONINTERNAL_H_INCLUDED
// this makes everything that includes this file export symbols whn using DFHACK_EXPORT (see Export.h)
#define BUILD_DFHACK_LIB
#include "DFGlobal.h"
#include "Tranquility.h"
#include <string>

4
dfhack/include/modules/Constructions.h
Unescape Escape View File

@ -14,7 +14,7 @@ namespace DFHack
constr_boulder = 4,
constr_logs = 5,
};
#pragma pack(1)
#pragma pack(push, 1)
struct t_construction
{
//0
@ -38,7 +38,7 @@ namespace DFHack
// added later by dfhack
uint32_t origin;
};
#pragma pack (pop)
class APIPrivate;
class DFHACK_EXPORT Constructions
{