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

Zebediah Figura : wined3d: Separate a helper to update Vulkan sampler bindings.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 5fe58921bfbee6f1ea12db800ff0534f86129bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fe58921bfbee6f1ea12db80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 11:50:44 2021 -0500 wined3d: Separate a helper to update Vulkan sampler bindings. 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/context_vk.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 23c249c682c..0d38b9eb5ea 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2784,6 +2784,21 @@ static bool wined3d_shader_descriptor_writes_vk_add_uav_counter_write( VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, NULL, NULL, &uav_vk->vk_counter_view); } +static bool wined3d_shader_descriptor_writes_vk_add_sampler_write(struct wined3d_shader_descriptor_writes_vk *writes, + struct wined3d_context_vk *context_vk, VkDescriptorSet vk_descriptor_set, const struct wined3d_state *state, + const struct wined3d_shader_resource_binding *binding) +{ + struct wined3d_sampler *sampler; + + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + return false; + wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); + return true; +} + static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { @@ -2796,7 +2811,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkPipelineLayout vk_pipeline_layout; VkPipelineBindPoint vk_bind_point; VkDescriptorSet vk_descriptor_set; - struct wined3d_sampler *sampler; VkResult vr; size_t i; @@ -2859,12 +2873,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: - if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) - sampler = context_vk->c.device->null_sampler; - if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, - VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + if (!wined3d_shader_descriptor_writes_vk_add_sampler_write(writes, + context_vk, vk_descriptor_set, state, binding)) return false; - wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); break; default:

1 0

Zebediah Figura : wined3d: Implement constant buffer offsetting for Vulkan.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: f838d5a2b9589de49b656434227ece434df2391c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f838d5a2b9589de49b656434… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 11:50:45 2021 -0500 wined3d: Implement constant buffer offsetting for Vulkan. 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/context_vk.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0d38b9eb5ea..4b1bea38370 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2652,19 +2652,21 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d static bool wined3d_shader_descriptor_writes_vk_add_cbv_write(struct wined3d_shader_descriptor_writes_vk *writes, struct wined3d_context_vk *context_vk, VkDescriptorSet vk_descriptor_set, const struct wined3d_state *state, - const struct wined3d_shader_resource_binding *binding) + const struct wined3d_shader_resource_binding *binding, VkDescriptorBufferInfo *buffer_info) { + const struct wined3d_constant_buffer_state *cb_state = &state->cb[binding->shader_type][binding->resource_idx]; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + if (!(buffer = cb_state->buffer)) return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, &device_vk->null_resources_vk.buffer_info, NULL, NULL); buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + *buffer_info = *wined3d_buffer_vk_get_buffer_info(buffer_vk); + buffer_info->offset += cb_state->offset; + buffer_info->range = min(cb_state->size, buffer_info->range); if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) return false; @@ -2803,6 +2805,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + VkDescriptorBufferInfo buffers[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; @@ -2849,8 +2852,8 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!wined3d_shader_descriptor_writes_vk_add_cbv_write(writes, - context_vk, vk_descriptor_set, state, binding)) + if (!wined3d_shader_descriptor_writes_vk_add_cbv_write(writes, context_vk, vk_descriptor_set, + state, binding, &buffers[binding->shader_type][binding->resource_idx])) return false; break;

1 0

