October 2021 - Wine-Commits

Zebediah Figura : wmvcore: Move the sync reader implementation to winegstreamer.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: e4767ea6126fce8b419ef10a3cfce8bf43206d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4767ea6126fce8b419ef10a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:07 2021 -0500 wmvcore: Move the sync reader implementation to winegstreamer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 ++- dlls/winegstreamer/winegstreamer.spec | 1 + .../syncreader.c => winegstreamer/wm_syncreader.c} | 33 ++++++++-------------- dlls/wmvcore/Makefile.in | 2 +- dlls/wmvcore/wmvcore_main.c | 16 +++++++++++ 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index e35df3cf3f9..671e3bcb7ba 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,6 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so +IMPORTLIB = winegstreamer IMPORTS = strmbase strmiids uuid ole32 mfuuid DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) @@ -11,7 +12,8 @@ C_SRCS = \ media_source.c \ mfplat.c \ quartz_parser.c \ - wg_parser.c + wg_parser.c \ + wm_syncreader.c IDL_SRCS = \ winegstreamer_classes.idl diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index b16365d0c9f..bd9f53a7445 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -2,3 +2,4 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall winegstreamer_create_wm_sync_reader(ptr) diff --git a/dlls/wmvcore/syncreader.c b/dlls/winegstreamer/wm_syncreader.c similarity index 96% rename from dlls/wmvcore/syncreader.c rename to dlls/winegstreamer/wm_syncreader.c index b245ff20d31..75b8e021148 100644 --- a/dlls/wmvcore/syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -16,11 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wmvcore.h" - +#include "gst_private.h" +#include "initguid.h" #include "wmsdk.h" -#include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -85,7 +83,7 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -605,27 +603,20 @@ static const IWMProfile3Vtbl WMProfile3Vtbl = WMProfile3_GetExpectedPacketCount }; -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader) { - WMSyncReader *sync; - - TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); + WMSyncReader *object; - sync = heap_alloc(sizeof(*sync)); + TRACE("reader %p.\n", reader); - if (!sync) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - sync->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; - sync->ref = 1; - - *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; + object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + object->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; + object->ref = 1; + TRACE("Created sync reader %p.\n", object); + *reader = (IWMSyncReader *)&object->IWMSyncReader2_iface; return S_OK; } - -HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) -{ - return WMCreateSyncReader(NULL, 0, syncreader); -} diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 15c017f86d9..d0b230dd7c0 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,12 +1,12 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 +DELAYIMPORTS = winegstreamer EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ reader.c \ - syncreader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5f93fc68e3b..8d4d4251369 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -25,6 +25,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); + +HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) +{ + TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + + return winegstreamer_create_wm_sync_reader(reader); +} + +HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **reader) +{ + TRACE("reader %p.\n", reader); + + return winegstreamer_create_wm_sync_reader(reader); +} + HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) { FIXME("(%s): stub\n", wine_dbgstr_w(url));

1 0

