Commit 088eb87e authored by Michael Müller's avatar Michael Müller Committed by Alexandre Julliard

comctl32: Add implementation for LoadIconMetric.

parent c098c13e
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
375 stdcall -noname -private StrCSpnIW(wstr wstr) 375 stdcall -noname -private StrCSpnIW(wstr wstr)
376 stdcall -noname -private IntlStrEqWorkerA(long str str long) 376 stdcall -noname -private IntlStrEqWorkerA(long str str long)
377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) 377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long)
380 stdcall -ordinal LoadIconMetric(ptr wstr long ptr)
381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr) 381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr)
382 stdcall -noname SmoothScrollWindow(ptr) 382 stdcall -noname SmoothScrollWindow(ptr)
383 stub -noname DoReaderMode 383 stub -noname DoReaderMode
......
...@@ -1658,3 +1658,31 @@ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, ...@@ -1658,3 +1658,31 @@ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx,
return S_OK; return S_OK;
} }
/***********************************************************************
* LoadIconMetric [COMCTL32.@]
*/
HRESULT WINAPI LoadIconMetric(HINSTANCE hinst, const WCHAR *name, int size, HICON *icon)
{
int cx, cy;
TRACE("(%p, %s, %d, %p)\n", hinst, debugstr_w(name), size, icon);
if (size == LIM_SMALL)
{
cx = GetSystemMetrics(SM_CXSMICON);
cy = GetSystemMetrics(SM_CYSMICON);
}
else if (size == LIM_LARGE)
{
cx = GetSystemMetrics(SM_CXICON);
cy = GetSystemMetrics(SM_CYICON);
}
else
{
*icon = NULL;
return E_INVALIDARG;
}
return LoadIconWithScaleDown(hinst, name, cx, cy, icon);
}
...@@ -42,7 +42,14 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*); ...@@ -42,7 +42,14 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
LANGID WINAPI GetMUILanguage (VOID); LANGID WINAPI GetMUILanguage (VOID);
VOID WINAPI InitMUILanguage (LANGID uiLang); VOID WINAPI InitMUILanguage (LANGID uiLang);
enum _LI_METRIC
{
LIM_SMALL,
LIM_LARGE
};
HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *); HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
#define COMCTL32_VERSION 5 /* dll version */ #define COMCTL32_VERSION 5 /* dll version */
......
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