September 2015 - Wine-commits

André Hentschel : psapi/tests: Don' t check for exact value.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: a3ab34b4197ee66c53fc1a202cdd9fe1a6b4bd13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab34b4197ee66c53fc1a202… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 20 14:43:46 2015 +0200 psapi/tests: Don't check for exact value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/psapi/tests/psapi_main.c | 55 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index cebfc5f..d7d3a1e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -194,6 +194,11 @@ static void test_GetModuleInformation(void) ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } +static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin) +{ + return (perf >= max(sysperf, margin) - margin && perf <= sysperf + margin); +} + static void test_GetPerformanceInfo(void) { PERFORMANCE_INFORMATION info; @@ -227,36 +232,30 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); - ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, - "expected info.CommitTotal=%u but got %u\n", - sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); - ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, - "expected info.CommitLimit=%u but got %u\n", - sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); + ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), + "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages); + + ok(check_with_margin(info.CommitLimit, sys_performance_info->TotalCommitLimit, 32), + "expected approximately %ld but got %d\n", info.CommitLimit, sys_performance_info->TotalCommitLimit); - ok(info.CommitPeak == sys_performance_info->PeakCommitment, - "expected info.CommitPeak=%u but got %u\n", - sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); + ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), + "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && - info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, - "expected approximately info.PhysicalAvailable=%u but got %u\n", - sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 64), + "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, - "expected info.KernelTotal=%u but got %u\n", - sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + "expected approximately %ld but got %d\n", info.KernelTotal, + sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, - "expected info.KernelPaged=%u but got %u\n", - sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); - ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, - "expected info.KernelNonpaged=%u but got %u\n", - sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); + ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 8), + "expected approximately %ld but got %d\n", info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); /* compare with values from SYSTEM_BASIC_INFORMATION */ size = 0; @@ -297,14 +296,14 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(info.HandleCount == handle_count, - "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); + ok(check_with_margin(info.HandleCount, handle_count, 8), + "expected approximately %d but got %d\n", info.HandleCount, handle_count); - ok(info.ProcessCount == process_count, - "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); + ok(check_with_margin(info.ProcessCount, process_count, 4), + "expected approximately %d but got %d\n", info.ProcessCount, process_count); - ok(info.ThreadCount == thread_count, - "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); + ok(check_with_margin(info.ThreadCount, thread_count, 4), + "expected approximately %d but got %d\n", info.ThreadCount, thread_count); } }

1 0

