February 2011 - Wine-commits

Austin English : shlwapi/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 92cb70e97c0b7e07a70fd186d8dea86b8ff9647a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb70e97c0b7e07a70fd186d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:38 2011 -0800 shlwapi/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shlwapi/tests/ordinal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index fc788b7..bfda161 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1638,7 +1638,7 @@ static void test_SHFormatDateTimeA(void) if (0) { /* crashes on native */ - ret = pSHFormatDateTimeA(NULL, NULL, NULL, 0); + pSHFormatDateTimeA(NULL, NULL, NULL, 0); } GetLocalTime(&st); @@ -1799,7 +1799,7 @@ static void test_SHFormatDateTimeW(void) if (0) { /* crashes on native */ - ret = pSHFormatDateTimeW(NULL, NULL, NULL, 0); + pSHFormatDateTimeW(NULL, NULL, NULL, 0); } GetLocalTime(&st); @@ -2630,7 +2630,7 @@ static void test_SHIShellFolder_EnumObjects(void) if(0){ /* NULL object crashes on Windows */ - hres = pSHIShellFolder_EnumObjects(NULL, NULL, 0, NULL); + pSHIShellFolder_EnumObjects(NULL, NULL, 0, NULL); } /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */ @@ -2712,9 +2712,9 @@ static void test_SHGetIniString(void) if(0){ /* these crash on Windows */ - ret = pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); - ret = pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); - ret = pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); + pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); + pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); } ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW);

1 0

Austin English : version/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 121885dd2d37eab454d80fcba39a8d655d9613c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121885dd2d37eab454d80fcba… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:19 2011 -0800 version/tests: Make sure return values are used (LLVM/Clang). --- dlls/version/tests/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index edf607c..e4badbe 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -341,12 +341,14 @@ static void test_32bit_win(void) retvalW = GetFileVersionInfoSizeW( mypathW, &hdlW); pVersionInfoW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalW ); retW = GetFileVersionInfoW( mypathW, 0, retvalW, pVersionInfoW ); + ok(retW, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError()); } GetModuleFileNameA(NULL, mypathA, MAX_PATH); retvalA = GetFileVersionInfoSizeA( mypathA, &hdlA); pVersionInfoA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalA ); retA = GetFileVersionInfoA( mypathA, 0, retvalA, pVersionInfoA ); + ok(retA, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError()); if (is_unicode_enabled) {

1 0

Austin English : user32/tests: Remove unneeded assignment (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 7b4cf0bec08f3c2f3e120bafe4404c02f0f5a264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b4cf0bec08f3c2f3e120bafe… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:59 2011 -0800 user32/tests: Remove unneeded assignment (LLVM/Clang). --- dlls/user32/tests/cursoricon.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8f7db52..cba5704 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1836,7 +1836,6 @@ static void test_DestroyCursor(void) ok( ret, "DestroyCursor succeeded\n" ); else ok( !ret, "DestroyCursor succeeded\n" ); - error = GetLastError(); ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() );

1 0

Austin English : ws2_32/tests: Remove unneeded assignments (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 99012fe7932f56bc3247e8d68e6d9a3e709b739e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99012fe7932f56bc3247e8d68… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:31 2011 -0800 ws2_32/tests: Remove unneeded assignments (LLVM/Clang). --- dlls/ws2_32/tests/sock.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2a8c1d2..de647f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -734,7 +734,7 @@ static void WINAPI event_client ( client_params *par ) tmp = WaitForSingleObject ( event, INFINITE ); ok ( tmp == WAIT_OBJECT_0, "event_client (%x): wait for connect event failed: %d\n", id, tmp ); err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); - wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); + ok ( err == 0, "event_client (%x): WSAEnumNetworkEvents error: %d\n", id, err ); err = wsa_events.iErrorCode[ FD_CONNECT_BIT ]; ok ( err == 0, "event_client (%x): connect error: %d\n", id, err ); if ( err ) goto out; @@ -755,7 +755,7 @@ static void WINAPI event_client ( client_params *par ) ok ( err == WAIT_OBJECT_0, "event_client (%x): wait failed\n", id ); err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); - wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); + ok( err == 0, "event_client (%x): WSAEnumNetworkEvents error: %d\n", id, err ); if ( wsa_events.lNetworkEvents & FD_WRITE ) { @@ -2580,8 +2580,7 @@ static void test_gethostbyname_hack(void) } } - he = NULL; - he = gethostbyname("nonexistent.winehq.org"); + gethostbyname("nonexistent.winehq.org"); /* Don't check for the return value, as some braindead ISPs will kindly * resolve nonexistent host names to addresses of the ISP's spam pages. */ } @@ -3977,7 +3976,6 @@ static void test_ConnectEx(void) acceptor = accept(listener, NULL, NULL); if (acceptor != INVALID_SOCKET) { closesocket(acceptor); - acceptor = INVALID_SOCKET; } buffer[0] = '1'; @@ -4238,7 +4236,6 @@ static void test_AcceptEx(void) closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); - acceptor = INVALID_SOCKET; /* Test short reads */ @@ -4276,7 +4273,6 @@ static void test_AcceptEx(void) closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); - acceptor = INVALID_SOCKET; /* Test CF_DEFER & AcceptEx interaction */ @@ -4387,7 +4383,6 @@ static void test_AcceptEx(void) closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); - acceptor = INVALID_SOCKET; /* clean up in case of failures */ while ((acceptor = accept(listener, NULL, NULL)) != INVALID_SOCKET) @@ -4424,7 +4419,6 @@ static void test_AcceptEx(void) ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); closesocket(acceptor); - acceptor = INVALID_SOCKET; /* Test closing with pending requests */ @@ -4439,7 +4433,6 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); closesocket(acceptor); - acceptor = INVALID_SOCKET; dwret = WaitForSingleObject(overlapped.hEvent, 1000); todo_wine ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT) /* NT4/2000 */, @@ -4472,7 +4465,6 @@ static void test_AcceptEx(void) ok(dwret == WAIT_TIMEOUT, "Waiting for timeout failed with %d + errno %d\n", dwret, GetLastError()); closesocket(acceptor); - acceptor = INVALID_SOCKET; acceptor = socket(AF_INET, SOCK_STREAM, 0); if (acceptor == INVALID_SOCKET) {

1 0

Austin English : xmllite/tests: Don't check test results inside if(0) (LLVM /Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: ea0e7d6421c8bdecdf5f6601fde0b8cbcdc47b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0e7d6421c8bdecdf5f6601f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:34 2011 -0800 xmllite/tests: Don't check test results inside if(0) (LLVM/Clang). --- dlls/xmllite/tests/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index bd6ac1a..de25d7e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -354,8 +354,8 @@ static void test_reader_create(void) /* crashes native */ if (0) { - hr = pCreateXmlReader(&IID_IXmlReader, NULL, NULL); - hr = pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); + pCreateXmlReader(&IID_IXmlReader, NULL, NULL); + pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); } hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL);