Zebediah Figura : wmvcore: Move the async reader implementation to winegstreamer.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: bf7c05d87a65b7b9999d71fc0df602e3dfa2fafa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7c05d87a65b7b9999d71fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:09 2021 -0500 wmvcore: Move the async reader implementation to winegstreamer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/winegstreamer.spec | 1 + .../reader.c => winegstreamer/wm_asyncreader.c} | 54 +++++++++------------- dlls/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 15 ++++++ 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 671e3bcb7ba..17311cd663c 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ wg_parser.c \ + wm_asyncreader.c \ wm_syncreader.c IDL_SRCS = \ diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index bd9f53a7445..bc6a390f8b1 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -2,4 +2,5 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall winegstreamer_create_wm_async_reader(ptr) @ stdcall winegstreamer_create_wm_sync_reader(ptr) diff --git a/dlls/wmvcore/reader.c b/dlls/winegstreamer/wm_asyncreader.c similarity index 98% rename from dlls/wmvcore/reader.c rename to dlls/winegstreamer/wm_asyncreader.c index 12ba8099ab1..d3fd1624f24 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -16,11 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wmvcore.h" - +#include "gst_private.h" #include "wmsdk.h" -#include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -153,7 +150,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -2039,36 +2036,31 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = packetsize_SetMinPacketSize }; -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) { - WMReader *reader; + WMReader *object; - TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + TRACE("reader %p.\n", reader); - reader = heap_alloc(sizeof(*reader)); - if(!reader) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; - reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; - reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; - reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; - reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; - reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; - reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; - reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; - reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; - reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - reader->ref = 1; - - *ret_reader = &reader->IWMReader_iface; + object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; + object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; + object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; + object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; + object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + object->IWMReader_iface.lpVtbl = &WMReaderVtbl; + object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; + object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; + object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; + object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; + object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; + object->ref = 1; + + TRACE("Created async reader %p.\n", object); + *reader = (IWMReader *)&object->IWMReader_iface; return S_OK; } - -HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) -{ - return WMCreateReader(NULL, 0, ret_reader); -} diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index d0b230dd7c0..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -6,7 +6,6 @@ DELAYIMPORTS = winegstreamer EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - reader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 8d4d4251369..ff837921286 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -25,8 +25,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader); HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +{ + TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + + return winegstreamer_create_wm_async_reader(reader); +} + +HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) +{ + TRACE("reader %p.\n", reader); + + return winegstreamer_create_wm_async_reader(reader); +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);

1 0

Zebediah Figura : winegstreamer: Get rid of the WMReader typedef.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 2652416be7b3914a98474faa562274c363f1dce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2652416be7b3914a98474faa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:10 2021 -0500 winegstreamer: Get rid of the WMReader typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 497 ++++++++++++++++++------------------ 1 file changed, 249 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2652416be7b3914a9847…

1 0

Nikolay Sivov : d3d10/effect: Use effect variable pointers to store per-pass shader objects.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: a3942ae20e288edf6ee621a09acfaf6e70a81a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3942ae20e288edf6ee621a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:32 2021 +0300 d3d10/effect: Use effect variable pointers to store per-pass shader objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 12 ++++++-- dlls/d3d10/effect.c | 74 ++++++++++++++++++++++++---------------------- dlls/d3d10/tests/effect.c | 28 ++++++++++++++++++ 3 files changed, 75 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3942ae20e288edf6ee6…

1 0

Nikolay Sivov : d3d10/effect: Explicitly store blend state variable.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 47350f363a1f3d1fed20293575d62264b2ec1d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47350f363a1f3d1fed202935… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:37 2021 +0300 d3d10/effect: Explicitly store blend state variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 31 ++++++++++++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5a0308ee42a..6979d2a114e 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc gs; struct d3d10_effect_variable *rasterizer; struct d3d10_effect_variable *depth_stencil; + struct d3d10_effect_variable *blend; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4a293601902..afcd292356e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1956,8 +1956,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_BLEND_STATE: { ID3D10EffectBlendVariable *bv = variable->lpVtbl->AsBlend(variable); - if (FAILED(hr = bv->lpVtbl->GetBlendState(bv, variable_idx, &o->object.bs))) - return hr; + if (!bv->lpVtbl->IsValid(bv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->blend = &v->elements[variable_idx]; + } + else + o->pass->blend = v; break; } @@ -2926,11 +2937,11 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) { case D3D10_EOT_RASTERIZER_STATE: case D3D10_EOT_DEPTH_STENCIL_STATE: - break; - case D3D10_EOT_BLEND_STATE: - ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); - return S_OK; + case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: + break; case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); @@ -2944,11 +2955,6 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; - case D3D10_EOT_STENCIL_REF: - case D3D10_EOT_BLEND_FACTOR: - case D3D10_EOT_SAMPLE_MASK: - return S_OK; - default: FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; @@ -4125,6 +4131,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (pass->depth_stencil) ID3D10Device_OMSetDepthStencilState(device, pass->depth_stencil->u.state.object.depth_stencil, pass->stencil_ref); + if (pass->blend) + ID3D10Device_OMSetBlendState(device, pass->blend->u.state.object.blend, + pass->blend_factor, pass->sample_mask); for (i = 0; i < pass->object_count; ++i) {

1 0

Nikolay Sivov : d3d10/effect: Set state block masks for state variables.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: e893e6e27bc3d97901f65519a14bce6e588f65bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e893e6e27bc3d97901f65519… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:38 2021 +0300 d3d10/effect: Set state block masks for state variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++++ dlls/d3d10/tests/effect.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index afcd292356e..0ba906375d7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4157,6 +4157,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10E D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1); if (pass->gs.shader != &null_shader_variable) D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1); + if (pass->rasterizer) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_RS_RASTERIZER_STATE, 0, 1); + if (pass->depth_stencil) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0, 1); + if (pass->blend) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_BLEND_STATE, 0, 1); return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 1a06ff95365..781abb46745 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4331,13 +4331,10 @@ static void test_effect_state_groups(void) hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_BLEND_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0);

