- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to vkd3d_shader_normalise().
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: vkd3d Branch: master Commit: 5de5f241a61c140117ee0aecfe25d586b1adad6d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5de5f241a61c140117ee0aecfe25d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 14:52:34 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to vkd3d_shader_normalise(). --- libs/vkd3d-shader/ir.c | 8 +++----- libs/vkd3d-shader/spirv.c | 3 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index ec32faae..4f022618 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4393,11 +4393,9 @@ fail: return ret; } -enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info) +enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) { - struct vkd3d_shader_message_context *message_context = parser->message_context; - struct vsir_program *program = &parser->program; enum vkd3d_result result = VKD3D_OK; remove_dcl_temps(program); @@ -4488,7 +4486,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (TRACE_ON()) vkd3d_shader_trace(program); - if ((result = vsir_program_validate(program, parser->config_flags, + if ((result = vsir_program_validate(program, config_flags, compile_info->source_name, message_context)) < 0) return result; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d1073884..e39e27a6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -10133,7 +10133,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, enum vkd3d_result result = VKD3D_OK; unsigned int i; - if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0) + if ((result = vsir_program_normalise(program, compiler->config_flags, + compile_info, compiler->message_context)) < 0) return result; if (program->temp_count) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 57065bac..21957d02 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1321,6 +1321,8 @@ struct vsir_program bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve); void vsir_program_cleanup(struct vsir_program *program); +enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context); enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags, const char *source_name, struct vkd3d_shader_message_context *message_context); @@ -1784,7 +1786,4 @@ void dxbc_writer_add_section(struct dxbc_writer *dxbc, uint32_t tag, const void void dxbc_writer_init(struct dxbc_writer *dxbc); int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *code); -enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info); - #endif /* __VKD3D_SHADER_PRIVATE_H */

1 0

