July 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Store map mode in DC_ATTR.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 43a605cc9b000527af2a946dbd1afba2a2138a44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a605cc9b000527af2a946d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:04 2021 +0100 gdi32: Store map mode in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/driver.c | 2 +- dlls/gdi32/font.c | 3 ++- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 22 +++++++++++----------- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3c9dca8c512..bae1e9d21ab 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -98,7 +98,7 @@ static void set_initial_dc_state( DC *dc ) dc->charExtra = 0; dc->breakExtra = 0; dc->breakRem = 0; - dc->MapMode = MM_TEXT; + dc->attr->map_mode = MM_TEXT; dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; @@ -405,7 +405,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; - newdc->MapMode = dc->MapMode; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; @@ -479,9 +478,9 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->charExtra = dcs->charExtra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; - dc->MapMode = dcs->MapMode; - dc->attr->graphics_mode = dcs->attr->graphics_mode; - dc->attr->cur_pos = dcs->attr->cur_pos; + dc->attr->map_mode = dcs->attr->map_mode; + dc->attr->graphics_mode = dcs->attr->graphics_mode; + dc->attr->cur_pos = dcs->attr->cur_pos; dc->attr->arc_direction = dcs->attr->arc_direction; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; dc->xformWorld2Vport = dcs->xformWorld2Vport; @@ -1392,22 +1391,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetMapMode (GDI32.@) - */ -INT WINAPI GetMapMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->MapMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetBrushOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 851e80b1cd9..b5cb80dce65 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -799,7 +799,7 @@ static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) dc->attr->layout = layout; if (layout != old_layout) { - if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + if (layout & LAYOUT_RTL) dc->attr->map_mode = MM_ANISOTROPIC; DC_UpdateXforms( dc ); } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6e4a52fec02..fd1f25025b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5995,7 +5995,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); - TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, dc->MapMode); + TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, + dc->attr->map_mode); if(align & TA_UPDATECP) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 35986dba37e..bbd172239cd 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -164,6 +164,15 @@ DWORD WINAPI GetLayout( HDC hdc ) return dc_attr ? dc_attr->layout : GDI_ERROR; } +/*********************************************************************** + * GetMapMode (GDI32.@) + */ +INT WINAPI GetMapMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->map_mode : 0; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index b2148fa3bae..b7a615cbf79 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -117,14 +117,14 @@ BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT if (size) *size = dc->vport_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!x_num || !x_denom || !y_num || !y_denom) return FALSE; dc->vport_ext.cx = (dc->vport_ext.cx * x_num) / x_denom; dc->vport_ext.cy = (dc->vport_ext.cy * y_num) / y_denom; if (dc->vport_ext.cx == 0) dc->vport_ext.cx = 1; if (dc->vport_ext.cy == 0) dc->vport_ext.cy = 1; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -136,14 +136,14 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ if (size) *size = dc->wnd_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!x_num || !x_denom || !y_num || !y_denom) return FALSE; dc->wnd_ext.cx = (dc->wnd_ext.cx * x_num) / x_denom; dc->wnd_ext.cy = (dc->wnd_ext.cy * y_num) / y_denom; if (dc->wnd_ext.cx == 0) dc->wnd_ext.cx = 1; if (dc->wnd_ext.cy == 0) dc->wnd_ext.cy = 1; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -151,10 +151,10 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) { DC *dc = get_nulldrv_dc( dev ); - INT ret = dc->MapMode; + INT ret = dc->attr->map_mode; SIZE virtual_size, virtual_res; - if (mode == dc->MapMode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return ret; + if (mode == dc->attr->map_mode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return ret; virtual_size = get_dc_virtual_size( dc ); virtual_res = get_dc_virtual_res( dc ); @@ -203,7 +203,7 @@ INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) return 0; } /* RTL layout is always MM_ANISOTROPIC */ - if (!(dc->attr->layout & LAYOUT_RTL)) dc->MapMode = mode; + if (!(dc->attr->layout & LAYOUT_RTL)) dc->attr->map_mode = mode; DC_UpdateXforms( dc ); return ret; } @@ -215,11 +215,11 @@ BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) if (size) *size = dc->vport_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!cx || !cy) return FALSE; dc->vport_ext.cx = cx; dc->vport_ext.cy = cy; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -244,14 +244,14 @@ BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) if (size) *size = dc->wnd_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!cx || !cy) return FALSE; dc->wnd_ext.cx = cx; dc->wnd_ext.cy = cy; /* The API docs say that you should call SetWindowExtEx before SetViewportExtEx. This advice does not imply that Windows doesn't ensure the isotropic mapping after SetWindowExtEx! */ - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index cb7a8e7f7c9..19a5819f031 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -124,7 +124,6 @@ typedef struct tagDC INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ - INT MapMode; ABORTPROC pAbortProc; /* AbortProc for Printing */ XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a4ed8b6aec9..08df860a5e6 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -111,6 +111,7 @@ typedef struct DC_ATTR WORD rop_mode; WORD rel_abs_mode; WORD stretch_blt_mode; + INT map_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 626afcad71223e636c47c082e307a8dcac0131bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=626afcad71223e636c47c082… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:05 2021 +0100 gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 8 -------- dlls/gdi32/driver.c | 24 ------------------------ dlls/gdi32/enhmfdrv/init.c | 4 ---- dlls/gdi32/font.c | 4 ---- dlls/gdi32/mfdrv/init.c | 4 ---- dlls/gdi32/path.c | 4 ---- dlls/wineandroid.drv/init.c | 4 ---- dlls/winemac.drv/gdi.c | 4 ---- dlls/wineps.drv/init.c | 4 ---- dlls/winex11.drv/init.c | 4 ---- dlls/winex11.drv/xrender.c | 4 ---- include/wine/gdi_driver.h | 6 +----- 12 files changed, 1 insertion(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=626afcad71223e636c47…

1 0

Jan Sikorski : wined3d: Track queries started inside/outside of a render pass separately.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: ba67dfe8c8e62edb7e7b9d62f3bd2305b1223d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba67dfe8c8e62edb7e7b9d62… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jul 28 13:42:13 2021 +0200 wined3d: Track queries started inside/outside of a render pass separately. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 28 ++++++++++++++++-- dlls/wined3d/query.c | 64 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 7 ++++- 3 files changed, 81 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba67dfe8c8e62edb7e7b…

1 0

Zebediah Figura : wined3d: Use a designated initializer to initialize wined3d_settings.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 203dd2b640e448ccb29cc9f0e8dd58f294e65cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203dd2b640e448ccb29cc9f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:11:26 2021 -0500 wined3d: Use a designated initializer to initialize wined3d_settings. And replace ~0u with the more meaningful UINT_MAX. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 293359714c3..6e93b8dc683 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -110,25 +110,21 @@ CRITICAL_SECTION wined3d_command_cs = {&wined3d_command_cs_debug, -1, 0, 0, 0, 0 * where appropriate. */ struct wined3d_settings wined3d_settings = { - WINED3D_CSMT_ENABLE, /* Multithreaded CS by default. */ - MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ - ORM_FBO, /* Use FBOs to do offscreen rendering */ - PCI_VENDOR_NONE,/* PCI Vendor ID */ - PCI_DEVICE_NONE,/* PCI Device ID */ - 0, /* The default of memory is set in init_driver_info */ - NULL, /* No wine logo by default */ - TRUE, /* Prefer multisample textures to multisample renderbuffers. */ - ~0u, /* Don't force a specific sample count by default. */ - FALSE, /* Don't range check relative addressing indices in float constants. */ - FALSE, /* No strict shader math by default. */ - ~0U, /* No VS shader model limit by default. */ - ~0U, /* No HS shader model limit by default. */ - ~0U, /* No DS shader model limit by default. */ - ~0U, /* No GS shader model limit by default. */ - ~0U, /* No PS shader model limit by default. */ - ~0u, /* No CS shader model limit by default. */ - WINED3D_RENDERER_AUTO, - WINED3D_SHADER_BACKEND_AUTO, + .cs_multithreaded = WINED3D_CSMT_ENABLE, + .max_gl_version = MAKEDWORD_VERSION(4, 4), + .offscreen_rendering_mode = ORM_FBO, + .pci_vendor_id = PCI_VENDOR_NONE, + .pci_device_id = PCI_DEVICE_NONE, + .multisample_textures = TRUE, + .sample_count = ~0u, + .max_sm_vs = UINT_MAX, + .max_sm_ps = UINT_MAX, + .max_sm_ds = UINT_MAX, + .max_sm_hs = UINT_MAX, + .max_sm_gs = UINT_MAX, + .max_sm_cs = UINT_MAX, + .renderer = WINED3D_RENDERER_AUTO, + .shader_backend = WINED3D_SHADER_BACKEND_AUTO, }; struct wined3d * CDECL wined3d_create(DWORD flags)

1 0

Jan Sikorski : wined3d: Do not request device local memory if we also want it to be host visible.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: ad0b459ebe601e5e9f4de5ca0964cf9d4e94244a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad0b459ebe601e5e9f4de5ca… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Jul 29 13:52:26 2021 +0200 wined3d: Do not request device local memory if we also want it to be host visible. Some implementations do not support this combination. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..4420885b15f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1410,12 +1410,12 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf FIXME("Ignoring some bind flags %#x.\n", bind_flags); memory_type = 0; - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 6760eea1f057f1a52bbbce13dba68a1bc34dac58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6760eea1f057f1a52bbbce13… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:09 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 85763d032ed..12a6ef418ba 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1867,6 +1867,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9c2d58827ba..902f9e07b48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3627,8 +3627,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DROP_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); - case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 0f04cc824a8..2c0f1a1e23c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -212,6 +212,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 15b3ab9b5ba1201df2d233f6fb7d8989f76ed94d URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b3ab9b5ba1201df2d233f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:10 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 12a6ef418ba..f0876c4c13a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1870,6 +1870,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 902f9e07b48..e41c5983e48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2416,6 +2416,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); case WS_IPV6_MULTICAST_IF: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); + case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: diff --git a/include/wine/afd.h b/include/wine/afd.h index 2c0f1a1e23c..30753cb93ab 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -213,6 +213,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: a3f3ecf1266004294c5a4acf9b82580146a0315f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f3ecf1266004294c5a4acf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:11 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f0876c4c13a..123b5323674 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1873,6 +1873,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e41c5983e48..8548e7bf3a7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3633,6 +3633,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); case WS_IPV6_MULTICAST_IF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); + case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 30753cb93ab..284e8f55bc4 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -214,6 +214,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: aab6e604a904bc4518f8d964b34151f3e3d4a37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab6e604a904bc4518f8d964… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:12 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 123b5323674..14bdaed19f7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1876,6 +1876,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8548e7bf3a7..432f3a26f30 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2419,6 +2419,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); case WS_IPV6_MULTICAST_LOOP: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 284e8f55bc4..3d4dcf539cd 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -215,6 +215,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 15bc605224fe0c0d9efc9e271ee2b3195fc77f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bc605224fe0c0d9efc9e27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:13 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 14bdaed19f7..e9239bd7bb9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1879,6 +1879,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 432f3a26f30..1f8020b5c3e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3638,6 +3638,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); case WS_IPV6_MULTICAST_LOOP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: diff --git a/include/wine/afd.h b/include/wine/afd.h index 3d4dcf539cd..6c84b72c028 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -216,6 +216,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(274) struct afd_create_params {

1 0