summaryrefslogtreecommitdiff
path: root/plugins/ShellExt/src/shlcom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ShellExt/src/shlcom.cpp')
-rw-r--r--plugins/ShellExt/src/shlcom.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index b9d9be7191..46a1aebc65 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -940,11 +940,11 @@ HRESULT TShlComRec::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRES
// don't check if it's really a menu
MEASUREITEMSTRUCT *msi = (MEASUREITEMSTRUCT*)lParam;
TMenuDrawInfo *psd = (TMenuDrawInfo*)msi->itemData;
- NONCLIENTMETRICSA ncm;
- ncm.cbSize = sizeof(ncm);
+ NONCLIENTMETRICS ncm;
+ ncm.cbSize = (VistaOrLater) ? sizeof(ncm) : offsetof(NONCLIENTMETRICS, iPaddedBorderWidth);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
// create the font used in menus, this font should be cached somewhere really
- HFONT hFont = CreateFontIndirectA(&ncm.lfMenuFont);
+ HFONT hFont = CreateFontIndirect(&ncm.lfMenuFont);
// select in the font
HFONT hOldFont = (HFONT)SelectObject(hMemDC, hFont);
// default to an icon