Nikolay Sivov : urlmon/tests: Fixed a couple of test failure on Win10.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: c0308873b94dfc7889ea376ac09a9002e5a90885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0308873b94dfc7889ea376ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 20 11:53:59 2015 +0300 urlmon/tests: Fixed a couple of test failure on Win10. --- dlls/urlmon/tests/protocol.c | 6 ++++++ include/urlmon.idl | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index c50d356..01d52ea 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -887,6 +887,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_RESERVED_7: trace("BINDSTATUS_RESERVED_7\n"); break; + case BINDSTATUS_RESERVED_8: + trace("BINDSTATUS_RESERVED_8\n"); + break; default: ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST); }; @@ -1399,6 +1402,9 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS CHECK_EXPECT(GetBindString_ROOTDOC_URL); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); return E_NOTIMPL; + case BINDSTRING_ENTERPRISE_ID: + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + return E_NOTIMPL; default: ok(0, "unexpected ulStringType %d\n", ulStringType); } diff --git a/include/urlmon.idl b/include/urlmon.idl index 4be8d4b..35dee40 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -729,7 +729,8 @@ interface IInternetBindInfo : IUnknown BINDSTRING_ROOTDOC_URL, BINDSTRING_INITIAL_FILENAME, BINDSTRING_PROXY_USERNAME, - BINDSTRING_PROXY_PASSWORD + BINDSTRING_PROXY_PASSWORD, + BINDSTRING_ENTERPRISE_ID } BINDSTRING; HRESULT GetBindInfo(

1 0

Nikolay Sivov : msacm32/tests: Allow alternative product id.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: bc26431e9409356081682b0fa219f350bb503890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc26431e9409356081682b0fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 21 21:13:24 2015 +0300 msacm32/tests: Allow alternative product id. --- dlls/msacm32/tests/msacm.c | 18 +++++++++++++----- include/mmreg.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 88ad330..0defb33 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -127,15 +127,16 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, TODO: should it be *exactly* sizeof(dd), as tested here? */ if (rc == MMSYSERR_NOERROR) { - struct { + static const struct { const char *shortname; - const WORD mid; - const WORD pid; + WORD mid; + WORD pid; + WORD pid_alt; } *iter, expected_ids[] = { { "Microsoft IMA ADPCM", MM_MICROSOFT, MM_MSFT_ACM_IMAADPCM }, { "MS-ADPCM", MM_MICROSOFT, MM_MSFT_ACM_MSADPCM }, { "Microsoft CCITT G.711", MM_MICROSOFT, MM_MSFT_ACM_G711}, - { "MPEG Layer-3 Codec", MM_FRAUNHOFER_IIS, MM_FHGIIS_MPEGLAYER3_DECODE }, + { "MPEG Layer-3 Codec", MM_FRAUNHOFER_IIS, MM_FHGIIS_MPEGLAYER3_DECODE, MM_FHGIIS_MPEGLAYER3_PROFESSIONAL }, { "MS-PCM", MM_MICROSOFT, MM_MSFT_ACM_PCM }, { 0 } }; @@ -145,7 +146,14 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, for (iter = expected_ids; iter->shortname; ++iter) { if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { - ok(iter->mid == dd.wMid && iter->pid == dd.wPid, + /* try alternative product id on mismatch */ + if (iter->pid_alt && iter->pid != dd.wPid) + ok(iter->mid == dd.wMid && iter->pid_alt == dd.wPid, + "Got wrong manufacturer (0x%x vs 0x%x) or product (0x%x vs 0x%x)\n", + dd.wMid, iter->mid, + dd.wPid, iter->pid_alt); + else + ok(iter->mid == dd.wMid && iter->pid == dd.wPid, "Got wrong manufacturer (0x%x vs 0x%x) or product (0x%x vs 0x%x)\n", dd.wMid, iter->mid, dd.wPid, iter->pid); diff --git a/include/mmreg.h b/include/mmreg.h index e0b1dd0..2ee2b00 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -129,6 +129,7 @@ typedef struct _WAVEFORMATEX { #define MM_FRAUNHOFER_IIS 0xAC #define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 +#define MM_FHGIIS_MPEGLAYER3_PROFESSIONAL 0x0d #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */

1 0

Sebastian Lackner : opencl: Avoid deprecation warning for OpenCL 1.2 APIs.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 7a485dd1ea09a42eb3656ffe1207a8e87d6992d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a485dd1ea09a42eb3656ffe1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 22 15:40:40 2015 +0200 opencl: Avoid deprecation warning for OpenCL 1.2 APIs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index f690733..2d145bf 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #if defined(HAVE_CL_CL_H) #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H)

1 0

Hans Leidekker : winhttp: Verify certificates against the hostname instead of the server name.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: d22e21f96d5069a235a9a814f7126b5ca5ed4c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22e21f96d5069a235a9a814f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:57:12 2015 +0200 winhttp: Verify certificates against the hostname instead of the server name. The server name is different when connections are made through a proxy server. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d3f4d91..380edb8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1051,7 +1051,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } } - if (!netconn_secure_connect( &request->netconn, connect->servername )) + if (!netconn_secure_connect( &request->netconn, connect->hostname )) { netconn_close( &request->netconn ); heap_free( addressW );

1 0

Hans Leidekker : winhttp/tests: Never use a proxy for connections to localhost.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 4eb2807bd42515e500d335d9a01e5550ed4632be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb2807bd42515e500d335d9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:57:44 2015 +0200 winhttp/tests: Never use a proxy for connections to localhost. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05993f0..15af208 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2138,7 +2138,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) DWORD count, status, size, error, supported, first, target; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2206,7 +2206,7 @@ static void test_basic_authentication(int port) DWORD status, size, error, supported, first, target; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2343,7 +2343,7 @@ static void test_basic_authentication(int port) /* credentials set with WinHttpSetCredentials take precedence over those set through options */ - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2377,7 +2377,7 @@ static void test_basic_authentication(int port) WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2419,7 +2419,7 @@ static void test_no_headers(int port) DWORD error; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2456,7 +2456,7 @@ static void test_no_content(int port) DWORD size, len = sizeof(buf), bytes_read, status; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2541,7 +2541,7 @@ static void test_head_request(int port) DWORD size, len, count, status; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2606,7 +2606,7 @@ static void test_not_modified(int port) GetSystemTime(&st); WinHttpTimeFromSystemTime(&st, &today[sizeof(ifmodifiedW)/sizeof(WCHAR)]); - session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); @@ -2660,7 +2660,7 @@ static void test_bad_header( int port ) DWORD index, len; BOOL ret; - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); con = WinHttpConnect( ses, localhostW, port, 0 ); @@ -2692,7 +2692,7 @@ static void test_multiple_reads(int port) DWORD total_len = 0; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); con = WinHttpConnect(ses, localhostW, port, 0); @@ -2745,7 +2745,7 @@ static void test_cookies( int port ) DWORD status, size; BOOL ret; - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); con = WinHttpConnect( ses, localhostW, port, 0 ); @@ -2825,7 +2825,7 @@ static void test_cookies( int port ) WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); con = WinHttpConnect( ses, localhostW, port, 0 ); @@ -2859,7 +2859,7 @@ static void test_connection_info( int port ) DWORD size, error; BOOL ret; - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); con = WinHttpConnect( ses, localhostW, port, 0 );

