ole32: The width of the metafile drawn should be 3 times the icon width in…

ole32: The width of the metafile drawn should be 3 times the icon width in OleMetafilePictFromIconAndLabel.

ole32: The width of the metafile drawn should be 3 times the icon width in…
d7d3309e · Rob Shearman · Alexandre Julliard · cdb86c6c · d7d3309e
Commit d7d3309e authored Dec 01, 2006 by Rob Shearman Committed by Alexandre Julliard Dec 04, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ole32_main.c dlls/ole32/ole32_main.c +4 -1

No files found.
--- a/dlls/ole32/ole32_main.c
+++ b/dlls/ole32/ole32_main.c
@@ -91,8 +91,11 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
 		GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size);
 		SelectObject(hdcScreen, screen_old_font);
 		ReleaseDC(NULL, hdcScreen);
+
+		width = 3 * icon_width;
 	}
-	width = max(text_size.cx, icon_width);
+	else
+		width = icon_width;

 	SetWindowOrgEx(hdc, 0, 0, NULL);
 	SetWindowExtEx(hdc, width, label_offset + text_size.cy, NULL);