1 0

Austin English : windowscodecs/tests: Make sure returns values are used ( LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 4c6edd7fe04fb77952f4b1efd657779caf21213c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6edd7fe04fb77952f4b1efd… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:24 2011 -0800 windowscodecs/tests: Make sure returns values are used (LLVM/Clang). --- dlls/windowscodecs/tests/stream.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index a55b898..5730995 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -114,6 +114,7 @@ static void test_StreamOnMemory(void) ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = sizeof(Memory) + 10; @@ -123,6 +124,7 @@ static void test_StreamOnMemory(void) ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = 1; @@ -132,6 +134,7 @@ static void test_StreamOnMemory(void) ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = -1; @@ -148,6 +151,7 @@ static void test_StreamOnMemory(void) "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); /* remains unchanged */ IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); @@ -456,6 +460,7 @@ static void test_StreamOnStreamRange(void) ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "Seek returned with %#x, expected %#x\n", hr, WINCODEC_ERR_VALUEOUTOFRANGE); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = 30; @@ -465,6 +470,7 @@ static void test_StreamOnStreamRange(void) ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "Seek returned with %#x, expected %#x\n", hr, WINCODEC_ERR_VALUEOUTOFRANGE); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = 1; @@ -474,6 +480,7 @@ static void test_StreamOnStreamRange(void) ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "Seek returned with %#x, expected %#x\n", hr, WINCODEC_ERR_VALUEOUTOFRANGE); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = -1; @@ -490,6 +497,7 @@ static void test_StreamOnStreamRange(void) "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); ok(uNewPos.u.HighPart == 0xdeadbeef && uNewPos.u.LowPart == 0xdeadbeef, "Seek cursor initialized to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0xdeadbeef, 0xdeadbeef); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); /* remains unchanged */ IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_SET, NULL);

1 0

André Hentschel : msvcrt: Fixed a typo.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 68b0a13572131acd05c7f454cf40d5b7d0081368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b0a13572131acd05c7f454c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 4 17:01:48 2011 +0100 msvcrt: Fixed a typo. --- dlls/msvcr90/msvcr90.c | 2 +- dlls/msvcrt/cpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2c811cb..32a874b 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -315,7 +315,7 @@ const char * __thiscall MSVCRT_type_info_name_internal_method(type_info * _this, if (!_this->name) { /* Create and set the demangled name */ - /* Nota: mangled name in type_info struct always start with a '.', while + /* Note: mangled name in type_info struct always starts with a '.', while * it isn't valid for mangled name. * Is this '.' really part of the mangled name, or has it some other meaning ? */ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 1e7a20a..6f6b5c6 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -605,7 +605,7 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this) if (!_this->name) { /* Create and set the demangled name */ - /* Nota: mangled name in type_info struct always start with a '.', while + /* Note: mangled name in type_info struct always starts with a '.', while * it isn't valid for mangled name. * Is this '.' really part of the mangled name, or has it some other meaning ? */

1 0

Austin English : dplayx/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 4036cc06b059a963a363c39feedced9ce13a397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036cc06b059a963a363c39fe… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 17:21:24 2011 -0800 dplayx/tests: Make sure to use return values (LLVM/Clang). --- dlls/dplayx/tests/dplayx.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6636999..b9d641b 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1359,6 +1359,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-2, callbackData.dwCounter1 ); /* Doesn't list private */ @@ -1367,6 +1368,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-1, callbackData.dwCounter1 ); /* Doesn't list full, no new, no join, private, protected */ @@ -1374,6 +1376,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Like with DPENUMSESSIONS_AVAILABLE */ @@ -1381,6 +1384,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Doesn't list full, no new, no join, private */ @@ -1388,6 +1392,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-4, callbackData.dwCounter1 ); @@ -1396,6 +1401,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-4, callbackData.dwCounter1 ); /* Read cache of last sync enumeration */ @@ -1403,12 +1409,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Stop enumeration */ callbackData.dwFlags = DPENUMSESSIONS_ASYNC; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Start enumeration */ Sleep(500); /* Give time to fill the cache */ @@ -1417,12 +1425,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Retrieve results */ callbackData.dwFlags = DPENUMSESSIONS_STOPASYNC; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Stop enumeration */ @@ -1445,12 +1455,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Both sessions automatically set DPSESSION_PASSWORDREQUIRED */ @@ -1471,6 +1483,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Without password, the flag is ignored */ @@ -1491,12 +1504,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* - Listing with incorrect password */ @@ -1505,12 +1520,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* - Listing with correct password */ @@ -1518,6 +1535,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); @@ -1526,6 +1544,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Read cache of last sync enumeration, even private sessions */ @@ -1556,12 +1575,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* Only one of the sessions */ dpsd.guidApplication = appGuid; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* The other session */ /* FIXME: For some reason, if we enum 1st with appGuid and 2nd with appGuid2, @@ -1571,6 +1592,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Both sessions */ for (i=4; i<=5; i++) @@ -2460,7 +2482,7 @@ static void test_PlayerName(void) /* Regular operation */ hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, 0 ); - + checkHR( DP_OK, hr ); dwDataSize = 1024; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DP_OK, hr ); @@ -2470,7 +2492,7 @@ static void test_PlayerName(void) check( 0, ((LPDPNAME)lpData)->dwFlags ); hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], NULL, 0 ); - + checkHR( DP_OK, hr ); dwDataSize = 1024; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DP_OK, hr ); @@ -5359,6 +5381,7 @@ static void test_Receive(void) { hr = IDirectPlayX_Receive( pDP, &idFrom, &idTo, DPRECEIVE_PEEK, lpData, &dwDataSize ); + checkHR( DP_OK, hr ); checkStr( message, (LPSTR) lpData ); }

1 0

Austin English : msi/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 6816aa295e9a3cb2643dfc65b81d40a930e53203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6816aa295e9a3cb2643dfc65b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 18:29:14 2011 -0800 msi/tests: Make sure to use return values (LLVM/Clang). --- dlls/msi/tests/format.c | 408 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 359 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6816aa295e9a3cb2643df…

1 0

Joris Huizer : crypt32: Remove helper variable i (Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 4d41bdd1074dc77029336d7170aa9f17500f5a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d41bdd1074dc77029336d717… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Feb 5 15:04:39 2011 +0100 crypt32: Remove helper variable i (Clang). --- dlls/crypt32/base64.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 7a23dd9..5d0d604 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -498,14 +498,13 @@ static inline BYTE decodeBase64Byte(int c) static LONG decodeBase64Block(const char *in_buf, int in_len, const char **nextBlock, PBYTE out_buf, DWORD *out_len) { - int len = in_len, i; + int len = in_len; const char *d = in_buf; int ip0, ip1, ip2, ip3; if (len < 4) return ERROR_INVALID_DATA; - i = 0; if (d[2] == '=') { if ((ip0 = decodeBase64Byte(d[0])) > 63) @@ -514,8 +513,8 @@ static LONG decodeBase64Block(const char *in_buf, int in_len, return ERROR_INVALID_DATA; if (out_buf) - out_buf[i] = (ip0 << 2) | (ip1 >> 4); - i++; + out_buf[0] = (ip0 << 2) | (ip1 >> 4); + *out_len = 1; } else if (d[3] == '=') { @@ -528,10 +527,10 @@ static LONG decodeBase64Block(const char *in_buf, int in_len, if (out_buf) { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); + out_buf[0] = (ip0 << 2) | (ip1 >> 4); + out_buf[1] = (ip1 << 4) | (ip2 >> 2); } - i += 2; + *out_len = 2; } else { @@ -546,11 +545,11 @@ static LONG decodeBase64Block(const char *in_buf, int in_len, if (out_buf) { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); - out_buf[i + 2] = (ip2 << 6) | ip3; + out_buf[0] = (ip0 << 2) | (ip1 >> 4); + out_buf[1] = (ip1 << 4) | (ip2 >> 2); + out_buf[2] = (ip2 << 6) | ip3; } - i += 3; + *out_len = 3; } if (len >= 6 && d[4] == '\r' && d[5] == '\n') *nextBlock = d + 6; @@ -560,7 +559,6 @@ static LONG decodeBase64Block(const char *in_buf, int in_len, *nextBlock = d + 4; else *nextBlock = NULL; - *out_len = i; return ERROR_SUCCESS; }

1 0