diff --git a/al-khaser/Shared/Common.cpp b/al-khaser/Shared/Common.cpp index 17cd788..fb5b001 100644 --- a/al-khaser/Shared/Common.cpp +++ b/al-khaser/Shared/Common.cpp @@ -50,7 +50,7 @@ VOID print_category(TCHAR* text) SetConsoleTextAttribute(nStdHandle, OriginalColors); } -VOID print_results(int result, TCHAR* szMsg) +VOID _print_check_text(TCHAR* szMsg) { _tprintf(TEXT("[*] %s"), szMsg); @@ -60,7 +60,10 @@ VOID print_results(int result, TCHAR* szMsg) _tprintf(TEXT(" ")); spaces_to_padd--; } - +} + +VOID _print_check_result(int result, TCHAR* szMsg) +{ if (result == TRUE) print_detected(); else @@ -72,14 +75,23 @@ VOID print_results(int result, TCHAR* szMsg) LOG_PRINT(buffer); } +VOID print_results(int result, TCHAR* szMsg) +{ + _print_check_text(szMsg); + _print_check_result(result, szMsg); +} + VOID exec_check(int(*callback)(), TCHAR* szMsg) { + /* Print the text to screen so we can see what's currently running */ + _print_check_text(szMsg); + /* Call our check */ int result = callback(); /* Print / Log the result */ if (szMsg) - print_results(result, szMsg); + _print_check_result(result, szMsg); } VOID resize_console_window() diff --git a/al-khaser/Shared/Common.h b/al-khaser/Shared/Common.h index 9662215..8e3267a 100644 --- a/al-khaser/Shared/Common.h +++ b/al-khaser/Shared/Common.h @@ -14,8 +14,5 @@ TCHAR* ascii_to_wide_str(CHAR* lpMultiByteStr); CHAR* wide_str_to_multibyte(TCHAR* lpWideStr); VOID resize_console_window(); VOID print_results(int result, TCHAR* szMsg); - - - - - +VOID _print_check_text(TCHAR* szMsg); +VOID _print_check_result(int result, TCHAR* szMsg); \ No newline at end of file diff --git a/al-khaser_x64.exe b/al-khaser_x64.exe index 18898c8..b520b11 100644 Binary files a/al-khaser_x64.exe and b/al-khaser_x64.exe differ diff --git a/al-khaser_x86.exe b/al-khaser_x86.exe index 3d34971..25a607a 100644 Binary files a/al-khaser_x86.exe and b/al-khaser_x86.exe differ