October 2019 - Wine-devel - list.winehq.org

[PATCH 1/3] wined3d: Factor out wined3d_texture_gl_upload_bo() function.
by Paul Gofman 18 Oct '19

18 Oct '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/texture.c | 231 +++++++++++++++++++++-------------------- 1 file changed, 120 insertions(+), 111 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c4ef184484..dd61ac8ae1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1845,6 +1845,124 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } +static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format, GLenum target, + unsigned int level, unsigned int src_row_pitch, unsigned int dst_x, unsigned int dst_y, + unsigned int dst_z, unsigned int update_w, unsigned int update_h, unsigned int update_d, + const BYTE *addr, BOOL srgb, struct wined3d_texture *dst_texture, + const struct wined3d_gl_info *gl_info) +{ + const struct wined3d_format_gl *format_gl = wined3d_format_gl(src_format); + + if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + { + unsigned int dst_row_pitch, dst_slice_pitch; + GLenum internal; + + if (srgb) + internal = format_gl->srgb_internal; + else if (dst_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET + && wined3d_resource_is_offscreen(&dst_texture->resource)) + internal = format_gl->rt_internal; + else + internal = format_gl->internal; + + wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + + TRACE("Uploading compressed data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, image_size %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, internal, dst_slice_pitch, addr); + + if (target == GL_TEXTURE_1D) + { + GL_EXTCALL(glCompressedTexSubImage1D(target, level, dst_x, + update_w, internal, dst_row_pitch, addr)); + } + else if (dst_row_pitch == src_row_pitch) + { + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, + update_w, update_h, internal, dst_slice_pitch, addr)); + } + } + else + { + unsigned int row_count = (update_h + src_format->block_height - 1) / src_format->block_height; + unsigned int row, y, z; + + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ + for (z = dst_z; z < dst_z + update_d; ++z) + { + for (row = 0, y = dst_y; row < row_count; ++row) + { + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, + update_w, src_format->block_height, 1, internal, dst_row_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, + update_w, src_format->block_height, internal, dst_row_pitch, addr)); + } + + y += src_format->block_height; + addr += src_row_pitch; + } + } + } + checkGLcall("Upload compressed texture data"); + } + else + { + unsigned int y, y_count; + + TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, format_gl->format, format_gl->type, addr); + + if (src_row_pitch) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); + y_count = 1; + } + else + { + y_count = update_h; + update_h = 1; + } + + for (y = 0; y < y_count; ++y) + { + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, + update_w, update_h, update_d, format_gl->format, format_gl->type, addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, addr); + } + } + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + checkGLcall("Upload texture data"); + } +} + static void wined3d_texture_gl_upload_data(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, @@ -1856,7 +1974,6 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; unsigned int update_d = src_box->back - src_box->front; - const struct wined3d_format_gl *format_gl; struct wined3d_bo_address bo; void *converted_mem = NULL; struct wined3d_format_gl f; @@ -1981,116 +2098,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); } - format_gl = wined3d_format_gl(src_format); - if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) - { - unsigned int dst_row_pitch, dst_slice_pitch; - const BYTE *addr = bo.addr; - GLenum internal; - - if (srgb) - internal = format_gl->srgb_internal; - else if (dst_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET - && wined3d_resource_is_offscreen(&dst_texture->resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; - - wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - - TRACE("Uploading compressed data, target %#x, level %u, x %u, y %u, z %u, " - "w %u, h %u, d %u, format %#x, image_size %#x, addr %p.\n", - target, level, dst_x, dst_y, dst_z, update_w, update_h, - update_d, internal, dst_slice_pitch, addr); - - if (target == GL_TEXTURE_1D) - { - GL_EXTCALL(glCompressedTexSubImage1D(target, level, dst_x, - update_w, internal, dst_row_pitch, addr)); - } - else if (dst_row_pitch == src_row_pitch) - { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr)); - } - } - else - { - unsigned int row_count = (update_h + src_format->block_height - 1) / src_format->block_height; - unsigned int row, y, z; - - /* glCompressedTexSubImage2D() ignores pixel store state, so we - * can't use the unpack row length like for glTexSubImage2D. */ - for (z = dst_z; z < dst_z + update_d; ++z) - { - for (row = 0, y = dst_y; row < row_count; ++row) - { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, - update_w, src_format->block_height, 1, internal, dst_row_pitch, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, src_format->block_height, internal, dst_row_pitch, addr)); - } - - y += src_format->block_height; - addr += src_row_pitch; - } - } - } - checkGLcall("Upload compressed texture data"); - } - else - { - unsigned int y, y_count; - - TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " - "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", - target, level, dst_x, dst_y, dst_z, update_w, update_h, - update_d, format_gl->format, format_gl->type, bo.addr); - - if (src_row_pitch) - { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); - y_count = 1; - } - else - { - y_count = update_h; - update_h = 1; - } - - for (y = 0; y < y_count; ++y) - { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, bo.addr)); - } - else if (target == GL_TEXTURE_1D) - { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, bo.addr); - } - else - { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, - update_w, update_h, format_gl->format, format_gl->type, bo.addr); - } - } - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("Upload texture data"); - } + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, + dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); if (bo.buffer_object) { -- 2.21.0

2 5

[PATCH v3] ws2_32: Handle more IGMP socket options
by Fabian Maurer 18 Oct '19

18 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47956 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Don't modify caller data v3: fix comment --- dlls/ws2_32/socket.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aa0a164ff9..1141ba725a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -692,6 +692,10 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_MULTICAST_LOOP ), MAP_OPTION( IP_ADD_MEMBERSHIP ), MAP_OPTION( IP_DROP_MEMBERSHIP ), + MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_BLOCK_SOURCE ), + MAP_OPTION( IP_UNBLOCK_SOURCE ), MAP_OPTION( IP_OPTIONS ), #ifdef IP_HDRINCL MAP_OPTION( IP_HDRINCL ), @@ -5801,6 +5805,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, int woptval; struct linger linger; struct timeval tval; + struct ip_mreq_source mreq_source; TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), @@ -6011,6 +6016,23 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_SOURCE_MEMBERSHIP: + case WS_IP_DROP_SOURCE_MEMBERSHIP: + case WS_IP_BLOCK_SOURCE: + case WS_IP_UNBLOCK_SOURCE: + { + /* ip_mreq_source is different on Linux (switched source/interface), so we need to make a copy */ + WS_IP_MREQ_SOURCE* val = (void*)optval; + mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; + mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; + mreq_source.imr_sourceaddr.s_addr = val->imr_sourceaddr.S_un.S_addr; + + optval = (char*)&mreq_source; + optlen = sizeof(mreq_source); + + convert_sockopt(&level, &optname); + break; + } case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL -- 2.23.0

2 1

[PATCH] user32/tests: Add ClipCursor / focus interactions tests.
by Rémi Bernon 18 Oct '19

18 Oct '19

This is to confirm the behaviour of SetForegroundWindow and other focus switching methods w.r.t. the active ClipCursor rect. Depending on the method used to switch windows, the ClipCursor rect may be reset or not. Alt-Tab seems to reset it most of the time, but not on all windows versions. Other methods like closing windows, or calling SetForegroundWindow usually do not. MSDN says the applications should release the cursor when losing the focus, and, as windows doesn't seem very consistent, we will assume that they do. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 215 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0dc4a8bcf3..e22a0b0ad22 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2862,6 +2862,219 @@ static void test_GetPointerType(void) ok(type == PT_MOUSE, " type %d\n", type ); } +static int clip_on_deactivate = 0; +static int clip_skip_cleanup = 0; +static int clip_default_cleanup = 0; +static RECT clip_rect = { 0, 0, 1, 1 }; + +static LRESULT WINAPI clip_cursor_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + + if (msg != WM_ACTIVATE) + return DefWindowProcA( hwnd, msg, wparam, lparam ); + + if (wparam != WA_INACTIVE) + { + ClipCursor( &clip_rect ); + } + else + { + if (clip_on_deactivate) + ClipCursor( &clip_rect ); + + if (clip_on_deactivate || clip_skip_cleanup) + return 0; + + if (clip_default_cleanup) + return DefWindowProcA( hwnd, msg, wparam, lparam ); + + ClipCursor( NULL ); + } + + return 0; +} + +static void send_alt_tab(void) +{ + keybd_event( VK_MENU, 0xb8, 0, 0 ); + Sleep( 100 ); + empty_message_queue(); + + keybd_event( VK_TAB, 0x8f, 0, 0 ); + Sleep( 100 ); + empty_message_queue(); + + keybd_event( VK_TAB, 0x8f, KEYEVENTF_KEYUP, 0 ); + Sleep( 100 ); + empty_message_queue(); + + keybd_event( VK_MENU, 0xb8, KEYEVENTF_KEYUP, 0 ); + Sleep( 100 ); + empty_message_queue(); +} + +static void test_ClipCursor(void) +{ + WNDCLASSA cls; + HWND hwnd, clip_hwnd; + RECT rect, screen_rect; + BOOL ret; + + cls.style = 0; + cls.lpfnWndProc = clip_cursor_wndproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA( 0 ); + cls.hIcon = 0; + cls.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW ); + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.lpszMenuName = NULL; + cls.lpszClassName = "ClipCursorClass"; + if (!RegisterClassA( &cls )) return; + + ret = ClipCursor( NULL ); + ok( ret, "ClipCursor failed.\n" ); + ret = GetClipCursor( &screen_rect ); + ok( ret, "GetClipCursor failed.\n" ); + + + hwnd = CreateWindowA( "static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok( hwnd != NULL, "CreateWindowA failed, GetLastError(): %x.\n", GetLastError() ); + ShowWindow( hwnd, SW_SHOW ); + empty_message_queue(); + + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &screen_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + + + clip_hwnd = CreateWindowA( cls.lpszClassName, NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok( clip_hwnd != NULL, "CreateWindowA failed, GetLastError(): %x.\n", GetLastError() ); + ShowWindow( clip_hwnd, SW_SHOW ); + empty_message_queue(); + + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + + + clip_on_deactivate = 0; + clip_skip_cleanup = 0; + clip_default_cleanup = 0; + SetForegroundWindow( hwnd ); + empty_message_queue(); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &screen_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + + + clip_on_deactivate = 1; + clip_skip_cleanup = 0; + clip_default_cleanup = 0; + SetForegroundWindow( hwnd ); + empty_message_queue(); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + send_alt_tab(); + /* this is not working on w8*, w1064v1809_2scr and wine */ + if( GetForegroundWindow() == hwnd ) + { + ok( GetForegroundWindow() == hwnd, "Failed to change windows with simulated Alt-Tab\n" ); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &screen_rect ) || + EqualRect( &rect, &clip_rect ) /* wxppro, w2003std, w2008s64 */, + "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + } + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + clip_on_deactivate = 0; + clip_skip_cleanup = 1; + clip_default_cleanup = 0; + SetForegroundWindow( hwnd ); + empty_message_queue(); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + send_alt_tab(); + /* this is not working on w8*, w1064v1809_2scr and wine */ + if( GetForegroundWindow() == hwnd ) + { + ok( GetForegroundWindow() == hwnd, "Failed to change windows with simulated Alt-Tab\n" ); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &screen_rect ) || + EqualRect( &rect, &clip_rect ) /* wxppro, w2003std, w2008s64 */, + "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + } + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + clip_on_deactivate = 0; + clip_skip_cleanup = 0; + clip_default_cleanup = 1; + SetForegroundWindow( hwnd ); + empty_message_queue(); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + send_alt_tab(); + /* this is not working on w8*, w1064v1809_2scr and wine */ + if( GetForegroundWindow() == hwnd ) + { + ok( GetForegroundWindow() == hwnd, "Failed to change windows with simulated Alt-Tab\n" ); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &screen_rect ) || + EqualRect( &rect, &clip_rect ) /* wxppro, w2003std, w2008s64 */, + "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + } + SetForegroundWindow( clip_hwnd ); + empty_message_queue(); + + + clip_on_deactivate = 1; + clip_skip_cleanup = 0; + clip_default_cleanup = 0; + DestroyWindow( clip_hwnd ); + empty_message_queue(); + ok( GetForegroundWindow() == hwnd, "Unexpected foreground window: %p\n", GetForegroundWindow() ); + ret = GetClipCursor( &rect ); + ok( ret, "GetClipCursor failed.\n" ); + ok( EqualRect( &rect, &clip_rect ), "Unexpected ClipCursor rect %s.\n", wine_dbgstr_rect( &rect ) ); + + + ClipCursor( NULL ); + + DestroyWindow( clip_hwnd ); + DestroyWindow( hwnd ); + + UnregisterClassA( cls.lpszClassName, GetModuleHandleA( 0 ) ); +} + START_TEST(input) { POINT pos; @@ -2907,4 +3120,6 @@ START_TEST(input) test_GetPointerType(); else win_skip("GetPointerType is not available\n"); + + test_ClipCursor(); } -- 2.23.0

2 1

vkd3d - DXIL support progress?
by Hans-Kristian Arntzen 18 Oct '19

18 Oct '19

Hi. There's this thread from September (https://www.winehq.org/pipermail/wine-devel/2019-September/150657.html) (Sorry, can't reply to it directly, as I wasn't on the ML at the time). I'd like to dig into DXIL translation, but there is risk of duplicating work. Greg: Got any status update? Cheers, Hans-Kristian

3 10

[PATCH v2] ws2_32: Handle more IGMP socket options
by Fabian Maurer 18 Oct '19

18 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47956 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Don't modify caller data --- dlls/ws2_32/socket.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aa0a164ff9..22a07ce893 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -692,6 +692,10 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_MULTICAST_LOOP ), MAP_OPTION( IP_ADD_MEMBERSHIP ), MAP_OPTION( IP_DROP_MEMBERSHIP ), + MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_BLOCK_SOURCE ), + MAP_OPTION( IP_UNBLOCK_SOURCE ), MAP_OPTION( IP_OPTIONS ), #ifdef IP_HDRINCL MAP_OPTION( IP_HDRINCL ), @@ -5801,6 +5805,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, int woptval; struct linger linger; struct timeval tval; + struct ip_mreq_source mreq_source; TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), @@ -6011,6 +6016,23 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_SOURCE_MEMBERSHIP: + case WS_IP_DROP_SOURCE_MEMBERSHIP: + case WS_IP_BLOCK_SOURCE: + case WS_IP_UNBLOCK_SOURCE: + { + /* ip_mreq_source is different on Windows (switched source/interface)m so we need to make a copy */ + WS_IP_MREQ_SOURCE* val = (void*)optval; + mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; + mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; + mreq_source.imr_sourceaddr.s_addr = val->imr_sourceaddr.S_un.S_addr; + + optval = (char*)&mreq_source; + optlen = sizeof(mreq_source); + + convert_sockopt(&level, &optname); + break; + } case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL -- 2.23.0

3 2

[PATCH] ntdll: Properly handle 0 returns from unw_step().
by Henri Verbeet 18 Oct '19

18 Oct '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- I.e., avoid looping forever trying to unwind the same frame. The ARM64 change is untested, since I don't have the required hardware/setup. dlls/ntdll/signal_arm64.c | 6 +++++- dlls/ntdll/signal_x86_64.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 43e59692299..d6d5f15c874 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -523,7 +523,11 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - rc = unw_step( &cursor ); + if (!(rc = unw_step( &cursor ))) + { + WARN( "last frame\n" ); + return STATUS_SUCCESS; + } if (rc < 0) { WARN( "failed to unwind: %d\n", rc ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6508654e778..9645c5266c8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1524,7 +1524,12 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, BOOL* got_info, ULONG64 *f ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - rc = unw_step(&cursor); + if (!(rc = unw_step( &cursor ))) + { + WARN( "last frame\n" ); + *got_info = FALSE; + return STATUS_SUCCESS; + } if (rc < 0) { WARN( "failed to unwind: %d\n", rc ); -- 2.11.0

1 0

[PATCH v2 1/4] quartz/tests: Relax system clock timing tests a bit.
by Zebediah Figura 18 Oct '19

18 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/systemclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index cd291e1490..3c493a0f38 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -89,8 +89,8 @@ static void test_get_time(void) Sleep(100); hr = IReferenceClock_GetTime(clock, &time2); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time2 - time1 > 98 * 10000, "Expected about %s, but got %s.\n", - wine_dbgstr_longlong(time1 + 98 * 10000), wine_dbgstr_longlong(time2)); + ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 80 * 10000), wine_dbgstr_longlong(time2)); ref = IReferenceClock_Release(clock); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -160,11 +160,11 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) { - ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 40), "Semaphore should be signaled.\n"); + ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); } hr = IReferenceClock_Unadvise(clock, cookie); -- 2.23.0

