June 2021 - Wine-devel - list.winehq.org

[PATCH] qcap:fix the bug which camera device can't be released correctly.
by luoriyuhui21＠163.com 05 Jun '21

05 Jun '21

From: Keming Liang <liangkeming(a)kylinos.cn> Signed-off-by: Keming Liang <liangkeming(a)kylinos.cn> --- dlls/qcap/qcap_private.h | 1 + dlls/qcap/v4l.c | 8 ++++++++ dlls/qcap/vfwcapture.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 104dba6a649..22dcecf40fd 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -44,6 +44,7 @@ struct video_capture_funcs { struct video_capture_device *(CDECL *create)(USHORT index); void (CDECL *destroy)(struct video_capture_device *device); + void (CDECL *close)(struct video_capture_device *device); HRESULT (CDECL *check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (CDECL *set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); void (CDECL *get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ccc06194b99..8102be50aec 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -118,6 +118,13 @@ static int xioctl(int fd, int request, void * arg) return r; } +static void CDECL v4l_device_close(struct video_capture_device *device) +{ + if (device->fd != -1) + video_close(device->fd); + device->fd = -1; +} + static void CDECL v4l_device_destroy(struct video_capture_device *device) { if (device->fd != -1) @@ -552,6 +559,7 @@ error: const struct video_capture_funcs v4l_funcs = { .create = v4l_device_create, + .close = v4l_device_close, .destroy = v4l_device_destroy, .check_format = v4l_device_check_format, .set_format = v4l_device_set_format, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 48401344ac4..155cfda20ba 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -254,6 +254,9 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) ERR("Failed to decommit allocator, hr %#x.\n", hr); + if (filter->init) + capture_funcs->close(filter->device); + return S_OK; } -- 2.25.1

3 3

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 05 Jun '21

05 Jun '21

1 0

Wine staging 6.10 release
by Alistair Leslie-Hughes 05 Jun '21

05 Jun '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.10 (571 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3d11/tests: Add a couple of extra tests for SRV/RTV conflict. * wined3d: Check for SRV/RTV binding conflicts per wined3d_state. * d3d11/tests: Add some tests for Map() on deferred contexts. * d3d11/tests: Add some tests for UpdateSubresource() on a deferred context. * user32: AddInternalGetWindowIcon stub. * shell32: Fix copying of files when using a context menu. * wtsapi32: Partial implementation of WTSEnumerateProcessesW. * wined3d: Store the framebuffer state inline in struct wined3d_cs_clear. * d3d11: Implement ID3D11Device::CreateDeferredContext(). * d3d11: Implement ID3D11Device1::CreateDeferredContext1(). * wined3d: Keep a list of acquired resources in struct wined3d_deferred_context. * d3d11: Implement ID3D11DeviceContext::ClearState() using a single CS op. * d3d11: Implement ID3D11DeviceContext::FinishCommandList(). * wined3d: Implement restoring context in wined3d_deferred_context_record_command_list(). * d3d11: Implement ID3D11DeviceContext::ExecuteCommandList(). * server: Add extra data bytes to be added after hardware_msg_data. * server: Add HID reports count / length to rawinput union. * server: Add HID reports support in GetRawInputBuffer. * server: Implement WM_INPUT / RIM_TYPEHID message dispatch. * ws2_32: Reuse old async ws2_async_io structures if possible. Added: * [49905] wscript: return TRUE for /d and /u stub switches * [51120] wbemdisp: Support DISPATCH_METHOD in ISWbemObject Invoke. * [39463] vbscript: Support looping of data from WMI * [51199] Add missing api-ms-win-core-psapi forwards * [51221] dpnet: Impelment IDirectPlay8Server EnumServiceProviders. Updated: * wined3d-CSMT_Main * d3d11-Deferred_Context * windows.networking.connectivity-new-dll Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] configure: Always warn on missing GStreamer if --with-gstreamer was specified.
by Zebediah Figura 04 Jun '21

04 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 425f3541d94..3fcd1036b79 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,8 +1622,11 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x **** -- 2.30.2

2 2

[PATCH v2 4/4] quartz: Notify EC_USERABORT event when closing video window.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-)

2 1

[PATCH v2 3/4] quartz: Hide video window on WM_CLOSE.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

In v2, - Merge two patches into one. - Use IVideoWindow::put_Visible to hide the video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-)

2 1

[PATCH v2 2/4] quartz/tests: Test the close button of the video window.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

In v2, refactor the tests to add sample delivery tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 98 ++++++++++++++++++++++++++-- dlls/quartz/tests/vmr7.c | 105 ++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 100 ++++++++++++++++++++++++++-- 3 files changed, 295 insertions(+), 8 deletions(-)

3 2

[PATCH v2 1/4] quartz/tests: Introduce commit_allocator helper in vmr7.c.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

New in v2 patch. The function exists in vmr9.c since 3cad37a64b90c31db0d0b71cb49e46d760b0a90d. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)

2 1

[PATCH v2 1/4] ws2_32: Use getifaddrs() and if_nametoindex() directly in interface_bind().
by Zebediah Figura 04 Jun '21

04 Jun '21

