February 2011 - Wine-Commits

Austin English : version/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 9, 2011

Feb. 9, 2011

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 : xmllite/tests: Don't check test results inside if(0) (LLVM /Clang).
by Alexandre Julliard Feb. 9, 2011

Feb. 9, 2011

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 : localui/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard Feb. 9, 2011

Feb. 9, 2011

Module: wine Branch: master Commit: 7a87c8ac453b515ecc135a30a0a12b7eaf2b37f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a87c8ac453b515ecc135a30a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 15:50:47 2011 -0800 localui/tests: Make sure to use return values (LLVM/Clang). --- dlls/localui/tests/localui.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index cb7a1cf..59ac3b5 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -71,9 +71,10 @@ static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); + ok(!res, "EnumPorts failed: got %d\n", res); pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); - SetLastError(0xdeadbeef); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); + ok(res == 1, "EnumPorts failed: got %d\n", res); } if (pi_buffer) { pi = (PORT_INFO_2W *) pi_buffer;

1 0

Austin English : ws2_32/tests: Remove unneeded assignments (LLVM/Clang).
by Alexandre Julliard Feb. 9, 2011

Feb. 9, 2011

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 : rpcrt4/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard Feb. 9, 2011

Feb. 9, 2011

Module: wine Branch: master Commit: 5b25b11b05d00ae74b69a4610f6fd43bd77bef8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b25b11b05d00ae74b69a4610… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:19 2011 -0800 rpcrt4/tests: Make sure return values are used (LLVM/Clang). --- dlls/rpcrt4/tests/cstub.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index c1b4b37..7517a6d 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -775,6 +775,7 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); + ok(pstub == S_OK, "create_stub failed: %u\n", GetLastError()); } @@ -892,6 +893,7 @@ static void test_Connect(IPSFactoryBuffer *ppsf) obj = (IUnknown*)&new_vtbl; r = IRpcStubBuffer_Connect(pstub, obj); + ok(r == S_OK, "r %08x\n", r); ok(connect_test_base_Connect_called == 1, "connect_test_bsae_Connect called %d times\n", connect_test_base_Connect_called); ok(connect_test_orig_release_called == 3, "release called %d\n", connect_test_orig_release_called);

1 0

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

Feb. 9, 2011

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

Joris Huizer : crypt32: Remove helper variable i (Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

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

Reece Dunn : winefile: In the Options > Font menu handler, initially select the current font.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: c013e44b1eae46a996334f063047bd34384c9210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c013e44b1eae46a996334f063… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Feb 8 19:03:25 2011 +0000 winefile: In the Options > Font menu handler, initially select the current font. --- programs/winefile/winefile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index aed4d14..1135407 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -263,11 +263,14 @@ static inline void choose_font(HWND hwnd) LOGFONTW lFont; HDC hdc = GetDC(hwnd); + + GetObjectW(Globals.hfont, sizeof(LOGFONTW), &lFont); + chFont.lStructSize = sizeof(CHOOSEFONTW); chFont.hwndOwner = hwnd; chFont.hDC = NULL; chFont.lpLogFont = &lFont; - chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL; + chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT; chFont.rgbColors = RGB(0,0,0); chFont.lCustData = 0; chFont.lpfnHook = NULL;

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 90c9681e42ee0cc35b7415dfce0e0e8b5b978d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c9681e42ee0cc35b7415dfc… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Tue Feb 8 20:18:39 2011 +0200 po: Update Ukrainian translation. --- po/uk.po | 747 +++++++++++++++++++------------------------------------------ 1 files changed, 233 insertions(+), 514 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90c9681e42ee0cc35b741…

1 0

Alexander Morozov : shell32: Implement Folder2::get_Self.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 7921522718e66155398437af80d37b1f29d824fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7921522718e66155398437af8… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Feb 2 20:11:19 2011 +0300 shell32: Implement Folder2::get_Self. --- dlls/shell32/shelldispatch.c | 312 +++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 4 - 2 files changed, 309 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7921522718e6615539843…

1 0