implemented detailed parser error information, added c++ allocation tracker to the memory allocation tracker, fixed a bug in UI manager and fixed a few memory leak issue. Now its memory leak free.

Author: 0ffffffffh

x64dbgApiBreak/res.aps

@@ -151,25 +151,24 @@ bool AbpDeregisterModule(ModuleApiInfo *mai)
 {
     apilist::iterator apit;
     modlist::iterator modit;
-	ApiFunctionInfo *afi;
+    ApiFunctionInfo *afi;
 
     if (!mai)
         return false;
 
 
     for (apit = mai->apiList->begin(); apit != mai->apiList->end(); apit++)
     {
-		afi = apit->second;
+        afi = apit->second;
 
         if (afi->callInfo.calls)
             FREEOBJECT(afi->callInfo.calls);
 
         FREEOBJECT(afi);
     }
 
-	mai->listCount = 0;
+    mai->listCount = 0;
     mai->apiList->clear();
-
     delete mai->apiList;
 
     for (modit = AbpModuleList.begin(); modit != AbpModuleList.end(); modit++)

x64dbgApiBreak/res.rc

@@ -22,6 +22,7 @@ bool AbMemReadGuaranteed(duint va, void *dest, duint size);
 #define TRACK_MEMORY_ALLOCATIONS
 
 #ifdef TRACK_MEMORY_ALLOCATIONS
+
 void *AbMemoryAlloc_DBG(int size,const char *file, const char *func, const int line);
 void *AbMemoryRealloc_DBG(void *memPtr, int newSize, const char *file, const char *func, const int line);
 void AbMemoryFree_DBG(void *memPtr);
@@ -32,6 +33,19 @@ void AbTrackMemory_DBG(void *memPtr);
 #define AbMemoryFree(memPtr)				AbMemoryFree_DBG((memPtr))
 #define AbTrackMemory(memPtr)				AbTrackMemory_DBG((memPtr))
 
+#ifdef __cplusplus
+
+void *operator new(size_t size, char *func, char *file, int line);
+
+//this just for compiler warning. it will forward to standart delete call
+void operator delete(void *memory, char *func, char *file, int line);
+
+void operator delete(void *memory);
+
+#define new new(__FUNCTION__, __FILE__, __LINE__)
+
+#endif
+
 #else
 #define AbMemoryAlloc(size)					_AbMemoryAlloc((size))
 #define AbMemoryRealloc(memPtr, newSize)	_AbMemoryRealloc((memPtr),(newSize))

x64dbgApiBreak/resource.h

@@ -52,7 +52,7 @@ typedef unsigned char uchar;
 
 #define AB_VERSION_MAJOR 0
 #define AB_VERSION_MINOR 5
-#define AB_VERSION_BUILD 38
+#define AB_VERSION_BUILD 39
 
 #if _WIN64
 #define AB_PLATFORM     "x64"

x64dbgApiBreak/src/apibreak.cpp

@@ -66,11 +66,22 @@ class ApiCallMapForm : public UiWrapper
             FREESTRING(mapContent);
     }
 
+	void OnCommand(WPARAM wp, LPARAM lp)
+	{
+		switch (LOWORD(wp))
+		{
+		case IDC_MAPDLG_BTNCONT:
+			AbDebuggerRun();
+			Close();
+			break;
+		}
+	}
+
     void OnInit()
     {
         EDITSTREAM es;
 
-        es.dwCookie = (DWORD_PTR)this;
+		es.dwCookie = (DWORD_PTR)this;
         es.dwError = 0;
         es.pfnCallback = EditStreamCallback;
 

x64dbgApiBreak/src/incl/corelib.h

@@ -42,11 +42,8 @@ class UiControlBase
 
         reqLen++; //Include null term
 
-        if ((ULONG)reqLen > size)
-        {
-            return 0;
-        }
-        else if (size == 0)
+
+        if (size == 0)
         {
             if (IsWindowUnicode(MyHandle()))
                 *pValue = (BYTE *)ALLOCSTRINGW(reqLen);
@@ -56,6 +53,10 @@ class UiControlBase
             if (*pValue == NULL)
                 return 0;
         }
+		else if ((ULONG)reqLen > size)
+		{
+			return 0;
+		}
 
 
         readLen = SendControlMsg(WM_GETTEXT, (WPARAM)reqLen, (LPARAM)*pValue);

x64dbgApiBreak/src/incl/defs.h

@@ -157,6 +157,10 @@ class UiWrapper
     ~UiWrapper(void)
     {
         DestroyControlResources();
+
+		if (this->wci.pci != NULL)
+			FREEOBJECT(this->wci.pci);
+
         CloseHandle(this->initCompletedEvent);
 
         if (!this->killingSelf)

x64dbgApiBreak/src/incl/dlgs/ApiCallMapForm.hpp

@@ -217,18 +217,18 @@ void __AbpInitMenu()
 
 DBG_LIBEXPORT bool pluginit(PLUG_INITSTRUCT* initStruct)
 {
-    initStruct->sdkVersion = PLUG_SDKVERSION;
-    initStruct->pluginVersion = MAKEWORD(AB_VERSION_MAJOR, AB_VERSION_MINOR);
-    strcpy_s(initStruct->pluginName, 256, "Api Break");
-    AbPluginHandle = initStruct->pluginHandle;
-
 #if _DEBUG
 	if (MessageBoxA(NULL, "Wanna break into debugger?", "Dive-in", MB_YESNO | MB_ICONQUESTION) == IDYES)
 	{
 		__debugbreak();
 	}
 #endif
 
+    initStruct->sdkVersion = PLUG_SDKVERSION;
+	initStruct->pluginVersion = (AB_VERSION_MAJOR * 10) + AB_VERSION_MINOR;
+    strcpy_s(initStruct->pluginName, 256, "Api Break");
+    AbPluginHandle = initStruct->pluginHandle;
+
 	if (AbpNeedsNewerx64Dbg())
 	{
 		MessageBoxA(NULL,
@@ -378,7 +378,7 @@ LONG WINAPI AbpShowOutputArgumentQuestion(LPVOID p)
     BASIC_INSTRUCTION_INFO instr;
     duint addr;
     char msgBuf[512];
-    LPSTR mapResult;
+	LPSTR mapResult;
 
     BpCallbackContext *bpcb = (BpCallbackContext *)p;