wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Jacek Caban : gdi32: Use get_dc_attr in SetMiterLimit.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: a6400cfbcb6cba86978d610ec9fdcc602eb61b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6400cfbcb6cba86978d610e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:11 2021 +0200 gdi32: Use get_dc_attr in SetMiterLimit. 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 | 24 ------------------------ dlls/gdi32/gdidc.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4a8326c647e..a0bc86d6337 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1538,30 +1538,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } -/******************************************************************* - * SetMiterLimit [GDI32.@] - * - * - */ -BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) -{ - BOOL bRet = FALSE; - DC *dc; - - TRACE("(%p,%f,%p)\n", hdc, eNewLimit, peOldLimit); - - dc = get_dc_ptr( hdc ); - if (dc) - { - if (peOldLimit) - *peOldLimit = dc->attr->miter_limit; - dc->attr->miter_limit = eNewLimit; - release_dc_ptr( dc ); - bRet = TRUE; - } - return bRet; -} - /******************************************************************* * GdiIsMetaPrintDC [GDI32.@] */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 8d55d50f9a3..aec9ad48610 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -339,6 +339,19 @@ BOOL WINAPI GetMiterLimit( HDC hdc, FLOAT *limit ) return TRUE; } +/******************************************************************* + * SetMiterLimit (GDI32.@) + */ +BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + /* FIXME: record EMFs */ + if (old_limit) *old_limit = dc_attr->miter_limit; + dc_attr->miter_limit = limit; + return TRUE; +} + /*********************************************************************** * SetPixel (GDI32.@) */

1 0

