- Wine-Devel - list.winehq.org

[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

[PATCH v2 3/9] gdi32: Directly use ntdll in init_font_options.
by Jacek Caban Sept. 28, 2021

Sept. 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed commit message. dlls/gdi32/font.c | 61 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 26 deletions(-)

3 3

[PATCH vkd3d 4/4] vkd3d-shader/sm4: Skip second-order extended operands.
by Henri Verbeet Sept. 28, 2021

Sept. 28, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6afb92c5..23814a35 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1213,6 +1213,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr } extended = *(*ptr)++; + if (extended & VKD3D_SM4_EXTENDED_OPERAND) + { + FIXME("Skipping second-order extended operand.\n"); + *ptr += *ptr < end; + } + type = extended & VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK; if (type == VKD3D_SM4_EXTENDED_OPERAND_MODIFIER) { @@ -1254,7 +1260,8 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->non_uniform = true; extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK - | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK); + | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK + | VKD3D_SM4_EXTENDED_OPERAND); if (extended) FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); } -- 2.20.1

1 0

[PATCH vkd3d 3/4] vkd3d-shader/sm4: Parse the "non-uniform" modifier.
by Henri Verbeet Sept. 28, 2021

Sept. 28, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 6 +++++- libs/vkd3d-shader/sm4.h | 3 +++ libs/vkd3d-shader/trace.c | 9 +++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f325d9b7..6afb92c5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1200,6 +1200,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->type = register_type_table[register_type]; } param->precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; + param->non_uniform = false; param->data_type = data_type; *modifier = VKD3DSPSM_NONE; @@ -1249,8 +1250,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->precision = register_precision_table[precision]; } + if (extended & VKD3D_SM4_REGISTER_NON_UNIFORM_MASK) + param->non_uniform = true; + extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK - | VKD3D_SM4_REGISTER_PRECISION_MASK); + | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK); if (extended) FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); } diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index e811f198..3ac41cb0 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -104,6 +104,9 @@ #define VKD3D_SM4_REGISTER_PRECISION_SHIFT 14 #define VKD3D_SM4_REGISTER_PRECISION_MASK (0x7u << VKD3D_SM4_REGISTER_PRECISION_SHIFT) +#define VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT 17 +#define VKD3D_SM4_REGISTER_NON_UNIFORM_MASK (0x1u << VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT) + #define VKD3D_SM4_ADDRESSING_SHIFT2 28 #define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index dba50d2a..45f38d13 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1202,6 +1202,13 @@ static void shader_print_precision(struct vkd3d_d3d_asm_compiler *compiler, cons vkd3d_string_buffer_printf(buffer, " {%s%s%s}", compiler->colours.modifier, precision, compiler->colours.reset); } +static void shader_print_non_uniform(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) +{ + if (reg->non_uniform) + vkd3d_string_buffer_printf(&compiler->buffer, " {%snonuniform%s}", + compiler->colours.modifier, compiler->colours.reset); +} + static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_dst_param *param, bool is_declaration) { @@ -1230,6 +1237,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, } shader_print_precision(compiler, &param->reg); + shader_print_non_uniform(compiler, &param->reg); } static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1302,6 +1310,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "|"); shader_print_precision(compiler, &param->reg); + shader_print_non_uniform(compiler, &param->reg); } static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b48b901f..8b3e7624 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -633,6 +633,7 @@ struct vkd3d_shader_register { enum vkd3d_shader_register_type type; enum vkd3d_shader_register_precision precision; + bool non_uniform; enum vkd3d_data_type data_type; struct vkd3d_shader_register_index idx[3]; enum vkd3d_immconst_type immconst_type; -- 2.20.1

1 0