Jacek Caban : gdi32: Use NtGdiPolyDraw for PolyDraw implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 11f09c2d74d0eaeeaba5f93544166f87881b7f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f09c2d74d0eaeeaba5f935… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:48:48 2021 +0200 gdi32: Use NtGdiPolyDraw for PolyDraw implementation. 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/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/graphics.c | 22 ++++++++++++++++------ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/painting.c | 13 +++++-------- dlls/gdi32/tests/metafile.c | 9 +++++++++ 6 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index b2b6bb4866e..7af63eed23b 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -671,18 +671,6 @@ static BOOL CDECL emfpathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx )); } -/*********************************************************************** - * emfpathdrv_PolyDraw - */ -static BOOL CDECL emfpathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyDraw ); - - return (emfdev->funcs->pPolyDraw( emfdev, pts, types, count ) && - next->funcs->pPolyDraw( next, pts, types, count )); -} - static const struct gdi_dc_funcs emfpath_driver = { @@ -757,7 +745,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pPie */ NULL, /* pPolyBezier */ NULL, /* pPolyBezierTo */ - emfpathdrv_PolyDraw, /* pPolyDraw */ + NULL, /* pPolyDraw */ NULL, /* pPolyPolygon */ NULL, /* pPolyPolyline */ NULL, /* pPolylineTo */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 80cffdbdebf..7c800148cf8 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -741,11 +741,11 @@ BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, } /********************************************************************** - * EMFDRV_PolyDraw + * EMFDC_PolyDraw */ -BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) +BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWORD count ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRPOLYDRAW *emr; BOOL ret; BYTE *types_dest; @@ -765,18 +765,28 @@ BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DW memcpy( types_dest, types, count ); if (count & 3) memset( types_dest + count, 0, 4 - (count & 3) ); - if (!physDev->path) + if (!emf->path) get_points_bounds( &emr->rclBounds, pts, count, 0 ); else emr->rclBounds = empty_bounds; - ret = EMFDRV_WriteRecord( dev, &emr->emr ); - if (ret && !physDev->path) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); + ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr ); + if (ret && !emf->path) EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds ); HeapFree( GetProcessHeap(), 0, emr ); return ret; } +/********************************************************************** + * EMFDRV_PolyDraw + */ +BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + + /********************************************************************** * EMFDRV_ExtFloodFill */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fd36712dfbc..f7b04be18dc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -71,6 +71,8 @@ extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezierTo( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *points, const BYTE *types, + DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyPolyline( DC_ATTR *dc_attr, const POINT *points, const DWORD *counts, DWORD polys ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT *counts, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c51892d3a9e..c6a8cbd567f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -337,3 +337,17 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count ) if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE; return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolylineTo ); } + +/*********************************************************************** + * PolyDraw (GDI32.@) + */ +BOOL WINAPI PolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWORD count ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, %p, %p, %u\n", hdc, points, types, count ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PolyDraw( dc_attr, points, types, count )) return FALSE; + return NtGdiPolyDraw( hdc, points, types, count ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 9c7081296df..f9fa18c4de0 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -699,24 +699,21 @@ BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAn } /*********************************************************************** - * PolyDraw (GDI32.@) + * NtGdiPolyDraw (win32u.@) */ -BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, - DWORD cCount) +BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWORD count ) { DC *dc = get_dc_ptr( hdc ); PHYSDEV physdev; BOOL result; - TRACE( "%p, %p, %p, %u\n", hdc, lppt, lpbTypes, cCount ); - if(!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyDraw ); - result = physdev->funcs->pPolyDraw( physdev, lppt, lpbTypes, cCount ); - if (result && cCount) - dc->attr->cur_pos = lppt[cCount - 1]; + result = physdev->funcs->pPolyDraw( physdev, points, types, count ); + if (result && count) + dc->attr->cur_pos = points[count - 1]; release_dc_ptr( dc ); return result; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4f72079a615..d9d43b80fc4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3324,6 +3324,9 @@ static void test_mf_Graphics(void) INT type; BOOL ret; + static const POINT points[] = { {1, 1}, {2, 2} }; + static const BYTE types[] = { PT_MOVETO, PT_LINETO }; + hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); @@ -3344,6 +3347,12 @@ static void test_mf_Graphics(void) ret = ArcTo(hdcMetafile, 1, 2, 30, 40, 11, 12, 23, 24 ); ok( !ret, "ArcTo succeeded\n" ); + SetLastError(0xdeadbeef); + ret = PolyDraw(hdcMetafile, points, types, ARRAY_SIZE(points)); + ok(!ret, "PolyDraw succeeded\n"); + todo_wine + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %u\n", GetLastError()); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hdcMetafile);

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for CreatePolyPolygonRgn implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 607733af0e02312e17a72d9bda64ed881207f38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=607733af0e02312e17a72d9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:49:00 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for CreatePolyPolygonRgn implementation. 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/objects.c | 10 ++++++++++ dlls/gdi32/painting.c | 4 ++++ dlls/gdi32/region.c | 9 --------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index e614a9d6a52..84ed2377954 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -281,6 +281,16 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat return NtGdiExtCreateRegion( xform, count, data ); } +/*********************************************************************** + * CreatePolyPolygonRgn (GDI32.@) + */ +HRGN WINAPI CreatePolyPolygonRgn( const POINT *points, const INT *counts, INT count, INT mode ) +{ + ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const UINT *)counts, + count, NtGdiPolyPolygonRgn ); + return ULongToHandle( ret ); +} + /*********************************************************************** * CreateRectRgnIndirect (GDI32.@) * diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f9fa18c4de0..803b9797736 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -585,6 +585,10 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts ULONG ret; DC *dc; + if (function == NtGdiPolyPolygonRgn) + return HandleToULong( create_polypolygon_region( points, (const INT *)counts, count, + HandleToULong(hdc), NULL )); + if (!(dc = get_dc_ptr( hdc ))) return FALSE; update_dc( dc ); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 502ce108a8f..4df48209de5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2692,12 +2692,3 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; } - - -/*********************************************************************** - * CreatePolyPolygonRgn (GDI32.@) - */ -HRGN WINAPI CreatePolyPolygonRgn( const POINT *pts, const INT *count, INT nbpolygons, INT mode ) -{ - return create_polypolygon_region( pts, count, nbpolygons, mode, NULL ); -}

