DBG: improved include situation for debugger.h

src/dbg/commandline.h

@@ -3,7 +3,47 @@
 
 #include "_global.h"
 #include "command.h"
-#include "debugger.h"
+
+typedef enum
+{
+    CMDL_ERR_READ_PEBBASE = 0,
+    CMDL_ERR_READ_PROCPARM_PTR,
+    CMDL_ERR_READ_PROCPARM_CMDLINE,
+    CMDL_ERR_CONVERTUNICODE,
+    CMDL_ERR_ALLOC,
+    CMDL_ERR_GET_PEB,
+    CMDL_ERR_READ_GETCOMMANDLINEBASE,
+    CMDL_ERR_CHECK_GETCOMMANDLINESTORED,
+    CMDL_ERR_WRITE_GETCOMMANDLINESTORED,
+    CMDL_ERR_GET_GETCOMMANDLINE,
+    CMDL_ERR_ALLOC_UNICODEANSI_COMMANDLINE,
+    CMDL_ERR_WRITE_ANSI_COMMANDLINE,
+    CMDL_ERR_WRITE_UNICODE_COMMANDLINE,
+    CMDL_ERR_WRITE_PEBUNICODE_COMMANDLINE
+
+} cmdline_error_type_t;
+
+typedef enum
+{
+    NO_QOUTES = 0,
+    QOUTES_AROUND_EXE,
+    QOUTES_AT_BEGIN_AND_END,
+    NO_CLOSE_QUOTE_FOUND
+
+} cmdline_qoutes_placement_t_enum;
+
+typedef struct
+{
+    cmdline_qoutes_placement_t_enum posEnum;
+    size_t firstPos;
+    size_t secondPos;
+} cmdline_qoutes_placement_t;
+
+typedef struct
+{
+    cmdline_error_type_t type;
+    duint addr;
+} cmdline_error_t;
 
 void showcommandlineerror(cmdline_error_t* cmdline_error);
 bool isCmdLineEmpty();

src/dbg/database.cpp

@@ -23,8 +23,8 @@
 #include "encodemap.h"
 #include "plugin_loader.h"
 #include "argument.h"
-#include "debugger.h"
 #include "filemap.h"
+#include "debugger.h"
 
 /**
 \brief Directory where program databases are stored (usually in \db). UTF-8 encoding.
@@ -226,7 +226,7 @@ void DbLoad(DbLoadSaveType loadType, const char* dbfile)
     if(loadType == DbLoadSaveType::DebugData || loadType == DbLoadSaveType::All)
     {
         if(strcmp(json_string_value(json_object_get(root, "hashAlgorithm")), "murmurhash") == 0) //Checking checksum of the debuggee.
-            dbhash = json_hex_value(json_object_get(root, "hash"));
+            dbhash = duint(json_hex_value(json_object_get(root, "hash")));
         else
             dbhash = 0;
 

src/dbg/debugger.h

@@ -6,6 +6,7 @@
 #include "command.h"
 #include "breakpoint.h"
 #include "_plugins.h"
+#include "commandline.h"
 
 //structures
 struct INIT_STRUCT
@@ -15,47 +16,6 @@ struct INIT_STRUCT
     char* currentfolder;
 };
 
-typedef enum
-{
-    CMDL_ERR_READ_PEBBASE = 0,
-    CMDL_ERR_READ_PROCPARM_PTR,
-    CMDL_ERR_READ_PROCPARM_CMDLINE,
-    CMDL_ERR_CONVERTUNICODE,
-    CMDL_ERR_ALLOC,
-    CMDL_ERR_GET_PEB,
-    CMDL_ERR_READ_GETCOMMANDLINEBASE,
-    CMDL_ERR_CHECK_GETCOMMANDLINESTORED,
-    CMDL_ERR_WRITE_GETCOMMANDLINESTORED,
-    CMDL_ERR_GET_GETCOMMANDLINE,
-    CMDL_ERR_ALLOC_UNICODEANSI_COMMANDLINE,
-    CMDL_ERR_WRITE_ANSI_COMMANDLINE,
-    CMDL_ERR_WRITE_UNICODE_COMMANDLINE,
-    CMDL_ERR_WRITE_PEBUNICODE_COMMANDLINE
-
-} cmdline_error_type_t;
-
-typedef enum
-{
-    NO_QOUTES = 0,
-    QOUTES_AROUND_EXE,
-    QOUTES_AT_BEGIN_AND_END,
-    NO_CLOSE_QUOTE_FOUND
-
-} cmdline_qoutes_placement_t_enum;
-
-typedef struct
-{
-    cmdline_qoutes_placement_t_enum posEnum;
-    size_t firstPos;
-    size_t secondPos;
-} cmdline_qoutes_placement_t;
-
-typedef struct
-{
-    cmdline_error_type_t type;
-    duint addr;
-} cmdline_error_t;
-
 struct ExceptionRange
 {
     unsigned int start;

src/dbg/exhandlerinfo.cpp

@@ -8,6 +8,7 @@
 #include "memory.h"
 #include "thread.h"
 #include "value.h"
+#include "debugger.h"
 
 bool ExHandlerGetInfo(EX_HANDLER_TYPE Type, std::vector<duint> & Entries)
 {

src/dbg/historycontext.cpp

@@ -5,6 +5,7 @@
 #include "watch.h"
 #include "threading.h"
 #include "cmd-watch-control.h"
+#include "debugger.h"
 
 static const duint HistoryMaxCount = 4096;
 static std::deque<HistoryContext> history;

src/dbg/historycontext.h

@@ -1,7 +1,8 @@
 #ifndef HISTORYCONTEXT_H
 #define HISTORYCONTEXT_H
 
-#include "debugger.h"
+#include "_global.h"
+#include "TitanEngine/TitanEngine.h"
 
 /**
  * @brief The class used to hold history context.

src/dbg/module.cpp

@@ -1,5 +1,5 @@
 #include "module.h"
-#include "debugger.h"
+#include "TitanEngine/TitanEngine.h"
 #include "threading.h"
 #include "symbolinfo.h"
 #include "murmurhash.h"

src/dbg/stackinfo.cpp

@@ -14,6 +14,7 @@
 #include "threading.h"
 #include "exhandlerinfo.h"
 #include "symbolinfo.h"
+#include "debugger.h"
 
 using SehMap = std::unordered_map<duint, STACK_COMMENT>;
 static SehMap SehCache;

src/dbg/thread.cpp

@@ -8,6 +8,7 @@
 #include "memory.h"
 #include "threading.h"
 #include "undocumented.h"
+#include "debugger.h"
 
 static std::unordered_map<DWORD, THREADINFO> threadList;
 static std::unordered_map<DWORD, THREADWAITREASON> threadWaitReasons;

src/dbg/thread.h

@@ -2,7 +2,6 @@
 #define _THREAD_H
 
 #include "_global.h"
-#include "debugger.h"
 #include "undocumented.h"
 
 void ThreadCreate(CREATE_THREAD_DEBUG_INFO* CreateThread);