1 0

Gabriel Ivăncescu : mshtml: Cap the compat mode for filters collection to IE8 mode.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: f7ea38d708311df8d1f72b1b53d7c4c2f73504f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ea38d708311df8d1f72b1b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 7 16:52:29 2021 +0300 mshtml: Cap the compat mode for filters collection to IE8 mode. So dispex_to_string returns [object]. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index dada4de9ab7..29aa378b6bf 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7074,7 +7074,7 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters collection->ref = 1; init_dispatch(&collection->dispex, (IUnknown*)&collection->IHTMLFiltersCollection_iface, - &HTMLFiltersCollection_dispex, compat_mode); + &HTMLFiltersCollection_dispex, min(compat_mode, COMPAT_MODE_IE8)); *ret = &collection->IHTMLFiltersCollection_iface; return S_OK;

1 0

Nikolay Sivov : d3d10: Fix up D3D10_DST_* names.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 87fb9fe721da6ceed20e190c69578a953ac7ff52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fb9fe721da6ceed20e190c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:34 2021 +0300 d3d10: Fix up D3D10_DST_* names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/stateblock.c | 16 ++++++++-------- include/d3d10effect.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index ccc8a0e504e..fef78872a49 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -73,8 +73,8 @@ static const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) { WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); - WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); - WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); + WINE_D3D10_TO_STR(D3D10_DST_OM_DEPTH_STENCIL_STATE); + WINE_D3D10_TO_STR(D3D10_DST_OM_BLEND_STATE); WINE_D3D10_TO_STR(D3D10_DST_VS); WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); @@ -696,9 +696,9 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_clear_bits(&mask->SOBuffers, 1, start_idx, count); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_clear_bits(&mask->OMRenderTargets, 1, start_idx, count); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_clear_bits(&mask->OMDepthStencilState, 1, start_idx, count); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_clear_bits(&mask->OMBlendState, 1, start_idx, count); case D3D10_DST_VS: return stateblock_mask_clear_bits(&mask->VS, 1, start_idx, count); @@ -783,9 +783,9 @@ HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_set_bits(&mask->SOBuffers, 1, start_idx, count); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_set_bits(&mask->OMRenderTargets, 1, start_idx, count); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_set_bits(&mask->OMDepthStencilState, 1, start_idx, count); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_set_bits(&mask->OMBlendState, 1, start_idx, count); case D3D10_DST_VS: return stateblock_mask_set_bits(&mask->VS, 1, start_idx, count); @@ -858,9 +858,9 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_get_bit(&mask->SOBuffers, 1, idx); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_get_bit(&mask->OMRenderTargets, 1, idx); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_get_bit(&mask->OMDepthStencilState, 1, idx); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_get_bit(&mask->OMBlendState, 1, idx); case D3D10_DST_VS: return stateblock_mask_get_bit(&mask->VS, 1, idx); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b4a33daca48..a4574c41fe4 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -34,8 +34,8 @@ typedef enum _D3D10_DEVICE_STATE_TYPES { D3D10_DST_SO_BUFFERS = 1, D3D10_DST_OM_RENDER_TARGETS, - D3D10_DST_DEPTH_STENCIL_STATE, - D3D10_DST_BLEND_STATE, + D3D10_DST_OM_DEPTH_STENCIL_STATE, + D3D10_DST_OM_BLEND_STATE, D3D10_DST_VS, D3D10_DST_VS_SAMPLERS, D3D10_DST_VS_SHADER_RESOURCES,

1 0

Nikolay Sivov : d3d10/effect: Explicitly store depth stencil state variable.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: e42720a6d8bcf4051b0460e58314eda76392ff59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e42720a6d8bcf4051b0460e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:36 2021 +0300 d3d10/effect: Explicitly store depth stencil state variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 4e35a2f319d..5a0308ee42a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10DepthStencilState *ds; ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc ps; struct d3d10_effect_pass_shader_desc gs; struct d3d10_effect_variable *rasterizer; + struct d3d10_effect_variable *depth_stencil; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 66eb723fe9c..4a293601902 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1937,8 +1937,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_DEPTH_STENCIL_STATE: { ID3D10EffectDepthStencilVariable *dv = variable->lpVtbl->AsDepthStencil(variable); - if (FAILED(hr = dv->lpVtbl->GetDepthStencilState(dv, variable_idx, &o->object.ds))) - return hr; + if (!dv->lpVtbl->IsValid(dv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->depth_stencil = &v->elements[variable_idx]; + } + else + o->pass->depth_stencil = v; break; } @@ -2914,11 +2925,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { case D3D10_EOT_RASTERIZER_STATE: - break; - case D3D10_EOT_DEPTH_STENCIL_STATE: - ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); - return S_OK; + break; case D3D10_EOT_BLEND_STATE: ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); @@ -4114,6 +4122,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface apply_shader_resources(device, pass->ps.shader); if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); + if (pass->depth_stencil) + ID3D10Device_OMSetDepthStencilState(device, pass->depth_stencil->u.state.object.depth_stencil, + pass->stencil_ref); for (i = 0; i < pass->object_count; ++i) {

1 0

Brendan Shanks : api-ms-win-core-realtime-l1-1-1: Add stub DLL.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 54d51df66828d159fb6eb7cb9030581559dd9321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d51df66828d159fb6eb7cb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 6 15:39:01 2021 -0700 api-ms-win-core-realtime-l1-1-1: Add stub DLL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 877c62d9647..ec425d91f63 100755 --- a/configure +++ b/configure @@ -1021,6 +1021,7 @@ enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_psm_appnotify_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 +enable_api_ms_win_core_realtime_l1_1_1 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registry_l2_1_0 enable_api_ms_win_core_registry_l2_2_0 @@ -19850,6 +19851,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-core-psm-appnotify-l1-1-0 enable_api_ms_win_core_psm_appnotify_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-1 enable_api_ms_win_core_realtime_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-2-0 enable_api_ms_win_core_registry_l2_2_0 diff --git a/configure.ac b/configure.ac index 1928a6503ea..530785c0033 100644 --- a/configure.ac +++ b/configure.ac @@ -2739,6 +2739,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in new file mode 100644 index 00000000000..88ebedfb236 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec new file mode 100644 index 00000000000..6cffa1f0b08 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stub QueryInterruptTime +@ stub QueryInterruptTimePrecise +@ stub QueryUnbiasedInterruptTimePrecise diff --git a/tools/make_specfiles b/tools/make_specfiles index a7ee7e7f4db..ecfc6d0e8f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,6 +219,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0",

1 0