From aee5efe7c0d0cdf784fb8bdb445cc233435d47dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 10 Feb 2012 02:35:51 +0100
Subject: [PATCH] Make it run on Windows, re-added more missing globals to
 memory.xml

---
 Memory.xml                           | 15 +++++++++++++++
 library/Process-windows.cpp          |  4 +---
 library/include/Core.h               |  2 +-
 library/include/MemAccess.h          |  2 +-
 library/include/VersionInfoFactory.h |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Memory.xml b/Memory.xml
index ca70e10bf..7a125caa1 100644
--- a/Memory.xml
+++ b/Memory.xml
@@ -21,10 +21,16 @@
     <Version name="v0.31.25 SDL" os="windows">
         <PETimeStamp value="0x4D90764F" />
         <!-- .data -->
+        <Address key="control_mode" value="0x8A4814" />
+        <Address key="game_mode" value="0x8A4818" />
         <Address key='cursor' value='0xb347f0'/>
         <Address key='selection_rect' value='0xb347fc'/>
+        <Address name="window_x" value="0xC20984" />
+        <Address name="window_y" value="0xC4EBA0" />
+        <Address name="window_z" value="0xC4EB7C" />
         <!-- .bss -->
         <Address key='world' value='0x16b0a58'/>
+        <Address key="pause_state" value="0x125C7C9" />
         <Address key='ui' value='0x14ee7e0'/>
         <Address key='gview' value='0x14f6070'/>
         <Address key='init' value='0x184ae58'/>
@@ -37,11 +43,14 @@
         <Address key='ui_workshop_job_cursor' value='0x14ec79c'/>
         <Address key='ui_workshop_in_add' value='0xeb0992'/>
 
+   <!--<Address key="screen_tiles_pointer" />-->
+
         <Address key='job_next_id' value='0xe18290'/>
 
         <Address key='ui_building_item_cursor' value='0xef7264'/>
         <Address key='ui_selected_unit' value='0xef2430'/>
         <Address key='ui_unit_view_mode' value='0xec4a5c'/>
+        <Address key="current_weather" value="0x125C7A0" />
         <Address key='cur_year' value='0xef7268'/>
         <Address key='cur_year_tick' value='0xec5170'/>
 
@@ -77,6 +86,9 @@
         <Address key='selection_rect' value='0x8c3de70'/>
         <Address key="control_mode" value="0x8c3de90" />
         <Address key="game_mode" value="0x8c3dea0" />
+        <Address key="window_x" value="0x8dfaa98" />
+        <Address key="window_y" value="0x8dfaa9c" />
+        <Address key="window_z" value="0x8dfaaa0" />
         <!-- .bss -->
         <Address key='world' value='0x93f77a0'/>
         <Address key="pause_state" value="0x93f06f0" />
@@ -92,6 +104,9 @@
         <Address key='ui_workshop_job_cursor' value='0x93f0644'/>
         <Address key='ui_workshop_in_add' value='0x93f0651'/>
 
+        <!-- maybe, untested for a looong time, possibly not even needed -->
+        <Address key="screen_tiles_pointer" value="0x958c17c" />
+
         <Address key='job_next_id' value='0x961d940'/>
 
         <Address key='ui_building_item_cursor' value='0x93f0648'/>
diff --git a/library/Process-windows.cpp b/library/Process-windows.cpp
index b02e3011f..054f08a9c 100644
--- a/library/Process-windows.cpp
+++ b/library/Process-windows.cpp
@@ -161,9 +161,7 @@ Process::Process(VersionInfoFactory * factory)
         identified = true;
         // give the process a data model and memory layout fixed for the base of first module
         my_descriptor  = new VersionInfo(*vinfo);
-        my_descriptor->RebaseAll((uint32_t)d->base);
-        // keep track of created memory_info object so we can destroy it later
-        my_descriptor->setParentProcess(this);
+        my_descriptor->rebaseTo((uint32_t)d->base);
         for(size_t i = 0; i < threads_ids.size();i++)
         {
             HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, (DWORD) threads_ids[i]);
diff --git a/library/include/Core.h b/library/include/Core.h
index 586340c3f..74a47387f 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -56,7 +56,7 @@ namespace DFHack
     class World;
     class Materials;
     class Notes;
-    class VersionInfo;
+    struct VersionInfo;
     class VersionInfoFactory;
     class PluginManager;
     class Core;
diff --git a/library/include/MemAccess.h b/library/include/MemAccess.h
index 531b83353..ea5d07d7c 100644
--- a/library/include/MemAccess.h
+++ b/library/include/MemAccess.h
@@ -36,7 +36,7 @@ distribution.
 
 namespace DFHack
 {
-    class VersionInfo;
+    struct VersionInfo;
     class Process;
     //class Window;
     class DFVector;
diff --git a/library/include/VersionInfoFactory.h b/library/include/VersionInfoFactory.h
index 27a06794e..08b1ea76e 100644
--- a/library/include/VersionInfoFactory.h
+++ b/library/include/VersionInfoFactory.h
@@ -31,7 +31,7 @@ distribution.
 class TiXmlElement;
 namespace DFHack
 {
-    class VersionInfo;
+    struct VersionInfo;
     class DFHACK_EXPORT VersionInfoFactory
     {
         public: