September 2019 - Wine-devel

[PATCH] testbot/TestAgent: Remove a redundant $Step declaration in _Connect().
by Francois Gouget 08 Sep '19

08 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a0a5efee..e6b0e0f6 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -857,7 +857,6 @@ sub _Connect($) my $OldRPC = $self->{rpc}; $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; - my $Step; my $Start = time(); foreach my $Attempt (1..$self->{cattempts}) { -- 2.20.1

1 0

[PATCH 1/3] advapi32/tests: Change sprintf to PathCombineA to avoid GCC warnings
by Alex Henrie 07 Sep '19

07 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/tests/Makefile.in | 2 +- dlls/advapi32/tests/service.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 12583e59f5..83c9c1d91c 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advapi32.dll -IMPORTS = ole32 advapi32 +IMPORTS = ole32 advapi32 shlwapi C_SRCS = \ cred.c \ diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9dad710490..0059b4ae40 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "lmcons.h" #include "aclapi.h" +#include "shlwapi.h" #include "wine/test.h" @@ -212,9 +213,9 @@ static void test_create_delete_svc(void) GetUserNameA(username, &user_size); /* Get the domainname to cater for that situation */ if (GetEnvironmentVariableA("USERDOMAIN", domain, MAX_PATH)) - sprintf(account, "%s\\%s", domain, username); + PathCombineA(account, domain, username); else - sprintf(account, ".\\%s", username); + PathCombineA(account, ".", username); /* All NULL */ SetLastError(0xdeadbeef); -- 2.23.0

2 3

[PATCH] hidclass.sys: Fix some memory leaks on error path (Coverity).
by Sven Baars 07 Sep '19

07 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/hidclass.sys/pnp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5db9c476a2..1c130e8dd8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -123,6 +123,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver AddDevice failed (%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -133,6 +134,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver failed to get Attributes(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -147,6 +149,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot get Device Descriptor(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -157,6 +160,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("No Report Descriptor found in reply\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -168,6 +172,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -178,6 +183,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return STATUS_NOT_SUPPORTED; } -- 2.17.1

1 0

[PATCH] wineqtdecoder: Add missing header
by Alistair Leslie-Hughes 07 Sep '19

07 Sep '19

Fixes MacOS build issue. [21:37:16] "_heap_alloc_zero", referenced from: [21:37:16] _QT_AddPin in qtsplitter.o [21:37:16] "_heap_free", referenced from: [21:37:16] _QT_RemoveOutputPins in qtsplitter.o Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 61ebeab2387..5fe58cd7598 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -118,6 +118,7 @@ #include "winuser.h" #include "dshow.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" -- 2.23.0.rc1

1 0

[PATCH] wininet: Support large downloads.
by Daniel Lehman 07 Sep '19

07 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/http.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 6 +++--- dlls/wininet/tests/http.c | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fccbb02f17..ad01420d45 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -52,7 +52,6 @@ #include "winternl.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG -#define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI #include "shlwapi.h" #include "sspi.h" @@ -2442,7 +2441,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return; @@ -2646,7 +2645,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, B int len, res; size_t size; - if(netconn_stream->content_length == ~0u) + if(netconn_stream->content_length == ~0) return WSAEISCONN; while(netconn_stream->content_read < netconn_stream->content_length) { @@ -2752,7 +2751,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, TRACE("reading %u byte chunk\n", chunked_stream->chunk_size); chunked_stream->buf_size++; chunked_stream->buf_pos--; - if(req->contentLength == ~0u) req->contentLength = chunked_stream->chunk_size; + if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size; else req->contentLength += chunked_stream->chunk_size; chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE; } @@ -2874,6 +2873,7 @@ static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; static const WCHAR headW[] = {'H','E','A','D',0}; + WCHAR contentLength[32]; WCHAR encoding[20]; DWORD size; @@ -2882,10 +2882,13 @@ static DWORD set_content_length(http_request_t *request) return ERROR_SUCCESS; } - size = sizeof(request->contentLength); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &request->contentLength, &size, NULL) != ERROR_SUCCESS) - request->contentLength = ~0u; + size = sizeof(contentLength); + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONTENT_LENGTH, + contentLength, &size, NULL) != ERROR_SUCCESS || + !StrToInt64ExW(contentLength, STIF_DEFAULT, (LONGLONG*)&request->contentLength)) { + request->contentLength = ~0; + } + request->netconn_stream.content_length = request->contentLength; request->netconn_stream.content_read = request->read_size; @@ -2911,7 +2914,7 @@ static DWORD set_content_length(http_request_t *request) } request->data_stream = &chunked_stream->data_stream; - request->contentLength = ~0u; + request->contentLength = ~0; } if(request->hdr.decoding) { @@ -3301,7 +3304,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->hdr.dwFlags = dwFlags; request->hdr.dwContext = dwContext; request->hdr.decoding = session->hdr.decoding; - request->contentLength = ~0u; + request->contentLength = ~0; request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl; request->data_stream = &request->netconn_stream.data_stream; @@ -4925,7 +4928,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; if(redirected) { - request->contentLength = ~0u; + request->contentLength = ~0; request->bytesToWrite = 0; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index f712fb6b64..40e51bec32 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -335,8 +335,8 @@ typedef struct { typedef struct { data_stream_t data_stream; - DWORD content_length; - DWORD content_read; + ULONGLONG content_length; + ULONGLONG content_read; } netconn_stream_t; #define READ_BUFFER_SIZE 8192 @@ -372,7 +372,7 @@ typedef struct struct HttpAuthInfo *proxyAuthInfo; CRITICAL_SECTION read_section; /* section to protect the following fields */ - DWORD contentLength; /* total number of bytes to be read */ + ULONGLONG contentLength; /* total number of bytes to be read */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fcbd95b837..a4521a94a4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5545,7 +5545,9 @@ static void test_large_content(int port) }; test_request_t req; DWORD sizelen, len; + DWORD read_size; DWORD64 len64; + char buf[16]; BOOL ret; size_t i; @@ -5594,6 +5596,24 @@ static void test_large_content(int port) ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); close_request(&req); + + /* test internal use of HttpQueryInfo on large size */ + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 4294967296\r\n" + "\r\n" + "xx"); + read_expect_async(req.request, buf, 4, &read_size, "xx"); + send_response_and_wait("yy1234567890", FALSE, buf, &read_size, "xxyy", 4, 0, 2); + read_expect_sync_data(req.request, buf, 10, "1234567890"); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + close_connection(); } static void test_http_connection(void) -- 2.17.1

2 1

[PATCH] ntdll/tests: Adjust timing on RtlWaitOnAddress tests.
by Daniel Lehman 07 Sep '19

07 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- my win10 laptop gets between 94 and 96. looks like it also randomly happens on official tests: http://test.winehq.org/data/765815729fc4af2472e60551364e3b29dccfbcff/win8_c… http://test.winehq.org/data/765815729fc4af2472e60551364e3b29dccfbcff/win8_c… --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b232138387..5abfcb0f11 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2115,7 +2115,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2130,7 +2130,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status); -- 2.17.1

1 0

[PATCH] winex11.drv: Fix a memory leak (Coverity).
by Sven Baars 06 Sep '19

06 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/winex11.drv/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a37530fdbf..c51954f1bf 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1849,13 +1849,12 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed) + if (!changed || !OpenClipboard( clipboard_hwnd )) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; } - if (!OpenClipboard( clipboard_hwnd )) return FALSE; TRACE( "selection changed, importing\n" ); EmptyClipboard(); is_clipboard_owner = TRUE; -- 2.17.1

1 0

[PATCH] services: Use threadpool timers for services delay loading.
by Jacek Caban 06 Sep '19

06 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47675 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/services/services.c | 39 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-)

1 0

[PATCH] quartz/tests: Fix a memory leak (Valgrind).
by Sven Baars 06 Sep '19

06 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/quartz/tests/filesource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 18a9bf1499..37f8dd97cd 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -460,6 +460,7 @@ static void test_file_source_filter(void) hr = IPin_QueryAccept(pin, pmt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); -- 2.17.1

1 1

[PATCH] d3d10: Avoid casts from COM object to interface
by Michael Stefaniuc 06 Sep '19

06 Sep '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2390eeeb8d..439833485d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2716,14 +2716,14 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (index >= This->local_buffer_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } l = &This->local_buffers[index]; TRACE("Returning buffer %p, %s.\n", l, debugstr_a(l->name)); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, @@ -2741,13 +2741,13 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (l->name && !strcmp(l->name, name)) { TRACE("Returning buffer %p.\n", l); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) @@ -3529,7 +3529,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variab TRACE("iface %p\n", iface); - return (ID3D10EffectConstantBuffer *)This->buffer; + return (ID3D10EffectConstantBuffer *)&This->buffer->ID3D10EffectVariable_iface; } static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar( -- 2.20.1

2 1