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

Ethan Lee : vkd3d-shader/hlsl: Add support for sign() intrinsic.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 5d735f3b0ee2074344cea16bc0d44e88d8da3351 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d735f3b0ee2074344cea16bc0d44… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri Apr 21 16:13:37 2023 -0400 vkd3d-shader/hlsl: Add support for sign() intrinsic. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++ tests/sign.shader_test | 52 ++++++++++++++++++++++++------------------------ 2 files changed, 63 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 27663a0d..1ba929b5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3165,6 +3165,42 @@ static bool intrinsic_saturate(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SAT, arg, loc); } +static bool intrinsic_sign(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *lt, *neg, *op1, *op2, *arg = params->args[0]; + struct hlsl_ir_constant *zero; + + struct hlsl_type *int_type = hlsl_get_numeric_type(ctx, arg->data_type->class, HLSL_TYPE_INT, + arg->data_type->dimx, arg->data_type->dimy); + + if (!(zero = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, arg->data_type->base_type), loc))) + return false; + list_add_tail(params->instrs, &zero->node.entry); + + /* Check if 0 < arg, cast bool to int */ + + if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, &zero->node, arg, loc))) + return false; + + if (!(op1 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc))) + return false; + + /* Check if arg < 0, cast bool to int and invert (meaning true is -1) */ + + if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, arg, &zero->node, loc))) + return false; + + if (!(op2 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, op2, loc))) + return false; + + /* Adding these two together will make 1 when > 0, -1 when < 0, and 0 when neither */ + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, neg, op1, loc); +} + static bool intrinsic_sin(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3483,6 +3519,7 @@ intrinsic_functions[] = {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, + {"sign", 1, true, intrinsic_sign}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, diff --git a/tests/sign.shader_test b/tests/sign.shader_test index dc1a557f..7ed632db 100644 --- a/tests/sign.shader_test +++ b/tests/sign.shader_test @@ -1,4 +1,4 @@ -[pixel shader notimpl] +[pixel shader] uniform float f; float4 main() : sv_target @@ -8,16 +8,16 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (1.0, 1.0, 1.0, 1.0) +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 -1.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (-1.0, -1.0, -1.0, -1.0) +draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (0.0, 0.0, 0.0, 0.0) +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader notimpl] +[pixel shader] uniform float4 f; float4 main() : sv_target @@ -27,10 +27,10 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo draw quad -todo probe all rgba (1.0, 1.0, 1.0, 1.0) +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader notimpl] +[pixel shader] uniform float2x2 f; float4 main() : sv_target @@ -41,10 +41,10 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 0.0 0.0 uniform 4 float4 3.0 4.0 0.0 0.0 -todo draw quad -todo probe all rgba (1.0, 1.0, 1.0, 1.0) +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader notimpl] +[pixel shader] uniform int f; float4 main() : sv_target @@ -54,16 +54,16 @@ float4 main() : sv_target [test] uniform 0 int4 1 0 0 0 -todo draw quad -todo probe all rgba (1, 1, 1, 1) +draw quad +probe all rgba (1, 1, 1, 1) uniform 0 int4 -1 0 0 0 -todo draw quad -todo probe all rgba (-1, -1, -1, -1) +draw quad +probe all rgba (-1, -1, -1, -1) uniform 0 int4 0 0 0 0 -todo draw quad -todo probe all rgba (0, 0, 0, 0) +draw quad +probe all rgba (0, 0, 0, 0) -[pixel shader notimpl] +[pixel shader] uniform int4 f; float4 main() : sv_target @@ -73,10 +73,10 @@ float4 main() : sv_target [test] uniform 0 int4 1 2 3 4 -todo draw quad -todo probe all rgba (1, 1, 1, 1) +draw quad +probe all rgba (1, 1, 1, 1) -[pixel shader notimpl] +[pixel shader] uniform int2x2 f; float4 main() : sv_target @@ -87,5 +87,5 @@ float4 main() : sv_target [test] uniform 0 int4 1 2 0 0 uniform 4 int4 3 4 0 0 -todo draw quad -todo probe all rgba (1, 1, 1, 1) +draw quad +probe all rgba (1, 1, 1, 1)