In order to avoid accessing iphlpapi. We will need to move this code to ntdll or the server, but we can't access iphlpapi from either. Even accessing a lower-level interface (i.e. ndis) is hard—we have no good way to enumerate ndis devices from either (without duplicating large parts of setupapi). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- In terms of ws2_32 complexity, this code paths seems no more complex, or even simpler. However, it omits the fallback path using SIOCGIFCON, making getifaddrs() a hard requirement for UDP binding. I don't know what if anything this risks losing support for, but current versions of all major operating systems seem to support it (BSD, Linux, Mac, Android), and we're gated on IP_BOUND_IF or IP_UNICAST_IF anyway. v2: Intentionally link to and call the iphlpapi if_nametoindex(), which is a simple wrapper around libc anyway, by redefining the unix version. Eventually this code will be moved out of ws2_32 and this step will be unnecessary. dlls/ws2_32/socket.c | 79 ++++++++++++++++++++---------------- dlls/ws2_32/ws2_32_private.h | 8 ++++ 2 files changed, 51 insertions(+), 36 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfe5ab186ee..ad2e3a1d683 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1975,62 +1975,65 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte */ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { +#if defined(HAVE_GETIFADDRS) && (defined(IP_BOUND_IF) || defined(LINUX_BOUND_IF)) struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; in_addr_t bind_addr = in_sock->sin_addr.s_addr; - PIP_ADAPTER_INFO adapters = NULL, adapter; + struct ifaddrs *ifaddrs, *ifaddr; + unsigned int index; BOOL ret = FALSE; - DWORD adap_size; int enable = 1; if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (_get_fd_type(fd) != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - goto cleanup; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters == NULL || GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) - goto cleanup; - /* Search the IPv4 adapter list for the appropriate binding interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); - if (bind_addr == adapter_addr) + if (getifaddrs( &ifaddrs ) < 0) return FALSE; + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET + && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { + index = if_nametoindex( ifaddr->ifa_name ); + if (!index) + { + ERR( "Unable to look up interface index for %s: %s\n", ifaddr->ifa_name, strerror( errno ) ); + continue; + } + #if defined(IP_BOUND_IF) /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */ - if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) + if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index)) != 0) goto cleanup; ret = TRUE; #elif defined(LINUX_BOUND_IF) - in_addr_t ifindex = (in_addr_t) htonl(adapter->Index); - struct interface_filter specific_interface_filter; - struct sock_fprog filter_prog; + { + in_addr_t ifindex = (in_addr_t) htonl(index); + struct interface_filter specific_interface_filter; + struct sock_fprog filter_prog; - if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) - goto cleanup; /* Failed to suggest egress interface */ - specific_interface_filter = generic_interface_filter; - specific_interface_filter.iface_rule.k = adapter->Index; - specific_interface_filter.ip_rule.k = htonl(adapter_addr); - filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); - filter_prog.filter = (struct sock_filter *) &specific_interface_filter; - if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) - goto cleanup; /* Failed to specify incoming packet filter */ - ret = TRUE; -#else - FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " - "receiving broadcast packets will not work on socket %04lx.\n", s); + if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) + goto cleanup; /* Failed to suggest egress interface */ + specific_interface_filter = generic_interface_filter; + specific_interface_filter.iface_rule.k = index; + specific_interface_filter.ip_rule.k = htonl(bind_addr); + filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); + filter_prog.filter = (struct sock_filter *) &specific_interface_filter; + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) + goto cleanup; /* Failed to specify incoming packet filter */ + ret = TRUE; + } #endif if (ret) { EnterCriticalSection(&cs_if_addr_cache); - if (if_addr_cache_size <= adapter->Index) + if (if_addr_cache_size <= index) { unsigned int new_size; in_addr_t *new; - new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + new_size = max(if_addr_cache_size * 2, index + 1); if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) { ERR("No memory.\n"); @@ -2043,10 +2046,10 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if_addr_cache = new; if_addr_cache_size = new_size; } - if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) - WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + if (if_addr_cache[index] && if_addr_cache[index] != bind_addr) + WARN("Adapter addr for iface index %u has changed.\n", index); - if_addr_cache[adapter->Index] = adapter_addr; + if_addr_cache[index] = bind_addr; LeaveCriticalSection(&cs_if_addr_cache); } break; @@ -2054,15 +2057,19 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) } /* Will soon be switching to INADDR_ANY: permit address reuse */ if (ret && setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) == 0) - TRACE("Socket %04lx bound to interface index %d\n", s, adapter->Index); + TRACE("Socket %04lx bound to interface index %d\n", s, index); else ret = FALSE; cleanup: if(!ret) ERR("Failed to bind to interface, receiving broadcast packets will not work on socket %04lx.\n", s); - HeapFree(GetProcessHeap(), 0, adapters); + freeifaddrs( ifaddrs ); return ret; +#else + FIXME( "Broadcast packets on interface-bound sockets are not currently supported on this platform.\n" ); + return FALSE; +#endif } /*********************************************************************** diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 527dbe903b4..c27c697a8b6 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -83,11 +83,18 @@ # include <resolv.h> #endif #ifdef HAVE_NET_IF_H +# define if_indextoname unix_if_indextoname +# define if_nametoindex unix_if_nametoindex # include <net/if.h> +# undef if_indextoname +# undef if_nametoindex #endif #ifdef HAVE_LINUX_FILTER_H # include <linux/filter.h> #endif +#ifdef HAVE_IFADDRS_H +# include <ifaddrs.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -144,6 +151,7 @@ #include "winnt.h" #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" +#include "netioapi.h" #include "ip2string.h" #include "wine/afd.h" #include "wine/server.h" -- 2.30.2

2 5

[PATCH] comctl32: Avoid gcc 11 maybe-uninitialized warning
by Andrew Eikum 04 Jun '21

04 Jun '21

dlls/comctl32/monthcal.c:1783:19: warning: ‘htinfo.uHit’ may be used uninitialized [-Wmaybe-uninitialized] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0bec07f477..70ea604d2c7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1799,6 +1799,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; htinfo.st = st_null; + htinfo.uHit = 0; /* we should preserve passed fields if hit area doesn't need them */ if (lpht->cbSize == sizeof(MCHITTESTINFO)) -- 2.31.1

1 0