Fix

Author: 0x5bfa

src/Files.App/Data/Contracts/IWindowsWallpaperService.cs

@@ -9,6 +9,6 @@ public interface IWindowsWallpaperService
 
 		bool SetDesktopSlideshow(string[] aszPaths);
 
-		bool SetLockScreenWallpaper(string szPath);
+		Task<bool> SetLockScreenWallpaper(string szPath);
 	}
 }

src/Files.App/Services/Windows/WindowsWallpaperService.cs

@@ -1,7 +1,9 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Logging;
+using Windows.Storage;
+using Windows.System.UserProfile;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
@@ -16,57 +18,64 @@ public sealed class WindowsWallpaperService : IWindowsWallpaperService
  		/// <inheritdoc/>
 		public unsafe bool SetDesktopWallpaper(string szPath)
 		{
-			PInvoke.CoCreateInstance(
-				typeof(DesktopWallpaper).GUID,
-				null,
-				CLSCTX.CLSCTX_INPROC_SERVER,
-				out IDesktopWallpaper desktopWallpaper);
-
-			desktopWallpaper.GetMonitorDevicePathCount(out var dwMonitorCount);
-
-			fixed (char* pszPath = szPath)
+			try
 			{
-				var pwszPath = new PWSTR(pszPath);
+				PInvoke.CoCreateInstance(
+					typeof(DesktopWallpaper).GUID,
+					null,
+					CLSCTX.CLSCTX_INPROC_SERVER,
+					out IDesktopWallpaper desktopWallpaper);
+
+				desktopWallpaper.GetMonitorDevicePathCount(out var dwMonitorCount);
 
-				for (uint dwIndex = 0; dwIndex < dwMonitorCount; dwIndex++)
+				fixed (char* pszPath = szPath)
 				{
-					desktopWallpaper.GetMonitorDevicePathAt(dwIndex, out var pMonitorID);
-					desktopWallpaper.SetWallpaper(pMonitorID, pwszPath);
+					var pwszPath = new PWSTR(pszPath);
+
+					for (uint dwIndex = 0; dwIndex < dwMonitorCount; dwIndex++)
+					{
+						desktopWallpaper.GetMonitorDevicePathAt(dwIndex, out var pMonitorID);
+						desktopWallpaper.SetWallpaper(pMonitorID, pwszPath);
+					}
 				}
+
+				return true;
 			}
+			catch (Exception ex)
+			{
+				App.Logger.LogWarning(ex, ex.Message);
 
-			// win32metadata bug: SetWallpaper should return HRESULT
-			return true;
+				return false;
+			}
 		}
 
- 		/// <inheritdoc/>
+		/// <inheritdoc/>
 		public unsafe bool SetDesktopSlideshow(string[] aszPaths)
 		{
-			PInvoke.CoCreateInstance(
-				typeof(DesktopWallpaper).GUID,
-				null,
-				CLSCTX.CLSCTX_INPROC_SERVER,
-				out IDesktopWallpaper desktopWallpaper);
-
 			try
 			{
-				ITEMIDLIST[] idList = new ITEMIDLIST[aszPaths.Length];
+				PInvoke.CoCreateInstance(
+					typeof(DesktopWallpaper).GUID,
+					null,
+					CLSCTX.CLSCTX_INPROC_SERVER,
+					out IDesktopWallpaper desktopWallpaper);
 
-				foreach (var szPath in aszPaths)
-				{
-					var id = PInvoke.ILCreateFromPath(szPath);
-					idList.Append(*id);
-				}
+				var dwCount = (uint)aszPaths.Length;
 
-				fixed (ITEMIDLIST** idListPointers = idList)
+				fixed (ITEMIDLIST** idList = new ITEMIDLIST*[dwCount])
 				{
+					for (uint dwIndex = 0u; dwIndex < dwCount; dwIndex++)
+					{
+						var id = PInvoke.ILCreateFromPath(aszPaths[dwIndex]);
+						idList[dwIndex] = id;
+					}
 
-				}
-
-				var idList = aszPaths.Select(x => PInvoke.ILCreateFromPath(x)).ToList();
-				PInvoke.SHCreateShellItemArrayFromIDLists((uint)idList.cou, [.. idList], out var shellItemArray);
+					// Get shell item array from images to use for slideshow
+					PInvoke.SHCreateShellItemArrayFromIDLists(dwCount, idList, out var shellItemArray);
 
-				desktopWallpaper.SetSlideshow(shellItemArray);
+					// Set slideshow
+					desktopWallpaper.SetSlideshow(shellItemArray);
+				}
 
 				// Set wallpaper to fill desktop.
 				desktopWallpaper.SetPosition(DESKTOP_WALLPAPER_POSITION.DWPOS_FILL);
@@ -76,15 +85,28 @@ public unsafe bool SetDesktopSlideshow(string[] aszPaths)
 			}
 			catch (Exception ex)
 			{
+				App.Logger.LogWarning(ex, ex.Message);
+
 				return false;
 			}
 		}
 
 		/// <inheritdoc/>
-		public bool SetLockScreenWallpaper(string szPath)
+		public async Task<bool> SetLockScreenWallpaper(string szPath)
 		{
-			// TODO: Use LockScreen WinRT class
-			return true;
+			try
+			{
+				IStorageFile sourceFile = await StorageFile.GetFileFromPathAsync(szPath);
+				await LockScreen.SetImageFileAsync(sourceFile);
+
+				return true;
+			}
+			catch (Exception ex)
+			{
+				App.Logger.LogWarning(ex, ex.Message);
+
+				return false;
+			}
 		}
 	}
 }