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

comctl32: Add implementation for LoadIconMetric. 

Signed-off-by: Michael Müller <michael@fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
This commit is contained in:
Michael Müller 2015-10-02 15:13:05 +02:00 committed by Alexandre Julliard
parent c098c13ee2
commit 088eb87e3b
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/comctl32/comctl32.spec
View File

@ -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

28
dlls/comctl32/commctrl.c
View File

@ -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);
}

7
include/commctrl.h
View File

@ -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 */