Jacek Caban : gdi32: Store miter limit in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 06dd790c452bbf783b98380a738e1d949213ebb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06dd790c452bbf783b98380a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:05 2021 +0200 gdi32: Store miter limit 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 | 30 +++--------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 675527d4df5..4a8326c647e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,7 +79,7 @@ static void set_initial_dc_state( DC *dc ) dc->vport_org.y = 0; dc->vport_ext.cx = 1; dc->vport_ext.cy = 1; - dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ + dc->attr->miter_limit = 10.0f; /* 10.0 is the default, from MSDN */ dc->attr->layout = 0; dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; @@ -1538,30 +1538,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } -/******************************************************************* - * GetMiterLimit [GDI32.@] - * - * - */ -BOOL WINAPI GetMiterLimit(HDC hdc, PFLOAT peLimit) -{ - BOOL bRet = FALSE; - DC *dc; - - TRACE("(%p,%p)\n", hdc, peLimit); - - dc = get_dc_ptr( hdc ); - if (dc) - { - if (peLimit) - *peLimit = dc->miterLimit; - - release_dc_ptr( dc ); - bRet = TRUE; - } - return bRet; -} - /******************************************************************* * SetMiterLimit [GDI32.@] * @@ -1578,8 +1554,8 @@ BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) if (dc) { if (peOldLimit) - *peOldLimit = dc->miterLimit; - dc->miterLimit = eNewLimit; + *peOldLimit = dc->attr->miter_limit; + dc->attr->miter_limit = eNewLimit; release_dc_ptr( dc ); bRet = TRUE; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce8e3572e90..c5c805ff77e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1316,7 +1316,7 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, y = a * face_1->dy - b * face_2->dy; if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > - dc->miterLimit * dc->miterLimit * pdev->pen_width * pdev->pen_width) + dc->attr->miter_limit * dc->attr->miter_limit * pdev->pen_width * pdev->pen_width) return 0; pts[0] = face_2->start; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index be9ac3d83b9..8d55d50f9a3 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -328,6 +328,17 @@ INT WINAPI SetROP2( HDC hdc, INT mode ) return ret; } +/*********************************************************************** + * GetMiterLimit (GDI32.@) + */ +BOOL WINAPI GetMiterLimit( HDC hdc, FLOAT *limit ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (limit) *limit = dc_attr->miter_limit; + return TRUE; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 73e6fd3d21f..773f6aa007d 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -97,7 +97,6 @@ typedef struct tagDC RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ - FLOAT miterLimit; WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8a0369a82d0..634bea9bb89 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1796,7 +1796,7 @@ static struct gdi_path *PATH_WidenPath(DC *dc) alpha = atan2( yb - yo, xb - xo ) - theta; if (alpha > 0) alpha -= M_PI; else alpha += M_PI; - if(_joint == PS_JOIN_MITER && dc->miterLimit < fabs(1 / sin(alpha/2))) { + if(_joint == PS_JOIN_MITER && dc->attr->miter_limit < fabs(1 / sin(alpha/2))) { _joint = PS_JOIN_BEVEL; } if(alpha > 0) { diff --git a/include/ntgdi.h b/include/ntgdi.h index 1fffc566adc..22d1f9da187 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -114,6 +114,7 @@ typedef struct DC_ATTR WORD rel_abs_mode; WORD stretch_blt_mode; INT map_mode; + FLOAT miter_limit; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Store DC pen color in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: b9ffa2bf261d49cd72caf4a42855107e0ac91d29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ffa2bf261d49cd72caf4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:00:54 2021 +0200 gdi32: Store DC pen color 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 | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fd4a1d3abd0..675527d4df5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -89,7 +89,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); dc->attr->brush_color = RGB( 255, 255, 255 ); - dc->dcPenColor = RGB( 0, 0, 0 ); + dc->attr->pen_color = RGB( 0, 0, 0 ); dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; dc->brush_org.y = 0; @@ -398,7 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; newdc->charExtra = dc->charExtra; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; dc->attr->brush_color = dcs->attr->brush_color; - dc->dcPenColor = dcs->dcPenColor; + dc->attr->pen_color = dcs->attr->pen_color; dc->brush_org = dcs->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; @@ -1504,26 +1503,6 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) return oldClr; } -/*********************************************************************** - * GetDCPenColor (GDI32.@) - */ -COLORREF WINAPI GetDCPenColor(HDC hdc) -{ - DC *dc; - COLORREF dcPenColor = CLR_INVALID; - - TRACE("hdc(%p)\n", hdc); - - dc = get_dc_ptr( hdc ); - if (dc) - { - dcPenColor = dc->dcPenColor; - release_dc_ptr( dc ); - } - - return dcPenColor; -} - /*********************************************************************** * SetDCPenColor (GDI32.@) */ @@ -1541,8 +1520,8 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) crColor = physdev->funcs->pSetDCPenColor( physdev, crColor ); if (crColor != CLR_INVALID) { - oldClr = dc->dcPenColor; - dc->dcPenColor = crColor; + oldClr = dc->attr->pen_color; + dc->attr->pen_color = crColor; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9d2c4022759..ce8e3572e90 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2189,7 +2189,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) - logbrush.lbColor = dc->dcPenColor; + logbrush.lbColor = dc->attr->pen_color; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); select_brush( pdev, &pdev->pen_brush, &logbrush, pattern, dither ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 9e85143ce0c..be9ac3d83b9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -83,6 +83,15 @@ COLORREF WINAPI GetDCBrushColor( HDC hdc ) return dc_attr ? dc_attr->brush_color : CLR_INVALID; } +/*********************************************************************** + * GetDCPenColor (GDI32.@) + */ +COLORREF WINAPI GetDCPenColor(HDC hdc) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->pen_color : CLR_INVALID; +} + /*********************************************************************** * GetTextColor (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index fb110409357..73e6fd3d21f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - COLORREF dcPenColor; POINT brush_org; DWORD mapperFlags; /* Font mapper flags */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 1f33cfe5143..1fffc566adc 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -101,6 +101,7 @@ typedef struct DC_ATTR LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; COLORREF brush_color; + COLORREF pen_color; COLORREF text_color; POINT cur_pos; INT graphics_mode;

1 0

