October 2014 - Wine-commits

Michael Stefaniuc : riched20: SUCCEEDED() is already a BOOL (PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 7f295effbd20301a7a63dc4e8e95c54ceb6189eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f295effbd20301a7a63dc4e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:28:44 2014 +0100 riched20: SUCCEEDED() is already a BOOL (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e62fc1..8fdaa53 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2118,7 +2118,7 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj); } - return SUCCEEDED(hr) != 0; + return SUCCEEDED(hr); } /* helper to send a msg filter notification */

1 0

Michael Stefaniuc : wininet: Simplify while loop conditions (PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 06afdda61777d43f6c7d5b78157b465172b0174b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06afdda61777d43f6c7d5b781… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:38:20 2014 +0100 wininet: Simplify while loop conditions (PVS-Studio). --- dlls/wininet/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a98ed53..cb30b26 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -809,7 +809,7 @@ static void strip_spaces(LPWSTR start) LPWSTR str = start; LPWSTR end; - while (*str == ' ' && *str != '\0') + while (*str == ' ') str++; if (str != start) @@ -841,13 +841,13 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) if (!token) return TRUE; realm = ptr; - while (*realm == ' ' && *realm != '\0') + while (*realm == ' ') realm++; if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) { token++; - while (*token == ' ' && *token != '\0') + while (*token == ' ') token++; if (*token == '\0') return TRUE;

1 0

Bruno Jesus : advapi32/tests: Fix copy & paste issue (Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: c7772a5d10c64c5ccf184c0ba5bb01f1609d916a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7772a5d10c64c5ccf184c0ba… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:04:22 2014 -0200 advapi32/tests: Fix copy & paste issue (Cppcheck). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82391e1..1445f6f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1136,7 +1136,7 @@ static void test_reg_open_key(void) ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); - bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + error = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error);

1 0

Bruno Jesus : advapi32/tests: Remove dead assignment (Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: d3b406ecce238e43e042bf90a2e02cfc2eae070f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b406ecce238e43e042bf90a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:13:04 2014 -0200 advapi32/tests: Remove dead assignment (Cppcheck). --- dlls/advapi32/tests/security.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b44496a..04a88ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -920,7 +920,6 @@ cleanup: rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); ok(rc == FILE_ATTRIBUTE_ARCHIVE, "expected FILE_ATTRIBUTE_ARCHIVE got %#x\n", rc); - retSize = 0xdeadbeef; rc = GetFileSecurityA(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &sdSize); ok(!rc, "GetFileSecurity should fail\n");

1 0

Bruno Jesus : advpack/tests: Remove dead assignment (Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: c1b2fc3c4f89efd753abf17272600c9ae7c5fbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b2fc3c4f89efd753abf1727… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:16:14 2014 -0200 advpack/tests: Remove dead assignment (Cppcheck). --- dlls/advpack/tests/advpack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index f3e70d7..5b9ed42 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -187,7 +187,6 @@ static void delnode_test(void) CloseHandle(hn); hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); - currDir[currDirLen] = '\0'; } static void append_str(char **str, const char *data, ...)

1 0

