2 files changed, 15 insertions, 9 deletions

diff --git a/src/dutil/inc/dpiutil.h b/src/dutil/inc/dpiutil.h
index 216d3dc6..b30e2332 100644
--- a/src/dutil/inc/dpiutil.h
+++ b/src/dutil/inc/dpiutil.h
@@ -41,23 +41,26 @@ typedef BOOL (APIENTRY* PFN_ADJUSTWINDOWRECTEXFORDPI)(
     __in DWORD dwExStyle,
     __in UINT dpi
     );
-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
     );
 typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARE)();
-typedef HRESULT (APIENTRY* PFN_SETPROCESSDPIAWARENESS)(
-    __in PROCESS_DPI_AWARENESS value
-    );
 typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARENESSCONTEXT)(
     __in DPI_AWARENESS_CONTEXT value
     );
 
+#ifdef DPI_ENUMS_DECLARED
+typedef HRESULT(APIENTRY* PFN_GETDPIFORMONITOR)(
+    __in HMONITOR hmonitor,
+    __in MONITOR_DPI_TYPE dpiType,
+    __in UINT* dpiX,
+    __in UINT* dpiY
+    );
+typedef HRESULT(APIENTRY* PFN_SETPROCESSDPIAWARENESS)(
+    __in PROCESS_DPI_AWARENESS value
+    );
+#endif
+
 void DAPI DpiuInitialize();
 void DAPI DpiuUninitialize();
 
diff --git a/src/dutil/thmutil.cpp b/src/dutil/thmutil.cpp
index 3cdc09e3..6c9c5cd6 100644
--- a/src/dutil/thmutil.cpp
+++ b/src/dutil/thmutil.cpp
@@ -660,6 +660,7 @@ DAPI_(HRESULT) ThemeCreateParentWindow(
         }
         else
         {
+            hr = S_OK;
             x = CW_USEDEFAULT;
             y = CW_USEDEFAULT;
         }
@@ -4683,6 +4684,8 @@ static HRESULT ShowControl(
                 ++iPageControl;
             }
 
+            hr = S_OK;
+
             Button_SetCheck(hWnd, (!sczText && !pControl->sczValue) || CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczText, -1, pControl->sczValue, -1));
         }
     }