Merge pull request #7 from zippy1981/ManagedOnly

Managed only

Author: JohnWintellect

Source/ManagedTest/ManagedTest.csproj

@@ -101,6 +101,12 @@
       <Name>Sysinternals.log4net</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Sysinternals.Debug\Sysinternals.Debug.csproj">
+      <Project>{fb1d522e-1acb-49dd-93d4-123e6ea13aed}</Project>
+      <Name>Sysinternals.Debug</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Source/Sysinternals.Debug/NativeMethods.cs

@@ -8,27 +8,78 @@
 //      - Moved to VS 2013 and .NET 4.5.1
 //////////////////////////////////////////////////////////////////////////////*/
 
+using System.Text;
+using Microsoft.Win32.SafeHandles;
+
 namespace Sysinternals.Debug
 {
     using System;
     using System.Diagnostics;
-    using System.Reflection;
     using System.Runtime.InteropServices;
 
     /// <summary>
     /// A class to wrap all the native code needed by this assembly.
     /// </summary>
     internal static class NativeMethods
     {
+        // Constants to represent C preprocessor macros for PInvokes
+        const uint GENERIC_WRITE = 0x40000000;
+        const uint OPEN_EXISTING = 3;
+        const uint FILE_WRITE_ACCESS = 0x0002;
+        const uint FILE_SHARE_WRITE = 0x00000002;
+        const uint FILE_ATTRIBUTE_NORMAL = 0x00000080;
+        const uint METHOD_BUFFERED = 0;
+
+        // Procmon Constants 
+        const uint FILE_DEVICE_PROCMON_LOG = 0x00009535;
+        const string PROCMON_DEBUGGER_HANDLER = "\\\\.\\Global\\ProcmonDebugLogger";
+
         /// <summary>
-        /// Flag to check if we've already done the process lookup.
+        /// The handle to the procmon log device.
         /// </summary>
-        private static bool lookedUpProcessType;
+        private static SafeFileHandle hProcMon;
 
         /// <summary>
-        /// True if the process is 64-bit.
+        /// Get the IO Control code for the ProcMon log.
         /// </summary>
-        private static bool is64BitProcess;
+        private static uint IOCTL_EXTERNAL_LOG_DEBUGOUT { get { return CTL_CODE(); } }
+
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/windows/hardware/ff543023(v=vs.85).aspx"/>
+        private static uint CTL_CODE(
+            uint DeviceType = FILE_DEVICE_PROCMON_LOG,
+            uint Function = 0x81,
+            uint Method = METHOD_BUFFERED,
+            uint Access = FILE_WRITE_ACCESS)
+        {
+            return ((DeviceType << 16) | (Access << 14) | (Function << 2) | Method);
+        }
+
+        /// <remarks>This is only used for opening the procmon log handle, hence the default parameters.</remarks>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx"/>
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        private static extern SafeFileHandle CreateFile(
+            string lpFileName = PROCMON_DEBUGGER_HANDLER,
+            uint dwDesiredAccess = GENERIC_WRITE,
+            uint dwShareMode = FILE_SHARE_WRITE,
+            IntPtr lpSecurityAttributes = default(IntPtr),
+            uint dwCreationDisposition = OPEN_EXISTING,
+            uint dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+            IntPtr hTemplateFile = default(IntPtr));
+
+        [DllImport("kernel32.dll", ExactSpelling = true, SetLastError = true, CharSet = CharSet.Auto)]
+        private static extern bool DeviceIoControl(
+            SafeFileHandle hDevice, uint dwIoControlCode,
+            StringBuilder lpInBuffer, uint nInBufferSize,
+            IntPtr lpOutBuffer, uint nOutBufferSize,
+            out uint lpBytesReturned, IntPtr lpOverlapped);
+
+        static NativeMethods()
+        {
+            AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
+            {
+                if (!hProcMon.IsInvalid) hProcMon.Close();
+            };
+        }
 
         /// <summary>
         /// Does the actual tracing to Process Monitor.
@@ -44,30 +95,20 @@ internal static class NativeMethods
         /// </returns>
         public static bool ProcMonDebugOutput(string message, params object[] args)
         {
-            if (false == lookedUpProcessType)
-            {
-                lookedUpProcessType = true;
-
-                Assembly mscorlibAssem = Assembly.GetAssembly(typeof(object));
-                Module[] mods = mscorlibAssem.GetModules();
-                PortableExecutableKinds peK;
-                ImageFileMachine ifn;
-                mods[0].GetPEKind(out peK, out ifn);
-                is64BitProcess = ImageFileMachine.I386 != ifn;
-            }
-
             bool returnValue = false;
             try
             {
-                string renderedMessage = string.Format(message, args);
-                if (true == is64BitProcess)
-                {
-                    returnValue = ProcMonDebugOutputx64(renderedMessage);
-                }
-                else
+                StringBuilder renderedMessage = new StringBuilder(); 
+                renderedMessage.AppendFormat(message, args);
+                uint outLen;
+                if (hProcMon == null || hProcMon.IsInvalid)
                 {
-                    returnValue = ProcMonDebugOutputWin32(renderedMessage);
+                    hProcMon = CreateFile();
                 }
+                DeviceIoControl(
+                    hProcMon, IOCTL_EXTERNAL_LOG_DEBUGOUT,
+                    renderedMessage, (uint)(message.Length * Marshal.SizeOf(typeof(char))),
+                    IntPtr.Zero, 0, out outLen, IntPtr.Zero);
             }
             catch (EntryPointNotFoundException notFoundException)
             {
@@ -79,21 +120,5 @@ public static bool ProcMonDebugOutput(string message, params object[] args)
 
             return returnValue;
         }
-
-        [DllImport("ProcMonDebugOutputx64.dll",
-                   CharSet = CharSet.Unicode,
-                   EntryPoint = "ProcMonDebugOutput",
-                   SetLastError = true,
-                   CallingConvention = CallingConvention.StdCall)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool ProcMonDebugOutputx64(string lpOutput);
-
-        [DllImport("ProcMonDebugOutputWin32.dll",
-                   CharSet = CharSet.Unicode,
-                   EntryPoint = "ProcMonDebugOutput",
-                   SetLastError = true,
-                   CallingConvention = CallingConvention.StdCall)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool ProcMonDebugOutputWin32(string lpOutput);
     }
 }