May 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Normalize bools when loading from uniforms or vertex input.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 6e677def71960c3e0c691b4c48a32e466bb8508c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e677def71960c3e0c691b4c48a32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 15:51:21 2023 -0500 vkd3d-shader/hlsl: Normalize bools when loading from uniforms or vertex input. --- libs/vkd3d-shader/tpf.c | 40 +++++++++++++++++++++++++++++++++++++--- tests/bool-semantics.shader_test | 2 +- tests/cast-to-int.shader_test | 2 +- tests/cast-to-uint.shader_test | 2 +- tests/hlsl-bool-cast.shader_test | 2 +- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 1889ee76..38d5c180 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4382,19 +4382,53 @@ static void write_sm4_jump(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +/* Does this variable's data come directly from the API user, rather than being + * temporary or from a previous shader stage? + * I.e. is it a uniform or VS input? */ +static bool var_is_user_input(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var) +{ + if (var->is_uniform) + return true; + + return var->is_input_semantic && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX; +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { + const struct hlsl_type *type = load->node.data_type; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_MOV; sm4_dst_from_node(&instr.dsts[0], &load->node); instr.dst_count = 1; - sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, load->node.data_type, instr.dsts[0].writemask); - instr.src_count = 1; + assert(type->class <= HLSL_CLASS_LAST_NUMERIC); + if (type->base_type == HLSL_TYPE_BOOL && var_is_user_input(ctx, load->src.var)) + { + struct hlsl_constant_value value; + + /* Uniform bools can be specified as anything, but internal bools always + * have 0 for false and ~0 for true. Normalize that here. */ + + instr.opcode = VKD3D_SM4_OP_MOVC; + + sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, type, instr.dsts[0].writemask); + + memset(&value, 0xff, sizeof(value)); + sm4_src_from_constant_value(&instr.srcs[1], &value, type->dimx, instr.dsts[0].writemask); + memset(&value, 0, sizeof(value)); + sm4_src_from_constant_value(&instr.srcs[2], &value, type->dimx, instr.dsts[0].writemask); + instr.src_count = 3; + } + else + { + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, type, instr.dsts[0].writemask); + instr.src_count = 1; + } write_sm4_instruction(buffer, &instr); } diff --git a/tests/bool-semantics.shader_test b/tests/bool-semantics.shader_test index 0e42fdf9..bcbd9f9b 100644 --- a/tests/bool-semantics.shader_test +++ b/tests/bool-semantics.shader_test @@ -50,4 +50,4 @@ float4 main(struct input i) : sv_target [test] draw triangle strip 4 -todo probe all rgba (0.0, 2.0, 2.0, 2.0) +probe all rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index 4c5d0e2f..fe8c79a3 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -20,7 +20,7 @@ uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 66f7267e..4ffc041a 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -20,7 +20,7 @@ uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index b0913bb8..09ca12e2 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -45,4 +45,4 @@ float4 main() : sv_target [test] uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000 draw quad -todo probe all rgba (2.0, 2.0, 2.0, 0.0) +probe all rgba (2.0, 2.0, 2.0, 0.0)

1 0

