From e896e1b3dd800cee820d2e18fb93856b2c60e461 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Fri, 10 Apr 2020 06:41:19 -0700 Subject: [PATCH] fixing a bunch of warnings from Window Walker (#2014) * first set of warning fixes * Since this is a Interop item, it should have a _ * Update Window.cs * Update InteropAndHelpers.cs looks like there was a space a the top * Update Window.cs --- .../Components/InteropAndHelpers.cs | 47 ++++++++++++++++--- .../Window Walker/Components/OpenWindows.cs | 1 - .../app/Window Walker/Components/Window.cs | 18 +++---- .../app/Window Walker/MainWindow.xaml.cs | 2 +- .../ViewModels/WindowWalkerViewModel.cs | 3 +- 5 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/modules/windowwalker/app/Window Walker/Components/InteropAndHelpers.cs b/src/modules/windowwalker/app/Window Walker/Components/InteropAndHelpers.cs index 1f90405c0b..946729e8db 100644 --- a/src/modules/windowwalker/app/Window Walker/Components/InteropAndHelpers.cs +++ b/src/modules/windowwalker/app/Window Walker/Components/InteropAndHelpers.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation +// Copyright (c) Microsoft Corporation // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. Code forked from Betsegaw Tadele's https://github.com/betsegaw/windowwalker/ @@ -603,167 +603,200 @@ namespace WindowWalker.Components /// The retrieved handle identifies the window of the same type that is highest in the Z order. /// GW_HWNDFIRST = 0, + /// /// The retrieved handle identifies the window of the same type that is lowest in the Z order. /// GW_HWNDLAST = 1, + /// /// The retrieved handle identifies the window below the specified window in the Z order. /// GW_HWNDNEXT = 2, + /// /// The retrieved handle identifies the window above the specified window in the Z order. /// GW_HWNDPREV = 3, + /// /// The retrieved handle identifies the specified window's owner window, if any. /// GW_OWNER = 4, + /// /// The retrieved handle identifies the child window at the top of the Z order, if the specified window /// is a parent window. /// GW_CHILD = 5, + /// /// The retrieved handle identifies the enabled popup window owned by the specified window. /// - GW_ENABLEDPOPUP = 6 + GW_ENABLEDPOPUP = 6, } /// /// GetWindowLong index to retrieves the extended window styles. /// +#pragma warning disable SA1310 // Field names should not contain underscore public const int GWL_EXSTYLE = -20; +#pragma warning restore SA1310 // Field names should not contain underscore /// /// The following are the extended window styles /// [Flags] - public enum ExtendedWindowStyles : UInt32 + public enum ExtendedWindowStyles : uint { /// /// The window has a double border; the window can, optionally, be created with a title bar by specifying /// the WS_CAPTION style in the dwStyle parameter. /// WS_EX_DLGMODALFRAME = 0X0001, + /// /// The child window created with this style does not send the WM_PARENTNOTIFY message to its parent window /// when it is created or destroyed. /// WS_EX_NOPARENTNOTIFY = 0X0004, + /// /// The window should be placed above all non-topmost windows and should stay above all non-topmost windows /// and should stay above them, even when the window is deactivated. /// WS_EX_TOPMOST = 0X0008, + /// /// The window accepts drag-drop files. /// WS_EX_ACCEPTFILES = 0x0010, + /// /// The window should not be painted until siblings beneath the window (that were created by the same thread) - /// have been painted. + /// have been painted. /// WS_EX_TRANSPARENT = 0x0020, + /// /// The window is a MDI child window. /// WS_EX_MDICHILD = 0x0040, + /// /// The window is intended to be used as a floating toolbar. A tool window has a title bar that is shorter /// than a normal title bar, and the window title is drawn using a smaller font. A tool window does not /// appear in the taskbar or in the dialog that appears when the user presses ALT+TAB. /// WS_EX_TOOLWINDOW = 0x0080, + /// /// The window has a border with a raised edge. /// WS_EX_WINDOWEDGE = 0x0100, + /// /// The window has a border with a sunken edge. /// WS_EX_CLIENTEDGE = 0x0200, + /// /// The title bar of the window includes a question mark. /// WS_EX_CONTEXTHELP = 0x0400, + /// /// The window has generic "right-aligned" properties. This depends on the window class. This style has /// an effect only if the shell language supports reading-order alignment, otherwise is ignored. /// WS_EX_RIGHT = 0x1000, + /// /// The window has generic left-aligned properties. This is the default. /// WS_EX_LEFT = 0x0, + /// /// If the shell language supports reading-order alignment, the window text is displayed using right-to-left /// reading-order properties. For other languages, the styles is ignored. /// WS_EX_RTLREADING = 0x2000, + /// /// The window text is displayed using left-to-right reading-order properties. This is the default. /// WS_EX_LTRREADING = 0x0, + /// /// If the shell language supports reading order alignment, the vertical scroll bar (if present) is to /// the left of the client area. For other languages, the style is ignored. /// WS_EX_LEFTSCROLLBAR = 0x4000, + /// /// The vertical scroll bar (if present) is to the right of the client area. This is the default. /// WS_EX_RIGHTSCROLLBAR = 0x0, + /// - /// The window itself contains child windows that should take part in dialog box, navigation. If this + /// The window itself contains child windows that should take part in dialog box, navigation. If this /// style is specified, the dialog manager recurses into children of this window when performing /// navigation operations such as handling tha TAB key, an arrow key, or a keyboard mnemonic. /// WS_EX_CONTROLPARENT = 0x10000, + /// /// The window has a three-dimensional border style intended to be used for items that do not accept /// user input. /// WS_EX_STATICEDGE = 0x20000, + /// /// Forces a top-level window onto the taskbar when the window is visible. /// WS_EX_APPWINDOW = 0x40000, + /// /// The window is an overlapped window. /// WS_EX_OVERLAPPEDWINDOW = WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE, + /// /// The window is palette window, which is a modeless dialog box that presents an array of commands. /// WS_EX_PALETTEWINDOW = WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST, + /// /// The window is a layered window. This style cannot be used if the window has a class style of either /// CS_OWNDC or CS_CLASSDC. Only for top level window before Windows 8, and child windows from Windows 8. /// WS_EX_LAYERED = 0x80000, + /// /// The window does not pass its window layout to its child windows. /// WS_EX_NOINHERITLAYOUT = 0x100000, + /// /// If the shell language supports reading order alignment, the horizontal origin of the window is on the /// right edge. Increasing horizontal values advance to the left. /// WS_EX_LAYOUTRTL = 0x400000, + /// /// Paints all descendants of a window in bottom-to-top painting order using double-buffering. - /// Bottom-to-top painting order allows a descendent window to have translucency (alpha) and + /// Bottom-to-top painting order allows a descendent window to have translucency (alpha) and /// transparency (color-key) effects, but only if the descendent window also has the WS_EX_TRANSPARENT /// bit set. Double-buffering allows the window and its descendents to be painted without flicker. /// WS_EX_COMPOSITED = 0x2000000, + /// /// A top-level window created with this style does not become the foreground window when the user /// clicks it. The system does not bring this window to the foreground when the user minimizes or closes /// the foreground window. /// - WS_EX_NOACTIVATE = 0x8000000 + WS_EX_NOACTIVATE = 0x8000000, } [DllImport("user32.dll", CharSet = CharSet.Unicode)] diff --git a/src/modules/windowwalker/app/Window Walker/Components/OpenWindows.cs b/src/modules/windowwalker/app/Window Walker/Components/OpenWindows.cs index e65dd2913a..4450fa546a 100644 --- a/src/modules/windowwalker/app/Window Walker/Components/OpenWindows.cs +++ b/src/modules/windowwalker/app/Window Walker/Components/OpenWindows.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; namespace WindowWalker.Components diff --git a/src/modules/windowwalker/app/Window Walker/Components/Window.cs b/src/modules/windowwalker/app/Window Walker/Components/Window.cs index 0aa84eafdb..a767145ecb 100644 --- a/src/modules/windowwalker/app/Window Walker/Components/Window.cs +++ b/src/modules/windowwalker/app/Window Walker/Components/Window.cs @@ -112,7 +112,7 @@ namespace WindowWalker.Components InteropAndHelpers.CallBackPtr callbackptr = new InteropAndHelpers.CallBackPtr((IntPtr hwnd, IntPtr lParam) => { var childProcessId = GetProcessIDFromWindowHandle(hwnd); - if (childProcessId != this.ProcessID) + if (childProcessId != ProcessID) { _handlesToProcessCache[Hwnd] = GetProcessNameFromWindowHandle(hwnd); return false; @@ -191,7 +191,7 @@ namespace WindowWalker.Components } /// - /// Determines whether the specified window handle identifies an existing window. + /// Gets a value indicating whether the specified window handle identifies an existing window. /// public bool IsWindow { @@ -202,7 +202,7 @@ namespace WindowWalker.Components } /// - /// Get a value indicating whether is the window GWL_EX_STYLE is a toolwindow + /// Gets a value indicating whether a value is the window GWL_EX_STYLE is a toolwindow /// public bool IsToolWindow { @@ -215,7 +215,7 @@ namespace WindowWalker.Components } /// - /// Get a value indicating whether the window GWL_EX_STYLE is an appwindow + /// Gets a value indicating whether the window GWL_EX_STYLE is an appwindow /// public bool IsAppWindow { @@ -228,7 +228,7 @@ namespace WindowWalker.Components } /// - /// Get a value indicating whether the window has ITaskList_Deleted property + /// Gets a value indicating whether the window has ITaskList_Deleted property /// public bool TaskListDeleted { @@ -239,18 +239,18 @@ namespace WindowWalker.Components } /// - /// Get a value indicating whether the app is a cloaked UWP app + /// Gets a value indicating whether the app is a cloaked UWP app /// public bool IsUWPCloaked { get { - return (this.IsWindowCloaked() && this.ClassName == "ApplicationFrameWindow"); + return IsWindowCloaked() && ClassName == "ApplicationFrameWindow"; } } /// - /// Determines whether the specified windows is the owner + /// Gets a value indicating whether the specified windows is the owner /// public bool IsOwner { @@ -267,7 +267,7 @@ namespace WindowWalker.Components { int isCloaked = 0; const int DWMWA_CLOAKED = 14; - InteropAndHelpers.DwmGetWindowAttribute(this.hwnd, DWMWA_CLOAKED, out isCloaked, sizeof(int)); + InteropAndHelpers.DwmGetWindowAttribute(hwnd, DWMWA_CLOAKED, out isCloaked, sizeof(int)); return isCloaked != 0; } diff --git a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs index ac20d27302..f1acd6c687 100644 --- a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs +++ b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs @@ -117,7 +117,7 @@ namespace WindowWalker private void Window_GotFocus(object sender, RoutedEventArgs e) { - this.searchBox.Focus(); + searchBox.Focus(); } } } diff --git a/src/modules/windowwalker/app/Window Walker/ViewModels/WindowWalkerViewModel.cs b/src/modules/windowwalker/app/Window Walker/ViewModels/WindowWalkerViewModel.cs index 2b5fd6dcad..8f57747b38 100644 --- a/src/modules/windowwalker/app/Window Walker/ViewModels/WindowWalkerViewModel.cs +++ b/src/modules/windowwalker/app/Window Walker/ViewModels/WindowWalkerViewModel.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Windows.Interop; -using Microsoft.Win32; + using WindowWalker.Components; using WindowWalker.MVVMHelpers; @@ -18,7 +18,6 @@ namespace WindowWalker.ViewModels private readonly List _hints = new List() { "search for running processes or windows...", - // "you can reinvoke this app using CTRL + WIN", }; private string _searchText = string.Empty;