Henri Verbeet : tests/shader_runner: Add GLSL support to the GL runner.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: vkd3d Branch: master Commit: 0715734dfb6120c2ea8d3dbbbeef9b3311dbc9ad URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0715734dfb6120c2ea8d3dbbbeef9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 19 12:36:23 2024 +0100 tests/shader_runner: Add GLSL support to the GL runner. --- tests/hlsl/abs.shader_test | 4 +- tests/hlsl/all.shader_test | 14 +-- tests/hlsl/angle-unit.shader_test | 4 +- tests/hlsl/any.shader_test | 36 +++--- tests/hlsl/arithmetic-float-uniform.shader_test | 12 +- tests/hlsl/arithmetic-float.shader_test | 12 +- tests/hlsl/arithmetic-int-uniform.shader_test | 16 +-- tests/hlsl/arithmetic-int.shader_test | 20 ++-- tests/hlsl/arithmetic-uint.shader_test | 8 +- tests/hlsl/array-parameters.shader_test | 8 +- tests/hlsl/array-size-expr.shader_test | 6 +- tests/hlsl/asfloat.shader_test | 4 +- tests/hlsl/asuint.shader_test | 4 +- tests/hlsl/bitwise.shader_test | 24 ++-- tests/hlsl/bool-cast.shader_test | 6 +- tests/hlsl/bool-semantics.shader_test | 2 +- tests/hlsl/cast-broadcast.shader_test | 4 +- .../hlsl/cast-componentwise-compatible.shader_test | 46 ++++---- tests/hlsl/cast-componentwise-equal.shader_test | 10 +- tests/hlsl/cast-to-float.shader_test | 4 +- tests/hlsl/cast-to-half.shader_test | 4 +- tests/hlsl/cast-to-int.shader_test | 6 +- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/cbuffer.shader_test | 30 ++--- tests/hlsl/ceil.shader_test | 8 +- tests/hlsl/cf-cond-types.shader_test | 4 +- tests/hlsl/clamp.shader_test | 4 +- tests/hlsl/clip.shader_test | 8 +- tests/hlsl/combined-samplers.shader_test | 12 +- tests/hlsl/comma.shader_test | 2 +- tests/hlsl/compute.shader_test | 2 +- tests/hlsl/conditional.shader_test | 10 +- tests/hlsl/const.shader_test | 2 +- tests/hlsl/cross.shader_test | 4 +- tests/hlsl/d3dcolor-to-ubyte4.shader_test | 4 +- tests/hlsl/ddxddy.shader_test | 8 +- tests/hlsl/determinant.shader_test | 14 +-- tests/hlsl/discard.shader_test | 4 +- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 14 +-- tests/hlsl/duplicate-modifiers.shader_test | 2 +- tests/hlsl/entry-point-semantics.shader_test | 18 +-- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/expr-indexing.shader_test | 14 +-- tests/hlsl/float-comparison.shader_test | 4 +- tests/hlsl/floor.shader_test | 8 +- tests/hlsl/fmod.shader_test | 8 +- tests/hlsl/for.shader_test | 6 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/function-return.shader_test | 38 +++--- tests/hlsl/function.shader_test | 14 +-- tests/hlsl/fwidth.shader_test | 2 +- tests/hlsl/gather-offset.shader_test | 14 +-- tests/hlsl/gather.shader_test | 12 +- tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/hard-copy-prop.shader_test | 12 +- tests/hlsl/initializer-flatten.shader_test | 10 +- tests/hlsl/initializer-implicit-array.shader_test | 8 +- .../hlsl/initializer-invalid-arg-count.shader_test | 4 +- tests/hlsl/initializer-local-array.shader_test | 4 +- tests/hlsl/initializer-matrix.shader_test | 12 +- tests/hlsl/initializer-multi.shader_test | 6 +- tests/hlsl/initializer-nested.shader_test | 6 +- tests/hlsl/initializer-numeric.shader_test | 12 +- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/initializer-static-array.shader_test | 4 +- tests/hlsl/initializer-struct.shader_test | 6 +- tests/hlsl/intrinsic-override.shader_test | 6 +- tests/hlsl/inverse-trig.shader_test | 60 +++++----- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 6 +- tests/hlsl/length.shader_test | 10 +- tests/hlsl/lerp.shader_test | 6 +- tests/hlsl/lit.shader_test | 8 +- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/logic-operations.shader_test | 24 ++-- tests/hlsl/loop.shader_test | 14 +-- tests/hlsl/majority-pragma.shader_test | 30 ++--- tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/majority-typedef.shader_test | 2 +- tests/hlsl/math.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 18 +-- tests/hlsl/matrix-semantics.shader_test | 12 +- tests/hlsl/max.shader_test | 6 +- tests/hlsl/minimum-precision.shader_test | 4 +- tests/hlsl/mul.shader_test | 40 +++---- tests/hlsl/multiple-rt.shader_test | 2 +- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/nointerpolation.shader_test | 10 +- tests/hlsl/non-const-indexing.shader_test | 48 ++++---- tests/hlsl/normalize.shader_test | 10 +- .../numeric-constructor-truncation.shader_test | 4 +- tests/hlsl/numeric-types.shader_test | 10 +- tests/hlsl/numthreads.shader_test | 2 +- tests/hlsl/object-field-offsets.shader_test | 6 +- tests/hlsl/object-references.shader_test | 10 +- tests/hlsl/pow.shader_test | 4 +- tests/hlsl/precise-modifier.shader_test | 6 +- tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- tests/hlsl/reflect.shader_test | 12 +- .../hlsl/register-reservations-numeric.shader_test | 12 +- .../register-reservations-resources.shader_test | 20 ++-- tests/hlsl/return-implicit-conversion.shader_test | 28 ++--- tests/hlsl/return.shader_test | 50 ++++---- tests/hlsl/round.shader_test | 6 +- tests/hlsl/sample-bias.shader_test | 6 +- tests/hlsl/sample-cmp.shader_test | 20 ++-- tests/hlsl/sample-grad.shader_test | 6 +- tests/hlsl/sample-level.shader_test | 12 +- tests/hlsl/sampler-offset.shader_test | 6 +- tests/hlsl/sampler.shader_test | 4 +- tests/hlsl/saturate.shader_test | 4 +- tests/hlsl/shader-interstage-interface.shader_test | 2 +- tests/hlsl/shape.shader_test | 54 ++++----- tests/hlsl/side-effects.shader_test | 6 +- tests/hlsl/sign.shader_test | 20 ++-- tests/hlsl/single-numeric-initializer.shader_test | 4 +- tests/hlsl/sm1-const-folding.shader_test | 24 ++-- tests/hlsl/smoothstep.shader_test | 18 +-- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/srv-buffers.shader_test | 14 +-- tests/hlsl/state-block-syntax.shader_test | 2 +- tests/hlsl/static-initializer.shader_test | 8 +- tests/hlsl/step.shader_test | 6 +- tests/hlsl/storage-qualifiers.shader_test | 4 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/struct-assignment.shader_test | 2 +- tests/hlsl/struct-semantics.shader_test | 2 +- tests/hlsl/switch.shader_test | 58 ++++----- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/swizzle-matrix.shader_test | 10 +- tests/hlsl/swizzles.shader_test | 24 ++-- tests/hlsl/ternary.shader_test | 28 ++--- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load-typed.shader_test | 4 +- tests/hlsl/texture-load.shader_test | 8 +- tests/hlsl/texture-ordering.shader_test | 10 +- tests/hlsl/transpose.shader_test | 10 +- tests/hlsl/trigonometry.shader_test | 8 +- tests/hlsl/trunc.shader_test | 8 +- tests/hlsl/type-names.shader_test | 2 +- tests/hlsl/uav-load.shader_test | 2 +- tests/hlsl/uav-out-param.shader_test | 4 +- tests/hlsl/uav-rwbuffer.shader_test | 4 +- tests/hlsl/uav-rwtexture.shader_test | 10 +- tests/hlsl/uniform-parameters.shader_test | 4 +- tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing-uniform.shader_test | 2 +- tests/hlsl/vector-indexing.shader_test | 6 +- tests/hlsl/vertex-shader-ops.shader_test | 14 +-- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- tests/hlsl/writemask-assignop-2.shader_test | 2 +- tests/hlsl/writemask-assignop-3.shader_test | 2 +- tests/shader_runner.c | 108 ++++++++++++----- tests/shader_runner.h | 3 + tests/shader_runner_gl.c | 129 +++++++++++++++++---- 159 files changed, 989 insertions(+), 859 deletions(-)

