Update dpiutil.h so users don't have to include ShellScalingApi.h.
Sean Hall committed
Jul 31, 2020 at 17:01 UTC
8a2fa05b14244f179d9bb127c6cb23c72d3bf2ae
2 files changed
+15
-9
src/dutil/inc/dpiutil.h
+12
-9
@@ -41,23 +41,26 @@ typedef BOOL (APIENTRY* PFN_ADJUSTWINDOWRECTEXFORDPI)(
41
__in DWORD dwExStyle,
42
__in UINT dpi
43
);
44
-typedef HRESULT (APIENTRY *PFN_GETDPIFORMONITOR)(
45
- __in HMONITOR hmonitor,
46
- __in MONITOR_DPI_TYPE dpiType,
47
- __in UINT* dpiX,
48
- __in UINT* dpiY
49
- );
44
typedef UINT (APIENTRY *PFN_GETDPIFORWINDOW)(
45
__in HWND hwnd
46
);
47
typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARE)();
54
-typedef HRESULT (APIENTRY* PFN_SETPROCESSDPIAWARENESS)(
55
- __in PROCESS_DPI_AWARENESS value
56
- );
48
typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARENESSCONTEXT)(
49
__in DPI_AWARENESS_CONTEXT value
50
);
51
52
+#ifdef DPI_ENUMS_DECLARED
53
+typedef HRESULT(APIENTRY* PFN_GETDPIFORMONITOR)(
54
+ __in HMONITOR hmonitor,
55
+ __in MONITOR_DPI_TYPE dpiType,
56
+ __in UINT* dpiX,
57
+ __in UINT* dpiY
58
+ );
59
+typedef HRESULT(APIENTRY* PFN_SETPROCESSDPIAWARENESS)(
60
+ __in PROCESS_DPI_AWARENESS value
61
+ );
62
+#endif
63
+
64
void DAPI DpiuInitialize();
65
void DAPI DpiuUninitialize();
66
src/dutil/thmutil.cpp
+3
@@ -660,6 +660,7 @@ DAPI_(HRESULT) ThemeCreateParentWindow(
660
}
661
else
662
{
663
+ hr = S_OK;
664
x = CW_USEDEFAULT;
665
y = CW_USEDEFAULT;
666
}
@@ -4683,6 +4684,8 @@ static HRESULT ShowControl(
4684
++iPageControl;
4685
}
4686
4687
+ hr = S_OK;
4688
+
4689
Button_SetCheck(hWnd, (!sczText && !pControl->sczValue) || CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczText, -1, pControl->sczValue, -1));
4690
}
4691
}