1 0

Hans Leidekker : winhttp/tests: Fix a test failure.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 42a8a3e74bd5c66c721e6236c2c3bf086858e58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a8a3e74bd5c66c721e6236c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:58:09 2015 +0200 winhttp/tests: Fix a test failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 15af208..369574a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -486,7 +486,8 @@ static void test_WinHttpAddHeaders(void) static const WCHAR test_header_begin[] = {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR full_path_test_header_begin[] = - {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','p','o','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; + {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0', + '/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; static const WCHAR test_header_name2[] = {'n','a','m','e',0};

1 0

Hans Leidekker : winhttp/tests: Handle timeout errors.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 29967d63bbe2279de003f4b1cea55000aac46074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29967d63bbe2279de003f4b1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:58:33 2015 +0200 winhttp/tests: Handle timeout errors. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 21 +++++++++++++-------- dlls/winhttp/tests/winhttp.c | 31 ++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index a409c0d..5d76d12 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -159,7 +159,7 @@ static void setup_test( struct info *info, enum api function, unsigned int line static void test_connection_cache( void ) { HANDLE ses, con, req, event; - DWORD size, status; + DWORD size, status, err; BOOL ret, unload = TRUE; struct info info, *context = &info; @@ -194,7 +194,8 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -222,7 +223,8 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -289,7 +291,8 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -317,7 +320,8 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -387,7 +391,7 @@ static const struct notification redirect_test[] = static void test_redirect( void ) { HANDLE ses, con, req; - DWORD size, status; + DWORD size, status, err; BOOL ret; struct info info, *context = &info; @@ -414,7 +418,8 @@ static void test_redirect( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -524,7 +529,7 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); err = GetLastError(); - if (!ret && err == ERROR_WINHTTP_CANNOT_CONNECT) + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); WinHttpCloseHandle( req ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 369574a..0ecd5ab 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -254,7 +254,7 @@ static void test_OpenRequest (void) SetLastError(0xdeadbeef); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); err = GetLastError(); - if (!ret && err == ERROR_WINHTTP_CANNOT_CONNECT) + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("Connection failed, skipping.\n"); goto done; @@ -280,6 +280,7 @@ static void test_empty_headers_param(void) { static const WCHAR empty[] = {0}; HINTERNET ses, con, req; + DWORD err; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -292,7 +293,8 @@ static void test_empty_headers_param(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -315,7 +317,7 @@ static void test_SendRequest (void) static CHAR post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len, bytes_rw, size; + DWORD header_len, optional_len, total_len, bytes_rw, size, err; DWORD_PTR context; BOOL ret; CHAR buffer[256]; @@ -348,7 +350,8 @@ static void test_SendRequest (void) context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -968,7 +971,7 @@ static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, L static void test_secure_connection(void) { HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size; + DWORD size, status, policy, bitness, read_size, err; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -989,7 +992,8 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("Connection failed, skipping.\n"); goto cleanup; @@ -1011,7 +1015,9 @@ static void test_secure_connection(void) WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && (GetLastError() == ERROR_WINHTTP_SECURE_FAILURE || GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT)) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_SECURE_FAILURE || err == ERROR_WINHTTP_CANNOT_CONNECT || + err == ERROR_WINHTTP_TIMEOUT)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; @@ -1089,7 +1095,8 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + error = GetLastError(); + if (!ret && (error == ERROR_WINHTTP_CANNOT_CONNECT || error == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -1116,7 +1123,8 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && (GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT || GetLastError() == ERROR_WINHTTP_TIMEOUT)) + error = GetLastError(); + if (!ret && (error == ERROR_WINHTTP_CANNOT_CONNECT || error == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -4009,7 +4017,7 @@ static void test_chunked_read(void) static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; - DWORD len; + DWORD len, err; HINTERNET ses, con = NULL, req = NULL; BOOL ret; @@ -4028,7 +4036,8 @@ static void test_chunked_read(void) if (!req) goto done; ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done;

1 0

Hans Leidekker : msi/tests: Fix a test failure on Ultimate editions.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 100c043e89485a1fd6d7071fd5f8291d8104d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=100c043e89485a1fd6d7071fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 23 11:02:32 2015 +0200 msi/tests: Fix a test failure on Ultimate editions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index b98a8c2..feeb1ff 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4229,12 +4229,11 @@ static void test_MsiGetFileVersion(void) ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* pcchLangBuf not big enough */ - langsz = 3; + langsz = 4; lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - ok(!strncmp(lang, langcheck, 2), - "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang); + ok(lstrcmpA(lang, "lang"), "lang not set\n"); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf big enough, pcchLangBuf not big enough */ @@ -4255,7 +4254,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); - ok(lstrcmpA(lang, "lang"), "lang buffer not modified\n"); + ok(strstr(lang, langcheck) != NULL, "expected %s in %s\n", langcheck, lang); /* NULL pcchVersionBuf and pcchLangBuf */ r = MsiGetFileVersionA(path, version, NULL, lang, NULL);

1 0

Sebastian Lackner : ntdll: Ignore higher bits in selector for ThreadDescriptorTableEntry info query.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 6d9cf4910329c01032662ca6ce87a3138ba3e0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9cf4910329c01032662ca6c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 23 20:19:52 2015 +0200 ntdll: Ignore higher bits in selector for ThreadDescriptorTableEntry info query. Fixes a random test failure in kernel32/thread tests caused by the uninitialized HIWORD. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0a8a7b9..b8109e1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1014,7 +1014,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = STATUS_INFO_LENGTH_MISMATCH; else if (!(tdi->Selector & 4)) /* GDT selector */ { - unsigned sel = tdi->Selector & ~3; /* ignore RPL */ + unsigned sel = LOWORD(tdi->Selector) & ~3; /* ignore RPL */ status = STATUS_SUCCESS; if (!sel) /* null selector */ memset( &tdi->Entry, 0, sizeof(tdi->Entry) ); @@ -1045,7 +1045,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_START_REQ( get_selector_entry ) { req->handle = wine_server_obj_handle( handle ); - req->entry = tdi->Selector >> 3; + req->entry = LOWORD(tdi->Selector) >> 3; status = wine_server_call( req ); if (!status) {

1 0