ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Use the default icon title font when writing the caption text out in OleMetafilePictFromIconAndLabel.

Browse Source
This commit is contained in:
Rob Shearman 2006-12-01 15:05:17 +00:00 committed by Alexandre Julliard
parent f0e2ea54e0
commit 2fa7cadf07
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ole32/ole32_main.c
View File

@ -49,15 +49,29 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
INT icon_height; INT icon_height;
INT label_offset; INT label_offset;
HDC hdcScreen; HDC hdcScreen;
LOGFONTW lf;
HFONT font;
TRACE("%p %p %s %d\n", hIcon, lpszLabel, debugstr_w(lpszSourceFile), iIconIndex); TRACE("%p %p %s %d\n", hIcon, lpszLabel, debugstr_w(lpszSourceFile), iIconIndex);
if( !hIcon ) if( !hIcon )
return NULL; return NULL;
if (!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0))
return NULL;
font = CreateFontIndirectW(&lf);
if (!font)
return NULL;
hdc = CreateMetaFileW(NULL); hdc = CreateMetaFileW(NULL);
if( !hdc ) if( !hdc )
{
DeleteObject(font);
return NULL; return NULL;
}
SelectObject(hdc, font);
ExtEscape(hdc, MFCOMMENT, sizeof(szIconOnly), szIconOnly, 0, NULL); ExtEscape(hdc, MFCOMMENT, sizeof(szIconOnly), szIconOnly, 0, NULL);
@ -67,10 +81,13 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
label_offset = icon_height; label_offset = icon_height;
if (lpszLabel) if (lpszLabel)
{ {
HFONT screen_old_font;
/* metafile DCs don't support GetTextExtentPoint32, so size the font /* metafile DCs don't support GetTextExtentPoint32, so size the font
* using the desktop window DC */ * using the desktop window DC */
hdcScreen = GetDC(NULL); hdcScreen = GetDC(NULL);
screen_old_font = SelectObject(hdcScreen, font);
GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size); GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size);
SelectObject(hdcScreen, screen_old_font);
ReleaseDC(NULL, hdcScreen); ReleaseDC(NULL, hdcScreen);
} }
width = max(text_size.cx, icon_width); width = max(text_size.cx, icon_width);
@ -105,6 +122,7 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
mfp.mm = MM_ANISOTROPIC; mfp.mm = MM_ANISOTROPIC;
mfp.xExt = mfp.yExt = 0; /* FIXME ? */ mfp.xExt = mfp.yExt = 0; /* FIXME ? */
mfp.hMF = CloseMetaFile(hdc); mfp.hMF = CloseMetaFile(hdc);
DeleteObject(font);
if( !mfp.hMF ) if( !mfp.hMF )
return NULL; return NULL;