Skip to content

W
wine-cw
Commit cdb86c6c authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

ole32: Fill in the xExt and yExt fields in OleMetafilePictFromIconAndLabel.

parent 2fa7cadf
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
dlls/ole32/ole32_main.c
View file @ cdb86c6c
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
#define HIMETRIC_INCHES 2540
/*********************************************************************** /***********************************************************************
* OleMetafilePictFromIconAndLabel (OLE32.@) * OleMetafilePictFromIconAndLabel (OLE32.@)
*/ */
...@@ -120,7 +122,10 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel, ...@@ -120,7 +122,10 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
} }
mfp.mm = MM_ANISOTROPIC; mfp.mm = MM_ANISOTROPIC;
mfp.xExt = mfp.yExt = 0; /* FIXME ? */ hdcScreen = GetDC(NULL);
mfp.xExt = MulDiv(width, HIMETRIC_INCHES, GetDeviceCaps(hdcScreen, LOGPIXELSX));
mfp.yExt = MulDiv(label_offset + text_size.cy, HIMETRIC_INCHES, GetDeviceCaps(hdcScreen, LOGPIXELSY));
ReleaseDC(NULL, hdcScreen);
mfp.hMF = CloseMetaFile(hdc); mfp.hMF = CloseMetaFile(hdc);
DeleteObject(font); DeleteObject(font);
if( !mfp.hMF ) if( !mfp.hMF )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment