Merge pull request #2 from wizardy0ga/crt-independant-printing

- Removed CRT dependency (print) from dbg macro in hashycalls source code. Hashycalls can now be debugged within implants that don't use the CRT.
- Condensed script & template versions to single version matching the modules version.
- Fixed various items in the winapi.json dataset.

Author: wizardy0ga

pyproject.toml

@@ -10,7 +10,7 @@ build-backend   = "hatchling.build"
 [project]
 name        = "hashycalls"
 readme      = "Readme.md"
-version     = "2.1.0"
+version     = "2.1.1"
 description = "An Import Address Table obfuscation utility for C/C++ based windows implants"
 authors     = [ 
     {name="wizardy0ga"} 

src/hashycalls/cli.py

@@ -22,7 +22,7 @@ def print_banner( key_width: int, val_width: int ) -> int:
     print( f"║{' '.center( key_width + val_width + 4, ' ' ) }{ RED }║")
     print( f"║{ RED }{ description.center( val_width + key_width + 4, ' ' ) }{ RED }║")
     print( f"║{ 'Coded By: Wizardy0ga'.center( val_width + key_width + 4 ) }║")
-    print( f"║{ f'Script Version: { SCRIPT_VERSION } | Template Version: { TEMPLATE_VERSION }'.center( key_width + val_width + 4 ) }║")
+    print( f"║{ f'Version: { VERSION }'.center( key_width + val_width + 4 ) }║")
     print( f"║{' '.center( key_width + val_width + 4, ' ' ) }{ RED }║")
 
     return ret

src/hashycalls/core.py

@@ -5,8 +5,7 @@
 from hashycalls.colors import *
 
 # -------------------------- Constants --------------------------
-SCRIPT_VERSION      = "2.1.0"
-TEMPLATE_VERSION    = "2.0.0"
+VERSION = "2.1.1"
 
 NAME_LOOKUP  = os.path.join( os.path.dirname( os.path.abspath( __file__ ) ), 'rsrc', 'data', 'name-conversion.json' )
 TYPE_LOOKUP  = os.path.join( os.path.dirname( os.path.abspath( __file__ ) ), 'rsrc', 'data', 'type-conversion.json' )
@@ -178,7 +177,7 @@ def __init__ ( self, source_file: str, filename: str ):
         self.comment_regex  = []
         self.source_file    = source_file
         self.header_content = \
-            f"Generated with hashycalls v-{ SCRIPT_VERSION }\nTemplate version: { TEMPLATE_VERSION }\nCommandline: { ' '.join( sys.argv ) }" 
+            f"Generated with hashycalls v-{ VERSION }\nCommandline: { ' '.join( sys.argv ) }" 
 
         with open( self.source_file, 'r' ) as file:
             self.content = file.read()

src/hashycalls/rsrc/code/solution file/src/hashycalls.c

@@ -35,8 +35,15 @@
 
 // --- Functions
 # ifdef DEBUG
-# include <stdio.h>
-# define dbg(msg, ...) printf("[DEBUG]::Hashycalls.%s.L%d -> " msg "\n", __func__, __LINE__, ##__VA_ARGS__)
+# define dbg(msg, ...)                                                          \
+    if (1) {                                                                    \
+        LPSTR Buf = (LPSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 1024); \
+        if (Buf) {                                                              \
+            int len = wsprintfA(Buf, "[DEBUG]::Hashycalls.%s.L%d -> " msg "\n", __func__, __LINE__, ##__VA_ARGS__); \
+            WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), Buf, len, 0, 0);     \
+            HeapFree(GetProcessHeap(), 0x00, Buf);                              \
+        }                                                                       \
+    }
 # endif
 # ifndef DEBUG
 # define dbg(msg, ...) do {} while (0)