mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:05:59 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[Peek]Fix crashes on File Explorer alternatives (#31211)

Browse Source 
* [Peek] Add check to ensure window class name matches File Explorer

* [Peek] Safe casting for IShellFolderViewDual2 compatibility.
This commit is contained in:
gokcekantarci 2024-02-07 17:52:11 +03:00 committed by GitHub
parent 3f837f8c90
commit 356db99bca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/peek/Peek.UI/Helpers/FileExplorerHelper.cs
View File

@ -63,21 +63,23 @@ namespace Peek.UI.Helpers
var shell = new Shell32.Shell(); var shell = new Shell32.Shell();
ShellWindows shellWindows = shell.Windows(); ShellWindows shellWindows = shell.Windows();
foreach (IWebBrowserApp webBrowserApp in shell.Windows()) foreach (IWebBrowserApp webBrowserApp in shellWindows)
{ {
var shellFolderView = (Shell32.IShellFolderViewDual2)webBrowserApp.Document; if (webBrowserApp.Document is Shell32.IShellFolderViewDual2 shellFolderView)
var folderTitle = shellFolderView.Folder.Title;
if (webBrowserApp.HWND == foregroundWindowHandle)
{ {
var serviceProvider = (IServiceProvider)webBrowserApp; var folderTitle = shellFolderView.Folder.Title;
var shellBrowser = (IShellBrowser)serviceProvider.QueryService(PInvoke.SID_STopLevelBrowser, typeof(IShellBrowser).GUID);
shellBrowser.GetWindow(out IntPtr shellBrowserHandle);
if (activeTab == shellBrowserHandle) if (webBrowserApp.HWND == foregroundWindowHandle)
{ {
shellItemArray = GetShellItemArray(shellBrowser, onlySelectedFiles); var serviceProvider = (IServiceProvider)webBrowserApp;
return shellItemArray; var shellBrowser = (IShellBrowser)serviceProvider.QueryService(PInvoke.SID_STopLevelBrowser, typeof(IShellBrowser).GUID);
shellBrowser.GetWindow(out IntPtr shellBrowserHandle);
if (activeTab == shellBrowserHandle)
{
shellItemArray = GetShellItemArray(shellBrowser, onlySelectedFiles);
return shellItemArray;
}
} }
} }
} }