Debugger Logs: Also support unicode logging

AndrasteFramework · Nov 26, 2023 · 6e5d6be · 6e5d6be
1 parent 5c0474e
commit 6e5d6be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Native/Kernel32.cs b/Native/Kernel32.cs
@@ -14,6 +14,7 @@ public static class Kernel32
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
         public static extern void OutputDebugStringW(string str);
+        public delegate void DelegateOutputDebugStringW([MarshalAs(UnmanagedType.LPWStr)] string str);
 
         [DllImport("kernel32.dll")]
         public static extern bool IsDebuggerPresent();

diff --git a/Util/DebuggerOutputLoggingManager.cs b/Util/DebuggerOutputLoggingManager.cs
@@ -10,6 +10,7 @@ public class DebuggerOutputLoggingManager : IManager
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private Hook<Kernel32.DelegateOutputDebugString> _odsAHook;
+        private Hook<Kernel32.DelegateOutputDebugStringW> _odsWHook;
         public Kernel32.DelegateOutputDebugString LoggingDelegate = DefaultLogger;
         public bool Swallow = false;
 
@@ -25,6 +26,17 @@ public void Load()
                     }
                 }, this);
             _odsAHook.Activate();
+
+            _odsWHook = new Hook<Kernel32.DelegateOutputDebugStringW>(
+                LocalHook.GetProcAddress("kernel32.dll", "OutputDebugStringW"), str =>
+                {
+                    LoggingDelegate.Invoke(str);
+                    if (!Swallow)
+                    {
+                        _odsWHook.Original(str);
+                    }
+                }, this);
+            _odsWHook.Activate();
         }
 
         public bool Enabled
@@ -35,10 +47,12 @@ public bool Enabled
                 if (value)
                 {
                     _odsAHook.Activate();
+                    _odsWHook.Activate();
                 }
                 else
                 {
                     _odsAHook.Deactivate();
+                    _odsWHook.Deactivate();
                 }
             }
         }