Bruno Jesus : atl: Remove dead assignment.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 08f3edccde763524e55e26a978da9a05d1219d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3edccde763524e55e26a97… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:20:35 2014 -0200 atl: Remove dead assignment. --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 90c5b5b..32e207e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -184,7 +184,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOOL do_register) { - LPCOLESTR iter = *pstr; + LPCOLESTR iter; HRESULT hres; LONG lres; HKEY hkey = 0;

1 0

Bruno Jesus : atl: Remove dead assignment.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 36c331f2e95d69499ee734523d85c285bf58ff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c331f2e95d69499ee734523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:22:55 2014 -0200 atl: Remove dead assignment. --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 32e207e..96fcb0e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -380,7 +380,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) { LPCOLESTR iter = data; strbuf buf; - HRESULT hres = S_OK; + HRESULT hres; unsigned int i; strbuf_init(&buf);

1 0

Alistair Leslie-Hughes : dplayx: Fix some crashes and wine_todo's.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 60db3a4a86ad3a19682dfb483a4c4f37dff1ea29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60db3a4a86ad3a19682dfb483… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 25 15:05:40 2014 +1000 dplayx: Fix some crashes and wine_todo's. --- dlls/dplayx/tests/dplayx.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 7b6c0c0..fb6646d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -685,7 +685,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W } hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); @@ -743,7 +743,7 @@ static void test_DirectPlayCreate(void) if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); @@ -915,9 +915,9 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) { hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + checkHR( DPERR_ALREADYINITIALIZED, hr ); } return TRUE; @@ -976,7 +976,7 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -1085,7 +1085,7 @@ static void test_Open(void) /* Uninitialized dpsd */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd_server.dwSize = sizeof(DPSESSIONDESC2); @@ -1095,7 +1095,7 @@ static void test_Open(void) /* Regular operation */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); /* Opening twice */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); @@ -1698,12 +1698,16 @@ static void test_SessionDesc(void) checkHR( DPERR_INVALIDPARAMS, hr ); hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL ); checkHR( DPERR_INVALIDPARAM, hr ); +if(0) +{ + /* Crashes under Win7 */ hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); checkHR( DPERR_INVALIDPARAM, hr ); dwDataSize=-1; hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} /* Get: Insufficient buffer size */ dwDataSize=0; @@ -2498,10 +2502,14 @@ static void test_PlayerName(void) checkHR( DPERR_INVALIDPLAYER, hr ); check( 1024, dwDataSize ); +if(0) +{ + /* Crashes under Win7 */ dwDataSize = -1; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); @@ -5789,6 +5797,9 @@ static void test_GetMessageQueue(void) check( -1, dwNumBytes ); /* - Remote players */ +if(0) +{ + /* Crash under Win7 */ dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3], DPMESSAGEQUEUE_RECEIVE, @@ -5796,6 +5807,7 @@ static void test_GetMessageQueue(void) checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */ check( -1, dwNumMsgs ); check( -1, dwNumBytes ); +} dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0,

1 0

Bruno Jesus : comctl32: Remove a dead assignment in comctl32undoc.c ( Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 197ea35c5a0f140d4cedd24c754f9eb83afc1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197ea35c5a0f140d4cedd24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:41:01 2014 -0200 comctl32: Remove a dead assignment in comctl32undoc.c (Cppcheck). --- dlls/comctl32/comctl32undoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index f20857c..97bbf1a 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -690,8 +690,8 @@ static HANDLE create_mru_list(LPWINEMRULIST mp) /* get values from key 'MRUList' */ if (newkey) { datasize = (mp->extview.uMax + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { + if (RegQueryValueExW( newkey, strMRUList, 0, &type, + (LPBYTE)mp->realMRU, &datasize)) { /* not present - set size to 1 (will become 0 later) */ datasize = 1; *mp->realMRU = 0;

1 0

Bruno Jesus : comctl32: Avoid magic numbers.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: f70167df587a4af9954d0733fdd3e8d0b24e0289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70167df587a4af9954d0733f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:12:23 2014 -0200 comctl32: Avoid magic numbers. --- dlls/comctl32/string.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index a9544fa..4c52f18 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -855,16 +855,15 @@ int WINAPI StrCSpnW(LPCWSTR lpszStr, LPCWSTR lpszMatch) BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, int iLen) { - DWORD dwFlags = LOCALE_USE_CP_ACP; + DWORD dwFlags; int iRet; TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringA(GetThreadLocale(), @@ -891,9 +890,8 @@ BOOL WINAPI IntlStrEqWorkerW(BOOL bCase, LPCWSTR lpszStr, LPCWSTR lpszComp, debugstr_w(lpszStr),debugstr_w(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringW(GetThreadLocale(),

1 0