yaakov/Notepad.Extensions.Logging
1
0
Fork 0
mirror of https://github.com/yaakov-h/Notepad.Extensions.Logging.git synced 2024-11-22 03:04:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Use EnumWindows instead of FindWindow"

Browse source 
This reverts commit fa24ae3022.
This commit is contained in:
Yaakov 2020-05-21 17:52:07 +10:00
parent fa24ae3022
commit 1d1f92c608
3 changed files with 15 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Notepad.Extensions.Logging.FunctionalTest/Program.cs
View file

@ -18,15 +18,9 @@ namespace Notepad.Extensions.Logging.FunctionalTest
var sp = sc.BuildServiceProvider();
var logger = sp.GetRequiredService<ILogger<Program>>();
//logger.LogWarning("Here is a warning.");
//logger.LogError(GetException(), "oh no!.");
//logger.LogInformation("Here is some info.");
//logger.LogInformation("here, have a nice 😋 emoji.");
logger.LogInformation(@"💧 Paul
@paws101
Replying to
@yaakov_h
But does it handle emoji injection?.");
logger.LogWarning("Here is a warning.");
logger.LogError(GetException(), "oh no!.");
logger.LogInformation("Here is some info.");
}
static Exception GetException()

9
Notepad.Extensions.Logging/NativeMethods.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Runtime.InteropServices;
using System.Text;
namespace Microsoft.Extensions.Logging
{
@ -16,13 +15,5 @@ namespace Microsoft.Extensions.Logging
[DllImport("User32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, [MarshalAs(UnmanagedType.LPWStr)] string lParam);
public delegate bool EnumWindowsDelegate(IntPtr hWnd, IntPtr lParam);
[DllImport("user32.dll")]
public static extern bool EnumWindows(EnumWindowsDelegate lpEnumFunc, IntPtr lParam);
[DllImport("User32.dll")]
public static extern int GetWindowText(IntPtr hWndParent, StringBuilder sb, int maxCount);
}
}

64
Notepad.Extensions.Logging/WindowFinder.cs
View file

@ -1,6 +1,4 @@
using System;
using System.ComponentModel;
using System.Text;
namespace Microsoft.Extensions.Logging
{
@ -8,66 +6,28 @@ namespace Microsoft.Extensions.Logging
{
public static IntPtr FindNotepadWindow()
{
sb ??= new StringBuilder(4096);
try
{
FindMainWindow();
if (handle == IntPtr.Zero)
{
return handle;
}
IntPtr edit = NativeMethods.FindWindowEx(handle, IntPtr.Zero, "EDIT", null);
return edit;
}
finally
{
handle = IntPtr.Zero;
sb.Clear();
}
var hwnd = FindMainWindow();
IntPtr edit = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "EDIT", null);
return edit;
}
static IntPtr FindMainWindow()
{
NativeMethods.EnumWindows(enumWindowsDelegate, IntPtr.Zero);
return handle;
}
static NativeMethods.EnumWindowsDelegate enumWindowsDelegate = new NativeMethods.EnumWindowsDelegate(EnumWindowsCallback);
static bool EnumWindowsCallback(IntPtr hWnd, IntPtr lParam)
{
var result = NativeMethods.GetWindowText(hWnd, sb, sb.Capacity);
if (result < 0)
IntPtr hwnd;
hwnd = NativeMethods.FindWindow(null, "Untitled - Notepad");
if (hwnd != IntPtr.Zero)
{
throw new Win32Exception(result);
return hwnd;
}
if (IsKnownNotepadWindow(sb.ToString()))
hwnd = NativeMethods.FindWindow(null, "*Untitled - Notepad");
if (hwnd != IntPtr.Zero)
{
WindowFinder.handle = hWnd;
return false;
}
return true;
}
[ThreadStatic]
static IntPtr handle;
[ThreadStatic]
static StringBuilder sb;
static bool IsKnownNotepadWindow(string titleText)
{
switch (titleText)
{
case "Untitled - Notepad":
case "*Untitled - Notepad":
return true;
return hwnd;
}
return false;
return IntPtr.Zero;
}
}
}