October 2015 - Wine-commits

Jacek Caban : windns.h: Added DnsCancelQuery declaration.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 61ee6d25ddb492e9892cfbdfa0b7c05886149de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ee6d25ddb492e9892cfbdfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:41 2015 +0200 windns.h: Added DnsCancelQuery declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/windns.h b/include/windns.h index fc2a49c..7b11e3a 100644 --- a/include/windns.h +++ b/include/windns.h @@ -618,6 +618,67 @@ typedef struct _DnsRRSet _prrset->pLastRR->pNext = NULL; \ } +#define DNS_ADDR_MAX_SOCKADDR_LENGTH 32 + +#include <pshpack1.h> + +typedef struct _DnsAddr +{ + char MaxSa[DNS_ADDR_MAX_SOCKADDR_LENGTH]; + union { + DWORD DnsAddrUserDword[8]; + } Data; +} DNS_ADDR, *PDNS_ADDR; + +typedef struct _DnsAddrArray +{ + DWORD MaxCount; + DWORD AddrCount; + DWORD Tag; + WORD Family; + WORD WordReserved; + DWORD Flags; + DWORD MatchFlag; + DWORD Reserved1; + DWORD Reserved2; + DNS_ADDR AddrArray[1]; +} DNS_ADDR_ARRAY, *PDNS_ADDR_ARRAY; + +#include <poppack.h> + +#define DNS_QUERY_RESULTS_VERSION1 0x1 + +typedef struct _DNS_QUERY_RESULT +{ + ULONG Version; + DNS_STATUS QueryStatus; + ULONG64 QueryOptions; + DNS_RECORD *pQueryRecords; + void *Reserved; +} DNS_QUERY_RESULT, *PDNS_QUERY_RESULT; + +typedef void WINAPI DNS_QUERY_COMPLETION_ROUTINE(void*,DNS_QUERY_RESULT*); +typedef DNS_QUERY_COMPLETION_ROUTINE *PDNS_QUERY_COMPLETION_ROUTINE; + +#define DNS_QUERY_REQUEST_VERSION1 0x1 + +typedef struct _DNS_QUERY_REQUEST +{ + ULONG Version; + const WCHAR *QueryName; + WORD QueryType; + ULONG64 QueryOptions; + PDNS_ADDR_ARRAY pDnsServerList; + ULONG InterfaceIndex; + PDNS_QUERY_COMPLETION_ROUTINE pQueryCompletionCallback; + void *pQueryContext; +} DNS_QUERY_REQUEST, *PDNS_QUERY_REQUEST; + +typedef struct _DNS_QUERY_CANCEL +{ + char Reserved[32]; +} DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -635,6 +696,8 @@ DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); #define DnsQuery WINELIB_NAME_AW(DnsQuery_) +DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST*,DNS_QUERY_RESULT*,DNS_QUERY_CANCEL*); +DNS_STATUS WINAPI DnsCancelQuery(DNS_QUERY_CANCEL*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PCWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET);

1 0

Jacek Caban : ws2def.h: Added ADDRINFOEX declaration.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 59d123288c087f238339faa6a18662d72c6833ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d123288c087f238339faa6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:49 2015 +0200 ws2def.h: Added ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/ws2def.h b/include/ws2def.h index 6255c68..5ea8ff3 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -110,4 +110,32 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +typedef struct addrinfoexA { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexA *ai_next; +} ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; + +typedef struct addrinfoexW { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + WCHAR *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexW *ai_next; +} ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW; + #endif /* _WS2DEF_ */

1 0

Jacek Caban : ws2tcpip.h: Added GetAddrInfoEx declaration.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 547b6cff0d69e40581919d1f9d9087324793e14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=547b6cff0d69e40581919d1f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:56 2015 +0200 ws2tcpip.h: Added GetAddrInfoEx declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index b3a6a1f..ef460a8 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -161,6 +161,8 @@ static inline WCHAR *gai_strerrorW(int errcode) # define gai_strerror WINELIB_NAME_AW(gai_strerror) #endif +typedef void (CALLBACK *LPLOOKUPSERVICE_COMPLETION_ROUTINE)(DWORD,DWORD,WSAOVERLAPPED*); + void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); @@ -169,6 +171,11 @@ int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,s #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) +int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct timeval*, + OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); +int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, + OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); +#define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWORD,INT); #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,WS(socklen_t),PWCHAR,DWORD,PWCHAR,DWORD,INT);

1 0

André Hentschel : dbghelp: Add more symbol types.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 59ba888e6742e1677350b187d639218336a12a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ba888e6742e1677350b187d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 13 21:12:20 2015 +0200 dbghelp: Add more symbol types. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 23b7a3a..4812a3f 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1700,6 +1700,11 @@ union codeview_symbol #define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D +#define S_LOCAL_VS2013 0x113E +#define S_FPOFF_VS2013 0x1144 +#define S_LPROC32_VS2013 0x1146 +#define S_GPROC32_VS2013 0x1147 + /* ======================================== * * Line number information * ======================================== */

1 0