Zebediah Figura : tests: Test bool semantics.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 3cce4e70e90e63b162655f79e6be94b2d3d7eefc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3cce4e70e90e63b162655f79e6be9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 20 19:46:27 2023 -0500 tests: Test bool semantics. --- Makefile.am | 1 + tests/bool-semantics.shader_test | 53 ++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 6 +++-- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index b9fd06ee..b689d12e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_shader_tests = \ tests/array-parameters.shader_test \ tests/asuint.shader_test \ tests/bitwise.shader_test \ + tests/bool-semantics.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-compatible.shader_test \ tests/cast-componentwise-equal.shader_test \ diff --git a/tests/bool-semantics.shader_test b/tests/bool-semantics.shader_test new file mode 100644 index 00000000..0e42fdf9 --- /dev/null +++ b/tests/bool-semantics.shader_test @@ -0,0 +1,53 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32b32a32 uint apple +0 r32g32 int sv_position + +[vertex buffer 0] +format r32 uint +0 1 0x80000000 0xffffffff -2 -2 +0 1 0x80000000 0xffffffff -2 2 +0 1 0x80000000 0xffffffff 2 -2 +0 1 0x80000000 0xffffffff 2 2 + +[vertex shader] + +struct input +{ + bool4 apple : apple; + int4 pos : sv_position; +}; + +struct output +{ + bool4 apple : apple; + int4 fapple : apple1; + float4 pos : sv_position; +}; + +void main(in struct input i, out struct output o, uint id : SV_VertexID) +{ + o.apple = i.apple; + o.fapple = i.apple; + o.pos = i.pos; +} + +[pixel shader] + +struct input +{ + bool4 apple : apple; + int4 fapple : apple1; + float4 pos : sv_position; +}; + +float4 main(struct input i) : sv_target +{ + return i.apple + i.fapple; +} + +[test] +draw triangle strip 4 +todo probe all rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f1d93457..8c66ff5e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -152,7 +152,9 @@ static DXGI_FORMAT parse_format(const char *line, enum texture_data_type *data_t formats[] = { {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, + {"r32g32b32a32 uint", TEXTURE_DATA_UINT, 16, DXGI_FORMAT_R32G32B32A32_UINT}, {"r32g32 float", TEXTURE_DATA_FLOAT, 8, DXGI_FORMAT_R32G32_FLOAT}, + {"r32g32 int", TEXTURE_DATA_SINT, 8, DXGI_FORMAT_R32G32_SINT}, {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, @@ -270,11 +272,11 @@ static void parse_resource_directive(struct resource_params *resource, const cha break; case TEXTURE_DATA_SINT: - u.i = strtol(line, &rest, 10); + u.i = strtol(line, &rest, 0); break; case TEXTURE_DATA_UINT: - u.u = strtoul(line, &rest, 10); + u.u = strtoul(line, &rest, 0); break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce an sm4_src_from_constant_value() helper.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 834497d5acf48425d89aabf3a64c8971c8aa2918 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/834497d5acf48425d89aabf3a64c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 15:50:53 2023 -0500 vkd3d-shader/hlsl: Introduce an sm4_src_from_constant_value() helper. --- libs/vkd3d-shader/tpf.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e45bab6c..1889ee76 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3199,6 +3199,29 @@ static void sm4_src_from_node(struct sm4_src_register *src, src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); } +static void sm4_src_from_constant_value(struct sm4_src_register *src, + const struct hlsl_constant_value *value, unsigned int width, unsigned int map_writemask) +{ + src->swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + src->reg.type = VKD3D_SM4_RT_IMMCONST; + if (width == 1) + { + src->reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + src->reg.immconst_uint[0] = value->u[0].u; + } + else + { + unsigned int i, j = 0; + + src->reg.dim = VKD3D_SM4_DIMENSION_VEC4; + for (i = 0; i < 4; ++i) + { + if (map_writemask & (1u << i)) + src->reg.immconst_uint[i] = value->u[j++].u; + } + } +} + static uint32_t sm4_encode_register(const struct sm4_register *reg) { return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) @@ -3609,7 +3632,6 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, { const unsigned int dimx = constant->node.data_type->dimx; struct sm4_instruction instr; - struct sm4_register *reg = &instr.srcs[0].reg; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; @@ -3617,24 +3639,7 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, sm4_dst_from_node(&instr.dsts[0], &constant->node); instr.dst_count = 1; - instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; - reg->type = VKD3D_SM4_RT_IMMCONST; - if (dimx == 1) - { - reg->dim = VKD3D_SM4_DIMENSION_SCALAR; - reg->immconst_uint[0] = constant->value.u[0].u; - } - else - { - unsigned int i, j = 0; - - reg->dim = VKD3D_SM4_DIMENSION_VEC4; - for (i = 0; i < 4; ++i) - { - if (instr.dsts[0].writemask & (1u << i)) - reg->immconst_uint[i] = constant->value.u[j++].u; - } - } + sm4_src_from_constant_value(&instr.srcs[0], &constant->value, dimx, instr.dsts[0].writemask); instr.src_count = 1, write_sm4_instruction(buffer, &instr);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Put the hlsl_ir_constant value in a structure.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 0a44e6043e6a66dc6a54dd08892e5254435c8134 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a44e6043e6a66dc6a54dd08892e5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:39:55 2022 -0600 vkd3d-shader/hlsl: Put the hlsl_ir_constant value in a structure. --- libs/vkd3d-shader/hlsl.c | 16 ++--- libs/vkd3d-shader/hlsl.h | 15 ++-- libs/vkd3d-shader/hlsl.y | 10 +-- libs/vkd3d-shader/hlsl_codegen.c | 37 +++++----- libs/vkd3d-shader/hlsl_constant_ops.c | 124 +++++++++++++++++----------------- libs/vkd3d-shader/tpf.c | 10 +-- 6 files changed, 106 insertions(+), 106 deletions(-)

1 0

Zebediah Figura : tests: Test casting from a bool uniform.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 8b4e70dfee137b2660cfc18bfe1eb7b3eaef8bfe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8b4e70dfee137b2660cfc18bfe1eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 15:17:53 2023 -0500 tests: Test casting from a bool uniform. --- tests/hlsl-bool-cast.shader_test | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index 397cbcc0..b0913bb8 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -13,9 +13,11 @@ float4 main() : SV_TARGET draw quad probe all rgba (0.0, 0.0, 1.0, 1.0) + [require] shader model >= 4.0 + [pixel shader] uniform float4 x; uniform int4 y; @@ -30,3 +32,17 @@ uniform 0 float4 0.0 0.0 2.0 4.0 uniform 4 int4 0 1 0 10 draw quad probe all rgba (0.0, 10.0, 1.0, 11.0) + + +[pixel shader] +uniform bool4 b; + +float4 main() : sv_target +{ + return (float4)b + (float4)(int4)b; +} + +[test] +uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000 +draw quad +todo probe all rgba (2.0, 2.0, 2.0, 0.0)

1 0

Piotr Caban : winspool: Change CUPS printers print processor to wineps.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: wine Branch: master Commit: 7034fc297bf730427c6c808cb3f574b56f50b60f URL: https://gitlab.winehq.org/wine/wine/-/commit/7034fc297bf730427c6c808cb3f574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 1 13:11:42 2023 +0200 winspool: Change CUPS printers print processor to wineps. --- dlls/winspool.drv/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7e1e6138ff2..2f2529ea01b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -720,7 +720,7 @@ static BOOL init_unix_printers( void ) HANDLE added_printer; PRINTER_INFO_2W pi2; NTSTATUS status; - WCHAR raw[] = L"RAW", winprint[] = L"WinPrint", empty[] = L""; + WCHAR raw[] = L"RAW", wineps[] = L"wineps", empty[] = L""; int i; if (create_printers_reg_key( system_printers_key, &printers_key )) @@ -753,6 +753,8 @@ static BOOL init_unix_printers( void ) RegDeleteValueW( printer_key, May_Delete_Value ); /* flag that the PPD file should be checked for an update */ set_reg_DWORD( printer_key, L"Status", status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + RegSetValueExW( printer_key, L"Print Processor", 0, REG_SZ, (const BYTE*)wineps, + (wcslen( wineps ) + 1) * sizeof(WCHAR)); RegCloseKey( printer_key ); } else @@ -767,7 +769,7 @@ static BOOL init_unix_printers( void ) memset( &pi2, 0, sizeof(PRINTER_INFO_2W) ); pi2.pPrinterName = printer->name; pi2.pDatatype = raw; - pi2.pPrintProcessor = winprint; + pi2.pPrintProcessor = wineps; pi2.pDriverName = printer->name; pi2.pComment = printer->comment; pi2.pLocation = printer->location;

1 0

Piotr Caban : wineps: Remove no longer used graphic driver functions.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: wine Branch: master Commit: eb73012a01c4ef83728a4c7e709fa24b0d59b6eb URL: https://gitlab.winehq.org/wine/wine/-/commit/eb73012a01c4ef83728a4c7e709fa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 1 13:34:23 2023 +0200 wineps: Remove no longer used graphic driver functions. --- dlls/wineps.drv/init.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ded8224e1d7..80b6a8e8036 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -765,25 +765,25 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pAbortPath */ NULL, /* pAlphaBlend */ NULL, /* pAngleArc */ - PSDRV_Arc, /* pArc */ + NULL, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ NULL, /* pBlendImage */ - PSDRV_Chord, /* pChord */ + NULL, /* pChord */ NULL, /* pCloseFigure */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ PSDRV_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ - PSDRV_Ellipse, /* pEllipse */ - PSDRV_EndDoc, /* pEndDoc */ - PSDRV_EndPage, /* pEndPage */ + NULL, /* pEllipse */ + NULL, /* pEndDoc */ + NULL, /* pEndPage */ NULL, /* pEndPath */ PSDRV_EnumFonts, /* pEnumFonts */ PSDRV_ExtEscape, /* pExtEscape */ NULL, /* pExtFloodFill */ - PSDRV_ExtTextOut, /* pExtTextOut */ - PSDRV_FillPath, /* pFillPath */ + NULL, /* pExtTextOut */ + NULL, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ @@ -813,42 +813,42 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pGradientFill */ NULL, /* pInvertRgn */ - PSDRV_LineTo, /* pLineTo */ + NULL, /* pLineTo */ NULL, /* pMoveTo */ - PSDRV_PaintRgn, /* pPaintRgn */ - PSDRV_PatBlt, /* pPatBlt */ - PSDRV_Pie, /* pPie */ - PSDRV_PolyBezier, /* pPolyBezier */ - PSDRV_PolyBezierTo, /* pPolyBezierTo */ + NULL, /* pPaintRgn */ + NULL, /* pPatBlt */ + NULL, /* pPie */ + NULL, /* pPolyBezier */ + NULL, /* pPolyBezierTo */ NULL, /* pPolyDraw */ - PSDRV_PolyPolygon, /* pPolyPolygon */ - PSDRV_PolyPolyline, /* pPolyPolyline */ + NULL, /* pPolyPolygon */ + NULL, /* pPolyPolyline */ NULL, /* pPolylineTo */ - PSDRV_PutImage, /* pPutImage */ + NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - PSDRV_Rectangle, /* pRectangle */ + NULL, /* pRectangle */ PSDRV_ResetDC, /* pResetDC */ - PSDRV_RoundRect, /* pRoundRect */ + NULL, /* pRoundRect */ NULL, /* pSelectBitmap */ - PSDRV_SelectBrush, /* pSelectBrush */ + NULL, /* pSelectBrush */ PSDRV_SelectFont, /* pSelectFont */ - PSDRV_SelectPen, /* pSelectPen */ - PSDRV_SetBkColor, /* pSetBkColor */ + NULL, /* pSelectPen */ + NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ - PSDRV_SetDCBrushColor, /* pSetDCBrushColor */ - PSDRV_SetDCPenColor, /* pSetDCPenColor */ + NULL, /* pSetDCBrushColor */ + NULL, /* pSetDCPenColor */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ - PSDRV_SetPixel, /* pSetPixel */ - PSDRV_SetTextColor, /* pSetTextColor */ - PSDRV_StartDoc, /* pStartDoc */ - PSDRV_StartPage, /* pStartPage */ + NULL, /* pSetPixel */ + NULL, /* pSetTextColor */ + NULL, /* pStartDoc */ + NULL, /* pStartPage */ NULL, /* pStretchBlt */ NULL, /* pStretchDIBits */ - PSDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ - PSDRV_StrokePath, /* pStrokePath */ + NULL, /* pStrokeAndFillPath */ + NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */

1 0

Piotr Caban : Revert "wineps: Fix default device font selection.".
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: wine Branch: master Commit: 50e18d19cc61e13588caf98f64176a3358e77f49 URL: https://gitlab.winehq.org/wine/wine/-/commit/50e18d19cc61e13588caf98f64176a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 28 19:58:33 2023 +0200 Revert "wineps: Fix default device font selection.". This reverts commit 4216179eaa75a12a48d96567b599be0af79e75d2. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/printproc.c | 2 -- dlls/wineps.drv/psdrv.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 39c7e2a4a7f..ded8224e1d7 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -92,7 +92,7 @@ static const PSDRV_DEVMODE DefaultDevmode = HINSTANCE PSDRV_hInstance = 0; HANDLE PSDRV_Heap = 0; -HFONT PSDRV_DefaultFont = 0; +static HFONT PSDRV_DefaultFont = 0; static const LOGFONTA DefaultLogFont = { 100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 39a46f8d6c3..e5376b43a4e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1147,8 +1147,6 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, if (i & 0x80000000) { *pattern = NULL; - if ((i & 0x7fffffff) == DEVICE_DEFAULT_FONT) - return PSDRV_DefaultFont; return GetStockObject(i & 0x7fffffff); } *pattern = data->patterns + i; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index bfa2807ce6f..07a625d43d2 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -417,7 +417,6 @@ extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates inc extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern HFONT PSDRV_DefaultFont DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wineps: Use only TrueType fonts in print processor.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: wine Branch: master Commit: eec01270c06f2e7b1fdf37709ee79fad53c091f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/eec01270c06f2e7b1fdf37709ee79f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 1 12:25:23 2023 +0200 wineps: Use only TrueType fonts in print processor. --- dlls/wineps.drv/printproc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9786f5f83df..39a46f8d6c3 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -185,8 +185,21 @@ static BOOL CDECL font_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) { + HFONT tt_font, old_font; + LOGFONTW lf; + *aa_flags = GGO_BITMAP; - return SelectObject(dev->hdc, hfont) ? hfont : 0; + if (!GetObjectW(hfont, sizeof(lf), &lf)) + return 0; + + lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; + tt_font = CreateFontIndirectW(&lf); + if (!tt_font) + return 0; + + old_font = SelectObject(dev->hdc, tt_font); + DeleteObject(tt_font); + return old_font ? hfont : 0; } static const struct gdi_dc_funcs font_funcs =

1 0

Piotr Caban : win32u: Don't allow bitmap fonts if OUT_TT_ONLY_PRECIS output precision is specified.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: wine Branch: master Commit: 857b25e548b06838ee00dcda84206329784132af URL: https://gitlab.winehq.org/wine/wine/-/commit/857b25e548b06838ee00dcda842063… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 1 11:49:57 2023 +0200 win32u: Don't allow bitmap fonts if OUT_TT_ONLY_PRECIS output precision is specified. --- dlls/win32u/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 1590ab00483..cdac88836b9 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -4622,6 +4622,9 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) break; } + if (lf.lfOutPrecision == OUT_TT_ONLY_PRECIS) + can_use_bitmap = FALSE; + lf.lfWidth = abs(lf.lfWidth); TRACE( "%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n",

1 0