Merge pull request #589 from emoacht/develop

Develop
emoacht · May 3, 2024 · 71f0782 · 71f0782
2 parents b9f3ae8 + a4e824a
commit 71f0782
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 15 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.6.11"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.6.12"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

diff --git a/Source/Monitorian.Core/Models/Monitor/DisplayConfig.cs b/Source/Monitorian.Core/Models/Monitor/DisplayConfig.cs
@@ -32,6 +32,10 @@ private static extern int QueryDisplayConfig(
 	private static extern int DisplayConfigGetDeviceInfo(
 		ref DISPLAYCONFIG_TARGET_DEVICE_NAME requestPacket);
 
+	[DllImport("User32.dll")]
+	private static extern int DisplayConfigGetDeviceInfo(
+		ref DISPLAYCONFIG_SOURCE_DEVICE_NAME requestPacket);
+
 	// All derived from wingdi.h
 	[StructLayout(LayoutKind.Sequential)]
 	private struct DISPLAYCONFIG_PATH_INFO
@@ -80,6 +84,15 @@ private struct DISPLAYCONFIG_TARGET_DEVICE_NAME
 		public string monitorDevicePath;
 	}
 
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+	private struct DISPLAYCONFIG_SOURCE_DEVICE_NAME
+	{
+		public DISPLAYCONFIG_DEVICE_INFO_HEADER header;
+
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+		public string viewGdiDeviceName;
+	}
+
 	[StructLayout(LayoutKind.Sequential)]
 	private struct DISPLAYCONFIG_PATH_SOURCE_INFO
 	{

diff --git a/Source/Monitorian.Core/Models/Monitor/DisplayMonitorProvider.cs b/Source/Monitorian.Core/Models/Monitor/DisplayMonitorProvider.cs
@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using System.Windows;
+using Windows.Devices.Display.Core;
 
 namespace Monitorian.Core.Models.Monitor;
 
@@ -147,6 +150,21 @@ public static async Task<DisplayItem[]> GetDisplayMonitorsAsync()
 						isInternal: (displayMonitor.ConnectionKind == Windows.Devices.Display.DisplayMonitorConnectionKind.Internal),
 						connectionDescription: GetConnectionDescription(displayMonitor.ConnectionKind, displayMonitor.PhysicalConnector)));
 				}
+
+#if DEBUG
+				using var manager = DisplayManager.Create(DisplayManagerOptions.None);
+				var state = manager.TryReadCurrentStateForAllTargets().State;
+				foreach (var target in state.Views
+					.SelectMany(x => x.Paths)
+					.Select(x => x.Target)
+					.Where(x => x.IsConnected))
+				{
+					var displayMonitor = target.TryGetMonitor();
+					var deviceInstanceId = DeviceConversion.ConvertToDeviceInstanceId(displayMonitor.DeviceId);
+					Debug.Assert(items.Any(x => x.DeviceInstanceId == deviceInstanceId));
+				}
+#endif
+
 				return items.ToArray();
 			}
 		}

diff --git a/Source/Monitorian.Core/Models/Monitor/MonitorManager.cs b/Source/Monitorian.Core/Models/Monitor/MonitorManager.cs
@@ -72,15 +72,31 @@ private static HashSet<string> GetOptionIds(string option)
 	#endregion
 
 	private static HashSet<string> _foundIds;
+	private static bool _isDisplayMonitorAvailable = true; // Default
+
+	private static async Task<DisplayMonitorProvider.DisplayItem[]> GetDisplayMonitorsAsync()
+	{
+		if (OsVersion.Is10Build17134OrGreater && _isDisplayMonitorAvailable)
+		{
+			try
+			{
+				return await DisplayMonitorProvider.GetDisplayMonitorsAsync();
+			}
+			catch (FileNotFoundException)
+			{
+				_isDisplayMonitorAvailable = false;
+			}
+		}
+		return null;
+	}
 
 	public static async Task<IEnumerable<IMonitor>> EnumerateMonitorsAsync(TimeSpan timeout, CancellationToken cancellationToken = default)
 	{
 		var deviceItems = DeviceContext.EnumerateMonitorDevices().ToArray();
 		_foundIds = new HashSet<string>(deviceItems.Select(x => x.DeviceInstanceId));
 
-		IDisplayItem[] displayItems = OsVersion.Is10Build17134OrGreater
-			? await DisplayMonitorProvider.GetDisplayMonitorsAsync()
-			: DisplayConfig.EnumerateDisplayConfigs().ToArray();
+		IDisplayItem[] displayItems = await GetDisplayMonitorsAsync();
+		displayItems ??= DisplayConfig.EnumerateDisplayConfigs().ToArray();
 
 		IEnumerable<BasicItem> EnumerateBasicItems()
 		{
@@ -341,10 +357,7 @@ public async Task PopulateAsync()
 					DeviceItems = DeviceContext.EnumerateMonitorDevices().ToArray()),
 
 				GetTask(nameof(DisplayMonitorItems), async () =>
-				{
-					if (OsVersion.Is10Build17134OrGreater)
-						DisplayMonitorItems = await DisplayMonitorProvider.GetDisplayMonitorsAsync();
-				}),
+					DisplayMonitorItems = await GetDisplayMonitorsAsync()),
 
 				GetTask(nameof(DisplayConfigItems), () =>
 					DisplayConfigItems = DisplayConfig.EnumerateDisplayConfigs().ToArray()),

diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.11.0")]
-[assembly: AssemblyFileVersion("4.6.11.0")]
+[assembly: AssemblyVersion("4.6.12.0")]
+[assembly: AssemblyFileVersion("4.6.12.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian.Core/ViewModels/MonitorViewModel.cs b/Source/Monitorian.Core/ViewModels/MonitorViewModel.cs
@@ -351,7 +351,7 @@ public void DecrementContrast(int tickSize)
 		SetContrast(contrast);
 	}
 
-	private bool SetContrast(int contrast)
+	public bool SetContrast(int contrast)
 	{
 		contrast = Math.Min(100, Math.Max(0, contrast));
 

diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.11.0")]
-[assembly: AssemblyFileVersion("4.6.11.0")]
+[assembly: AssemblyVersion("4.6.12.0")]
+[assembly: AssemblyFileVersion("4.6.12.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Source/ScreenFrame/Properties/AssemblyInfo.cs b/Source/ScreenFrame/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.5.0")]
-[assembly: AssemblyFileVersion("4.6.5.0")]
+[assembly: AssemblyVersion("4.6.12.0")]
+[assembly: AssemblyFileVersion("4.6.12.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Source/ScreenFrame/VisualTreeHelperAddition.cs b/Source/ScreenFrame/VisualTreeHelperAddition.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
@@ -67,6 +68,11 @@ private enum MONITOR_DPI_TYPE
 		MDT_Default = MDT_Effective_DPI
 	}
 
+	[DllImport("Shcore.dll")]
+	private static extern int GetScaleFactorForMonitor(
+		IntPtr hMon,
+		out uint pScale);
+
 	#endregion
 
 	#region DPI
@@ -196,6 +202,16 @@ private static DpiScale GetDpi(IntPtr monitorHandle)
 		if (result != S_OK)
 			return SystemDpi;
 
+#if DEBUG
+		result = GetScaleFactorForMonitor(
+			monitorHandle,
+			out uint factor);
+		if (result == S_OK)
+		{
+			Debug.Assert(factor == (dpiX / DefaultPixelsPerInch * 100));
+		}
+#endif
+
 		return new DpiScale(dpiX / DefaultPixelsPerInch, dpiY / DefaultPixelsPerInch);
 	}