1 0

Francisco Casas : vkd3d-shader/hlsl: Always specify resource on intrinsic_tex().
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: abb207fab068d3c2d23c34abfbd1c8341fe28935 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/abb207fab068d3c2d23c34abfbd1c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 26 14:42:17 2023 -0400 vkd3d-shader/hlsl: Always specify resource on intrinsic_tex(). Otherwise, in the added test, we get: vkd3d-compiler: vkd3d-shader/hlsl.c:452: hlsl_init_deref_from_index_chain: Assertion `chain' failed. because on the path that triggers the following error: E5002: Wrong type for argument 1 of 'tex3D': expected 'sampler' or 'sampler3D', but got 'sampler2D'. a NULL params.resource is passed to hlsl_new_resource_load() and then to hlsl_init_deref_from_index_chain(). --- libs/vkd3d-shader/hlsl.y | 5 +---- tests/sampler.shader_test | 9 +++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ba929b5..ab0b3f65 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3331,16 +3331,13 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * name, ctx->builtin_types.sampler[dim]->name, string->buffer); hlsl_release_string_buffer(ctx, string); } - else - { - load_params.resource = params->args[0]; - } if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) coords = params->args[1]; load_params.coords = coords; + load_params.resource = params->args[0]; load_params.format = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4); if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test index 2cb70a0b..23741a35 100644 --- a/tests/sampler.shader_test +++ b/tests/sampler.shader_test @@ -45,3 +45,12 @@ float4 main() : sv_target [test] draw quad probe all rgba (0.25, 0, 0.25, 0) + + +[pixel shader fail] +sampler2D s; + +float4 main() : sv_target +{ + return tex3D(s, float3(0.0, 0.0, 0.0)); +}

1 0

David Kahurani : gdiplus: Traverse and draw the whole string.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 03bc97a8c1af137a505ab71cf17a5c5556c6ad0d URL: https://gitlab.winehq.org/wine/wine/-/commit/03bc97a8c1af137a505ab71cf17a5c… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon May 1 12:54:29 2023 +0300 gdiplus: Traverse and draw the whole string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45698 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2e30300e348..656069d7ffe 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -908,7 +908,7 @@ static GpStatus format_string_callback(HDC dc, if (y + bounds->Height * args->scale > args->maxY) args->maxY = y + bounds->Height * args->scale; - for (i = index; i < length; ++i) + for (i = index; i < length + index; ++i) { GLYPHMETRICS gm; TTPOLYGONHEADER *ph = NULL, *origph;

1 0

Biswapriyo Nath : include: Add DXGI_DEBUG_D3D11 in d3d11sdklayers.idl.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 2b7ba08743d3a4062a1a1f12a952e329cb56e9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b7ba08743d3a4062a1a1f12a952e3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon May 1 19:14:55 2023 +0530 include: Add DXGI_DEBUG_D3D11 in d3d11sdklayers.idl. Required for libplacebo. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/d3d11sdklayers.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index 54236fcdac7..843e97860d9 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -28,6 +28,8 @@ const UINT D3D11_DEBUG_FEATURE_NEVER_DISCARD_OFFERED_RESOURCE = 0x10; const UINT D3D11_DEBUG_FEATURE_AVOID_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x40; const UINT D3D11_DEBUG_FEATURE_DISABLE_TILED_RESOURCE_MAPPING_TRACKING_AND_VALIDATION = 0x80; +cpp_quote("DEFINE_GUID(DXGI_DEBUG_D3D11, 0x4b99317b, 0xac39, 0x4aa6, 0xbb, 0xb, 0xba, 0xa0, 0x47, 0x84, 0x79, 0x8f);") + typedef enum D3D11_MESSAGE_CATEGORY { D3D11_MESSAGE_CATEGORY_APPLICATION_DEFINED, D3D11_MESSAGE_CATEGORY_MISCELLANEOUS,

1 0

Zebediah Figura : tests: Test casting from a bool uniform.
by Alexandre Julliard 01 May '23

01 May '23

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

Davide Beatrici : winepulse: Use mmdevapi's SimpleAudioVolume.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 77428d0295a83d927a5e7b02c39086d661469fb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/77428d0295a83d927a5e7b02c39086… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 29 08:15:33 2023 +0200 winepulse: Use mmdevapi's SimpleAudioVolume. --- dlls/winepulse.drv/mmdevdrv.c | 130 +----------------------------------------- 1 file changed, 1 insertion(+), 129 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5f2a8b8609d..59e2d086d0b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -128,7 +128,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; -static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; +extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; @@ -151,11 +151,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); } -static inline AudioSessionWrapper *impl_from_ISimpleAudioVolume(ISimpleAudioVolume *iface) -{ - return CONTAINING_RECORD(iface, AudioSessionWrapper, ISimpleAudioVolume_iface); -} - static inline AudioSessionWrapper *impl_from_IChannelAudioVolume(IChannelAudioVolume *iface) { return CONTAINING_RECORD(iface, AudioSessionWrapper, IChannelAudioVolume_iface); @@ -1887,129 +1882,6 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) return ret; } -static HRESULT WINAPI SimpleAudioVolume_QueryInterface( - ISimpleAudioVolume *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if (!ppv) - return E_POINTER; - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_ISimpleAudioVolume)) - *ppv = iface; - if (*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); -} - -static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); -} - -static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( - ISimpleAudioVolume *iface, float level, const GUID *context) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - AudioSession *session = This->session; - ACImpl *client; - - TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); - - if (level < 0.f || level > 1.f) - return E_INVALIDARG; - - if (context) - FIXME("Notifications not supported yet\n"); - - TRACE("PulseAudio does not support session volume control\n"); - - sessions_lock(); - session->master_vol = level; - LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) - set_stream_volumes(client); - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( - ISimpleAudioVolume *iface, float *level) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - AudioSession *session = This->session; - - TRACE("(%p)->(%p)\n", session, level); - - if (!level) - return NULL_PTR_ERR; - - *level = session->master_vol; - - return S_OK; -} - -static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, - BOOL mute, const GUID *context) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - AudioSession *session = This->session; - ACImpl *client; - - TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); - - if (context) - FIXME("Notifications not supported yet\n"); - - sessions_lock(); - session->mute = mute; - LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) - set_stream_volumes(client); - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI SimpleAudioVolume_GetMute(ISimpleAudioVolume *iface, - BOOL *mute) -{ - AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - AudioSession *session = This->session; - - TRACE("(%p)->(%p)\n", session, mute); - - if (!mute) - return NULL_PTR_ERR; - - *mute = session->mute; - - return S_OK; -} - -static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = -{ - SimpleAudioVolume_QueryInterface, - SimpleAudioVolume_AddRef, - SimpleAudioVolume_Release, - SimpleAudioVolume_SetMasterVolume, - SimpleAudioVolume_GetMasterVolume, - SimpleAudioVolume_SetMute, - SimpleAudioVolume_GetMute -}; - static HRESULT WINAPI ChannelAudioVolume_QueryInterface( IChannelAudioVolume *iface, REFIID riid, void **ppv) {

1 0

Piotr Caban : gdi32: Ignore in_count parameter in Escape() on PASSTHROUGH escape.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: a79c2fd3792eba13fc8d2038e8e9a97906629836 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79c2fd3792eba13fc8d2038e8e9a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 1 14:19:03 2023 +0200 gdi32: Ignore in_count parameter in Escape() on PASSTHROUGH escape. --- dlls/gdi32/dc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b1ca342f8e3..531fbb1fe85 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -637,6 +637,12 @@ INT WINAPI Escape( HDC hdc, INT escape, INT in_count, const char *in_data, void } break; } + + case PASSTHROUGH: + case POSTSCRIPT_PASSTHROUGH: + in_count = *(const WORD *)in_data + sizeof(WORD); + out_data = NULL; + break; } /* if not handled internally, pass it to the driver */

1 0

Piotr Caban : gdi32: Support saving EMR_EXTESCAPE record in spool file.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: f4d78d5352f23135d04c3f3ca8ce30921a814e5a URL: https://gitlab.winehq.org/wine/wine/-/commit/f4d78d5352f23135d04c3f3ca8ce30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 28 18:13:47 2023 +0200 gdi32: Support saving EMR_EXTESCAPE record in spool file. --- dlls/gdi32/dc.c | 9 +++++++++ dlls/gdi32/emfdc.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 3 files changed, 43 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 531fbb1fe85..66832f9012e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -655,8 +655,17 @@ INT WINAPI Escape( HDC hdc, INT escape, INT in_count, const char *in_data, void INT WINAPI ExtEscape( HDC hdc, INT escape, INT input_size, const char *input, INT output_size, char *output ) { + struct print *print; + DC_ATTR *dc_attr; + if (is_meta_dc( hdc )) return METADC_ExtEscape( hdc, escape, input_size, input, output_size, output ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if ((print = get_dc_print( dc_attr )) && dc_attr->emf) + { + int ret = EMFDC_ExtEscape( dc_attr, escape, input_size, input, output_size, output ); + if (ret) return ret; + } return NtGdiExtEscape( hdc, NULL, 0, escape, input_size, input, output_size, output ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index ef316fe42a1..5c3d01e43b1 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1167,6 +1167,38 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR return ret; } +INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *input, + INT output_size, char *output) +{ + struct EMREXTESCAPE + { + EMR emr; + DWORD escape; + DWORD size; + BYTE data[1]; + } *emr; + size_t size; + + if (escape == QUERYESCSUPPORT) return 0; + + size = FIELD_OFFSET( struct EMREXTESCAPE, data[input_size] ); + size = (size + 3) & ~3; + if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; + + emr->emr.iType = EMR_EXTESCAPE; + emr->emr.nSize = size; + emr->escape = escape; + emr->size = input_size; + memcpy(emr->data, input, input_size); + emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + if (output_size && output) return 0; + + if (escape == PASSTHROUGH || escape == POSTSCRIPT_PASSTHROUGH) + input_size -= sizeof(WORD); + return input_size ? input_size : 1; +} + BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, UINT fill_type ) { EMREXTFLOODFILL emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b8f914fe1f4..b78733103f8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -187,6 +187,8 @@ extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, extern BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExcludeClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *input, + INT output_size, char *output) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtSelectClipRgn( DC_ATTR *dc_attr, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdi32: Return error in EndPage if it's called before StartPage.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 33ee9fad7157e98da6d4f34370ad55ff2335fb1b URL: https://gitlab.winehq.org/wine/wine/-/commit/33ee9fad7157e98da6d4f34370ad55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 28 18:19:17 2023 +0200 gdi32: Return error in EndPage if it's called before StartPage. --- dlls/gdi32/dc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 66832f9012e..0b5e0824d00 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2458,6 +2458,7 @@ INT WINAPI EndPage( HDC hdc ) { BOOL write = print->flags & WRITE_DEVMODE; + if (!(print->flags & CALL_END_PAGE)) return SP_ERROR; print->flags = (print->flags & ~(CALL_END_PAGE | WRITE_DEVMODE)) | CALL_START_PAGE; if (dc_attr->emf) return spool_end_page( dc_attr, print->printer, print->devmode, write );

1 0

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

01 May '23

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