1.2.80

M41doror · Mar 27, 2019 · 809491c · 809491c
1 parent 7211404
commit 809491c
Show file tree

Hide file tree

Showing 13 changed files with 11,474 additions and 981 deletions.
diff --git a/Buffer.cpp b/Buffer.cpp
@@ -3,6 +3,7 @@
 #include "ORADAD.h"
 
 extern HANDLE g_hHeap;
+extern BOOL g_bSupportsAnsi;
 
 //
 // Public functions
@@ -21,7 +22,7 @@ BufferInitialize (
    {
       Log(
          __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_ERROR,
-         "Unable to open outfile %S (error %u).", szFilename, GetLastError()
+         "[!] %sUnable to open outfile %S%s (error %u).", COLOR_RED, szFilename, COLOR_RESET, GetLastError()
       );
       return FALSE;
    }

diff --git a/Engine.cpp b/Engine.cpp
@@ -5,6 +5,7 @@
 #include "ORADAD.h"
 
 extern HANDLE g_hHeap;
+extern BOOL g_bSupportsAnsi;
 
 BOOL
 pLocateDc(
@@ -77,8 +78,8 @@ Process (
    {
       Log(
          __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_CRITICAL,
-         "Unable to create directory '%S' (error %u).",
-         szDirectory, GetLastError()
+         "[!] %sUnable to create directory '%S'%s (error %u).",
+         COLOR_RED, szDirectory, COLOR_RESET, GetLastError()
       );
       return FALSE;
    }
@@ -158,8 +159,8 @@ Process (
    {
       Log(
          __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_CRITICAL,
-         "Unable to open table file '%S' (error %u).",
-         szDirectory, GetLastError()
+         "[!] %sUnable to open table file '%S'%s (error %u).",
+         COLOR_RED, szDirectory, COLOR_RESET, GetLastError()
       );
       return FALSE;
    }
@@ -218,7 +219,7 @@ Process (
             {
                Log(
                   __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_INFORMATION,
-                  "Processing extra domain in forest: %S",
+                  "[.] Processing extra domain in forest: %S",
                   szOtherDomain
                );
                pProcessDomain(pGlobalConfig, &pOtherRootDse, szDirectory, szServer, szRootDns, TRUE, TRUE);
@@ -246,7 +247,7 @@ Process (
       {
          Log(
             __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_ERROR,
-            "Unable to enumerate trust (error %u).", dwResult
+            "[!] %sUnable to enumerate trust (error %u).%s", COLOR_RED, dwResult, COLOR_RESET
          );
       }
       else
@@ -255,7 +256,7 @@ Process (
 
          Log(
             __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_INFORMATION,
-            "Find %u domains in forest.", ulDomainCount
+            "[.] Find %u domains in forest.", ulDomainCount
          );
 
          pRootDse = (PROOTDSE_CONFIG)_HeapAlloc(sizeof(ROOTDSE_CONFIG) * ulDomainCount);
@@ -266,7 +267,7 @@ Process (
          {
             Log(
                __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_INFORMATION,
-               "Domain in forest: %S (Attribute: %u / Type: %u)",
+               "[.] Domain in forest: %S (Attribute: %u / Type: %u)",
                pTrust[i].DnsDomainName, pTrust[i].TrustAttributes, pTrust[i].TrustType
             );
 
@@ -335,14 +336,14 @@ pLocateDc (
    {
       Log(
          __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_ERROR,
-         "Unable to locate DC for domain '%S' (error %u).", szDomainName, dwResult
+         "[!] %sUnable to locate DC for domain '%S'%s (error %u).", COLOR_RED, szDomainName, COLOR_RESET, dwResult
       );
       return FALSE;
    }
 
    Log(
       __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_VERBOSE,
-      "DC Locator: DC: %S (flags 0x%x), Domain: %S, Forest: %S",
+      "[.] DC Locator: DC: %S (flags 0x%x), Domain: %S, Forest: %S",
       pDomainControllerInfo->DomainControllerName,
       pDomainControllerInfo->Flags,
       pDomainControllerInfo->DomainName,

diff --git a/Filters.cpp b/Filters.cpp
@@ -5,6 +5,7 @@
 #include "Constants.h"
 
 extern HANDLE g_hHeap;
+extern BOOL g_bSupportsAnsi;
 
 #define NEVER_VALUE                 9223372036854775808
 #define STR_UNABLE_CONVERT_SID      L"Unable to convert SID"
@@ -119,7 +120,7 @@ GetFilter (
    {
       Log(
          __FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_ERROR,
-         "Unknown filter '%S'.", szFilter
+         "[!] %sUnknown filter '%S'.%s", COLOR_RED, szFilter, COLOR_RESET
       );
       return FALSE;
    }

diff --git a/Functions.h b/Functions.h
@@ -7,6 +7,13 @@ XmlReadConfigFile(
    _In_ PGLOBAL_CONFIG pGlobalConfig
 );
 
+PVOID
+XmlReadSchemaFile(
+   _In_z_ LPTSTR szConfigPath,
+   _In_ PGLOBAL_CONFIG pGlobalConfig,
+   _In_ PVOID pXMLDocConfig
+);
+
 //
 // Engine.cpp
 //
@@ -80,6 +87,12 @@ LPWSTRtoLPSTR(
    _In_opt_z_ LPWSTR szToConvert
 );
 
+BOOL
+GetFileVersion(
+   _Out_ wchar_t* szVersion,
+   _In_  size_t BufferCount
+);
+
 BOOL
 MetadataWriteFile(
    _In_ PGLOBAL_CONFIG pGlobalConfig,
@@ -93,6 +106,22 @@ MetadataCreateFile(
    _In_z_ LPWSTR szRootDns
 );
 
+BOOL
+cmdOptionExists(
+   _In_ wchar_t *argv[],
+   _In_ int argc,
+   _In_z_ const wchar_t *szOption
+);
+
+BOOL
+GetCmdOption(
+   _In_ wchar_t *argv[],
+   _In_ int argc,
+   _In_z_ const wchar_t *szOption,
+   _In_ TYPE_CONFIG ElementType,
+   _Out_ PVOID pvElementValue
+);
+
 //
 // Buffer.cpp
 //