1 0

Paul Gofman : strmbase: Fallback to InitializeCriticalSection() if RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO is unsupported.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 86557b9e0ba8a783f1b0d0918b1ddec7e0a7749e URL: https://gitlab.winehq.org/wine/wine/-/commit/86557b9e0ba8a783f1b0d0918b1dde… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 12:44:58 2024 -0600 strmbase: Fallback to InitializeCriticalSection() if RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO is unsupported. --- libs/strmbase/filter.c | 6 ++++-- libs/strmbase/pospass.c | 3 ++- libs/strmbase/seeking.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index fa8738188a2..3229c7ba82a 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -524,10 +524,12 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->outer_unk = outer ? outer : &filter->IUnknown_inner; filter->refcount = 1; - InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&filter->filter_cs); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); - InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&filter->stream_cs); if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs"); filter->clsid = *clsid; diff --git a/libs/strmbase/pospass.c b/libs/strmbase/pospass.c index 79ebf44cf24..2b6321432bd 100644 --- a/libs/strmbase/pospass.c +++ b/libs/strmbase/pospass.c @@ -730,7 +730,8 @@ void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknow passthrough->IMediaPosition_iface.lpVtbl = &IMediaPositionPassThru_Vtbl; passthrough->IMediaSeeking_iface.lpVtbl = &IMediaSeekingPassThru_Vtbl; passthrough->ISeekingPassThru_iface.lpVtbl = &ISeekingPassThru_Vtbl; - InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&passthrough->time_cs); passthrough->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_passthrough.time_cs" ); } diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c index 574083b985f..62e6d454a57 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -49,7 +49,8 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl * pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&pSeeking->cs); pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; }

1 0

Zebediah Figura : quartz/tests: Add some tests for VMR7 renderless mode.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 525ef1bf777433dc64f21dbd0135cc4b509ce330 URL: https://gitlab.winehq.org/wine/wine/-/commit/525ef1bf777433dc64f21dbd0135cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 13:44:15 2023 -0600 quartz/tests: Add some tests for VMR7 renderless mode. --- dlls/quartz/tests/vmr7.c | 467 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 467 insertions(+)