1 0

Jacek Caban : gdi32: Store text alignment in DC_ATTR.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: aca66fb50399b862ca91a6a2e6a56a81f8bcdfdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca66fb50399b862ca91a6a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:49:19 2021 +0200 gdi32: Store text alignment 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 | 26 +++++--------------------- dlls/gdi32/enhmfdrv/graphics.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2573390c6f2..deca9510f20 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -94,7 +94,7 @@ static void set_initial_dc_state( DC *dc ) dc->brush_org.x = 0; dc->brush_org.y = 0; dc->mapperFlags = 0; - dc->textAlign = TA_LEFT | TA_TOP | TA_NOUPDATECP; + dc->attr->text_align = TA_LEFT | TA_TOP | TA_NOUPDATECP; dc->charExtra = 0; dc->breakExtra = 0; dc->breakRem = 0; @@ -409,7 +409,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; - newdc->textAlign = dc->textAlign; + newdc->attr->text_align = dc->attr->text_align; newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; @@ -486,7 +486,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->dcPenColor = dcs->dcPenColor; dc->brush_org = dcs->brush_org; dc->mapperFlags = dcs->mapperFlags; - dc->textAlign = dcs->textAlign; + dc->attr->text_align = dcs->attr->text_align; dc->charExtra = dcs->charExtra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; @@ -988,22 +988,6 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) } -/*********************************************************************** - * GetTextAlign (GDI32.@) - */ -UINT WINAPI GetTextAlign( HDC hdc ) -{ - UINT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->textAlign; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetTextAlign (GDI32.@) */ @@ -1020,8 +1004,8 @@ UINT WINAPI SetTextAlign( HDC hdc, UINT align ) align = physdev->funcs->pSetTextAlign( physdev, align ); if (align != GDI_ERROR) { - ret = dc->textAlign; - dc->textAlign = align; + ret = dc->attr->text_align; + dc->attr->text_align = align; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 7c800148cf8..67def307f1e 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -936,7 +936,7 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT BOOL ret; int textHeight = 0; int textWidth = 0; - const UINT textAlign = dc->textAlign; + const UINT textAlign = dc->attr->text_align; const INT graphicsMode = dc->attr->graphics_mode; FLOAT exScale, eyScale; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 41d6f9dda69..d89f9182b9b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5949,7 +5949,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (!dc) return FALSE; if (count > INT_MAX) return FALSE; - align = dc->textAlign; + align = dc->attr->text_align; breakRem = dc->breakRem; layout = dc->layout; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c6a8cbd567f..e2161d062b8 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -37,6 +37,15 @@ static DC_ATTR *get_dc_attr( HDC hdc ) return dc_attr; } +/*********************************************************************** + * GetTextAlign (GDI32.@) + */ +UINT WINAPI GetTextAlign( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->text_align : 0; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 4527651bb33..dc36789fdec 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -130,7 +130,6 @@ typedef struct tagDC POINT brush_org; DWORD mapperFlags; /* Font mapper flags */ - WORD textAlign; /* Text alignment from SetTextAlign() */ INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ diff --git a/include/ntgdi.h b/include/ntgdi.h index dce35a8b0b8..33c5b53f50f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -100,6 +100,7 @@ typedef struct DC_ATTR { POINT cur_pos; INT graphics_mode; + WORD text_align; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use NtGdiExtTextOutW for ExtTextOutW implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: cc7e7002ef8f92f47fe047d598dce057fcc2885b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7e7002ef8f92f47fe047d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:49:42 2021 +0200 gdi32: Use NtGdiExtTextOutW for ExtTextOutW implementation. 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/enhmfdrv/dc.c | 15 +-------------- dlls/gdi32/enhmfdrv/graphics.c | 41 +++++++++++++++++++++++++---------------- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- dlls/gdi32/mfdrv/text.c | 20 ++++++++++---------- include/ntgdi.h | 2 ++ 9 files changed, 61 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc7e7002ef8f92f47fe0…

1 0

Jacek Caban : gdi32: Use NtGdiCloseFigure for CloseFigure implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 0f3173e7d97bfcd4a189cee1916f1bc1e0fb47b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f3173e7d97bfcd4a189cee1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:50:13 2021 +0200 gdi32: Use NtGdiCloseFigure for CloseFigure implementation. 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/enhmfdrv/dc.c | 19 +++---------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 7c7c060a53b..855f01970d4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -513,15 +513,14 @@ BOOL CDECL EMFDRV_BeginPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev ) +BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) { EMRCLOSEFIGURE emr; emr.emr.iType = EMR_CLOSEFIGURE; emr.emr.nSize = sizeof(emr); - EMFDRV_WriteRecord( dev, &emr.emr ); - return FALSE; /* always fails without a path */ + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_EndPath( PHYSDEV dev ) @@ -611,18 +610,6 @@ static BOOL CDECL emfpathdrv_BeginPath( PHYSDEV dev ) return (emfdev->funcs->pBeginPath( emfdev ) && next->funcs->pBeginPath( next )); } -/*********************************************************************** - * emfpathdrv_CloseFigure - */ -static BOOL CDECL emfpathdrv_CloseFigure( PHYSDEV dev ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pCloseFigure ); - - emfdev->funcs->pCloseFigure( emfdev ); - return next->funcs->pCloseFigure( next ); -} - /*********************************************************************** * emfpathdrv_CreateDC */ @@ -670,7 +657,7 @@ static const struct gdi_dc_funcs emfpath_driver = emfpathdrv_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ NULL, /* pChord */ - emfpathdrv_CloseFigure, /* pCloseFigure */ + NULL, /* pCloseFigure */ NULL, /* pCreateCompatibleDC */ emfpathdrv_CreateDC, /* pCreateDC */ emfpathdrv_DeleteDC, /* pDeleteDC */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 128b157c45a..554f55973f6 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -71,7 +71,6 @@ extern BOOL CDECL EMFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT wid PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0aac934a87b..4e7105b1b80 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -44,8 +44,8 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_ArcTo, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ - EMFDRV_Chord, /* pChord */ - EMFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pChord */ + NULL, /* pCloseFigure */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ EMFDRV_DeleteDC, /* pDeleteDC */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ea670732f96..829dacd073c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -67,6 +67,7 @@ extern BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT extern BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD type ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *rect, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 9200803b6f0..1d2ad9766c4 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -375,3 +375,15 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return FALSE; return NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); } + +/*********************************************************************** + * CloseFigure (GDI32.@) + */ +BOOL WINAPI CloseFigure( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_CloseFigure( dc_attr )) return FALSE; + return NtGdiCloseFigure( hdc ); +} diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 3646ba91079..fc9a4d4721f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -617,11 +617,9 @@ BOOL WINAPI AbortPath( HDC hdc ) /*********************************************************************** - * CloseFigure (GDI32.@) - * - * FIXME: Check that SetLastError is being called correctly + * NtGdiCloseFigure (win32u.@) */ -BOOL WINAPI CloseFigure(HDC hdc) +BOOL WINAPI NtGdiCloseFigure( HDC hdc ) { BOOL ret = FALSE; DC *dc = get_dc_ptr( hdc );

1 0

Jacek Caban : gdi32: Use ntgdi interface for path functions.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 972cfaca1fd58bf399e033ee0b576e789404797a URL: https://source.winehq.org/git/wine.git/?a=commit;h=972cfaca1fd58bf399e033ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:50:37 2021 +0200 gdi32: Use ntgdi interface for path functions. 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/enhmfdrv/dc.c | 27 ++++++++++++--------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 --- dlls/gdi32/enhmfdrv/init.c | 6 +++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/path.c | 29 +++++++++-------------------- dlls/gdi32/tests/metafile.c | 22 ++++++++++++++-------- 7 files changed, 77 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=972cfaca1fd58bf399e0…

1 0

Huw Davies : iphlpapi: Retrieve the IPv4 addresses using an export rather than a helper.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 8d9d7fc5d2b858182ab76f29ece658616004b7c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d9d7fc5d2b858182ab76f29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:19 2021 +0100 iphlpapi: Retrieve the IPv4 addresses using an export rather than a helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6e1d95ab321..b2d597fd9ab 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -76,6 +76,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); +DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); static const NPI_MODULEID *ip_module_id( USHORT family ) { @@ -350,7 +351,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c if (!(pairs = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; ptr = (SOCKADDR_IN6 *)&pairs[dst_count]; - if ((ret = getIPAddrTable( &table, GetProcessHeap(), 0 ))) + if ((ret = AllocateAndGetIpAddrTableFromStack( &table, FALSE, GetProcessHeap(), 0 ))) { HeapFree( GetProcessHeap(), 0, pairs ); return ret;

1 0

Huw Davies : include: Add IN6_IS_ADDR_LINKLOCAL() and IN6_IS_ADDR_SITELOCAL().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: c3c20fdc0b2d937edbd958dfd939a571dc27167e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c20fdc0b2d937edbd958df… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:20 2021 +0100 include: Add IN6_IS_ADDR_LINKLOCAL() and IN6_IS_ADDR_SITELOCAL(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..2f9d4f663ad 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -323,6 +323,16 @@ static inline BOOLEAN WS(IN6_IS_ADDR_UNSPECIFIED) ( const IN6_ADDR *a ) (a->s6_words[7] == 0)); } +static inline BOOLEAN WS(IN6_IS_ADDR_LINKLOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0x80)); +} + +static inline BOOLEAN WS(IN6_IS_ADDR_SITELOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0xc0)); +} + #ifdef __cplusplus } #endif

1 0