DBG: added jansson (JSON) library + kill the command thread to prevent crashes on exit + memory leak detector (allow the user to send 'alloctrace.txt'
PROJECT: updated clean & release scripts
This commit is contained in:
parent
17abb7f136
commit
6d09617554
|
|
@ -4,6 +4,7 @@ del /Q *.sdf
|
|||
del /Q *.layout
|
||||
del /Q /A H *.suo
|
||||
rmdir /S /Q ipch
|
||||
rmdir /S /Q release
|
||||
echo cleaning x64_dbg_bridge...
|
||||
cd x64_dbg_bridge
|
||||
rmdir /S /Q obj
|
||||
|
|
|
|||
12
release.bat
12
release.bat
|
|
@ -25,14 +25,14 @@ copy bin\x32\BeaEngine.dll %RELEASEDIR%\bin_base\bin\x32\BeaEngine.dll
|
|||
copy bin\x32\dbghelp.dll %RELEASEDIR%\bin_base\bin\x32\dbghelp.dll
|
||||
copy bin\x32\DeviceNameResolver.dll %RELEASEDIR%\bin_base\bin\x32\DeviceNameResolver.dll
|
||||
copy bin\x32\Scylla.dll %RELEASEDIR%\bin_base\bin\x32\Scylla.dll
|
||||
copy bin\x32\sqlite.dll %RELEASEDIR%\bin_base\bin\x32\sqlite.dll
|
||||
copy bin\x32\jansson.dll %RELEASEDIR%\bin_base\bin\x32\jansson.dll
|
||||
copy bin\x32\TitanEngine.dll %RELEASEDIR%\bin_base\bin\x32\TitanEngine.dll
|
||||
copy bin\x32\XEDParse.dll %RELEASEDIR%\bin_base\bin\x32\XEDParse.dll
|
||||
copy bin\x64\BeaEngine.dll %RELEASEDIR%\bin_base\bin\x64\BeaEngine.dll
|
||||
copy bin\x64\dbghelp.dll %RELEASEDIR%\bin_base\bin\x64\dbghelp.dll
|
||||
copy bin\x64\DeviceNameResolver.dll %RELEASEDIR%\bin_base\bin\x64\DeviceNameResolver.dll
|
||||
copy bin\x64\Scylla.dll %RELEASEDIR%\bin_base\bin\x64\Scylla.dll
|
||||
copy bin\x64\sqlite.dll %RELEASEDIR%\bin_base\bin\x64\sqlite.dll
|
||||
copy bin\x64\jansson.dll %RELEASEDIR%\bin_base\bin\x64\jansson.dll
|
||||
copy bin\x64\TitanEngine.dll %RELEASEDIR%\bin_base\bin\x64\TitanEngine.dll
|
||||
copy bin\x64\XEDParse.dll %RELEASEDIR%\bin_base\bin\x64\XEDParse.dll
|
||||
|
||||
|
|
@ -61,12 +61,20 @@ copy help\x64_dbg.chm %RELEASEDIR%\help
|
|||
echo pluginsdk
|
||||
|
||||
mkdir %RELEASEDIR%\pluginsdk
|
||||
mkdir %RELEASEDIR%\pluginsdk\BeaEngine
|
||||
mkdir %RELEASEDIR%\pluginsdk\dbghelp
|
||||
mkdir %RELEASEDIR%\pluginsdk\DeviceNameResolver
|
||||
mkdir %RELEASEDIR%\pluginsdk\jansson
|
||||
mkdir %RELEASEDIR%\pluginsdk\TitanEngine
|
||||
mkdir %RELEASEDIR%\pluginsdk\XEDParse
|
||||
|
||||
xcopy x64_dbg_dbg\BeaEngine %RELEASEDIR%\pluginsdk\BeaEngine /S /Y
|
||||
xcopy x64_dbg_dbg\dbghelp %RELEASEDIR%\pluginsdk\dbghelp /S /Y
|
||||
xcopy x64_dbg_dbg\DeviceNameResolver %RELEASEDIR%\pluginsdk\DeviceNameResolver /S /Y
|
||||
xcopy x64_dbg_dbg\jansson %RELEASEDIR%\pluginsdk\jansson /S /Y
|
||||
xcopy x64_dbg_dbg\TitanEngine %RELEASEDIR%\pluginsdk\TitanEngine /S /Y
|
||||
del %RELEASEDIR%\pluginsdk\TitanEngine\TitanEngine.txt /F /Q
|
||||
xcopy x64_dbg_dbg\XEDParse %RELEASEDIR%\pluginsdk\XEDParse /S /Y
|
||||
copy x64_dbg_dbg\_plugin_types.h %RELEASEDIR%\pluginsdk\_plugin_types.h
|
||||
copy x64_dbg_dbg\_plugins.h %RELEASEDIR%\pluginsdk\_plugins.h
|
||||
copy x64_dbg_bridge\bridgemain.h %RELEASEDIR%\pluginsdk\bridgemain.h
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ void efree(void* ptr)
|
|||
}
|
||||
|
||||
static int emalloc_count=0;
|
||||
static char alloctrace[MAX_PATH]="";
|
||||
|
||||
void* emalloc(size_t size, const char* reason)
|
||||
{
|
||||
//unsigned char* a=(unsigned char*)VirtualAlloc(0, size+0x1000, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
|
||||
unsigned char* a=new (std::nothrow)unsigned char[size+0x1000];
|
||||
if(!a)
|
||||
{
|
||||
|
|
@ -29,22 +29,31 @@ void* emalloc(size_t size, const char* reason)
|
|||
}
|
||||
memset(a, 0, size+0x1000);
|
||||
emalloc_count++;
|
||||
/*FILE* file=fopen("alloctrace.txt", "a+");
|
||||
FILE* file=fopen(alloctrace, "a+");
|
||||
fprintf(file, "DBG%.5d:alloc:"fhex":%s:"fhex"\n", emalloc_count, a, reason, size);
|
||||
fclose(file);*/
|
||||
fclose(file);
|
||||
return a;
|
||||
}
|
||||
|
||||
void efree(void* ptr, const char* reason)
|
||||
{
|
||||
emalloc_count--;
|
||||
/*FILE* file=fopen("alloctrace.txt", "a+");
|
||||
FILE* file=fopen(alloctrace, "a+");
|
||||
fprintf(file, "DBG%.5d:efree:"fhex":%s\n", emalloc_count, ptr, reason);
|
||||
fclose(file);*/
|
||||
//VirtualFree(ptr, 0, MEM_RELEASE);
|
||||
fclose(file);
|
||||
delete[] (unsigned char*)ptr;
|
||||
}
|
||||
|
||||
int memleaks()
|
||||
{
|
||||
return emalloc_count;
|
||||
}
|
||||
|
||||
void setalloctrace(const char* file)
|
||||
{
|
||||
strcpy(alloctrace, file);
|
||||
}
|
||||
|
||||
bool arraycontains(const char* cmd_list, const char* cmd)
|
||||
{
|
||||
//TODO: fix this function a little
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include <map>
|
||||
#include <tlhelp32.h>
|
||||
#include "..\x64_dbg_bridge\bridgemain.h"
|
||||
#include "jansson\jansson.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#include "dbghelp\dbghelp.h"
|
||||
|
|
@ -37,8 +38,6 @@
|
|||
#define DLL_IMPORT __declspec(dllimport)
|
||||
#endif //DLL_IMPORT
|
||||
|
||||
#include "dbg.h"
|
||||
|
||||
//defines
|
||||
#define deflen 1024
|
||||
|
||||
|
|
@ -100,6 +99,8 @@ void* emalloc(size_t size);
|
|||
void efree(void* ptr);
|
||||
void* emalloc(size_t size, const char* reason);
|
||||
void efree(void* ptr, const char* reason);
|
||||
int memleaks();
|
||||
void setalloctrace(const char* file);
|
||||
bool arraycontains(const char* cmd_list, const char* cmd);
|
||||
bool scmp(const char* a, const char* b);
|
||||
void formathex(char* string);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,292 @@
|
|||
/*
|
||||
* Copyright (c) 2009-2014 Petri Lehtinen <petri@digip.org>
|
||||
*
|
||||
* Jansson is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the MIT license. See LICENSE for details.
|
||||
*/
|
||||
|
||||
#ifndef JANSSON_H
|
||||
#define JANSSON_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h> /* for size_t */
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "jansson_config.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/* version */
|
||||
|
||||
#define JANSSON_MAJOR_VERSION 2
|
||||
#define JANSSON_MINOR_VERSION 6
|
||||
#define JANSSON_MICRO_VERSION 0
|
||||
|
||||
/* Micro version is omitted if it's 0 */
|
||||
#define JANSSON_VERSION "2.6"
|
||||
|
||||
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
|
||||
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
|
||||
#define JANSSON_VERSION_HEX ((JANSSON_MAJOR_VERSION << 16) | \
|
||||
(JANSSON_MINOR_VERSION << 8) | \
|
||||
(JANSSON_MICRO_VERSION << 0))
|
||||
|
||||
|
||||
/* types */
|
||||
|
||||
typedef enum {
|
||||
JSON_OBJECT,
|
||||
JSON_ARRAY,
|
||||
JSON_STRING,
|
||||
JSON_INTEGER,
|
||||
JSON_REAL,
|
||||
JSON_TRUE,
|
||||
JSON_FALSE,
|
||||
JSON_NULL
|
||||
} json_type;
|
||||
|
||||
typedef struct json_t
|
||||
{
|
||||
json_type type;
|
||||
size_t refcount;
|
||||
} json_t;
|
||||
|
||||
#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
|
||||
#if JSON_INTEGER_IS_LONG_LONG
|
||||
#ifdef _WIN32
|
||||
#define JSON_INTEGER_FORMAT "I64d"
|
||||
#else
|
||||
#define JSON_INTEGER_FORMAT "lld"
|
||||
#endif
|
||||
typedef long long json_int_t;
|
||||
#else
|
||||
#define JSON_INTEGER_FORMAT "ld"
|
||||
typedef long json_int_t;
|
||||
#endif /* JSON_INTEGER_IS_LONG_LONG */
|
||||
#endif
|
||||
|
||||
#define json_typeof(json) ((json)->type)
|
||||
#define json_is_object(json) ((json) && json_typeof(json) == JSON_OBJECT)
|
||||
#define json_is_array(json) ((json) && json_typeof(json) == JSON_ARRAY)
|
||||
#define json_is_string(json) ((json) && json_typeof(json) == JSON_STRING)
|
||||
#define json_is_integer(json) ((json) && json_typeof(json) == JSON_INTEGER)
|
||||
#define json_is_real(json) ((json) && json_typeof(json) == JSON_REAL)
|
||||
#define json_is_number(json) (json_is_integer(json) || json_is_real(json))
|
||||
#define json_is_true(json) ((json) && json_typeof(json) == JSON_TRUE)
|
||||
#define json_is_false(json) ((json) && json_typeof(json) == JSON_FALSE)
|
||||
#define json_boolean_value json_is_true
|
||||
#define json_is_boolean(json) (json_is_true(json) || json_is_false(json))
|
||||
#define json_is_null(json) ((json) && json_typeof(json) == JSON_NULL)
|
||||
|
||||
/* construction, destruction, reference counting */
|
||||
|
||||
__declspec(dllimport) json_t* json_object(void);
|
||||
__declspec(dllimport) json_t* json_array(void);
|
||||
__declspec(dllimport) json_t* json_string(const char *value);
|
||||
__declspec(dllimport) json_t* json_stringn(const char *value, size_t len);
|
||||
__declspec(dllimport) json_t* json_string_nocheck(const char *value);
|
||||
__declspec(dllimport) json_t* json_stringn_nocheck(const char *value, size_t len);
|
||||
__declspec(dllimport) json_t* json_integer(json_int_t value);
|
||||
__declspec(dllimport) json_t* json_real(double value);
|
||||
__declspec(dllimport) json_t* json_true(void);
|
||||
__declspec(dllimport) json_t* json_false(void);
|
||||
#define json_boolean(val) ((val) ? json_true() : json_false())
|
||||
__declspec(dllimport) json_t* json_null(void);
|
||||
|
||||
static JSON_INLINE
|
||||
json_t *json_incref(json_t *json)
|
||||
{
|
||||
if(json && json->refcount != (size_t)-1)
|
||||
++json->refcount;
|
||||
return json;
|
||||
}
|
||||
|
||||
/* do not call json_delete directly */
|
||||
__declspec(dllimport) void json_delete(json_t *json);
|
||||
|
||||
static JSON_INLINE
|
||||
void json_decref(json_t *json)
|
||||
{
|
||||
if(json && json->refcount != (size_t)-1 && --json->refcount == 0)
|
||||
json_delete(json);
|
||||
}
|
||||
|
||||
|
||||
/* error reporting */
|
||||
|
||||
#define JSON_ERROR_TEXT_LENGTH 160
|
||||
#define JSON_ERROR_SOURCE_LENGTH 80
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int line;
|
||||
int column;
|
||||
int position;
|
||||
char source[JSON_ERROR_SOURCE_LENGTH];
|
||||
char text[JSON_ERROR_TEXT_LENGTH];
|
||||
} json_error_t;
|
||||
|
||||
|
||||
/* getters, setters, manipulation */
|
||||
|
||||
__declspec(dllimport) void json_object_seed(size_t seed);
|
||||
__declspec(dllimport) size_t json_object_size(const json_t *object);
|
||||
__declspec(dllimport) json_t* json_object_get(const json_t *object, const char *key);
|
||||
__declspec(dllimport) int json_object_set_new(json_t *object, const char *key, json_t *value);
|
||||
__declspec(dllimport) int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
|
||||
__declspec(dllimport) int json_object_del(json_t *object, const char *key);
|
||||
__declspec(dllimport) int json_object_clear(json_t *object);
|
||||
__declspec(dllimport) int json_object_update(json_t *object, json_t *other);
|
||||
__declspec(dllimport) int json_object_update_existing(json_t *object, json_t *other);
|
||||
__declspec(dllimport) int json_object_update_missing(json_t *object, json_t *other);
|
||||
__declspec(dllimport) void* json_object_iter(json_t *object);
|
||||
__declspec(dllimport) void* json_object_iter_at(json_t *object, const char *key);
|
||||
__declspec(dllimport) void* json_object_key_to_iter(const char *key);
|
||||
__declspec(dllimport) void* json_object_iter_next(json_t *object, void *iter);
|
||||
__declspec(dllimport) const char* json_object_iter_key(void *iter);
|
||||
__declspec(dllimport) json_t* json_object_iter_value(void *iter);
|
||||
__declspec(dllimport) int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
|
||||
|
||||
#define json_object_foreach(object, key, value) \
|
||||
for(key = json_object_iter_key(json_object_iter(object)); \
|
||||
key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
|
||||
key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
|
||||
|
||||
#define json_array_foreach(array, index, value) \
|
||||
for(index = 0; \
|
||||
index < json_array_size(array) && (value = json_array_get(array, index)); \
|
||||
index++)
|
||||
|
||||
static JSON_INLINE
|
||||
int json_object_set(json_t *object, const char *key, json_t *value)
|
||||
{
|
||||
return json_object_set_new(object, key, json_incref(value));
|
||||
}
|
||||
|
||||
static JSON_INLINE
|
||||
int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
|
||||
{
|
||||
return json_object_set_new_nocheck(object, key, json_incref(value));
|
||||
}
|
||||
|
||||
static JSON_INLINE
|
||||
int json_object_iter_set(json_t *object, void *iter, json_t *value)
|
||||
{
|
||||
return json_object_iter_set_new(object, iter, json_incref(value));
|
||||
}
|
||||
|
||||
__declspec(dllimport) size_t json_array_size(const json_t *array);
|
||||
__declspec(dllimport) json_t* json_array_get(const json_t *array, size_t index);
|
||||
__declspec(dllimport) int json_array_set_new(json_t *array, size_t index, json_t *value);
|
||||
__declspec(dllimport) int json_array_append_new(json_t *array, json_t *value);
|
||||
__declspec(dllimport) int json_array_insert_new(json_t *array, size_t index, json_t *value);
|
||||
__declspec(dllimport) int json_array_remove(json_t *array, size_t index);
|
||||
__declspec(dllimport) int json_array_clear(json_t *array);
|
||||
__declspec(dllimport) int json_array_extend(json_t *array, json_t *other);
|
||||
|
||||
static JSON_INLINE
|
||||
int json_array_set(json_t *array, size_t ind, json_t *value)
|
||||
{
|
||||
return json_array_set_new(array, ind, json_incref(value));
|
||||
}
|
||||
|
||||
static JSON_INLINE
|
||||
int json_array_append(json_t *array, json_t *value)
|
||||
{
|
||||
return json_array_append_new(array, json_incref(value));
|
||||
}
|
||||
|
||||
static JSON_INLINE
|
||||
int json_array_insert(json_t *array, size_t ind, json_t *value)
|
||||
{
|
||||
return json_array_insert_new(array, ind, json_incref(value));
|
||||
}
|
||||
|
||||
__declspec(dllimport) const char* json_string_value(const json_t *string);
|
||||
__declspec(dllimport) size_t json_string_length(const json_t *string);
|
||||
__declspec(dllimport) json_int_t json_integer_value(const json_t *integer);
|
||||
__declspec(dllimport) double json_real_value(const json_t *real);
|
||||
__declspec(dllimport) double json_number_value(const json_t *json);
|
||||
|
||||
__declspec(dllimport) int json_string_set(json_t *string, const char *value);
|
||||
__declspec(dllimport) int json_string_setn(json_t *string, const char *value, size_t len);
|
||||
__declspec(dllimport) int json_string_set_nocheck(json_t *string, const char *value);
|
||||
__declspec(dllimport) int json_string_setn_nocheck(json_t *string, const char *value, size_t len);
|
||||
__declspec(dllimport) int json_integer_set(json_t *integer, json_int_t value);
|
||||
__declspec(dllimport) int json_real_set(json_t *real, double value);
|
||||
|
||||
/* pack, unpack */
|
||||
|
||||
__declspec(dllimport) json_t* json_pack(const char *fmt, ...);
|
||||
__declspec(dllimport) json_t* json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
|
||||
__declspec(dllimport) json_t* json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
|
||||
|
||||
#define JSON_VALIDATE_ONLY 0x1
|
||||
#define JSON_STRICT 0x2
|
||||
|
||||
__declspec(dllimport) int json_unpack(json_t *root, const char *fmt, ...);
|
||||
__declspec(dllimport) int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...);
|
||||
__declspec(dllimport) int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, va_list ap);
|
||||
|
||||
|
||||
/* equality */
|
||||
|
||||
__declspec(dllimport) int json_equal(json_t *value1, json_t *value2);
|
||||
|
||||
|
||||
/* copying */
|
||||
|
||||
__declspec(dllimport) json_t* json_copy(json_t *value);
|
||||
__declspec(dllimport) json_t* json_deep_copy(const json_t *value);
|
||||
|
||||
|
||||
/* decoding */
|
||||
|
||||
#define JSON_REJECT_DUPLICATES 0x1
|
||||
#define JSON_DISABLE_EOF_CHECK 0x2
|
||||
#define JSON_DECODE_ANY 0x4
|
||||
#define JSON_DECODE_INT_AS_REAL 0x8
|
||||
#define JSON_ALLOW_NUL 0x10
|
||||
|
||||
typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
|
||||
|
||||
__declspec(dllimport) json_t* json_loads(const char *input, size_t flags, json_error_t *error);
|
||||
__declspec(dllimport) json_t* json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
|
||||
__declspec(dllimport) json_t* json_loadf(FILE *input, size_t flags, json_error_t *error);
|
||||
__declspec(dllimport) json_t* json_load_file(const char *path, size_t flags, json_error_t *error);
|
||||
__declspec(dllimport) json_t* json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
|
||||
|
||||
|
||||
/* encoding */
|
||||
|
||||
#define JSON_INDENT(n) ((n) & 0x1F)
|
||||
#define JSON_COMPACT 0x20
|
||||
#define JSON_ENSURE_ASCII 0x40
|
||||
#define JSON_SORT_KEYS 0x80
|
||||
#define JSON_PRESERVE_ORDER 0x100
|
||||
#define JSON_ENCODE_ANY 0x200
|
||||
#define JSON_ESCAPE_SLASH 0x400
|
||||
#define JSON_REAL_PRECISION(n) (((n) & 0x1F) << 11)
|
||||
|
||||
typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
|
||||
|
||||
__declspec(dllimport) char* json_dumps(const json_t *json, size_t flags);
|
||||
__declspec(dllimport) int json_dumpf(const json_t *json, FILE *output, size_t flags);
|
||||
__declspec(dllimport) int json_dump_file(const json_t *json, const char *path, size_t flags);
|
||||
__declspec(dllimport) int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags);
|
||||
|
||||
/* custom memory allocation */
|
||||
|
||||
typedef void *(*json_malloc_t)(size_t);
|
||||
typedef void (*json_free_t)(void *);
|
||||
|
||||
__declspec(dllimport) void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2014 Petri Lehtinen <petri@digip.org>
|
||||
*
|
||||
* Jansson is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the MIT license. See LICENSE for details.
|
||||
*
|
||||
*
|
||||
* This file specifies a part of the site-specific configuration for
|
||||
* Jansson, namely those things that affect the public API in
|
||||
* jansson.h.
|
||||
*
|
||||
* The CMake system will generate the jansson_config.h file and
|
||||
* copy it to the build and install directories.
|
||||
*/
|
||||
|
||||
#ifndef JANSSON_CONFIG_H
|
||||
#define JANSSON_CONFIG_H
|
||||
|
||||
/* Define this so that we can disable scattered automake configuration in source files */
|
||||
#ifndef JANSSON_USING_CMAKE
|
||||
#define JANSSON_USING_CMAKE
|
||||
#endif
|
||||
|
||||
/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
|
||||
* as we will also check for __int64 etc types.
|
||||
* (the definition was used in the automake system) */
|
||||
|
||||
/* Bring in the cmake-detected defines */
|
||||
#define HAVE_STDINT_H 1
|
||||
/* #undef HAVE_INTTYPES_H */
|
||||
/* #undef HAVE_SYS_TYPES_H */
|
||||
|
||||
/* Include our standard type header for the integer typedef */
|
||||
|
||||
#if defined(HAVE_STDINT_H)
|
||||
# include <stdint.h>
|
||||
#elif defined(HAVE_INTTYPES_H)
|
||||
# include <inttypes.h>
|
||||
#elif defined(HAVE_SYS_TYPES_H)
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* If your compiler supports the inline keyword in C, JSON_INLINE is
|
||||
defined to `inline', otherwise empty. In C++, the inline is always
|
||||
supported. */
|
||||
#ifdef __cplusplus
|
||||
#define JSON_INLINE inline
|
||||
#else
|
||||
#define JSON_INLINE __inline
|
||||
#endif
|
||||
|
||||
|
||||
#define json_int_t long long
|
||||
#define json_strtoint _strtoi64
|
||||
#define JSON_INTEGER_FORMAT "I64d"
|
||||
|
||||
|
||||
/* If locale.h and localeconv() are available, define to 1, otherwise to 0. */
|
||||
#define JSON_HAVE_LOCALECONV 1
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -17,6 +17,8 @@
|
|||
|
||||
static MESSAGE_STACK* gMsgStack=0;
|
||||
static COMMAND* command_list=0;
|
||||
static HANDLE hCommandLoopThread=0;
|
||||
static char alloctrace[MAX_PATH]="";
|
||||
|
||||
//Original code by Aurel from http://www.codeguru.com/cpp/w-p/win32/article.php/c1427/A-Simple-Win32-CommandLine-Parser.htm
|
||||
static void commandlinefree(int argc, char** argv)
|
||||
|
|
@ -209,7 +211,6 @@ static DWORD WINAPI DbgCommandLoopThread(void* a)
|
|||
|
||||
extern "C" DLL_EXPORT const char* _dbg_dbginit()
|
||||
{
|
||||
DeleteFileA("alloctrace.txt");
|
||||
char dir[deflen]="";
|
||||
if(!GetModuleFileNameA(hInst, dir, deflen))
|
||||
return "GetModuleFileNameA failed!";
|
||||
|
|
@ -217,6 +218,10 @@ extern "C" DLL_EXPORT const char* _dbg_dbginit()
|
|||
while(dir[len]!='\\')
|
||||
len--;
|
||||
dir[len]=0;
|
||||
strcpy(alloctrace, dir);
|
||||
PathAppendA(alloctrace, "\\alloctrace.txt");
|
||||
DeleteFileA(alloctrace);
|
||||
setalloctrace(alloctrace);
|
||||
strcpy(dbbasepath, dir); //debug directory
|
||||
PathAppendA(dbbasepath, "db");
|
||||
CreateDirectoryA(dbbasepath, 0); //create database directory
|
||||
|
|
@ -226,7 +231,7 @@ extern "C" DLL_EXPORT const char* _dbg_dbginit()
|
|||
return "Could not allocate message stack!";
|
||||
varinit();
|
||||
registercommands();
|
||||
CloseHandle(CreateThread(0, 0, DbgCommandLoopThread, 0, 0, 0));
|
||||
hCommandLoopThread=CreateThread(0, 0, DbgCommandLoopThread, 0, 0, 0);
|
||||
char plugindir[deflen]="";
|
||||
strcpy(plugindir, dir);
|
||||
PathAppendA(plugindir, "plugins");
|
||||
|
|
@ -250,9 +255,18 @@ extern "C" DLL_EXPORT void _dbg_dbgexitsignal()
|
|||
cbStopDebug(0, 0);
|
||||
wait(WAITID_STOP); //after this, debugging stopped
|
||||
pluginunload();
|
||||
TerminateThread(hCommandLoopThread, 0);
|
||||
cmdfree(command_list);
|
||||
varfree();
|
||||
msgfreestack(gMsgStack);
|
||||
if(memleaks())
|
||||
{
|
||||
char msg[256]="";
|
||||
sprintf(msg, "%d memory leak(s) found!\n\nPlease send 'alloctrace.txt' to the authors of x64_dbg.", memleaks());
|
||||
MessageBoxA(0, msg, "error", MB_ICONERROR|MB_SYSTEMMODAL);
|
||||
}
|
||||
else
|
||||
DeleteFileA(alloctrace);
|
||||
}
|
||||
|
||||
extern "C" DLL_EXPORT bool _dbg_dbgcmddirectexec(const char* cmd)
|
||||
|
|
|
|||
|
|
@ -51,9 +51,7 @@
|
|||
<ClInclude Include="command.h" />
|
||||
<ClInclude Include="console.h" />
|
||||
<ClInclude Include="data.h" />
|
||||
<ClInclude Include="dbg.h" />
|
||||
<ClInclude Include="dbghelp\dbghelp.h" />
|
||||
<ClInclude Include="dbg\dbg.h" />
|
||||
<ClInclude Include="debugger.h" />
|
||||
<ClInclude Include="DeviceNameResolver\DeviceNameResolver.h" />
|
||||
<ClInclude Include="disasm_fast.h" />
|
||||
|
|
@ -127,7 +125,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32_bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>jansson\jansson_x86.lib;DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32_bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
@ -142,7 +140,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64_bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>jansson\jansson_x64.lib;DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64_bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@
|
|||
<Filter Include="Header Files\dbghelp">
|
||||
<UniqueIdentifier>{5623fb24-3b6d-49a6-a0d3-1cfcc46f87bd}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\dbg">
|
||||
<UniqueIdentifier>{c7d6554c-6b4c-42b2-8d0a-7968cdfdba63}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\TitanEngine">
|
||||
<UniqueIdentifier>{23226861-3b20-42db-8dd6-c5d276ba7a83}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -140,9 +137,6 @@
|
|||
<ClInclude Include="data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="dbg.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="debugger.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -221,9 +215,6 @@
|
|||
<ClInclude Include="dbghelp\dbghelp.h">
|
||||
<Filter>Header Files\dbghelp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="dbg\dbg.h">
|
||||
<Filter>Header Files\dbg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="XEDParse\XEDParse.h">
|
||||
<Filter>Header Files\XEDParse</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
Loading…
Reference in New Issue