1 0

Zebediah Figura : quartz: Reimplement the VMR7 using the VMR7 presenter.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 4c40aeb90bcac53688d1481f4be81959521c0790 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c40aeb90bcac53688d1481f4be819… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 13:28:50 2023 -0600 quartz: Reimplement the VMR7 using the VMR7 presenter. --- dlls/quartz/tests/vmr7.c | 7 +- dlls/quartz/vmr7.c | 753 +++++------------------------------------------ 2 files changed, 77 insertions(+), 683 deletions(-)

1 0

Zebediah Figura : quartz: Implement SetVideoClippingWindow() and PresentImage() in the VMR7 presenter.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: e428afe4aed0d684e9442e43d68446d616f29f92 URL: https://gitlab.winehq.org/wine/wine/-/commit/e428afe4aed0d684e9442e43d68446… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 13:20:50 2023 -0600 quartz: Implement SetVideoClippingWindow() and PresentImage() in the VMR7 presenter. --- dlls/quartz/vmr7_presenter.c | 59 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index 78d97bd5e10..0c6cb6dedbd 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -33,6 +33,8 @@ struct vmr7_presenter IDirectDraw7 *ddraw; IDirectDrawSurface7 *frontbuffer; + IDirectDrawSurface7 *primary; + HWND window; }; static struct vmr7_presenter *impl_from_IVMRImagePresenter(IVMRImagePresenter *iface) @@ -82,6 +84,7 @@ static ULONG WINAPI image_presenter_Release(IVMRImagePresenter *iface) { if (presenter->frontbuffer) IDirectDrawSurface7_Release(presenter->frontbuffer); + IDirectDrawSurface7_Release(presenter->primary); IDirectDraw7_Release(presenter->ddraw); free(presenter); } @@ -103,8 +106,31 @@ static HRESULT WINAPI image_presenter_StopPresenting(IVMRImagePresenter *iface, static HRESULT WINAPI image_presenter_PresentImage(IVMRImagePresenter *iface, DWORD_PTR cookie, VMRPRESENTATIONINFO *info) { - FIXME("iface %p, cookie %#Ix, info %p, stub!\n", iface, cookie, info); - return E_NOTIMPL; + struct vmr7_presenter *presenter = impl_from_IVMRImagePresenter(iface); + POINT point; + HRESULT hr; + RECT rect; + + TRACE("iface %p, cookie %#Ix, info %p.\n", iface, cookie, info); + + TRACE("flags %#lx, surface %p, start %s, end %s, aspect ratio %ldx%ld,\n", + info->dwFlags, info->lpSurf, debugstr_time(info->rtStart), + debugstr_time(info->rtEnd), info->szAspectRatio.cx, info->szAspectRatio.cy); + TRACE("src %s, dst %s, type-specific flags %#lx, interlace flags %#lx.\n", + wine_dbgstr_rect(&info->rcSrc), wine_dbgstr_rect(&info->rcDst), + info->dwTypeSpecificFlags, info->dwInterlaceFlags); + + if (info->dwFlags & VMRSample_SrcDstRectsValid) + FIXME("Ignoring src/dst rects.\n"); + + GetClientRect(presenter->window, &rect); + point.x = point.y = 0; + ClientToScreen(presenter->window, &point); + OffsetRect(&rect, point.x, point.y); + if (FAILED(hr = IDirectDrawSurface7_Blt(presenter->primary, &rect, info->lpSurf, NULL, DDBLT_WAIT, NULL))) + ERR("Failed to blit, hr %#lx.\n", hr); + + return S_OK; } static const IVMRImagePresenterVtbl image_presenter_vtbl = @@ -310,8 +336,23 @@ static HRESULT WINAPI windowless_control_SetAspectRatioMode( static HRESULT WINAPI windowless_control_SetVideoClippingWindow( IVMRWindowlessControl *iface, HWND window) { - FIXME("iface %p, window %p, stub!.\n", iface, window); - return E_NOTIMPL; + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + IDirectDrawClipper *clipper; + HRESULT hr; + + TRACE("iface %p, window %p.\n", iface, window); + + if (FAILED(hr = IDirectDraw7_CreateClipper(presenter->ddraw, 0, &clipper, NULL))) + ERR("Failed to create clipper, hr %#lx.\n", hr); + if (FAILED(hr = IDirectDrawClipper_SetHWnd(clipper, 0, window))) + ERR("Failed to set clip window, hr %#lx.\n", hr); + if (FAILED(hr = IDirectDrawSurface7_SetClipper(presenter->primary, clipper))) + ERR("Failed to set clipper, hr %#lx.\n", hr); + IDirectDrawClipper_Release(clipper); + + presenter->window = window; + + return S_OK; } static HRESULT WINAPI windowless_control_RepaintVideo( @@ -384,6 +425,13 @@ HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) struct vmr7_presenter *object; HRESULT hr; + DDSURFACEDESC2 primary_desc = + { + .dwSize = sizeof(DDSURFACEDESC2), + .dwFlags = DDSD_CAPS, + .ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE, + }; + TRACE("outer %p, out %p.\n", outer, out); if (outer) @@ -406,6 +454,9 @@ HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) if (FAILED(hr = IDirectDraw7_SetCooperativeLevel(object->ddraw, NULL, DDSCL_NORMAL))) ERR("Failed to set cooperative level, hr %#lx.\n", hr); + if (FAILED(hr = IDirectDraw7_CreateSurface(object->ddraw, &primary_desc, &object->primary, NULL))) + ERR("Failed to create primary surface, hr %#lx.\n", hr); + TRACE("Created VMR7 default presenter %p.\n", object); *out = (IUnknown *)&object->IVMRSurfaceAllocator_iface; return S_OK;