Vincent Povirk : crypt32: Zero-pad RSA Private Key values as needed to fit PRIVATEKEYBLOB.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 8327b063bcdcd20392e92e44b62bfc04259416dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8327b063bcdcd20392e92e44b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 12 16:05:50 2015 -0500 crypt32: Zero-pad RSA Private Key values as needed to fit PRIVATEKEYBLOB. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 888ea05..09c9608 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4002,18 +4002,19 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, &size, NULL, NULL); if (ret) { - halflen = decodedKey->modulus.cbData / 2; - if ((decodedKey->modulus.cbData != halflen * 2) || - (decodedKey->prime1.cbData != halflen) || - (decodedKey->prime2.cbData != halflen) || - (decodedKey->exponent1.cbData != halflen) || - (decodedKey->exponent2.cbData != halflen) || - (decodedKey->coefficient.cbData != halflen) || - (decodedKey->privexp.cbData != halflen * 2)) - { - ret = FALSE; - SetLastError(CRYPT_E_BAD_ENCODE); - } + halflen = decodedKey->prime1.cbData; + if (halflen < decodedKey->prime2.cbData) + halflen = decodedKey->prime2.cbData; + if (halflen < decodedKey->exponent1.cbData) + halflen = decodedKey->exponent1.cbData; + if (halflen < decodedKey->exponent2.cbData) + halflen = decodedKey->exponent2.cbData; + if (halflen < decodedKey->coefficient.cbData) + halflen = decodedKey->coefficient.cbData; + if (halflen * 2 < decodedKey->modulus.cbData) + halflen = decodedKey->modulus.cbData / 2 + decodedKey->modulus.cbData % 2; + if (halflen * 2 < decodedKey->privexp.cbData) + halflen = decodedKey->privexp.cbData / 2 + decodedKey->privexp.cbData % 2; if (ret) { @@ -4048,20 +4049,21 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, rsaPubKey->bitlen = halflen * 16; vardata = (BYTE*)(rsaPubKey + 1); + memset(vardata, 0, halflen * 9); memcpy(vardata, - decodedKey->modulus.pbData, halflen * 2); + decodedKey->modulus.pbData, decodedKey->modulus.cbData); memcpy(vardata + halflen * 2, - decodedKey->prime1.pbData, halflen); + decodedKey->prime1.pbData, decodedKey->prime1.cbData); memcpy(vardata + halflen * 3, - decodedKey->prime2.pbData, halflen); + decodedKey->prime2.pbData, decodedKey->prime2.cbData); memcpy(vardata + halflen * 4, - decodedKey->exponent1.pbData, halflen); + decodedKey->exponent1.pbData, decodedKey->exponent1.cbData); memcpy(vardata + halflen * 5, - decodedKey->exponent2.pbData, halflen); + decodedKey->exponent2.pbData, decodedKey->exponent2.cbData); memcpy(vardata + halflen * 6, - decodedKey->coefficient.pbData, halflen); + decodedKey->coefficient.pbData, decodedKey->coefficient.cbData); memcpy(vardata + halflen * 7, - decodedKey->privexp.pbData, halflen * 2); + decodedKey->privexp.pbData, decodedKey->privexp.cbData); } }

1 0

Nikolay Sivov : comctl32/imagelist: Use proper type for return variable ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 680ba9330ebac421d4efe992f049f3a5710c8ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680ba9330ebac421d4efe992f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:13:58 2015 +0300 comctl32/imagelist: Use proper type for return variable (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c915472..608ccc9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3554,7 +3554,7 @@ static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList2 *iface, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot) { IImageList *iml2 = NULL; - HRESULT ret; + BOOL ret; if (!punk) return E_FAIL;

1 0

Michael Stefaniuc : hidclass.sys: Fix a misplaced closing bracket ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 428925eeeea23366ce6346d473c47fdd7a6302d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428925eeeea23366ce6346d47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:28:11 2015 +0200 hidclass.sys: Fix a misplaced closing bracket (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ac9b047..13ac99b 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -964,7 +964,7 @@ WINE_HIDP_PREPARSED_DATA* build_PreparseData( if (feature_features[i]->caps.ReportID != wine_report->reportID) { wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); - wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report)+wine_report->dwSize; + wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report+wine_report->dwSize); new_report(wine_report, feature_features[i]); data->dwFeatureReportCount++; bitLength = max(bitOffset, bitLength);

1 0

Michael Stefaniuc : dplayx: Avoid shadowing a variable used in loop control (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 9f6bf52ff181b5682ce757c58e03c9fa1b8b90ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6bf52ff181b5682ce757c58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:26 2015 +0200 dplayx: Avoid shadowing a variable used in loop control (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 2b4b554..2cf342f 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -762,8 +762,6 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 DWORD dwAtIndex; LPCSTR atKey = "Address Types"; LPCSTR guidDataSubKey = "Guid"; - FILETIME filetime; - TRACE(" this time through: %s\n", subKeyName );

1 0

Michael Stefaniuc : comctl32/tests: WC_DIALOG is already an INTATOM ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a16a27075138e84cd8ebac640930e89b8928a98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16a27075138e84cd8ebac640… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:43 2015 +0200 comctl32/tests: WC_DIALOG is already an INTATOM (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 9a422f1..6594298 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -300,7 +300,7 @@ static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; /* The first dialog created will be the parent dialog */ - if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + if (!done && c->lpcs->lpszClass == (LPWSTR)WC_DIALOG) { old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); done = TRUE;

1 0

Michael Stefaniuc : comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 88531272ce276a9183baa0f33cbb366d3752a081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88531272ce276a9183baa0f33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:32:36 2015 +0200 comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ffd0dca..9a4b902 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -267,7 +267,7 @@ static void test_LoadIconWithScaleDown(void) /* invalid arguments */ icon = (HICON)0x1234; - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, 0x100, &icon); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); ok(icon == NULL, "Expected NULL, got %p\n", icon); @@ -302,7 +302,7 @@ static void test_LoadIconWithScaleDown(void) "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); /* load icon using predefined identifier */ - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_SMALL, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -312,7 +312,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_LARGE, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -322,7 +322,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconWithScaleDown(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 42, 42, &icon); + hr = pLoadIconWithScaleDown(NULL, (LPWSTR)IDI_APPLICATION, 42, 42, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError());

1 0