October 2015 - Wine-commits

Michael Müller : advapi32: Mark some registry functions as hotpatchable.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 9eb8aa1ebbc1aabc2f3e889db3663c8f7b6e7fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb8aa1ebbc1aabc2f3e889db… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 00:33:24 2015 +0200 advapi32: Mark some registry functions as hotpatchable. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/advapi32/registry.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 2482b85..f988c0e 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -522,7 +524,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc * Unlike RegCreateKeyExA(), this function will not create the key if it * does not exist. */ -LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; STRING nameA; @@ -1107,7 +1109,7 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW * Success: ERROR_SUCCESS * Failure: Error code */ -LSTATUS WINAPI RegCloseKey( HKEY hkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCloseKey( HKEY hkey ) { if (!hkey) return ERROR_INVALID_HANDLE; if (hkey >= (HKEY)0x80000000) return ERROR_SUCCESS; @@ -1477,8 +1479,8 @@ LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDW * MSDN states that if data is too small it is partially filled. In reality * it remains untouched. */ -LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, - LPBYTE data, LPDWORD count ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, + LPDWORD type, LPBYTE data, LPDWORD count ) { NTSTATUS status; ANSI_STRING nameA;

1 0

Alasdair Sinclair : ntdsapi: Fix null termination of buffer.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: ac7069e09b2555c08ebb4f323e9b8558a866ab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7069e09b2555c08ebb4f323… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Mon Oct 5 00:31:31 2015 +0000 ntdsapi: Fix null termination of buffer. Signed-off-by: Alasdair Sinclair <alasdairsinc(a)gmail.com> --- dlls/ntdsapi/ntdsapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 2a313ec..ee0c837 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -225,7 +225,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD p = buf + strlenW(class); *p++ = '/'; memcpy(p, name, strlenW(name) * sizeof(WCHAR)); - buf[len] = 0; + buf[len - 1] = 0; return ERROR_SUCCESS; }

1 0

Sebastian Lackner : ws2_32: Fix TRACE and specfile for inet_pton.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: f8aa842deabce583c17d68292dbde8a67d77ee4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8aa842deabce583c17d68292… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 04:57:34 2015 +0200 ws2_32: Fix TRACE and specfile for inet_pton. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/ws2_32.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5cf3e0f..535cf57 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7431,7 +7431,7 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) #ifdef HAVE_INET_PTON int unixaf, ret; - TRACE("family %d, addr '%s', buffer (%p)\n", family, addr ? addr : "(null)", buffer); + TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_a(addr), buffer); if (!addr || !buffer) { diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index f7c6c2d..d08d59a 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -121,4 +121,4 @@ @ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo @ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo @ stdcall inet_ntop(long ptr ptr long) WS_inet_ntop -@ stdcall inet_pton(long ptr ptr) WS_inet_pton +@ stdcall inet_pton(long str ptr) WS_inet_pton

1 0

Michael Müller : ws2_32: Implement InetPtonW function.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: af8c79343ce9eb24e223607ec2c04cb91ffaf782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8c79343ce9eb24e223607ec… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 04:57:53 2015 +0200 ws2_32: Implement InetPtonW function. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 535cf57..5098f85 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7456,6 +7456,36 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) #endif } +/*********************************************************************** +* InetPtonW (WS2_32.@) +*/ +INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) +{ + char *addrA; + int len; + INT ret; + + TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_w(addr), buffer); + + if (!addr) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + len = WideCharToMultiByte(CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL); + if (!(addrA = HeapAlloc(GetProcessHeap(), 0, len))) + { + SetLastError(WSA_NOT_ENOUGH_MEMORY); + return SOCKET_ERROR; + } + WideCharToMultiByte(CP_ACP, 0, addr, -1, addrA, len, NULL, NULL); + + ret = WS_inet_pton(family, addrA, buffer); + + HeapFree(GetProcessHeap(), 0, addrA); + return ret; +} /*********************************************************************** * WSAStringToAddressA (WS2_32.80) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index d08d59a..1b096b5 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -53,6 +53,7 @@ @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) +@ stdcall InetPtonW(long wstr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

1 0

