3 files changed, 62 insertions, 0 deletions

diff --git a/src/dutil/inc/dpiutil.h b/src/dutil/inc/dpiutil.h
new file mode 100644
index 00000000..c6f73b02
--- /dev/null
+++ b/src/dutil/inc/dpiutil.h
@@ -0,0 +1,55 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// from WinUser.h
+#ifndef WM_DPICHANGED
+#define WM_DPICHANGED       0x02E0
+#endif
+#ifndef USER_DEFAULT_SCREEN_DPI
+#define USER_DEFAULT_SCREEN_DPI 96
+#endif
+
+typedef struct _DPIU_WINDOW_CONTEXT
+{
+    UINT nDpi;
+} DPIU_WINDOW_CONTEXT;
+
+typedef HRESULT (APIENTRY *PFN_GETDPIFORMONITOR)(
+    __in HMONITOR hmonitor,
+    __in MONITOR_DPI_TYPE dpiType,
+    __in UINT* dpiX,
+    __in UINT* dpiY
+    );
+typedef UINT (APIENTRY *PFN_GETDPIFORWINDOW)(
+    __in HWND hwnd
+    );
+
+void DAPI DpiuInitialize();
+void DAPI DpiuUninitialize();
+
+/********************************************************************
+ DpiuGetWindowContext - get the DPI context of the given window.
+
+*******************************************************************/
+void DAPI DpiuGetWindowContext(
+    __in HWND hWnd,
+    __in DPIU_WINDOW_CONTEXT* pWindowContext
+    );
+
+/********************************************************************
+ DpiuScaleValue - scale the value to the target DPI.
+
+*******************************************************************/
+int DAPI DpiuScaleValue(
+    __in int nDefaultDpiValue,
+    __in UINT nTargetDpi
+    );
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/dutil/inc/dutilsources.h b/src/dutil/inc/dutilsources.h
index c88ada37..bf3da16f 100644
--- a/src/dutil/inc/dutilsources.h
+++ b/src/dutil/inc/dutilsources.h
@@ -19,6 +19,7 @@ typedef enum DUTIL_SOURCE
     DUTIL_SOURCE_DICTUTIL,
     DUTIL_SOURCE_DIRUTIL,
     DUTIL_SOURCE_DLUTIL,
+    DUTIL_SOURCE_DPIUTIL,
     DUTIL_SOURCE_DUTIL,
     DUTIL_SOURCE_ESEUTIL,
     DUTIL_SOURCE_FILEUTIL,
diff --git a/src/dutil/inc/thmutil.h b/src/dutil/inc/thmutil.h
index e661a6cb..52de755f 100644
--- a/src/dutil/inc/thmutil.h
+++ b/src/dutil/inc/thmutil.h
@@ -255,6 +255,10 @@ struct THEME
     DWORD dwFontId;
     HANDLE hIcon;
     LPWSTR sczCaption;
+    int nDefaultDpiHeight;
+    int nDefaultDpiMinimumHeight;
+    int nDefaultDpiWidth;
+    int nDefaultDpiMinimumWidth;
     int nHeight;
     int nMinimumHeight;
     int nWidth;
@@ -283,6 +287,8 @@ struct THEME
     DWORD dwCurrentPageId;
     HWND hwndTooltip;
 
+    UINT nDpi;
+
     // callback functions
     PFNTHM_EVALUATE_VARIABLE_CONDITION pfnEvaluateCondition;
     PFNTHM_FORMAT_VARIABLE_STRING pfnFormatString;