1 0

Zebediah Figura : quartz: Implement IVMRSurfaceAllocatorNotify::AdviseSurfaceAllocator().
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 442ef4066560a3f44146410ad9dfc3d7201cc773 URL: https://gitlab.winehq.org/wine/wine/-/commit/442ef4066560a3f44146410ad9dfc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 13:29:22 2023 -0600 quartz: Implement IVMRSurfaceAllocatorNotify::AdviseSurfaceAllocator(). --- dlls/quartz/vmr7.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr7.c b/dlls/quartz/vmr7.c index 5b1b13b7436..2a077f266ab 100644 --- a/dlls/quartz/vmr7.c +++ b/dlls/quartz/vmr7.c @@ -1176,8 +1176,39 @@ static ULONG WINAPI surface_allocator_notify_Release(IVMRSurfaceAllocatorNotify static HRESULT WINAPI surface_allocator_notify_AdviseSurfaceAllocator( IVMRSurfaceAllocatorNotify *iface, DWORD_PTR cookie, IVMRSurfaceAllocator *allocator) { - FIXME("iface %p, cookie %#Ix, allocator %p, stub!\n", iface, cookie, allocator); - return E_NOTIMPL; + struct vmr7 *filter = impl_from_IVMRSurfaceAllocatorNotify(iface); + IVMRImagePresenter *presenter; + + TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + filter->cookie = cookie; + + if (filter->renderer.sink.pin.peer) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + WARN("Attempt to set allocator while connected; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + if (FAILED(IVMRSurfaceAllocator_QueryInterface(allocator, &IID_IVMRImagePresenter, (void **)&presenter))) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return E_NOINTERFACE; + } + + if (filter->allocator) + { + IVMRImagePresenter_Release(filter->presenter); + IVMRSurfaceAllocator_Release(filter->allocator); + } + filter->allocator = allocator; + filter->presenter = presenter; + IVMRSurfaceAllocator_AddRef(allocator); + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return S_OK; } static HRESULT WINAPI surface_allocator_notify_SetDDrawDevice(

1 0