Jacek Caban : gdi32: Store DC brush color in DC_ATTR.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: e7abb54f430e92a559425f933b0e237ccb8294e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abb54f430e92a559425f93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:00:45 2021 +0200 gdi32: Store DC brush color 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 | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index bae1e9d21ab..fd4a1d3abd0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -88,7 +88,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); - dc->dcBrushColor = RGB( 255, 255, 255 ); + dc->attr->brush_color = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; @@ -398,7 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; - dc->dcBrushColor = dcs->dcBrushColor; + dc->attr->brush_color = dcs->attr->brush_color; dc->dcPenColor = dcs->dcPenColor; dc->brush_org = dcs->brush_org; dc->mapperFlags = dcs->mapperFlags; @@ -1479,26 +1478,6 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) return oldlayout; } -/*********************************************************************** - * GetDCBrushColor (GDI32.@) - */ -COLORREF WINAPI GetDCBrushColor(HDC hdc) -{ - DC *dc; - COLORREF dcBrushColor = CLR_INVALID; - - TRACE("hdc(%p)\n", hdc); - - dc = get_dc_ptr( hdc ); - if (dc) - { - dcBrushColor = dc->dcBrushColor; - release_dc_ptr( dc ); - } - - return dcBrushColor; -} - /*********************************************************************** * SetDCBrushColor (GDI32.@) */ @@ -1516,8 +1495,8 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) crColor = physdev->funcs->pSetDCBrushColor( physdev, crColor ); if (crColor != CLR_INVALID) { - oldClr = dc->dcBrushColor; - dc->dcBrushColor = crColor; + oldClr = dc->attr->brush_color; + dc->attr->brush_color = crColor; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3a0ea7465a6..9d2c4022759 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2137,7 +2137,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ GetObjectW( hbrush, sizeof(logbrush), &logbrush ); if (hbrush == GetStockObject( DC_BRUSH )) - logbrush.lbColor = dc->dcBrushColor; + logbrush.lbColor = dc->attr->brush_color; select_brush( pdev, &pdev->brush, &logbrush, pattern, TRUE ); return hbrush; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index bbd172239cd..9e85143ce0c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -74,6 +74,15 @@ COLORREF WINAPI GetBkColor( HDC hdc ) return dc_attr ? dc_attr->background_color : CLR_INVALID; } +/*********************************************************************** + * GetDCBrushColor (GDI32.@) + */ +COLORREF WINAPI GetDCBrushColor( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->brush_color : CLR_INVALID; +} + /*********************************************************************** * GetTextColor (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 19a5819f031..fb110409357 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index 08df860a5e6..1f33cfe5143 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -100,6 +100,7 @@ typedef struct DC_ATTR { LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; + COLORREF brush_color; COLORREF text_color; POINT cur_pos; INT graphics_mode;

1 0

Nikolay Sivov : mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 600ed80b9be874b6fc469a3640c5072b575495bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=600ed80b9be874b6fc469a36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 30 11:36:45 2021 +0300 mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 11 +++++++- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 09c65b5fcf1..d99e2b046a6 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -74,6 +74,7 @@ struct sample_allocator DXGI_FORMAT dxgi_format; unsigned int usage; unsigned int bindflags; + unsigned int miscflags; unsigned int buffer_count; } frame_desc; @@ -1352,6 +1353,7 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; else if (desc.Usage == D3D11_USAGE_STAGING) desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; + desc.MiscFlags = allocator->frame_desc.miscflags; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1380,7 +1382,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { struct surface_service service; DXGI_FORMAT dxgi_format; - unsigned int i; + unsigned int i, value; GUID major, subtype; UINT64 frame_size; IMFSample *sample; @@ -1415,6 +1417,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); allocator->frame_desc.bindflags = 0; + allocator->frame_desc.miscflags = 0; allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || @@ -1428,7 +1431,13 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u } if (attributes) + { IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED; + } sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1c041b7eb4..3e0907e41ad 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6798,6 +6798,12 @@ static void test_sample_allocator(void) D3D11_USAGE_STAGING, D3D11_USAGE_STAGING + 1, }; + static const unsigned int sharing[] = + { + D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED, + }; if (!pMFCreateVideoSampleAllocatorEx) { @@ -7155,6 +7161,67 @@ todo_wine IMFVideoSampleAllocatorEx_Release(allocatorex); } + /* MF_SA_D3D11_SHARED, MF_SA_D3D11_SHARED_WITHOUT_MUTEX */ + for (i = 0; i < ARRAY_SIZE(sharing); ++i) + { + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_SetDirectXManager(allocatorex, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteAllItems(attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, D3D11_USAGE_DEFAULT); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) + { + todo_wine + ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); + IMFVideoSampleAllocatorEx_Release(allocatorex); + continue; + } + ok(hr == S_OK, "%u: Unexpected hr %#x.\n", i, hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.MiscFlags == sharing[i], "%u: unexpected misc flags %#x.\n", i, desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorEx_Release(allocatorex); + } + IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager);

1 0

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