1 3

[PATCH 1/2] quartz/videorenderer: Get rid of CreateRenderingSubsystem().
by Zebediah Figura 18 Oct '19

18 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87365d9212..f4d6945380 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,21 +82,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) -{ - This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!This->hEvent) - return FALSE; - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) - { - CloseHandle(This->hEvent); - return FALSE; - } - - return TRUE; -} - static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -873,8 +858,11 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - if (!CreateRenderingSubsystem(pVideoRenderer)) { - hr = E_FAIL; + pVideoRenderer->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + if (FAILED(BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) + { + CloseHandle(pVideoRenderer->hEvent); goto fail; } -- 2.23.0

3 4

[PATCH] wininet/tests: Fix FTP test failures.
by Hans Leidekker 18 Oct '19

18 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/tests/ftp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6f50104f3b..317b291495 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -71,7 +71,7 @@ static void test_connect(HINTERNET hInternet) */ SetLastError(0xdeadbeef); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (hFtp) /* some servers accept an empty password */ { ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); @@ -701,7 +701,7 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } -static void test_command(HINTERNET hFtp, HINTERNET hConnect) +static void test_command(HINTERNET hFtp) { BOOL ret; DWORD error; @@ -716,17 +716,18 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { { FALSE, ERROR_INVALID_PARAMETER, NULL }, { FALSE, ERROR_INVALID_PARAMETER, "" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, - { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, - { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" } + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "invalid" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size" }, + { TRUE, ERROR_SUCCESS, "type i" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " size" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg " }, + { TRUE, ERROR_SUCCESS, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "pwd welcome.msg" }, + { TRUE, ERROR_SUCCESS, "pwd" } }; if (!pFtpCommandA) @@ -964,7 +965,7 @@ static void test_status_callbacks(HINTERNET hInternet) cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); if (!hFtp) { @@ -998,7 +999,7 @@ START_TEST(ftp) hInternet = InternetOpenA("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (!hFtp) { InternetCloseHandle(hInternet); @@ -1031,7 +1032,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); - test_command(hFtp, hHttp); + test_command(hFtp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); test_status_callbacks(hInternet); -- 2.20.1

1 0

[PATCH] ws2_32: Handle more IGMP socket options
by Fabian Maurer 18 Oct '19

18 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47956 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ws2_32/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aa0a164ff9..32d3b04403 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -692,6 +692,10 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_MULTICAST_LOOP ), MAP_OPTION( IP_ADD_MEMBERSHIP ), MAP_OPTION( IP_DROP_MEMBERSHIP ), + MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_BLOCK_SOURCE ), + MAP_OPTION( IP_UNBLOCK_SOURCE ), MAP_OPTION( IP_OPTIONS ), #ifdef IP_HDRINCL MAP_OPTION( IP_HDRINCL ), @@ -6011,6 +6015,20 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_SOURCE_MEMBERSHIP: + case WS_IP_DROP_SOURCE_MEMBERSHIP: + case WS_IP_BLOCK_SOURCE: + case WS_IP_UNBLOCK_SOURCE: + { + /* ip_mreq_source is different on Windows, we need to switch source and interface */ + struct ip_mreq_source * val = (void*)optval; + struct in_addr temp_addr = val->imr_sourceaddr; + val->imr_sourceaddr = val->imr_interface; + val->imr_interface = temp_addr; + + convert_sockopt(&level, &optname); + break; + } case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL -- 2.23.0

3 3