wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Michael Stefaniuc : msacm32/tests: Remove always true condition ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: baf0af67ae60cadb5a47f1cd3376514d2d2c32e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf0af67ae60cadb5a47f1cd3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 23:58:37 2015 +0200 msacm32/tests: Remove always true condition (PVS-Studio). dd.szShortName is an array of CHAR and not an arbitrary pointer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 0defb33..4c9dca0 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -145,7 +145,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); for (iter = expected_ids; iter->shortname; ++iter) { - if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { + if (!strcmp(iter->shortname, dd.szShortName)) { /* try alternative product id on mismatch */ if (iter->pid_alt && iter->pid != dd.wPid) ok(iter->mid == dd.wMid && iter->pid_alt == dd.wPid,

1 0

Nikolay Sivov : wmiutils: Don't return HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: afd1e40e824a3f2d49531b4fcf47375e943b7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1e40e824a3f2d49531b4fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:44:46 2015 +0300 wmiutils: Don't return HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7977416..61386d9 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -1211,7 +1211,7 @@ static BOOL WINAPI path_IsRelative( LPWSTR wszNamespace) { FIXME("%p, %s, %s\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsRelativeOrChild( @@ -1221,7 +1221,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LONG lFlags) { FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsLocal( @@ -1229,7 +1229,7 @@ static BOOL WINAPI path_IsLocal( LPCWSTR wszMachine) { FIXME("%p, %s\n", iface, debugstr_w(wszMachine)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsSameClassName( @@ -1237,7 +1237,7 @@ static BOOL WINAPI path_IsSameClassName( LPCWSTR wszClass) { FIXME("%p, %s\n", iface, debugstr_w(wszClass)); - return E_NOTIMPL; + return FALSE; } static const struct IWbemPathVtbl path_vtbl =

1 0

Nikolay Sivov : d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 6c2bda6e339fde134c2ee3e191f4e38b560f50de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2bda6e339fde134c2ee3e19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3bf0ff2..326e789 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1638,12 +1638,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, NULL); @@ -1661,12 +1661,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0

Nikolay Sivov : d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 6410e8a7712315bea07fcbf9325b93f6fb268d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6410e8a7712315bea07fcbf93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ccc16c6..827f144 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -834,12 +834,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, NULL); @@ -857,12 +857,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0

Nikolay Sivov : ddraw/tests: Use proper type for return values (PVS-Studio ).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 8cd2d5df202ec290f0ffbad2efbbc3e0ed71b0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd2d5df202ec290f0ffbad2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:40:29 2015 +0300 ddraw/tests: Use proper type for return values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index a325f86..13e2732 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -567,13 +567,13 @@ static void setdisplaymode(int i) scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); if (!EqualRect(&scrn, &orig_rect)) { - HRESULT rect_result; + BOOL rect_result, ret; /* Check that the client rect was resized */ - rc = GetClientRect(hwnd, &test); - ok(rc!=0, "GetClientRect returned %x\n", rc); - rc = EqualRect(&scrn, &test); - todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); + ret = GetClientRect(hwnd, &test); + ok(ret, "GetClientRect returned %d\n", ret); + ret = EqualRect(&scrn, &test); + todo_wine ok(ret, "Fullscreen window has wrong size\n"); /* Check that switching to normal cooperative level does not restore the display mode */

1 0

Nikolay Sivov : comctl32/tests: Fix function prototype (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 490b4eec4bc2f169633e3e660e924e2276751e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=490b4eec4bc2f169633e3e660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:15:32 2015 +0300 comctl32/tests: Fix function prototype (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 6f13846..7e8108a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1254,7 +1254,7 @@ static void test_imagelist_storage(void) static void test_shell_imagelist(void) { - BOOL (WINAPI *pSHGetImageList)(INT, REFIID, void**); + HRESULT (WINAPI *pSHGetImageList)(INT, REFIID, void**); IImageList *iml = NULL; HMODULE hShell32; HRESULT hr; @@ -1274,8 +1274,7 @@ static void test_shell_imagelist(void) } /* Get system image list */ - hr = (pSHGetImageList)(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); - + hr = pSHGetImageList(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); if (hr != S_OK) {

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

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

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

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

← Newer
1
...
37
38
39
40
41
42
43
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015