From 9c62cc9a416a2a1287f4d01e7ba5f41db4113cad Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 17 Oct 2019 02:35:28 +0800
Subject: [PATCH] Fix #3069

---
 .../Interop/UnmanagedMethods.cs               |  9 ++++++++
 src/Windows/Avalonia.Win32/ScreenImpl.cs      | 22 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index d37bec3334..2c6425e26c 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -1031,6 +1031,9 @@ namespace Avalonia.Win32.Interop
         [DllImport("shcore.dll")]
         public static extern long GetDpiForMonitor(IntPtr hmonitor, MONITOR_DPI_TYPE dpiType, out uint dpiX, out uint dpiY);
 
+        [DllImport("gdi32.dll")]
+        public static extern int GetDeviceCaps(IntPtr hdc, DEVICECAP nIndex);
+
         [DllImport("shcore.dll")]
         public static extern void GetScaleFactorForMonitor(IntPtr hMon, out uint pScale);
 
@@ -1147,6 +1150,12 @@ namespace Avalonia.Win32.Interop
             }
         }
 
+        public enum DEVICECAP
+        {
+            HORZRES = 8,
+            DESKTOPHORZRES = 118
+        }
+
         public enum PROCESS_DPI_AWARENESS
         {
             PROCESS_DPI_UNAWARE = 0,
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index e77aa07bcd..6a89c9bf24 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -28,9 +28,25 @@ namespace Avalonia.Win32
                         (IntPtr monitor, IntPtr hdcMonitor, ref Rect lprcMonitor, IntPtr data) =>
                         {
                             MONITORINFO monitorInfo = MONITORINFO.Create();
-                            if (GetMonitorInfo(monitor,ref monitorInfo))
+                            if (GetMonitorInfo(monitor, ref monitorInfo))
                             {
-                                GetDpiForMonitor(monitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var x, out _);
+                                var dpi = 1.0;
+                                try
+                                {
+                                    GetDpiForMonitor(monitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var x, out _);
+                                    dpi = (double)x;
+                                }
+                                catch (DllNotFoundException)
+                                {
+                                    var hdc = GetDC(IntPtr.Zero);
+
+                                    double virtW = GetDeviceCaps(hdc, DEVICECAP.HORZRES);
+                                    double physW = GetDeviceCaps(hdc, DEVICECAP.DESKTOPHORZRES);
+
+                                    dpi = (96d * physW / virtW);
+
+                                    ReleaseDC(IntPtr.Zero, hdc);
+                                }
 
                                 RECT bounds = monitorInfo.rcMonitor;
                                 RECT workingArea = monitorInfo.rcWork;
@@ -40,7 +56,7 @@ namespace Avalonia.Win32
                                     new PixelRect(workingArea.left, workingArea.top, workingArea.right - workingArea.left,
                                         workingArea.bottom - workingArea.top);
                                 screens[index] =
-                                    new WinScreen((double)x / 96.0d, avaloniaBounds, avaloniaWorkArea, monitorInfo.dwFlags == 1,
+                                    new WinScreen(dpi / 96.0d, avaloniaBounds, avaloniaWorkArea, monitorInfo.dwFlags == 1,
                                         monitor);
                                 index++;
                             }