- Wine-Devel - list.winehq.org

[PATCH] ws2_32/tests: Test getaddrinfo() when we only have local IPv6 address.
by Ziqing Hui March 2, 2022

March 2, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/ws2_32/tests/protocol.c | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..7a1c1ff72b6 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2035,6 +2035,25 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b) ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); } +static BOOL is_ipv6_local(SOCKADDR_IN6 *addr) +{ + IN6_ADDR *a = &addr->sin6_addr; + return ((a->s6_words[0] == 0) && (a->s6_words[1] == 0) && (a->s6_words[2] == 0) && (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && (a->s6_words[5] == 0) && (a->s6_words[6] == 0) && (a->s6_words[7] == 0x0100)) || + ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0x80)); +} + +static BOOL ipv6_found(ADDRINFOA *addr) +{ + ADDRINFOA *p; + for (p = addr; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + return TRUE; + } + return FALSE; +} + static void test_getaddrinfo(void) { int i, ret; @@ -2042,6 +2061,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); @@ -2309,6 +2329,55 @@ static void test_getaddrinfo(void) ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); freeaddrinfo(result); + + /* Check whether we have global IPv6 address */ + result = NULL; + ret = getaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + has_ipv6_addr = FALSE; + for (p = result; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6 && !is_ipv6_local((SOCKADDR_IN6 *)p->ai_addr)) + { + has_ipv6_addr = TRUE; + break; + } + } + freeaddrinfo(result); + + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + for (i = 0; i < ARRAY_SIZE(hinttests); i++) + { + if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue; + winetest_push_context("Test %u", i); + + hint.ai_flags = 0; + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result); + ok(!ret, "Got unexpected ret %d\n", ret); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + hint.ai_family = AF_INET6; + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result); + if (!has_ipv6_addr) + todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret); + freeaddrinfo(result); + + winetest_pop_context(); + } } static void test_dns(void) -- 2.25.1

1 0