Zebediah Figura : quartz: Return S_OK from IVMRSurfaceAllocator_PrepareSurface().
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 668c959f5a09dd82a4df679d14f2e9b66493db2d URL: https://gitlab.winehq.org/wine/wine/-/commit/668c959f5a09dd82a4df679d14f2e9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 14:24:48 2023 -0600 quartz: Return S_OK from IVMRSurfaceAllocator_PrepareSurface(). --- dlls/quartz/vmr7_presenter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index 0c6cb6dedbd..406c9ead52a 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -235,8 +235,8 @@ static HRESULT WINAPI surface_allocator_FreeSurface(IVMRSurfaceAllocator *iface, static HRESULT WINAPI surface_allocator_PrepareSurface(IVMRSurfaceAllocator *iface, DWORD_PTR id, IDirectDrawSurface7 *surface, DWORD flags) { - FIXME("iface %p, id %#Ix, surface %p, flags %#lx, stub!\n", iface, id, surface, flags); - return E_NOTIMPL; + TRACE("iface %p, id %#Ix, surface %p, flags %#lx.\n", iface, id, surface, flags); + return S_OK; } static HRESULT WINAPI surface_allocator_AdviseNotify(IVMRSurfaceAllocator *iface,

1 0

Vijay Kiran Kamuju : urlmon: Add stub for ordinal 414.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: 2fd582e1653de1bd2871625c7f954238d60dc404 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fd582e1653de1bd2871625c7f9542… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 15 19:48:19 2024 +0100 urlmon: Add stub for ordinal 414. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53635 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52352 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48085 --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 8725c8c5aeb..deb302e5179 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -108,6 +108,7 @@ 363 stdcall @(long long ptr) propsys.InitVariantFromResource 387 stdcall @(ptr long) propsys.VariantToUInt32WithDefault 410 stdcall @(long long) LogSqmBits +414 stdcall @(long long) LogSqmIncrement 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState 445 stdcall -noname MapBrowserEmulationModeToUserAgent(ptr ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 491313b7cf8..c5a8fdcffa2 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -770,6 +770,16 @@ int WINAPI LogSqmBits(DWORD unk1, DWORD unk2) return 0; } +/*********************************************************************** + * LogSqmIncrement (URLMON.414) + * Undocumented, added in IE8 + */ +int WINAPI LogSqmIncrement(DWORD unk1, DWORD unk2) +{ + FIXME("stub: %ld %ld\n", unk1, unk2); + return 0; +} + /*********************************************************************** * LogSqmUXCommandOffsetInternal (URLMON.423) * Undocumented, added in IE8

1 0

Jinoh Kang : ntdll/tests: Don't import kernel32.RtlPcToFileHeader.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: wine Branch: master Commit: fa7c837f918139e91f04cbe1c5c1b9a84670c39f URL: https://gitlab.winehq.org/wine/wine/-/commit/fa7c837f918139e91f04cbe1c5c1b9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Mar 20 00:48:56 2024 +0900 ntdll/tests: Don't import kernel32.RtlPcToFileHeader. kernel32.RtlPcToFileHeader is an export forwarder to ntdll.RtlPcToFileHeader and does not exist on Windows 8 or earlier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56458 --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3300e5fbe00..67b02cbd8b6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10831,11 +10831,11 @@ static void test_backtrace(void) ok( count > 0, "got %u entries\n", count ); for (i = hash_expect = 0; i < count; i++) hash_expect += (ULONG_PTR)buffer[i]; ok( hash == hash_expect, "hash mismatch %lx / %lx\n", hash, hash_expect ); - RtlPcToFileHeader( buffer[0], &module ); + pRtlPcToFileHeader( buffer[0], &module ); if (is_arm64ec && module == hntdll) /* Windows arm64ec has an extra frame for the entry thunk */ { ok( count > 1, "wrong count %u\n", count ); - RtlPcToFileHeader( buffer[1], &module ); + pRtlPcToFileHeader( buffer[1], &module ); } GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); ok( module == GetModuleHandleA(0), "wrong module %p %s / %p for %p\n", @@ -10855,7 +10855,7 @@ static void test_backtrace(void) if (count && !buffer[count - 1]) count--; /* win11 32-bit */ if (count <= 1) return; - RtlPcToFileHeader( buffer[count - 1], &module ); + pRtlPcToFileHeader( buffer[count - 1], &module ); GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); ok( module == hntdll, "wrong module %p %s for frame %u %p\n", module, debugstr_w(name), count - 1, buffer[count - 1] );

1 0