From 7885eb8e74e35f06d486177b74b5a8b4e8984dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 10 Jun 2010 10:30:56 +0200
Subject: [PATCH] 0.31.06-SDL, needs testing

---
 CMakeLists.txt                            |  1 +
 library/include/dfhack/DFContextManager.h |  2 ++
 library/private/DFMemInfoManager.h        |  2 +-
 output/Memory.xml                         | 30 ++++++++++++++++-------
 tools/playground/incrementalsearch.cpp    |  5 ++--
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4dc7ab5e..8da4d71db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+INCLUDE(CPack)
 # main project file. use it from a build sub-folder, see COMPILE for details
 PROJECT (dfhack)
 cmake_minimum_required(VERSION 2.6)
diff --git a/library/include/dfhack/DFContextManager.h b/library/include/dfhack/DFContextManager.h
index 210fdb835..804b7c48a 100644
--- a/library/include/dfhack/DFContextManager.h
+++ b/library/include/dfhack/DFContextManager.h
@@ -126,6 +126,8 @@ namespace DFHack
          */
         bool Contains(Process* p);
 
+        // TODO: Add excise(Context *) method
+
         /**
          * Get the number of tracked invalid contexts.
          * @return Number of tracked invalid contexts
diff --git a/library/private/DFMemInfoManager.h b/library/private/DFMemInfoManager.h
index 2e11ca608..60563d228 100644
--- a/library/private/DFMemInfoManager.h
+++ b/library/private/DFMemInfoManager.h
@@ -40,8 +40,8 @@ namespace DFHack
             // memory info entries loaded from a file
             bool loadFile( string path_to_xml);
             bool isInErrorState() const {return error;};
-        private:
             std::vector<memory_info*> meminfo;
+        private:
             void ParseVTable(TiXmlElement* vtable, memory_info* mem);
             void ParseEntry (TiXmlElement* entry, memory_info* mem, map <string ,TiXmlElement *>& knownEntries);
             bool error;
diff --git a/output/Memory.xml b/output/Memory.xml
index 39df9cbd0..32fc15e16 100755
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1603,6 +1603,13 @@ map_data_1b60_offset          0x1B9c
         <!--<Address name="creature_vector">0x1678704</Address> CHMOD-->
         <Address name="dwarf_race_index">0x014abee4</Address> CHMOD
         <Address name="dwarf_civ_id">0x1471FB0</Address> BOGUS!
+        <Address name="window_dims">0x180b10c</Address> LOOKS O.K.
+        <Address name="window_x">0xe6c0dc</Address> VERIFIED
+        <Address name="window_y">0xe9a1b0</Address> VERIFIED
+        <Address name="window_z">0xe9a18c</Address> VERIFIED
+        <Address name="cursor_xyz">0xaf12cc</Address> VERIFIED
+        <Address name="current_tick">0xE80780</Address> LOOKS O.K.
+        <Address name="current_year">0xEB2878</Address> LOOKS O.K.
 <!--
         <Address name="mat_inorganics">0x16BD0B0</Address> 
         <Address name="mat_organics_all">0x16BD0C8</Address> 
@@ -1622,8 +1629,6 @@ map_data_1b60_offset          0x1B9c
         <Address name="language_vector">0x016c539c</Address> CHMOD
         <Address name="translation_vector">0x016c53cc</Address> CHMOD
         -->
-        <Address name="current_tick">0xE80780</Address> LOOKS O.K.
-        <Address name="current_year">0xEB2878</Address> LOOKS O.K.
 <!--
         <Address name="map_data">0x16c2ad4</Address> old 0x016BAAC4
         <Address name="x_count_block">0x16c2af4</Address> old 0x016BAAE4
@@ -1647,16 +1652,20 @@ map_data_1b60_offset          0x1B9c
         <Address name="buildings_vector">0x16793e8</Address> 
         <Address name="items_vector">0x1678800</Address> 
 -->
-        <Address name="window_dims">0x180b10c</Address> LOOKS O.K.
-        <Address name="window_x">0xe6c0dc</Address> VERIFIED
-        <Address name="window_y">0xe9a1b0</Address> VERIFIED
-        <Address name="window_z">0xe9a18c</Address> VERIFIED
-        <Address name="cursor_xyz">0xaf12cc</Address> VERIFIED
-
         <Offset name="item_type_accessor">0x0</Offset> Why do i have to redefine this ???
         ... what?
     </Entry>
-        
+    <Entry version="v0.31.06" os="windows" id="0.31.06" base="0.31.05" rebase="0x10">
+        <String name="md5">c4b7e37dafa2716e31d29110968ac64e</String>
+        <HexValue name="pe_timestamp">0x4c0f83d5</HexValue>
+        <Address name="cursor_xyz">0xaf12d0</Address>
+[addresses]
+translation_vector      = 0x016c53dc
+language_vector         = 0x016c53ac
+creature_vector         = 0x0168071c
+dwarf_race_index        = 0x014abef4
+    </Entry>
+
                             .-"""-.
                            '       \
                           |,.  ,-.  |   _________________________
@@ -2117,6 +2126,9 @@ map_data_1b60_offset          0x1B9c
         WORLD + 0x54E80
         <Address name="translation_vector">0x931b00c</Address>
     </Entry>
+    <Entry version="v0.31.06" os="linux" id="30_06lin" base="linux-offsets-2010">
+        <String name="md5">13a1c19e8f59b74e307e094e2a0f28c3</String>
+    </Entry>
     </MemoryDescriptors>
 </DFExtractor>
 
diff --git a/tools/playground/incrementalsearch.cpp b/tools/playground/incrementalsearch.cpp
index 8eab76fa8..3c3014dca 100644
--- a/tools/playground/incrementalsearch.cpp
+++ b/tools/playground/incrementalsearch.cpp
@@ -463,7 +463,7 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
     SegmentedFinder sf(ranges, DF);
     cout << "looking for vectors..." << endl;
     sf.Find<int ,vecTriplet>(0,4,allVectors, vectorAll);
-
+/*
     // trim vectors. anything with > 10000 entries is not interesting
     for(uint64_t i = 0; i < allVectors.size();i++)
     {
@@ -477,7 +477,8 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
             }
         }
     }
-
+*/
+    filtVectors = allVectors;
     cout << "-------------------" << endl;
     cout << "!!LANGUAGE TABLES!!" << endl;
     cout << "-------------------" << endl;