windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2025-09-12 18:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code Cleanup

Browse Source
This commit is contained in:
ema
2025-05-25 01:32:38 +08:00
parent 05a2a819b7
commit 2e8fd2bae7
22 changed files with 68 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
QuickLook.Plugin/QuickLook.Plugin.AppViewer/MsiInfoPanel.xaml
View File

@@ -8,13 +8,6 @@
FontSize="14" FontSize="14"
UseLayoutRounding="True" UseLayoutRounding="True"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/QuickLook.Common;component/Styles/MainWindowStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="15" /> <RowDefinition Height="15" />

3
QuickLook.Plugin/QuickLook.Plugin.AppViewer/MsiInfoPanel.xaml.cs
View File

@@ -35,9 +35,6 @@ public partial class MsiInfoPanel : UserControl, IAppInfoPanel
{ {
InitializeComponent(); InitializeComponent();
// apply global theme
Resources.MergedDictionaries[0].Clear();
string translationFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Translations.config"); string translationFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Translations.config");
productNameTitle.Text = TranslationHelper.Get("PRODUCT_NAME", translationFile); productNameTitle.Text = TranslationHelper.Get("PRODUCT_NAME", translationFile);
productVersionTitle.Text = TranslationHelper.Get("PRODUCT_VERSION", translationFile); productVersionTitle.Text = TranslationHelper.Get("PRODUCT_VERSION", translationFile);

32
QuickLook.Plugin/QuickLook.Plugin.AppViewer/WindowsThumbnailProvider.cs
View File

@@ -44,13 +44,13 @@ internal static class WindowsThumbnailProvider
private static extern int SHCreateItemFromParsingName( private static extern int SHCreateItemFromParsingName(
[MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] string path,
// The following parameter is not used - binding context. // The following parameter is not used - binding context.
IntPtr pbc, nint pbc,
ref Guid riid, ref Guid riid,
[MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem); [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
[DllImport("gdi32.dll")] [DllImport("gdi32.dll")]
[return: MarshalAs(UnmanagedType.Bool)] [return: MarshalAs(UnmanagedType.Bool)]
private static extern bool DeleteObject(IntPtr hObject); private static extern bool DeleteObject(nint hObject);
public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options) public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
{ {
@@ -71,7 +71,7 @@ internal static class WindowsThumbnailProvider
} }
} }
internal static Bitmap GetBitmapFromHBitmap(IntPtr nativeHBitmap) internal static Bitmap GetBitmapFromHBitmap(nint nativeHBitmap)
{ {
var bmp = Image.FromHbitmap(nativeHBitmap); var bmp = Image.FromHbitmap(nativeHBitmap);
@@ -115,7 +115,7 @@ internal static class WindowsThumbnailProvider
return srcBitmap; return srcBitmap;
} }
private static IntPtr GetHBitmap(string fileName, int width, int height, ThumbnailOptions options) private static nint GetHBitmap(string fileName, int width, int height, ThumbnailOptions options)
{ {
var shellItem2Guid = new Guid(IShellItem2Guid); var shellItem2Guid = new Guid(IShellItem2Guid);
var retCode = var retCode =
@@ -142,18 +142,18 @@ internal static class WindowsThumbnailProvider
[Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")] [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
internal interface IShellItem internal interface IShellItem
{ {
void BindToHandler(IntPtr pbc, public void BindToHandler(nint pbc,
[MarshalAs(UnmanagedType.LPStruct)] Guid bhid, [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
[MarshalAs(UnmanagedType.LPStruct)] Guid riid, [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
out IntPtr ppv); out nint ppv);
void GetParent(out IShellItem ppsi); public void GetParent(out IShellItem ppsi);
void GetDisplayName(SIGDN sigdnName, out IntPtr ppszName); public void GetDisplayName(SIGDN sigdnName, out nint ppszName);
void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs); public void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
void Compare(IShellItem psi, uint hint, out int piOrder); public void Compare(IShellItem psi, uint hint, out int piOrder);
} }
internal enum SIGDN : uint internal enum SIGDN : uint
@@ -165,7 +165,7 @@ internal static class WindowsThumbnailProvider
PARENTRELATIVEEDITING = 0x80031001, PARENTRELATIVEEDITING = 0x80031001,
DESKTOPABSOLUTEEDITING = 0x8004c000, DESKTOPABSOLUTEEDITING = 0x8004c000,
FILESYSPATH = 0x80058000, FILESYSPATH = 0x80058000,
URL = 0x80068000 URL = 0x80068000,
} }
internal enum HResult internal enum HResult
@@ -182,7 +182,7 @@ internal static class WindowsThumbnailProvider
Win32ErrorCanceled = 1223, Win32ErrorCanceled = 1223,
Canceled = unchecked((int)0x800704C7), Canceled = unchecked((int)0x800704C7),
ResourceInUse = unchecked((int)0x800700AA), ResourceInUse = unchecked((int)0x800700AA),
AccessDenied = unchecked((int)0x80030005) AccessDenied = unchecked((int)0x80030005),
} }
[ComImport] [ComImport]
@@ -191,10 +191,10 @@ internal static class WindowsThumbnailProvider
internal interface IShellItemImageFactory internal interface IShellItemImageFactory
{ {
[PreserveSig] [PreserveSig]
HResult GetImage( public HResult GetImage(
[In][MarshalAs(UnmanagedType.Struct)] NativeSize size, [In][MarshalAs(UnmanagedType.Struct)] NativeSize size,
[In] ThumbnailOptions flags, [In] ThumbnailOptions flags,
[Out] out IntPtr phbm); [Out] out nint phbm);
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

3
QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml.cs
View File

@@ -20,9 +20,6 @@ using System.Windows.Controls;
namespace QuickLook.Plugin.ArchiveViewer; namespace QuickLook.Plugin.ArchiveViewer;
/// <summary>
/// Interaction logic for ArchiveFileListView.xaml
/// </summary>
public partial class ArchiveFileListView : UserControl, IDisposable public partial class ArchiveFileListView : UserControl, IDisposable
{ {
public ArchiveFileListView() public ArchiveFileListView()

3
QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveInfoPanel.xaml.cs
View File

@@ -32,9 +32,6 @@ using System.Windows.Controls;
namespace QuickLook.Plugin.ArchiveViewer; namespace QuickLook.Plugin.ArchiveViewer;
/// <summary>
/// Interaction logic for ArchiveInfoPanel.xaml
/// </summary>
public partial class ArchiveInfoPanel : UserControl, IDisposable, INotifyPropertyChanged public partial class ArchiveInfoPanel : UserControl, IDisposable, INotifyPropertyChanged
{ {
private readonly Dictionary<string, ArchiveFileEntry> _fileEntries = []; private readonly Dictionary<string, ArchiveFileEntry> _fileEntries = [];

6
QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/IconManager.cs
View File

@@ -196,7 +196,7 @@ public static class IconManager
public const uint FileAttributeDirectory = 0x00000010; public const uint FileAttributeDirectory = 0x00000010;
[DllImport("Shell32.dll")] [DllImport("Shell32.dll")]
public static extern IntPtr SHGetFileInfo( public static extern nint SHGetFileInfo(
string pszPath, string pszPath,
uint dwFileAttributes, uint dwFileAttributes,
ref Shfileinfo psfi, ref Shfileinfo psfi,
@@ -208,7 +208,7 @@ public static class IconManager
public struct Shfileinfo public struct Shfileinfo
{ {
private const int Namesize = 80; private const int Namesize = 80;
public readonly IntPtr hIcon; public readonly nint hIcon;
private readonly int iIcon; private readonly int iIcon;
private readonly uint dwAttributes; private readonly uint dwAttributes;
@@ -232,6 +232,6 @@ public static class IconManager
/// <param name="hIcon">Pointer to icon handle.</param> /// <param name="hIcon">Pointer to icon handle.</param>
/// <returns>N/A</returns> /// <returns>N/A</returns>
[DllImport("User32.dll")] [DllImport("User32.dll")]
public static extern int DestroyIcon(IntPtr hIcon); public static extern int DestroyIcon(nint hIcon);
} }
} }

3
QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs
View File

@@ -31,9 +31,6 @@ using UtfUnknown;
namespace QuickLook.Plugin.CsvViewer; namespace QuickLook.Plugin.CsvViewer;
/// <summary>
/// Interaction logic for CsvViewerPanel.xaml
/// </summary>
public partial class CsvViewerPanel : UserControl public partial class CsvViewerPanel : UserControl
{ {
public CsvViewerPanel() public CsvViewerPanel()

3
QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs
View File

@@ -38,9 +38,6 @@ using System.Windows.Threading;
namespace QuickLook.Plugin.ImageViewer; namespace QuickLook.Plugin.ImageViewer;
/// <summary>
/// Interaction logic for ImagePanel.xaml
/// </summary>
public partial class ImagePanel : UserControl, INotifyPropertyChanged, IDisposable public partial class ImagePanel : UserControl, INotifyPropertyChanged, IDisposable
{ {
private Visibility _backgroundVisibility = Visibility.Visible; private Visibility _backgroundVisibility = Visibility.Visible;

3
QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml.cs
View File

@@ -29,9 +29,6 @@ using System.Windows.Controls;
namespace QuickLook.Plugin.PDFViewer; namespace QuickLook.Plugin.PDFViewer;
/// <summary>
/// Interaction logic for PdfViewer.xaml
/// </summary>
public partial class PdfViewerControl : UserControl, INotifyPropertyChanged, IDisposable public partial class PdfViewerControl : UserControl, INotifyPropertyChanged, IDisposable
{ {
private int _changePageDeltaSum; private int _changePageDeltaSum;

7
QuickLook.Plugin/QuickLook.Plugin.PEViewer/PEInfoPanel.xaml
View File

@@ -8,13 +8,6 @@
FontSize="14" FontSize="14"
UseLayoutRounding="True" UseLayoutRounding="True"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/QuickLook.Common;component/Styles/MainWindowStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="15" /> <RowDefinition Height="15" />

13
QuickLook.Plugin/QuickLook.Plugin.PEViewer/PEInfoPanel.xaml.cs
View File

@@ -29,27 +29,16 @@ namespace QuickLook.Plugin.PEViewer;
public partial class PEInfoPanel : UserControl public partial class PEInfoPanel : UserControl
{ {
private bool _stop;
public PEInfoPanel() public PEInfoPanel()
{ {
InitializeComponent(); InitializeComponent();
// apply global theme
Resources.MergedDictionaries[0].Clear();
string translationFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Translations.config"); string translationFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Translations.config");
totalSizeTitle.Text = TranslationHelper.Get("TOTAL_SIZE", translationFile); totalSizeTitle.Text = TranslationHelper.Get("TOTAL_SIZE", translationFile);
fileVersionTitle.Text = TranslationHelper.Get("FILE_VERSION", translationFile); fileVersionTitle.Text = TranslationHelper.Get("FILE_VERSION", translationFile);
productVersionTitle.Text = TranslationHelper.Get("PRODUCT_VERSION", translationFile); productVersionTitle.Text = TranslationHelper.Get("PRODUCT_VERSION", translationFile);
} }
public bool Stop
{
set => _stop = value;
get => _stop;
}
public void DisplayInfo(string path) public void DisplayInfo(string path)
{ {
_ = Task.Run(() => _ = Task.Run(() =>
@@ -71,8 +60,6 @@ public partial class PEInfoPanel : UserControl
var name = Path.GetFileName(path); var name = Path.GetFileName(path);
filename.Text = string.IsNullOrEmpty(name) ? path : name; filename.Text = string.IsNullOrEmpty(name) ? path : name;
Stop = false;
_ = Task.Run(() => _ = Task.Run(() =>
{ {
if (File.Exists(path)) if (File.Exists(path))

30
QuickLook.Plugin/QuickLook.Plugin.PEViewer/WindowsThumbnailProvider.cs
View File

@@ -44,7 +44,7 @@ internal static class WindowsThumbnailProvider
private static extern int SHCreateItemFromParsingName( private static extern int SHCreateItemFromParsingName(
[MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] string path,
// The following parameter is not used - binding context. // The following parameter is not used - binding context.
IntPtr pbc, nint pbc,
ref Guid riid, ref Guid riid,
[MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem); [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
@@ -71,7 +71,7 @@ internal static class WindowsThumbnailProvider
} }
} }
internal static Bitmap GetBitmapFromHBitmap(IntPtr nativeHBitmap) internal static Bitmap GetBitmapFromHBitmap(nint nativeHBitmap)
{ {
var bmp = Image.FromHbitmap(nativeHBitmap); var bmp = Image.FromHbitmap(nativeHBitmap);
@@ -115,7 +115,7 @@ internal static class WindowsThumbnailProvider
return srcBitmap; return srcBitmap;
} }
private static IntPtr GetHBitmap(string fileName, int width, int height, ThumbnailOptions options) private static nint GetHBitmap(string fileName, int width, int height, ThumbnailOptions options)
{ {
var shellItem2Guid = new Guid(IShellItem2Guid); var shellItem2Guid = new Guid(IShellItem2Guid);
var retCode = var retCode =
@@ -142,18 +142,18 @@ internal static class WindowsThumbnailProvider
[Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")] [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
internal interface IShellItem internal interface IShellItem
{ {
void BindToHandler(IntPtr pbc, public void BindToHandler(nint pbc,
[MarshalAs(UnmanagedType.LPStruct)] Guid bhid, [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
[MarshalAs(UnmanagedType.LPStruct)] Guid riid, [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
out IntPtr ppv); out nint ppv);
void GetParent(out IShellItem ppsi); public void GetParent(out IShellItem ppsi);
void GetDisplayName(SIGDN sigdnName, out IntPtr ppszName); public void GetDisplayName(SIGDN sigdnName, out nint ppszName);
void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs); public void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
void Compare(IShellItem psi, uint hint, out int piOrder); public void Compare(IShellItem psi, uint hint, out int piOrder);
} }
internal enum SIGDN : uint internal enum SIGDN : uint
@@ -165,7 +165,7 @@ internal static class WindowsThumbnailProvider
PARENTRELATIVEEDITING = 0x80031001, PARENTRELATIVEEDITING = 0x80031001,
DESKTOPABSOLUTEEDITING = 0x8004c000, DESKTOPABSOLUTEEDITING = 0x8004c000,
FILESYSPATH = 0x80058000, FILESYSPATH = 0x80058000,
URL = 0x80068000 URL = 0x80068000,
} }
internal enum HResult internal enum HResult
@@ -182,7 +182,7 @@ internal static class WindowsThumbnailProvider
Win32ErrorCanceled = 1223, Win32ErrorCanceled = 1223,
Canceled = unchecked((int)0x800704C7), Canceled = unchecked((int)0x800704C7),
ResourceInUse = unchecked((int)0x800700AA), ResourceInUse = unchecked((int)0x800700AA),
AccessDenied = unchecked((int)0x80030005) AccessDenied = unchecked((int)0x80030005),
} }
[ComImport] [ComImport]
@@ -191,10 +191,10 @@ internal static class WindowsThumbnailProvider
internal interface IShellItemImageFactory internal interface IShellItemImageFactory
{ {
[PreserveSig] [PreserveSig]
HResult GetImage( public HResult GetImage(
[In][MarshalAs(UnmanagedType.Struct)] NativeSize size, [In][MarshalAs(UnmanagedType.Struct)] NativeSize size,
[In] ThumbnailOptions flags, [In] ThumbnailOptions flags,
[Out] out IntPtr phbm); [Out] out nint phbm);
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

7
QuickLook.Plugin/QuickLook.Plugin.PluginInstaller/PluginInfoPanel.xaml
View File

@@ -7,13 +7,6 @@
Height="200" Height="200"
FontSize="14" FontSize="14"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/QuickLook.Common;component/Styles/MainWindowStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid> <Grid>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

3
QuickLook.Plugin/QuickLook.Plugin.PluginInstaller/PluginInfoPanel.xaml.cs
View File

@@ -37,9 +37,6 @@ public partial class PluginInfoPanel : UserControl
{ {
InitializeComponent(); InitializeComponent();
// apply global theme
Resources.MergedDictionaries[0].Clear();
_path = path; _path = path;
_context = context; _context = context;
ReadInfo(); ReadInfo();

3
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
View File

@@ -45,9 +45,6 @@ using WPFMediaKit.DirectShow.MediaPlayers;
namespace QuickLook.Plugin.VideoViewer; namespace QuickLook.Plugin.VideoViewer;
/// <summary>
/// Interaction logic for UserControl1.xaml
/// </summary>
public partial class ViewerPanel : UserControl, IDisposable, INotifyPropertyChanged public partial class ViewerPanel : UserControl, IDisposable, INotifyPropertyChanged
{ {
private readonly ContextObject _context; private readonly ContextObject _context;

3
QuickLook/Controls/GlassLayer/GlassLayer.xaml.cs
View File

@@ -23,9 +23,6 @@ using QuickLook.Common.Helpers;
namespace QuickLook.Controls.GlassLayer; namespace QuickLook.Controls.GlassLayer;
/// <summary>
/// Interaction logic for GlassLayer.xaml
/// </summary>
public partial class GlassLayer : UserControl public partial class GlassLayer : UserControl
{ {
public GlassLayer() public GlassLayer()

8
QuickLook/Helpers/ShareHelper.cs
View File

@@ -109,12 +109,12 @@ internal static class DataTransferManagerHelper
private static IDataTransferManagerInterop DataTransferManagerInterop => private static IDataTransferManagerInterop DataTransferManagerInterop =>
(IDataTransferManagerInterop)WindowsRuntimeMarshal.GetActivationFactory(typeof(DataTransferManager)); (IDataTransferManagerInterop)WindowsRuntimeMarshal.GetActivationFactory(typeof(DataTransferManager));
public static DataTransferManager GetForWindow(IntPtr hwnd) public static DataTransferManager GetForWindow(nint hwnd)
{ {
return DataTransferManagerInterop.GetForWindow(hwnd, DTM_IID); return DataTransferManagerInterop.GetForWindow(hwnd, DTM_IID);
} }
public static void ShowShareUIForWindow(IntPtr hwnd) public static void ShowShareUIForWindow(nint hwnd)
{ {
DataTransferManagerInterop.ShowShareUIForWindow(hwnd); DataTransferManagerInterop.ShowShareUIForWindow(hwnd);
} }
@@ -124,8 +124,8 @@ internal static class DataTransferManagerHelper
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
private interface IDataTransferManagerInterop private interface IDataTransferManagerInterop
{ {
DataTransferManager GetForWindow([In] IntPtr appWindow, [In] ref Guid riid); public DataTransferManager GetForWindow([In] nint appWindow, [In] ref Guid riid);
void ShowShareUIForWindow(IntPtr appWindow); public void ShowShareUIForWindow(nint appWindow);
} }
} }

36
QuickLook/NativeMethods/ShellLink.cs
View File

@@ -110,64 +110,64 @@ internal enum SLR_FLAGS
internal interface IShellLinkW internal interface IShellLinkW
{ {
/// <summary>Retrieves the path and file name of a Shell link object</summary> /// <summary>Retrieves the path and file name of a Shell link object</summary>
void GetPath([Out] [MarshalAs(UnmanagedType.LPWStr)] public void GetPath([Out] [MarshalAs(UnmanagedType.LPWStr)]
StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATAW pfd, SLGP_FLAGS fFlags); StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATAW pfd, SLGP_FLAGS fFlags);
/// <summary>Retrieves the list of item identifiers for a Shell link object</summary> /// <summary>Retrieves the list of item identifiers for a Shell link object</summary>
void GetIDList(out IntPtr ppidl); public void GetIDList(out nint ppidl);
/// <summary>Sets the pointer to an item identifier list (PIDL) for a Shell link object.</summary> /// <summary>Sets the pointer to an item identifier list (PIDL) for a Shell link object.</summary>
void SetIDList(IntPtr pidl); public void SetIDList(nint pidl);
/// <summary>Retrieves the description string for a Shell link object</summary> /// <summary>Retrieves the description string for a Shell link object</summary>
void GetDescription([Out] [MarshalAs(UnmanagedType.LPWStr)] public void GetDescription([Out] [MarshalAs(UnmanagedType.LPWStr)]
StringBuilder pszName, int cchMaxName); StringBuilder pszName, int cchMaxName);
/// <summary>Sets the description for a Shell link object. The description can be any application-defined string</summary> /// <summary>Sets the description for a Shell link object. The description can be any application-defined string</summary>
void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName); public void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
/// <summary>Retrieves the name of the working directory for a Shell link object</summary> /// <summary>Retrieves the name of the working directory for a Shell link object</summary>
void GetWorkingDirectory([Out] [MarshalAs(UnmanagedType.LPWStr)] public void GetWorkingDirectory([Out] [MarshalAs(UnmanagedType.LPWStr)]
StringBuilder pszDir, int cchMaxPath); StringBuilder pszDir, int cchMaxPath);
/// <summary>Sets the name of the working directory for a Shell link object</summary> /// <summary>Sets the name of the working directory for a Shell link object</summary>
void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir); public void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
/// <summary>Retrieves the command-line arguments associated with a Shell link object</summary> /// <summary>Retrieves the command-line arguments associated with a Shell link object</summary>
void GetArguments([Out] [MarshalAs(UnmanagedType.LPWStr)] public void GetArguments([Out] [MarshalAs(UnmanagedType.LPWStr)]
StringBuilder pszArgs, int cchMaxPath); StringBuilder pszArgs, int cchMaxPath);
/// <summary>Sets the command-line arguments for a Shell link object</summary> /// <summary>Sets the command-line arguments for a Shell link object</summary>
void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs); public void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
/// <summary>Retrieves the hot key for a Shell link object</summary> /// <summary>Retrieves the hot key for a Shell link object</summary>
void GetHotkey(out short pwHotkey); public void GetHotkey(out short pwHotkey);
/// <summary>Sets a hot key for a Shell link object</summary> /// <summary>Sets a hot key for a Shell link object</summary>
void SetHotkey(short wHotkey); public void SetHotkey(short wHotkey);
/// <summary>Retrieves the show command for a Shell link object</summary> /// <summary>Retrieves the show command for a Shell link object</summary>
void GetShowCmd(out int piShowCmd); public void GetShowCmd(out int piShowCmd);
/// <summary>Sets the show command for a Shell link object. The show command sets the initial show state of the window.</summary> /// <summary>Sets the show command for a Shell link object. The show command sets the initial show state of the window.</summary>
void SetShowCmd(int iShowCmd); public void SetShowCmd(int iShowCmd);
/// <summary>Retrieves the location (path and index) of the icon for a Shell link object</summary> /// <summary>Retrieves the location (path and index) of the icon for a Shell link object</summary>
void GetIconLocation([Out] [MarshalAs(UnmanagedType.LPWStr)] public void GetIconLocation([Out] [MarshalAs(UnmanagedType.LPWStr)]
StringBuilder pszIconPath, StringBuilder pszIconPath,
int cchIconPath, out int piIcon); int cchIconPath, out int piIcon);
/// <summary>Sets the location (path and index) of the icon for a Shell link object</summary> /// <summary>Sets the location (path and index) of the icon for a Shell link object</summary>
void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon); public void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
/// <summary>Sets the relative path to the Shell link object</summary> /// <summary>Sets the relative path to the Shell link object</summary>
void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved); public void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
/// <summary>Attempts to find the target of a Shell link, even if it has been moved or renamed</summary> /// <summary>Attempts to find the target of a Shell link, even if it has been moved or renamed</summary>
void Resolve(IntPtr hwnd, SLR_FLAGS fFlags); public void Resolve(nint hwnd, SLR_FLAGS fFlags);
/// <summary>Sets the path and file name of a Shell link object</summary> /// <summary>Sets the path and file name of a Shell link object</summary>
void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile); public void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
} }
// CLSID_ShellLink from ShlGuid.h // CLSID_ShellLink from ShlGuid.h

7
QuickLook/Plugin/InfoPanel/InfoPanel.xaml
View File

@@ -9,13 +9,6 @@
FontSize="14" FontSize="14"
UseLayoutRounding="True" UseLayoutRounding="True"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/QuickLook.Common;component/Styles/MainWindowStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="15" /> <RowDefinition Height="15" />

8
QuickLook/Plugin/InfoPanel/InfoPanel.xaml.cs
View File

@@ -25,9 +25,6 @@ using System.Windows.Controls;
namespace QuickLook.Plugin.InfoPanel; namespace QuickLook.Plugin.InfoPanel;
/// <summary>
/// Interaction logic for InfoPanel.xaml
/// </summary>
public partial class InfoPanel : UserControl public partial class InfoPanel : UserControl
{ {
private bool _stop; private bool _stop;
@@ -35,9 +32,6 @@ public partial class InfoPanel : UserControl
public InfoPanel() public InfoPanel()
{ {
InitializeComponent(); InitializeComponent();
// apply global theme
Resources.MergedDictionaries[0].Clear();
} }
public bool Stop public bool Stop
@@ -48,7 +42,7 @@ public partial class InfoPanel : UserControl
public void DisplayInfo(string path) public void DisplayInfo(string path)
{ {
Task.Run(() => _ = Task.Run(() =>
{ {
var scale = DisplayDeviceHelper.GetCurrentScaleFactor(); var scale = DisplayDeviceHelper.GetCurrentScaleFactor();

22
QuickLook/Plugin/InfoPanel/WindowsThumbnailProvider.cs
View File

@@ -44,13 +44,13 @@ internal static class WindowsThumbnailProvider
private static extern int SHCreateItemFromParsingName( private static extern int SHCreateItemFromParsingName(
[MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] string path,
// The following parameter is not used - binding context. // The following parameter is not used - binding context.
IntPtr pbc, nint pbc,
ref Guid riid, ref Guid riid,
[MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem); [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
[DllImport("gdi32.dll")] [DllImport("gdi32.dll")]
[return: MarshalAs(UnmanagedType.Bool)] [return: MarshalAs(UnmanagedType.Bool)]
private static extern bool DeleteObject(IntPtr hObject); private static extern bool DeleteObject(nint hObject);
public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options) public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
{ {
@@ -71,7 +71,7 @@ internal static class WindowsThumbnailProvider
} }
} }
internal static Bitmap GetBitmapFromHBitmap(IntPtr nativeHBitmap) internal static Bitmap GetBitmapFromHBitmap(nint nativeHBitmap)
{ {
var bmp = Image.FromHbitmap(nativeHBitmap); var bmp = Image.FromHbitmap(nativeHBitmap);
@@ -115,7 +115,7 @@ internal static class WindowsThumbnailProvider
return srcBitmap; return srcBitmap;
} }
private static IntPtr GetHBitmap(string fileName, int width, int height, ThumbnailOptions options) private static nint GetHBitmap(string fileName, int width, int height, ThumbnailOptions options)
{ {
var shellItem2Guid = new Guid(IShellItem2Guid); var shellItem2Guid = new Guid(IShellItem2Guid);
var retCode = var retCode =
@@ -142,18 +142,18 @@ internal static class WindowsThumbnailProvider
[Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")] [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
internal interface IShellItem internal interface IShellItem
{ {
void BindToHandler(IntPtr pbc, public void BindToHandler(nint pbc,
[MarshalAs(UnmanagedType.LPStruct)] Guid bhid, [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
[MarshalAs(UnmanagedType.LPStruct)] Guid riid, [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
out IntPtr ppv); out nint ppv);
void GetParent(out IShellItem ppsi); public void GetParent(out IShellItem ppsi);
void GetDisplayName(SIGDN sigdnName, out IntPtr ppszName); public void GetDisplayName(SIGDN sigdnName, out nint ppszName);
void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs); public void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
void Compare(IShellItem psi, uint hint, out int piOrder); public void Compare(IShellItem psi, uint hint, out int piOrder);
} }
internal enum SIGDN : uint internal enum SIGDN : uint
@@ -194,7 +194,7 @@ internal static class WindowsThumbnailProvider
HResult GetImage( HResult GetImage(
[In][MarshalAs(UnmanagedType.Struct)] NativeSize size, [In][MarshalAs(UnmanagedType.Struct)] NativeSize size,
[In] ThumbnailOptions flags, [In] ThumbnailOptions flags,
[Out] out IntPtr phbm); [Out] out nint phbm);
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

3
QuickLook/ViewerWindow.xaml.cs
View File

@@ -31,9 +31,6 @@ using Size = System.Windows.Size;
namespace QuickLook; namespace QuickLook;
/// <summary>
/// Interaction logic for ViewerWindow.xaml
/// </summary>
public partial class ViewerWindow : Window public partial class ViewerWindow : Window
{ {
private Size _customWindowSize = Size.Empty; private Size _customWindowSize = Size.Empty;