- Wine-Devel - list.winehq.org

[PATCH v3 1/3] wined3d: Introduce wined3d_view_load_location() helper.
by Jan Sikorski Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..dfca8fc53f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -461,21 +480,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_load_location(buffer_from_resource(resource), context, location); - return; - } - - texture = texture_from_resource(resource); - sub_resource_idx = view->sub_resource_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_load_location(texture, sub_resource_idx, context, location); + wined3d_view_load_location(view->resource, &view->desc, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) -- 2.30.2

2 6

[PATCH v2 9/9] gdi32: Use single get_cptable implementation.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

3 2

[PATCH v2 7/9] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

3 2

[PATCH v2 6/9] gdi32: Introduce user_callbacks.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is one more hack to unblock the transition. Ultimately, both relevant parts of user32 and gdi32 will live in win32u, so those will be just internal calls. The plan is to move ntgdi to win32u first (we're fairly close to that with this series, but we still need to make it compatible with proper Unix lib) and then work at moving user32 bits (hopefully this can be done more incrementally). dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++----------- dlls/gdi32/freetype.c | 18 +++++ dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 ++----- dlls/gdi32/region.c | 11 +-- dlls/gdi32/win32u_private.h | 41 +++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++ 9 files changed, 246 insertions(+), 81 deletions(-) create mode 100644 dlls/gdi32/win32u_private.h create mode 100644 dlls/gdi32/wrappers.c

3 2

[PATCH v2 5/9] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

3 2

[PATCH v2 4/9] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Passing function getter to NtGdiOpenDCW is hackish, but it's meant to unblock the transition for now. This is used for printer drivers. Since DC driver interface is meant to be Unix-side-only, we will need to change it. While making wineps.drv a Unix lib would be possible, I think it would be better to mimic Windows behaviour closer. For that, we'd need to expose printer processor functionality from wineps.drv that would convert EMFs to PostScript. The existing wineps code seems to be a good base for that. We'd need to factor out driver-specific bits and call conversion functions from EMF replay. With that in place: - gdi32 would setup EMF recording for printer DCs (on PE side) - it would submit EMF records to winspool when appropriate - winspool would detect EMFs and use print processor to convert it to PS - winspool would submit PS document to the printer With that in place, hopefully only small bits of wineps.drv will still need to live in DC driver part. I hope that we will be able to move those bits directly to win32u, so no actual library loading would need to be performed by gdi32 nor ntgdi. dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

3 2

[PATCH v2 3/9] gdi32: Remove unused argument from CreateDC driver entry point.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

2 1

[PATCH v2 2/9] gdi32: Get codepages and OS version directly from PEB.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-)

2 1

[PATCH v2 1/9] gdi32: Don't use wide string literals ntgdi functions.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed build on macOS dlls/gdi32/font.c | 111 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 176 +++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 101 deletions(-)

2 1

[PATCH 1/6] dbghelp/dwarf: downgrade FIXME into WARN for empty range
by Eric Pouech Sept. 28, 2021

Sept. 28, 2021

it happens to be generated for some inline functions, that we badly support yet Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0397ffe90b2..f05186eb9c0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1236,7 +1236,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (high > *phigh) *phigh = high; } if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} - if (*plow == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} + if (*plow == *phigh) {WARN("entry found, but low=high %lx %lx\n", low, high); return FALSE;} return TRUE; } @@ -2002,7 +2002,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) { - FIXME("cannot read range\n"); + WARN("cannot read range\n"); return; }

3 7