30 Jul '21

Module: wine Branch: master Commit: bf633a97a028c132483a4fda9f132c5c211da00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf633a97a028c132483a4fda… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 30 00:00:47 2021 -0500 ws2_32: Move the setsockopt(IPV6_V6ONLY) 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 | 23 +++++++++++++++ dlls/ws2_32/socket.c | 73 +----------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 25 insertions(+), 72 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index bda23d0b9b1..24090c1a17b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1899,6 +1899,29 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_V6ONLY: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_V6ONLY, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_V6ONLY: + { + int fd, needs_close = FALSE; + union unix_sockaddr addr; + socklen_t len = sizeof(addr); + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (!getsockname( fd, &addr.addr, &len ) && addr.addr.sa_family == AF_INET && !addr.in.sin_port) + { + /* changing IPV6_V6ONLY succeeds on an unbound IPv4 socket */ + WARN( "ignoring IPV6_V6ONLY on an unbound IPv4 socket\n" ); + return STATUS_SUCCESS; + } + + ret = setsockopt( fd, IPPROTO_IPV6, IPV6_V6ONLY, in_buffer, in_size ); + if (needs_close) close( fd ); + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30faad3a546..a28c25ec697 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1081,56 +1081,6 @@ unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *wsaddr, int wsaddrlen, return uaddrlen; } -static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) -{ - switch (uaddr->sa_family) - { -#ifdef HAS_IPX - case AF_IPX: - { - static const struct sockaddr_ipx emptyAddr; - struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; - return ipx->sipx_port - || memcmp(&ipx->sipx_network, &emptyAddr.sipx_network, sizeof(emptyAddr.sipx_network)) - || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); - } -#endif - case AF_INET6: - { - static const struct sockaddr_in6 emptyAddr; - const struct sockaddr_in6 *in6 = (const struct sockaddr_in6*) uaddr; - return in6->sin6_port || memcmp(&in6->sin6_addr, &emptyAddr.sin6_addr, sizeof(struct in6_addr)); - } - case AF_INET: - { - static const struct sockaddr_in emptyAddr; - const struct sockaddr_in *in = (const struct sockaddr_in*) uaddr; - return in->sin_port || memcmp(&in->sin_addr, &emptyAddr.sin_addr, sizeof(struct in_addr)); - } - case AF_UNSPEC: - return FALSE; - default: - FIXME("unknown address family %d\n", uaddr->sa_family); - return TRUE; - } -} - -/* Returns -1 if getsockname fails, 0 if not bound, 1 otherwise */ -static int is_fd_bound(int fd, union generic_unix_sockaddr *uaddr, socklen_t *uaddrlen) -{ - union generic_unix_sockaddr inaddr; - socklen_t inlen; - int res; - - if (!uaddr) uaddr = &inaddr; - if (!uaddrlen) uaddrlen = &inlen; - - *uaddrlen = sizeof(inaddr); - res = getsockname(fd, &uaddr->addr, uaddrlen); - if (!res) res = is_sockaddr_bound(&uaddr->addr, *uaddrlen); - return res; -} - /* Returns 0 if successful, -1 if the buffer is too small */ int ws_sockaddr_u2ws(const struct sockaddr *uaddr, struct WS_sockaddr *wsaddr, int *wsaddrlen) { @@ -3644,29 +3594,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); case WS_IPV6_V6ONLY: - { - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen; - int bound; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_V6ONLY, optval, optlen ); - fd = get_sock_fd( s, 0, NULL ); - if (fd == -1) return SOCKET_ERROR; - - bound = is_fd_bound(fd, &uaddr, &uaddrlen); - release_sock_fd( s, fd ); - if (bound == 0 && uaddr.addr.sa_family == AF_INET) - { - /* Changing IPV6_V6ONLY succeeds on AF_INET (IPv4) socket - * on Windows (with IPv6 support) if the socket is unbound. - * It is essentially a noop, though Windows does store the value - */ - WARN("Silently ignoring IPPROTO_IPV6+IPV6_V6ONLY on AF_INET socket\n"); - return 0; - } - level = IPPROTO_IPV6; - optname = IPV6_V6ONLY; - break; - } default: FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); return SOCKET_ERROR; diff --git a/include/wine/afd.h b/include/wine/afd.h index 47ddd09f1c0..9a1edb1fda6 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -222,6 +222,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF WINE_AFD_IOC(277) #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) #define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) +#define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) struct afd_create_params {

1 0

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

30 Jul '21

Module: wine Branch: master Commit: 43dfa9d437a3c42fb62e941feab9613ccf63ecb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dfa9d437a3c42fb62e941f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 30 00:00:46 2021 -0500 ws2_32: Move the getsockopt(IPV6_V6ONLY) 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 | 11 +---------- include/wine/afd.h | 1 + 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 27d7e1c06d2..bda23d0b9b1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1896,6 +1896,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IPV6_V6ONLY: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_V6ONLY, 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 769b6e5cea0..30faad3a546 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2428,16 +2428,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF, optval, optlen ); case WS_IPV6_V6ONLY: - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - return ret; + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_V6ONLY, optval, optlen ); default: FIXME( "unrecognized IPv6 option %u\n", optname ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 8aba4dd3c71..47ddd09f1c0 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -221,6 +221,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS WINE_AFD_IOC(276) #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF WINE_AFD_IOC(277) #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) +#define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) struct afd_create_params {

1 0

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

30 Jul '21

Module: wine Branch: master Commit: 81ba59bb21a27b16ab13019c0e0ca75e992003fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ba59bb21a27b16ab13019c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 30 00:00:45 2021 -0500 ws2_32: Move the setsockopt(IPV6_UNICAST_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 | 8 +++----- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 09318a279ed..27d7e1c06d2 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1891,6 +1891,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IPV6_UNICAST_IF case IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ca4f2c1831..769b6e5cea0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3642,11 +3642,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); -#ifdef IPV6_UNICAST_IF - case WS_IPV6_UNICAST_IF: -#endif - convert_sockopt(&level, &optname); - break; case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; @@ -3654,6 +3649,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_UNICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); + case WS_IPV6_UNICAST_IF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); + case WS_IPV6_V6ONLY: { union generic_unix_sockaddr uaddr; diff --git a/include/wine/afd.h b/include/wine/afd.h index b43d53522a4..8aba4dd3c71 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -220,6 +220,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS WINE_AFD_IOC(275) #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS WINE_AFD_IOC(276) #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF WINE_AFD_IOC(277) +#define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) struct afd_create_params {

1 0

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

30 Jul '21

Module: wine Branch: master Commit: a6b880a0424914aa54f409b07bd94e30daaf2178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b880a0424914aa54f409b0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 30 00:00:44 2021 -0500 ws2_32: Move the getsockopt(IPV6_UNICAST_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 | 5 +++++ dlls/ws2_32/socket.c | 6 +++--- include/wine/afd.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index efbfc375969..09318a279ed 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1888,6 +1888,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, in_buffer, in_size ); +#ifdef IPV6_UNICAST_IF + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, out_buffer, out_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3ca2ce545b4..2ca4f2c1831 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2424,10 +2424,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_UNICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); - case WS_IPV6_V6ONLY: -#ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: -#endif + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF, optval, optlen ); + + case WS_IPV6_V6ONLY: if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); diff --git a/include/wine/afd.h b/include/wine/afd.h index 64d555889f5..b43d53522a4 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -219,6 +219,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(274) #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS WINE_AFD_IOC(275) #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS WINE_AFD_IOC(276) +#define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF WINE_AFD_IOC(277) struct afd_create_params {

1 0

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

30 Jul '21

Module: wine Branch: master Commit: 717766e58f3b2807468cd66612a78ab18b851bdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=717766e58f3b2807468cd666… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 30 00:00:43 2021 -0500 ws2_32: Move the setsockopt(IPV6_UNICAST_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 | 5 ++++- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0a0ba7e2a98..efbfc375969 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1885,6 +1885,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_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 87f864d3c2b..3ca2ce545b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3642,7 +3642,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, 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: #endif @@ -3651,6 +3650,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + + case WS_IPV6_UNICAST_HOPS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); + case WS_IPV6_V6ONLY: { union generic_unix_sockaddr uaddr; diff --git a/include/wine/afd.h b/include/wine/afd.h index 9427ce46535..64d555889f5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -218,6 +218,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(274) #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS WINE_AFD_IOC(275) +#define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS WINE_AFD_IOC(276) struct afd_create_params {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021