2 files changed, 14 insertions, 9 deletions
diff --git a/c/main.cpp b/c/main.cpp
index 2af8030..203a24d 100644
--- a/c/main.cpp
+++ b/c/main.cpp
@@ -60,8 +60,8 @@ FileView<ElvDataA> g_fvElv(L"elvdata.dat", g_cfg.cEp+128u);
 FileView<DlvDataA> g_fvDlv(L"dlvdata.dat", g_cfg.cEp+128u);
 
 /* Optional Windows functions. */
-BOOL (*IsThemeActive)();
-BOOL (*SetWindowTheme)(HWND, const wchar_t*, const wchar_t*);
+BOOL (__stdcall *IsThemeActive)();
+HRESULT (__stdcall *SetWindowTheme)(HWND, const wchar_t*, const wchar_t*);
 
 /* Initialize important global state on parent window creation. */
 static void InitializeMainWindow(HWND);
@@ -157,16 +157,21 @@ void InitializeMainWindow(const HWND hWnd)
 	/* Load normal font. */
 	if (auto lib = Library::Maybe(L"User32.dll");
 	    lib && lib->GetProcAddress<void>("SystemParametersInfoW")) {
-		NONCLIENTMETRICS m = {sizeof(NONCLIENTMETRICS)};
-		Require(SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &m, 0));
+		NONCLIENTMETRICSW m = {sizeof(NONCLIENTMETRICSW)};
+
+#if (WINVER >= 0x0600)
+		m.cbSize -= 4;
+#endif
+
+		Require(SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &m, 0));
 		g_hfNormal = Require(CreateFontIndirectW(&m.lfMessageFont));
 	} else
 		g_hfNormal = static_cast<HFONT>(Require(GetStockObject(DEFAULT_GUI_FONT)));
 
 	/* Load bold font. */
 	{
-		LOGFONT lf;
-		Require(GetObjectW(g_hfNormal, sizeof(LOGFONT), &lf));
+		LOGFONTW lf;
+		Require(GetObjectW(g_hfNormal, sizeof(LOGFONTW), &lf));
 		lf.lfWeight = FW_BOLD;
 		g_hfBold = Require(CreateFontIndirectW(&lf));
 	}
diff --git a/c/win.h b/c/win.h
index 8329f68..1e09c1f 100644
--- a/c/win.h
+++ b/c/win.h
@@ -133,14 +133,14 @@ inline BOOL SetWindowRect(const HWND hWnd, const RECT r)
  * uxtheme.dll exists, and otherwise do nothing. */
 inline BOOL EBIsThemeActive()
 {
-	extern BOOL (*IsThemeActive)();
+	extern BOOL (__stdcall *IsThemeActive)();
 	return IsThemeActive? IsThemeActive(): 0;
 }
 
-inline BOOL EBSetWindowTheme(const HWND hWnd, const wchar_t* const pszSubAppName,
+inline HRESULT EBSetWindowTheme(const HWND hWnd, const wchar_t* const pszSubAppName,
     const wchar_t* const pszSubIdList)
 {
-	extern BOOL (*SetWindowTheme)(HWND, const wchar_t*, const wchar_t*);
+	extern HRESULT (__stdcall *SetWindowTheme)(HWND, const wchar_t*, const wchar_t*);
 	return SetWindowTheme? SetWindowTheme(hWnd, pszSubAppName, pszSubIdList): 0;
 }