Sebastian Lackner : ws2_32/tests: Add tests for InetPtonW.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: efb1b16dc8db847718793a3dc576f6f7b104b81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1b16dc8db847718793a3dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 04:58:04 2015 +0200 ws2_32/tests: Add tests for InetPtonW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8a0e375..7574631 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,7 +67,8 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); -static int (WINAPI *pInetPton)(INT,LPSTR,LPVOID); +static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); +static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); @@ -1159,7 +1160,8 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); - pInetPton = (void *)GetProcAddress(hws2_32, "inet_pton"); + pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); + pInetPtonW = (void *)GetProcAddress(hws2_32, "InetPtonW"); pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); @@ -4698,10 +4700,11 @@ static void test_inet_pton(void) int i, ret; DWORD err; char buffer[64],str[64]; + WCHAR printableW[64]; const char *ptr; /* InetNtop and InetPton became available in Vista and Win2008 */ - if (!pInetNtop || !pInetPton) + if (!pInetNtop || !pInetPtonA || !pInetPtonW) { win_skip("InetNtop and/or InetPton not present, not executing tests\n"); return; @@ -4710,7 +4713,7 @@ static void test_inet_pton(void) for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { WSASetLastError(0xdeadbeef); - ret = pInetPton(tests[i].family, (char *)tests[i].printable, buffer); + ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); if (tests[i].ret == -1) { @@ -4731,6 +4734,25 @@ static void test_inet_pton(void) ok (strcmp(ptr, tests[i].collapsed) == 0, "Test [%d]: Expected '%s', got '%s'\n", i, tests[i].collapsed, ptr); } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + if (tests[i].printable) + MultiByteToWideChar(CP_ACP, 0, tests[i].printable, -1, printableW, + sizeof(printableW) / sizeof(printableW[0])); + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); + ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + if (tests[i].ret == -1) + { + err = WSAGetLastError(); + ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); + } + if (tests[i].ret != 1) continue; + ok(memcmp(buffer, tests[i].raw_data, + tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, + "Test [%d]: Expected binary data differs\n", i); + } } static void test_ioctlsocket(void)

1 0

Hugh McMaster : crypt32/tests: Delete WineTest registry key when tests are complete.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 82e1830f5cda487035e32073eb45063a236d65c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e1830f5cda487035e32073e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 5 17:15:20 2015 +1100 crypt32/tests: Delete WineTest registry key when tests are complete. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/crypt32/tests/store.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index a416a39..a0c209a 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2203,6 +2203,35 @@ static const BYTE serializedStoreWithCertAndHash[] = { 0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static void delete_test_key(void) +{ + HKEY root_key, test_key; + static const WCHAR SysCertW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0}; + static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; + WCHAR subkey_name[32]; + DWORD num_subkeys, subkey_name_len; + int idx; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, SysCertW, 0, KEY_READ, &root_key)) + return; + if (RegOpenKeyExW(root_key, WineTestW, 0, KEY_READ, &test_key)) + { + RegCloseKey(root_key); + return; + } + RegQueryInfoKeyW(test_key, NULL, NULL, NULL, &num_subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + for (idx = num_subkeys; idx-- > 0;) + { + subkey_name_len = sizeof(subkey_name)/sizeof(WCHAR); + RegEnumKeyExW(test_key, idx, subkey_name, &subkey_name_len, NULL, NULL, NULL, NULL); + RegDeleteKeyW(test_key, subkey_name); + } + RegCloseKey(test_key); + RegDeleteKeyW(root_key, WineTestW); + RegCloseKey(root_key); +} + static void testAddCertificateLink(void) { BOOL ret; @@ -2499,6 +2528,8 @@ static void testAddCertificateLink(void) CertFreeCertificateContext(source); CertCloseStore(store1, 0); + + delete_test_key(); } static DWORD countCertsInStore(HCERTSTORE store)

1 0

Francois Gouget : ntdll: Work around a conflict between Wine and Solaris list.h.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 67c2e06fcd7b49d21a61d9e17aa7e01a0503621b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c2e06fcd7b49d21a61d9e17… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 5 10:01:56 2015 +0200 ntdll: Work around a conflict between Wine and Solaris list.h. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/directory.c | 15 +++++++++++++++ dlls/ntdll/file.c | 15 +++++++++++++++ server/fd.c | 5 +---- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f589621..4faafe9 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -48,7 +48,22 @@ #include <sys/attr.h> #endif #ifdef HAVE_SYS_VNODE_H +/* Work around a conflict with Solaris' system list defined in sys/list.h. */ +#define list SYSLIST +#define list_next SYSLIST_NEXT +#define list_prev SYSLIST_PREV +#define list_head SYSLIST_HEAD +#define list_tail SYSLIST_TAIL +#define list_move_tail SYSLIST_MOVE_TAIL +#define list_remove SYSLIST_REMOVE #include <sys/vnode.h> +#undef list +#undef list_next +#undef list_prev +#undef list_head +#undef list_tail +#undef list_move_tail +#undef list_remove #endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index be6b591..8f89ba5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -61,7 +61,22 @@ # include <utime.h> #endif #ifdef HAVE_SYS_VFS_H +/* Work around a conflict with Solaris' system list defined in sys/list.h. */ +#define list SYSLIST +#define list_next SYSLIST_NEXT +#define list_prev SYSLIST_PREV +#define list_head SYSLIST_HEAD +#define list_tail SYSLIST_TAIL +#define list_move_tail SYSLIST_MOVE_TAIL +#define list_remove SYSLIST_REMOVE # include <sys/vfs.h> +#undef list +#undef list_next +#undef list_prev +#undef list_head +#undef list_tail +#undef list_move_tail +#undef list_remove #endif #ifdef HAVE_SYS_MOUNT_H # include <sys/mount.h> diff --git a/server/fd.c b/server/fd.c index 6c78a0a..fe778f1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -44,10 +44,7 @@ #include <sys/statvfs.h> #endif #ifdef HAVE_SYS_VFS_H -/* - * Solaris defines its system list in sys/list.h. - * This need to be workaround it here. - */ +/* Work around a conflict with Solaris' system list defined in sys/list.h. */ #define list SYSLIST #define list_next SYSLIST_NEXT #define list_prev SYSLIST_PREV

