Merge pull request #2 from superp00t/master

prevent Windows 7 crash caused by no shcore.dll
richardwilkes · Jan 18, 2019 · e8f80e7 · e8f80e7
2 parents cb2055e + 57668bb
commit e8f80e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/internal/windows/displays_windows.go b/internal/windows/displays_windows.go
@@ -18,20 +18,27 @@ func (d *driver) Displays() []*webapp.Display {
 		} else {
 			var dpiX, dpiY uint32
 			if err = GetDpiForMonitor(monitor, MDT_EFFECTIVE_DPI, &dpiX, &dpiY); err != nil {
-				jot.Error(err)
-			} else {
-				d.Bounds.X = float64(info.MonitorBounds.Left)
-				d.Bounds.Y = float64(info.MonitorBounds.Top)
-				d.Bounds.Width = float64(info.MonitorBounds.Right - info.MonitorBounds.Left)
-				d.Bounds.Height = float64(info.MonitorBounds.Bottom - info.MonitorBounds.Top)
-				d.UsableBounds.X = float64(info.WorkBounds.Left)
-				d.UsableBounds.Y = float64(info.WorkBounds.Top)
-				d.UsableBounds.Width = float64(info.WorkBounds.Right - info.WorkBounds.Left)
-				d.UsableBounds.Height = float64(info.WorkBounds.Bottom - info.WorkBounds.Top)
-				d.ScalingFactor = float64(dpiX) / 96
-				d.IsMain = info.Flags&MONITORINFOF_PRIMARY != 0
-				result = append(result, d)
+				// Windows 7 fallback
+				overallX := GetDeviceCaps(dc, LOGPIXELSX)
+				overallY := GetDeviceCaps(dc, LOGPIXELSY)
+
+				if overallX > 0 && overallY > 0 {
+					dpiX = uint32(overallX)
+					dpiY = uint32(overallY)
+				}
 			}
+
+			d.Bounds.X = float64(info.MonitorBounds.Left)
+			d.Bounds.Y = float64(info.MonitorBounds.Top)
+			d.Bounds.Width = float64(info.MonitorBounds.Right - info.MonitorBounds.Left)
+			d.Bounds.Height = float64(info.MonitorBounds.Bottom - info.MonitorBounds.Top)
+			d.UsableBounds.X = float64(info.WorkBounds.Left)
+			d.UsableBounds.Y = float64(info.WorkBounds.Top)
+			d.UsableBounds.Width = float64(info.WorkBounds.Right - info.WorkBounds.Left)
+			d.UsableBounds.Height = float64(info.WorkBounds.Bottom - info.WorkBounds.Top)
+			d.ScalingFactor = float64(dpiX) / 96
+			d.IsMain = info.Flags&MONITORINFOF_PRIMARY != 0
+			result = append(result, d)
 		}
 		return 1
 	}, 0); err != nil {

diff --git a/internal/windows/shcoredll_windows.go b/internal/windows/shcoredll_windows.go
@@ -14,6 +14,11 @@ var (
 
 // GetDpiForMonitor https://docs.microsoft.com/en-us/windows/desktop/api/libloaderapi/nf-libloaderapi-getmodulehandlew
 func GetDpiForMonitor(monitor HMONITOR, dpiType int32, dpiX, dpiY *uint32) error {
+	err := getDpiForMonitor.Find()
+	if err != nil {
+		return errs.NewWithCause(getDpiForMonitor.Name, err)
+	}
+
 	ret, _, err := getDpiForMonitor.Call(uintptr(monitor), uintptr(dpiType), uintptr(unsafe.Pointer(dpiX)), uintptr(unsafe.Pointer(dpiY)))
 	if ret != 0 {
 		return errs.NewWithCause(getDpiForMonitor.Name, err)