[PATCH v3 0/8] Fix sock_send reordering issue (#52401)
by Jinoh Kang March 2, 2022

March 2, 2022

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (8): server: Actually set initial status in set_async_direct_result handler. server: Add async_initial_status_callback. server: Defer postprocessing until after setting initial status in recv_socket handler. server: Defer postprocessing until after setting initial status in send_socket handler. server: Add mark_pending field to set_async_direct_result request. server: Attempt to complete I/O request immediately in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 102 ++++++++++++++++++++++-------- dlls/ntdll/unix/sync.c | 9 +-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ws2_32/tests/sock.c | 14 ++--- server/async.c | 52 +++++++++++++--- server/file.h | 2 + server/protocol.def | 6 +- server/sock.c | 110 +++++++++++++++++++-------------- 8 files changed, 204 insertions(+), 93 deletions(-) Interdiff: diff --git a/server/sock.c b/server/sock.c index 2706c2d20ed..1112708369d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3513,7 +3513,7 @@ DECL_HANDLER(send_socket) else if (!async_queued( &sock->write_q )) { /* If write_q is not empty, we cannot really tell if the already queued - * asyncs will not consume all available data; if there's no data + * asyncs will not consume all available space; if there's no space * available, the current request won't be immediately satiable. */ struct pollfd pollfd; -- 2.34.1

3 15

[PATCH 1/3] conhost: Don't compare the console config if the user cancels the dialog
by Hugh McMaster March 2, 2022

March 2, 2022

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 33ffb3915ed..9fc310f3111 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2036,7 +2036,8 @@ static BOOL config_dialog( struct console *console, BOOL current ) header.hwndParent = console->win; header.u3.phpage = pages; header.dwFlags = PSH_NOAPPLYNOW; - PropertySheetW( &header ); + if (!PropertySheetW( &header )) + return TRUE; if (!memcmp( &prev_config, &di.config, sizeof(prev_config) )) return TRUE; -- 2.35.1

2 6

[PATCH 1/2] include: Add winusb.h file.
by Mohamad Al-Jaf March 1, 2022

March 1, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/winusb.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 include/winusb.h diff --git a/include/Makefile.in b/include/Makefile.in index 2bb8cd672a7..908eaea2261 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -830,6 +830,7 @@ SOURCES = \ wintabx.h \ winternl.h \ wintrust.h \ + winusb.h \ winuser.h \ winuser.rh \ winver.h \ diff --git a/include/winusb.h b/include/winusb.h new file mode 100644 index 00000000000..188b4380878 --- /dev/null +++ b/include/winusb.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSB_H_ +#define _WINUSB_H_ + +#include <winapifamily.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef PVOID WINUSB_INTERFACE_HANDLE, *PWINUSB_INTERFACE_HANDLE; + +BOOL WINAPI WinUsb_Free(WINUSB_INTERFACE_HANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSB_H_ */ -- 2.35.1

1 1

[PATCH] widl: Allow multiple uses of the activatable attribute.
by Bernhard Kölbl March 1, 2022

March 1, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 93f7b0f52b9..02db99a55b7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2326,7 +2326,7 @@ struct allowed_attr struct allowed_attr allowed_attr[] = { /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC R <display name> } */ - /* ATTR_ACTIVATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, + /* ATTR_ACTIVATABLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "aggregatable" }, /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, -- 2.35.1

1 0

[PATCH 3/3] mshtml: Post messages asynchronously in IE9+ modes.
by Jacek Caban March 1, 2022

March 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 33 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 11 +++++++++++ dlls/mshtml/tests/events.js | 1 - dlls/mshtml/tests/jstest.html | 15 -------------- 4 files changed, 44 insertions(+), 16 deletions(-)

2 1

[PATCH 2/3] mshtml: Implement IDOMMessageEvent::data property.
by Jacek Caban March 1, 2022

March 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 28 +++++++++++++++++++++++++--- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 16 ++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-)

2 1

[PATCH v2] win32u: Don't use get_dc_ptr() in __wine_get_wgl_driver().
by Paul Gofman March 1, 2022

March 1, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use "user_driver->" instead of load_driver(); - store is_display DC parameter and base dibdrv choice on that; - move __wine_get_wgl_driver to dc.c. dlls/user32/driver.c | 4 +++- dlls/win32u/dc.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/dibdrv/dc.c | 18 ++---------------- dlls/win32u/driver.c | 31 ++++++++----------------------- dlls/win32u/emfdrv.c | 1 - dlls/win32u/font.c | 1 - dlls/win32u/ntgdi_private.h | 2 ++ dlls/win32u/path.c | 1 - dlls/wineandroid.drv/init.c | 13 +++---------- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 13 +++---------- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 5 +++-- 16 files changed, 59 insertions(+), 70 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5381e0c52d7..c8df3f31e2e 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -380,8 +380,10 @@ static struct user_driver_funcs lazy_load_driver = NULL, /* vulkan support */ NULL, + /* opengl support */ + NULL, /* thread management */ - NULL + NULL, }; void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 4ee138b2906..ab5f6fe6d28 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -36,6 +36,8 @@ #include "winternl.h" #include "winerror.h" #include "ntgdi_private.h" +#include "wine/wgl.h" +#include "wine/wgl_driver.h" #include "wine/debug.h" @@ -763,6 +765,7 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD dc->attr->vis_rect.top = 0; dc->attr->vis_rect.right = NtGdiGetDeviceCaps( hdc, DESKTOPHORZRES ); dc->attr->vis_rect.bottom = NtGdiGetDeviceCaps( hdc, DESKTOPVERTRES ); + dc->is_display = !!is_display; DC_InitDC( dc ); release_dc_ptr( dc ); @@ -1364,3 +1367,32 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH release_dc_ptr(dc); return ret; } + +/*********************************************************************** + * __wine_get_wgl_driver (win32u.@) + */ +struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +{ + BOOL dibdrv; + DC * dc; + + if (!(dc = get_dc_obj( hdc ))) return NULL; + if (dc->attr->disabled) + { + GDI_ReleaseObj( hdc ); + return NULL; + } + dibdrv = !dc->is_display; + GDI_ReleaseObj( hdc ); + + if (dibdrv) + { + if (version != WINE_WGL_DRIVER_VERSION) + { + ERR( "version mismatch, opengl32 wants %u but dibdrv has %u\n", version, WINE_WGL_DRIVER_VERSION ); + return NULL; + } + return dibdrv_get_wgl_driver(); + } + return user_driver->pwine_get_wgl_driver( version ); +} diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index a96b613d0a3..f29651773c0 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -603,15 +603,10 @@ static struct opengl_funcs opengl_funcs = }; /********************************************************************** - * dibdrv_wine_get_wgl_driver + * dibdrv_get_wgl_driver */ -static struct opengl_funcs * CDECL dibdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +struct opengl_funcs *dibdrv_get_wgl_driver(void) { - if (version != WINE_WGL_DRIVER_VERSION) - { - ERR( "version mismatch, opengl32 wants %u but dibdrv has %u\n", version, WINE_WGL_DRIVER_VERSION ); - return NULL; - } if (!osmesa_funcs && !(osmesa_funcs = init_opengl_lib())) { static int warned; @@ -715,7 +710,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - dibdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ GDI_PRIORITY_DIB_DRV /* priority */ }; @@ -1177,13 +1171,6 @@ static INT CDECL windrv_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT wi return ret; } -static struct opengl_funcs * CDECL windrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) -{ - dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); - if (dev->funcs == &dib_driver) dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); - return dev->funcs->wine_get_wgl_driver( dev, version ); -} - static const struct gdi_dc_funcs window_driver = { NULL, /* pAbortDoc */ @@ -1277,6 +1264,5 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - windrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ GDI_PRIORITY_DIB_DRV + 10 /* priority */ }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index dc858cdc0ce..9e530305cca 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -571,11 +571,6 @@ static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSO return STATUS_PROCEDURE_NOT_FOUND; } -static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) -{ - return (void *)-1; -} - const struct gdi_dc_funcs null_driver = { nulldrv_AbortDoc, /* pAbortDoc */ @@ -669,7 +664,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_UnrealizePalette, /* pUnrealizePalette */ nulldrv_D3DKMTCheckVidPnExclusiveOwnership, /* pD3DKMTCheckVidPnExclusiveOwnership */ nulldrv_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ - nulldrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ GDI_PRIORITY_NULL_DRV /* priority */ }; @@ -928,6 +922,11 @@ static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT ve return NULL; } +static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version ) +{ + return (void *)-1; +} + static void CDECL nulldrv_ThreadDetach( void ) { } @@ -1063,6 +1062,8 @@ static const struct user_driver_funcs lazy_load_driver = .pSystemParametersInfo = nulldrv_SystemParametersInfo, /* vulkan support */ .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, + /* opengl support */ + .pwine_get_wgl_driver = nulldrv_wine_get_wgl_driver, /* thread management */ .pThreadDetach = nulldrv_ThreadDetach, }; @@ -1126,6 +1127,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(WindowPosChanged); SET_USER_FUNC(SystemParametersInfo); SET_USER_FUNC(wine_get_vulkan_driver); + SET_USER_FUNC(wine_get_wgl_driver); SET_USER_FUNC(ThreadDetach); #undef SET_USER_FUNC @@ -1368,20 +1370,3 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE return get_display_driver()->pD3DKMTCheckVidPnExclusiveOwnership( desc ); } - -/*********************************************************************** - * __wine_get_wgl_driver (win32u.@) - */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - struct opengl_funcs *ret = NULL; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); - ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); - release_dc_ptr( dc ); - } - return ret; -} diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index f261a86e392..81481953288 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -524,7 +524,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index b8213ac9e6a..87ef75f04af 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -4351,7 +4351,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ GDI_PRIORITY_FONT_DRV /* priority */ }; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 2ed6182e151..e906b029bce 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -59,6 +59,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL is_display:1; /* DC is for display device */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ @@ -207,6 +208,7 @@ extern UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, extern UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) DECLSPEC_HIDDEN; extern void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) DECLSPEC_HIDDEN; +extern struct opengl_funcs *dibdrv_get_wgl_driver(void) DECLSPEC_HIDDEN; /* driver.c */ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c index a87a7ab06c2..93a124953af 100644 --- a/dlls/win32u/path.c +++ b/dlls/win32u/path.c @@ -2121,6 +2121,5 @@ const struct gdi_dc_funcs path_driver = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ GDI_PRIORITY_PATH_DRV /* priority */ }; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index ed9116eb47e..7c103475e6b 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -261,16 +261,9 @@ BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devm /********************************************************************** * ANDROID_wine_get_wgl_driver */ -static struct opengl_funcs * CDECL ANDROID_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +static struct opengl_funcs * CDECL ANDROID_wine_get_wgl_driver( UINT version ) { - struct opengl_funcs *ret; - - if (!(ret = get_wgl_driver( version ))) - { - dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); - ret = dev->funcs->wine_get_wgl_driver( dev, version ); - } - return ret; + return get_wgl_driver( version ); } @@ -279,7 +272,6 @@ static const struct user_driver_funcs android_drv_funcs = .dc_funcs.pCreateCompatibleDC = ANDROID_CreateCompatibleDC, .dc_funcs.pCreateDC = ANDROID_CreateDC, .dc_funcs.pDeleteDC = ANDROID_DeleteDC, - .dc_funcs.wine_get_wgl_driver = ANDROID_wine_get_wgl_driver, .dc_funcs.priority = GDI_PRIORITY_GRAPHICS_DRV, .pGetKeyNameText = ANDROID_GetKeyNameText, @@ -302,6 +294,7 @@ static const struct user_driver_funcs android_drv_funcs = .pWindowMessage = ANDROID_WindowMessage, .pWindowPosChanging = ANDROID_WindowPosChanging, .pWindowPosChanged = ANDROID_WindowPosChanged, + .pwine_get_wgl_driver = ANDROID_wine_get_wgl_driver, }; diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 40ba4c570c5..264781c6ac1 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -268,7 +268,6 @@ static const struct user_driver_funcs macdrv_funcs = .dc_funcs.pGetDeviceCaps = macdrv_GetDeviceCaps, .dc_funcs.pGetDeviceGammaRamp = macdrv_GetDeviceGammaRamp, .dc_funcs.pSetDeviceGammaRamp = macdrv_SetDeviceGammaRamp, - .dc_funcs.wine_get_wgl_driver = macdrv_wine_get_wgl_driver, .dc_funcs.priority = GDI_PRIORITY_GRAPHICS_DRV, .pActivateKeyboardLayout = macdrv_ActivateKeyboardLayout, @@ -309,6 +308,7 @@ static const struct user_driver_funcs macdrv_funcs = .pWindowPosChanged = macdrv_WindowPosChanged, .pWindowPosChanging = macdrv_WindowPosChanging, .pwine_get_vulkan_driver = macdrv_wine_get_vulkan_driver, + .pwine_get_wgl_driver = macdrv_wine_get_wgl_driver, }; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0bd0a18f111..4e4524722af 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -263,7 +263,7 @@ extern DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN; -extern struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version) DECLSPEC_HIDDEN; +extern struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; extern const struct vulkan_funcs * CDECL macdrv_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; extern void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, const RECT* old_client_rect) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index daf194c2aec..02ac613ddc9 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4632,7 +4632,7 @@ static struct opengl_funcs opengl_funcs = /********************************************************************** * macdrv_wine_get_wgl_driver */ -struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version) +struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(UINT version) { static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 27260e95507..04b00e82709 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -858,7 +858,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 5b31c352a23..fe2c50bffa7 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -312,16 +312,9 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI /********************************************************************** * X11DRV_wine_get_wgl_driver */ -static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( UINT version ) { - struct opengl_funcs *ret; - - if (!(ret = get_glx_driver( version ))) - { - dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); - ret = dev->funcs->wine_get_wgl_driver( dev, version ); - } - return ret; + return get_glx_driver( version ); } /********************************************************************** @@ -377,7 +370,6 @@ static const struct user_driver_funcs x11drv_funcs = .dc_funcs.pUnrealizePalette = X11DRV_UnrealizePalette, .dc_funcs.pD3DKMTCheckVidPnExclusiveOwnership = X11DRV_D3DKMTCheckVidPnExclusiveOwnership, .dc_funcs.pD3DKMTSetVidPnSourceOwner = X11DRV_D3DKMTSetVidPnSourceOwner, - .dc_funcs.wine_get_wgl_driver = X11DRV_wine_get_wgl_driver, .dc_funcs.priority = GDI_PRIORITY_GRAPHICS_DRV, .pActivateKeyboardLayout = X11DRV_ActivateKeyboardLayout, @@ -419,6 +411,7 @@ static const struct user_driver_funcs x11drv_funcs = .pWindowPosChanged = X11DRV_WindowPosChanged, .pSystemParametersInfo = X11DRV_SystemParametersInfo, .pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver, + .pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver, .pThreadDetach = X11DRV_ThreadDetach, }; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 92dc35fa9e1..5ede97fb026 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2246,7 +2246,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */ }; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 567a6c21608..e6f8239e27d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -159,14 +159,13 @@ struct gdi_dc_funcs BOOL (CDECL *pUnrealizePalette)(HPALETTE); NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); - struct opengl_funcs * (CDECL *wine_get_wgl_driver)(PHYSDEV,UINT); /* priority order for the driver on the stack */ UINT priority; }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 74 +#define WINE_GDI_DRIVER_VERSION 75 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -321,6 +320,8 @@ struct user_driver_funcs BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); /* vulkan support */ const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT); + /* opengl support */ + struct opengl_funcs * (CDECL *pwine_get_wgl_driver)(UINT); /* thread management */ void (CDECL *pThreadDetach)(void); }; -- 2.35.1

3 3

[PATCH v2 1/5] include/windows.media.speechrecognition.idl: Add SpeechRecognizerUIOptions.
by Rémi Bernon March 1, 2022

March 1, 2022

From: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/windows.media.speechrecognition.idl | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index ebcd579865d..9c288ce4066 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -47,6 +47,7 @@ namespace Windows { interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; interface ISpeechRecognizerTimeouts; + interface ISpeechRecognizerUIOptions; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; @@ -55,6 +56,7 @@ namespace Windows { runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; runtimeclass SpeechRecognizerTimeouts; + runtimeclass SpeechRecognizerUIOptions; } } } @@ -263,6 +265,23 @@ namespace Windows { [propput] HRESULT BabbleTimeout([in] Windows.Foundation.TimeSpan value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerUIOptions), + uuid(7888d641-b92b-44ba-a25f-d1864630641f) + ] + interface ISpeechRecognizerUIOptions : IInspectable + { + [propget] HRESULT ExampleText([out, retval] HSTRING *value); + [propput] HRESULT ExampleText([in] HSTRING value); + [propget] HRESULT AudiblePrompt([out, retval] HSTRING *value); + [propput] HRESULT AudiblePrompt([in] HSTRING value); + [propget] HRESULT IsReadBackEnabled([out, retval] boolean *value); + [propput] HRESULT IsReadBackEnabled([in] boolean value); + [propget] HRESULT ShowConfirmation([out, retval] boolean *value); + [propput] HRESULT ShowConfirmation([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -340,6 +359,15 @@ namespace Windows { { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerTimeouts; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognizerUIOptions + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerUIOptions; + } } } } -- 2.34.1

4 10

[PATCH 1/3] mshtml: Add IDOMMessageEvent stub implementation.
by Jacek Caban March 1, 2022

March 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 145 +++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + include/mshtml.idl | 32 ++++++++ 3 files changed, 179 insertions(+)

1 0