wine-devel April 2021

wine-devel@winehq.org

70 participants
697 discussions

[PATCH resend] ws2_32: Hook up IPV6_HOPLIMIT
by Alex Henrie 30 Apr '21

30 Apr '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- FelgoLiveClient.exe from https://felgo.com/ sets this option. --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 29464fb94c9..5c2c2170e14 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -532,6 +532,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -864,6 +865,7 @@ static const int ws_ipv6_map[][2] = #ifdef IPV6_DROP_MEMBERSHIP MAP_OPTION( IPV6_DROP_MEMBERSHIP ), #endif + MAP_OPTION( IPV6_HOPLIMIT ), MAP_OPTION( IPV6_MULTICAST_IF ), MAP_OPTION( IPV6_MULTICAST_HOPS ), MAP_OPTION( IPV6_MULTICAST_LOOP ), @@ -4203,6 +4205,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -5921,6 +5924,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: -- 2.31.1

2 1

[PATCH 1/5] ws2_32/tests: Add some tests for bind().
by Zebediah Figura 30 Apr '21

30 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5bd18586e51..9cf271d0fea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8373,6 +8373,71 @@ static void test_wsaioctl(void) closesocket(s); } +static void test_bind(void) +{ + const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + struct sockaddr addr; + SOCKET s, s2; + int ret, len; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + WSASetLastError(0xdeadbeef); + ret = bind(s, NULL, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + addr.sa_family = 0xdead; + WSASetLastError(0xdeadbeef); + ret = bind(s, &addr, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr) - 1); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + len = sizeof(addr); + ret = getsockname(s, &addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + + s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + WSASetLastError(0xdeadbeef); + ret = bind(s2, &addr, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEADDRINUSE, "got error %u\n", WSAGetLastError()); + + closesocket(s2); + closesocket(s); + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -8427,6 +8492,7 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_bind(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); -- 2.30.2

2 6

[PATCH 4/4] shell32: use a smaller range of shellview menu IDs in our IContextMenu functions
by Damjan Jovanovic 30 Apr '21

30 Apr '21

The shellview menu IDs are very large, eg. FCIDM_SHVIEW_OPEN is 0x7102, while applications want menu IDs to fit into a small range, eg. 1-1000 for Explorer++. This causes our IContextMenu_QueryContextMenu() functions to leave out most menu options. We should rebase our shellview menu ids by -0x7000 so they occupy a smaller range. This gets both Explorer++ and Double Commander to show the correct right-click menus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24893 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 57 +++++++++++++++++++++++++++------- dlls/shell32/tests/shlfolder.c | 8 +++++ 2 files changed, 54 insertions(+), 11 deletions(-)

2 1

[PATCH]: po: Update Lithuanian translation
by Aurimas Fišeras 30 Apr '21

30 Apr '21

1 0

[PATCH 3/4] shell32/tests: test what Shell_MergeMenus() does with a negative adjustment
by Damjan Jovanovic 30 Apr '21

30 Apr '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/tests/shlfileop.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[PATCH 2/4] shell32: the menu wIDs in hmenu were rebased by idCmdFirst
by Damjan Jovanovic 30 Apr '21

30 Apr '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] shell32/tests: add more tests for Shell_MergeMenus()
by Damjan Jovanovic 30 Apr '21

30 Apr '21

Show Shell_MergeMenus() really adds the offset instead of changing IDs to start with it, and that it really honours the maximum allowed value. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/tests/shlfileop.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

1 0

[PATCH] winegstreamer: Delay duration query until caps have been acquired.
by Zebediah Figura 29 Apr '21

29 Apr '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/waveparser.c | 2 +- dlls/winegstreamer/wg_parser.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index f3ea8f2b482..f78e15e5c19 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -929,7 +929,7 @@ static void test_seeking(void) duration = 0xdeadbeef; hr = IMediaSeeking_GetDuration(seeking, &duration); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(duration > 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration > 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); stop = current = 0xdeadbeef; hr = IMediaSeeking_GetStopPosition(seeking, &stop); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d6aceff8cfe..c06e5af8160 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1553,7 +1553,6 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s { struct wg_parser_stream *stream = parser->streams[i]; - stream->duration = query_duration(stream->their_src); while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) @@ -1561,6 +1560,12 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s pthread_mutex_unlock(&parser->mutex); return E_FAIL; } + /* GStreamer doesn't actually provide any guarantees about when duration + * is available, even for seekable streams. However, many elements (e.g. + * avidemux, wavparse, qtdemux) in practice record duration before + * fixing caps, so as a heuristic, wait until we get caps before trying + * to query for duration. */ + stream->duration = query_duration(stream->their_src); } pthread_mutex_unlock(&parser->mutex); -- 2.30.2

1 0

[PATCH 3/4] d3d11/tests: Initialise "constant" in test_device_context_state() (Valgrind).
by Henri Verbeet 29 Apr '21

29 Apr '21

We're mostly just using this to make sure the value we read back is that same as the one we set, so in that sense the actual value is inconsequential. Nevertheless, randomness is generally undesirable in the tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca60170d080..191df67a41d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6775,6 +6775,7 @@ static void test_device_context_state(void) 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000020, 0x00050050, 0x00000008, 0x0100086a, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x0100003e, }; + static const struct vec4 constant = {1.257f, 1.885f, 2.513f, 3.770f}; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; @@ -6814,7 +6815,6 @@ static void test_device_context_state(void) ID3D11Texture2D *texture; enum DXGI_FORMAT format; float blend_factor[4]; - struct vec4 constant; DWORD data_size; BOOL pred_value; ULONG refcount; -- 2.20.1

2 1

[PATCH 4/4] wined3d: Only read "*rect_count" when "rects" is non-NULL in wined3d_device_context_get_scissor_rects() (Valgrind).
by Henri Verbeet 29 Apr '21

29 Apr '21

When "rects" is NULL, "*rect_count" is potentially uninitialised. That's fairly benign because the resulting "count" value is inconsequential in that case, but it's also unnecessary, and easy to avoid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f3d7cff74bf..813ee773478 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1722,8 +1722,7 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_ TRACE("context %p, rect_count %p, rects %p.\n", context, rect_count, rects); - count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1; - if (count && rects) + if (rects && (count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1)) memcpy(rects, state->scissor_rects, count * sizeof(*rects)); if (rect_count) *rect_count = state->scissor_rect_count; -- 2.20.1

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
70
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2021