1 0

Marcus Meissner : hidclass.sys: Fixed copy/paste error (Coverity).
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 4b74e9dfa7dcb9067e867300f6bfd52a57206830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b74e9dfa7dcb9067e867300f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 3 09:52:55 2015 +0200 hidclass.sys: Fixed copy/paste error (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 6f8e45e..35057f1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -414,7 +414,7 @@ void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *f if ((itemVal & INPUT_ARRAY) == 0) feature->isArray= TRUE; else - feature->isArray= TRUE; /* Var */ + feature->isArray= FALSE; /* Var */ if ((itemVal & INPUT_ABS) == 0) feature->IsAbsolute = TRUE; else

1 0

Michael Müller : comctl32: Add semi-stub implementation for LoadIconWithScaleDown.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: c098c13ee268a542df7dd5a1069b4bb5a400197a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c098c13ee268a542df7dd5a10… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 2 15:12:44 2015 +0200 comctl32: Add semi-stub implementation for LoadIconWithScaleDown. Thanks to Nikolay Sivov and Alistair Leslie-Hughes for various comments and ideas for improvements. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/comctl32/commctrl.c | 18 +++++++++++++++--- include/commctrl.h | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index e18c27d..97656a5 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -3,6 +3,7 @@ * * Copyright 1997 Dimitrie O. Paun * Copyright 1998,2000 Eric Kohl + * Copyright 2014-2015 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1641,8 +1642,19 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnBu /*********************************************************************** * LoadIconWithScaleDown [COMCTL32.@] */ -HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, PCWSTR name, int cx, int cy, HICON *icon) +HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, int cy, HICON *icon) { - FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon); - return E_NOTIMPL; + TRACE("(%p, %s, %d, %d, %p)\n", hinst, debugstr_w(name), cx, cy, icon); + + *icon = NULL; + + if (!name) + return E_INVALIDARG; + + *icon = LoadImageW(hinst, name, IMAGE_ICON, cx, cy, + (hinst || IS_INTRESOURCE(name)) ? 0 : LR_LOADFROMFILE); + if (!*icon) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } diff --git a/include/commctrl.h b/include/commctrl.h index 0bcaeb6..0ed0997 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -42,7 +42,7 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*); LANGID WINAPI GetMUILanguage (VOID); VOID WINAPI InitMUILanguage (LANGID uiLang); -HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, PCWSTR, int, int, HICON *); +HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *); #define COMCTL32_VERSION 5 /* dll version */

1 0

Michael Müller : comctl32: Add implementation for LoadIconMetric.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 088eb87e3b6e3b41acde6f544b1f9d41b83674bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=088eb87e3b6e3b41acde6f544… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 2 15:13:05 2015 +0200 comctl32: Add implementation for LoadIconMetric. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 28 ++++++++++++++++++++++++++++ include/commctrl.h | 7 +++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 1e92e5f..1a5ab57 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -88,6 +88,7 @@ 375 stdcall -noname -private StrCSpnIW(wstr wstr) 376 stdcall -noname -private IntlStrEqWorkerA(long str str 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) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 97656a5..6d6b5e4 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1658,3 +1658,31 @@ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, 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); +} diff --git a/include/commctrl.h b/include/commctrl.h index 0ed0997..5029e77 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -42,7 +42,14 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*); LANGID WINAPI GetMUILanguage (VOID); VOID WINAPI InitMUILanguage (LANGID uiLang); +enum _LI_METRIC +{ + LIM_SMALL, + LIM_LARGE +}; + HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *); +HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *); #define COMCTL32_VERSION 5 /* dll version */

1 0