March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Implement independent blend.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 2da5422bd2628ad79ae65cee17702817aa1476f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da5422bd2628ad79ae65cee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 23:25:01 2020 -0500 wined3d: Implement independent blend. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/state.c | 22 ++-- dlls/d3d11/tests/d3d11.c | 7 +- dlls/wined3d/adapter_gl.c | 7 ++ dlls/wined3d/device.c | 21 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 214 +++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 19 ++-- 10 files changed, 220 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2da5422bd2628ad79ae6…

1 0

Zebediah Figura : quartz: Implement proper DLL refcounting.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: cb3dc989286f7933c6982cded376eb4e04bd595c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3dc989286f7933c6982cde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:12 2020 -0500 quartz: Implement proper DLL refcounting. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48734 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 ++ dlls/quartz/avidec.c | 2 ++ dlls/quartz/dsoundrender.c | 2 ++ dlls/quartz/filesource.c | 2 ++ dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/filtermapper.c | 4 ++++ dlls/quartz/main.c | 9 +++++---- dlls/quartz/memallocator.c | 2 ++ dlls/quartz/passthrough.c | 2 ++ dlls/quartz/quartz_private.h | 2 ++ dlls/quartz/systemclock.c | 2 ++ dlls/quartz/videorenderer.c | 2 ++ dlls/quartz/vmr9.c | 2 ++ 13 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b354ae4009..7c511471ff 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -493,6 +493,8 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) IUnknown_Release(filter->seeking); strmbase_filter_cleanup(&filter->filter); free(filter); + + InterlockedDecrement(&object_locks); } static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 7b6838e466..0837ae2b8d 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -489,6 +489,8 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) IUnknown_Release(filter->seeking); strmbase_filter_cleanup(&filter->filter); free(filter); + + InterlockedDecrement(&object_locks); } static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1a422d2743..64743b97ec 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -503,6 +503,8 @@ static void dsound_render_destroy(struct strmbase_renderer *iface) strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); + + InterlockedDecrement(&object_locks); } static HRESULT dsound_render_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 09ab5e51fe..72e52dd01c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -353,6 +353,8 @@ static void async_reader_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); + + InterlockedDecrement(&object_locks); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index dfda734d8a..c659cf96e4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -518,6 +518,8 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) } DeleteCriticalSection(&This->cs); CoTaskMemFree(This); + + InterlockedDecrement(&object_locks); } return ref; } diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d1403b516..db162c0133 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -193,8 +193,12 @@ static ULONG WINAPI Inner_Release(IUnknown *iface) TRACE("(%p)->(): new ref = %d\n", This, ref); if (ref == 0) + { CoTaskMemFree(This); + InterlockedDecrement(&object_locks); + } + return ref; } diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 89c7fe9bb1..4acb4f1a79 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -27,7 +27,7 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -static LONG server_locks = 0; +LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -124,6 +124,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { + InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } @@ -135,9 +136,9 @@ static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); if(dolock) - InterlockedIncrement(&server_locks); + InterlockedIncrement(&object_locks); else - InterlockedDecrement(&server_locks); + InterlockedDecrement(&object_locks); return S_OK; } @@ -200,7 +201,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - if(server_locks == 0 && QUARTZ_DllCanUnloadNow() == S_OK) + if (!object_locks && QUARTZ_DllCanUnloadNow() == S_OK) return S_OK; return S_FALSE; } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 531fbe874c..cc13f776cf 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -911,6 +911,8 @@ static void StdMemAllocator_Destroy(IMemAllocator *iface) DeleteCriticalSection(&This->csState); CoTaskMemFree(This); + + InterlockedDecrement(&object_locks); } HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 2f8fe9dc37..7f81ae8a1b 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -80,6 +80,8 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) { strmbase_passthrough_cleanup(&passthrough->passthrough); free(passthrough); + + InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 5538537908..1812b1c37e 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -56,6 +56,8 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } +extern LONG object_locks; + /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 8ccd6df47c..24d8651aab 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -105,6 +105,8 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); heap_free(clock); + + InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1b5e68e7d5..37227bfa21 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -248,6 +248,8 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); + + InterlockedDecrement(&object_locks); } static HRESULT video_renderer_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b8cf0698ec..e7a588e28a 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -519,6 +519,8 @@ static void vmr_destroy(struct strmbase_renderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); + + InterlockedDecrement(&object_locks); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out)

1 0

Zebediah Figura : strmbase: Use strmbase_passthrough directly in strmbase_renderer.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 191ae9f3ff54b160ebbccbe5e255bd0d6071be85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191ae9f3ff54b160ebbccbe5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:10 2020 -0500 strmbase: Use strmbase_passthrough directly in strmbase_renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pospass.c | 102 ++++++++++++--------------------------- dlls/strmbase/renderer.c | 42 +++++++--------- dlls/strmbase/strmbase_private.h | 6 +-- include/wine/strmbase.h | 22 ++++++++- 4 files changed, 72 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=191ae9f3ff54b160ebbc…

1 0

Zebediah Figura : strmbase: Get rid of the PassThruImpl typedef.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 54ee53382f59aa8333b4ad5fd97acdb07ec0ef7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ee53382f59aa8333b4ad5f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:09 2020 -0500 strmbase: Get rid of the PassThruImpl typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pospass.c | 104 ++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54ee53382f59aa8333b4…

1 0

Zebediah Figura : strmbase: Move the seeking passthrough object to quartz.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 3b8b06671376f80a1353171c6aeb1c528eb34ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8b06671376f80a1353171c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:11 2020 -0500 strmbase: Move the seeking passthrough object to quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 + dlls/quartz/main.c | 5 -- dlls/quartz/passthrough.c | 112 +++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/quartz_private.h | 1 + dlls/strmbase/pospass.c | 89 ---------------------------------- include/wine/strmbase.h | 2 - 6 files changed, 114 insertions(+), 96 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 858b957879..ec29ef53c6 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ filtermapper.c \ main.c \ memallocator.c \ + passthrough.c \ regsvr.c \ systemclock.c \ video.c \ diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 284f2cacae..89c7fe9bb1 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -36,11 +36,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return QUARTZ_DllMain(instance, reason, reserved); } -static HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) -{ - return PosPassThru_Construct(outer, (void **)out); -} - /****************************************************************************** * DirectShow ClassFactory */ diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c new file mode 100644 index 0000000000..2f8fe9dc37 --- /dev/null +++ b/dlls/quartz/passthrough.c @@ -0,0 +1,112 @@ +/* + * Seeking passthrough object + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "quartz_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +struct seeking_passthrough +{ + struct strmbase_passthrough passthrough; + + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; +}; + +static struct seeking_passthrough *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct seeking_passthrough, IUnknown_inner); +} + +static HRESULT WINAPI seeking_passthrough_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); + + TRACE("passthrough %p, iid %s, out %p.\n", passthrough, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IMediaPosition)) + *out = &passthrough->passthrough.IMediaPosition_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &passthrough->passthrough.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_ISeekingPassThru)) + *out = &passthrough->passthrough.ISeekingPassThru_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI seeking_passthrough_AddRef(IUnknown *iface) +{ + struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&passthrough->refcount); + + TRACE("%p increasing refcount to %u.\n", passthrough, refcount); + return refcount; +} + +static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) +{ + struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&passthrough->refcount); + + TRACE("%p decreasing refcount to %u.\n", passthrough, refcount); + if (!refcount) + { + strmbase_passthrough_cleanup(&passthrough->passthrough); + free(passthrough); + } + return refcount; +} + +static const IUnknownVtbl seeking_passthrough_vtbl = +{ + seeking_passthrough_QueryInterface, + seeking_passthrough_AddRef, + seeking_passthrough_Release, +}; + +HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) +{ + struct seeking_passthrough *object; + + TRACE("outer %p, out %p.\n", outer, out); + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IUnknown_inner.lpVtbl = &seeking_passthrough_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + object->refcount = 1; + + strmbase_passthrough_init(&object->passthrough, object->outer_unk); + + TRACE("Created seeking passthrough %p.\n", object); + *out = &object->IUnknown_inner; + return S_OK; +} diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 3332c27d21..5538537908 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -69,6 +69,7 @@ HRESULT filter_graph_no_thread_create(IUnknown *outer, IUnknown **out) DECLSPEC_ HRESULT filter_mapper_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT mem_allocator_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT system_clock_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT video_renderer_default_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT vmr7_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 3b4560d35e..b9e6f23a97 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -764,92 +764,3 @@ void strmbase_passthrough_eos(struct strmbase_passthrough *passthrough) passthrough->timevalid = FALSE; LeaveCriticalSection(&passthrough->time_cs); } - -struct seeking_passthrough -{ - struct strmbase_passthrough passthrough; - - IUnknown IUnknown_inner; - IUnknown *outer_unk; - LONG refcount; -}; - -static struct seeking_passthrough *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, struct seeking_passthrough, IUnknown_inner); -} - -static HRESULT WINAPI seeking_passthrough_QueryInterface(IUnknown *iface, REFIID iid, void **out) -{ - struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); - - TRACE("passthrough %p, iid %s, out %p.\n", passthrough, debugstr_guid(iid), out); - - if (IsEqualGUID(iid, &IID_IUnknown)) - *out = iface; - else if (IsEqualGUID(iid, &IID_IMediaPosition)) - *out = &passthrough->passthrough.IMediaPosition_iface; - else if (IsEqualGUID(iid, &IID_IMediaSeeking)) - *out = &passthrough->passthrough.IMediaSeeking_iface; - else if (IsEqualGUID(iid, &IID_ISeekingPassThru)) - *out = &passthrough->passthrough.ISeekingPassThru_iface; - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; -} - -static ULONG WINAPI seeking_passthrough_AddRef(IUnknown *iface) -{ - struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&passthrough->refcount); - - TRACE("%p increasing refcount to %u.\n", passthrough, refcount); - return refcount; -} - -static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) -{ - struct seeking_passthrough *passthrough = impl_from_IUnknown(iface); - ULONG refcount = InterlockedDecrement(&passthrough->refcount); - - TRACE("%p decreasing refcount to %u.\n", passthrough, refcount); - if (!refcount) - { - strmbase_passthrough_cleanup(&passthrough->passthrough); - heap_free(passthrough); - } - return refcount; -} - -static const IUnknownVtbl seeking_passthrough_vtbl = -{ - seeking_passthrough_QueryInterface, - seeking_passthrough_AddRef, - seeking_passthrough_Release, -}; - -HRESULT WINAPI PosPassThru_Construct(IUnknown *outer, void **out) -{ - struct seeking_passthrough *object; - - TRACE("outer %p, out %p.\n", outer, out); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - object->IUnknown_inner.lpVtbl = &seeking_passthrough_vtbl; - object->outer_unk = outer ? outer : &object->IUnknown_inner; - object->refcount = 1; - - strmbase_passthrough_init(&object->passthrough, object->outer_unk); - - TRACE("Created seeking passthrough %p.\n", object); - *out = &object->IUnknown_inner; - return S_OK; -} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6d620c7933..732ba1be26 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,8 +204,6 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); -HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru); - /* Output Queue */ typedef struct tagOutputQueue { CRITICAL_SECTION csQueue;

1 0

Alistair Leslie-Hughes : wineqtdecoder: Don't define CLSID_QTSplitter twice.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: dca6461ec8abb29e94a7ae43385e82c1a8cc6d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca6461ec8abb29e94a7ae43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 13 01:00:57 2020 +0000 wineqtdecoder: Don't define CLSID_QTSplitter twice. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 6973620809..f52971f3f7 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -127,7 +127,6 @@ #include "wineqtdecoder_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(qtsplitter); -extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { struct strmbase_source pin;

1 0

Zebediah Figura : strmbase: Separate the seeking passthrough object from its implementation.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: d5d6cfbf63c7ad00403be0b74f01876458fcaaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5d6cfbf63c7ad00403be0b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:08 2020 -0500 strmbase: Separate the seeking passthrough object from its implementation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pospass.c | 275 ++++++++++++++++++++++++++---------------------- 1 file changed, 147 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5d6cfbf63c7ad00403b…

1 0

Nikolay Sivov : dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 52a55f3e046cad58107fbe26f3b7d99e329945fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a55f3e046cad58107fbe26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 23:34:33 2020 +0300 dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a418081d49..de8ac2ea3c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -680,21 +680,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB22 */ case b_IN: - if (i > 0) - { - switch (break_class[i-1]) - { - case b_AL: - case b_HL: - case b_EX: - case b_ID: - case b_EB: - case b_EM: - case b_IN: - case b_NU: - set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - } - } + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; }

1 0

Zebediah Figura : kernel32: Reimplement ReplaceFile() on top of MoveFileEx().
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 5e218fe758fe6beed5c7ad73405eccf33c307e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e218fe758fe6beed5c7ad73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:30:30 2020 -0500 kernel32: Reimplement ReplaceFile() on top of MoveFileEx(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 140 +++++++++++++-------------------------------------- 1 file changed, 35 insertions(+), 105 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b2979f9622..2a2ace5dd8 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -423,11 +423,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa LPVOID lpExclude, LPVOID lpReserved) { UNICODE_STRING nt_replaced_name, nt_replacement_name; - ANSI_STRING unix_replaced_name, unix_replacement_name, unix_backup_name; - HANDLE hReplaced = NULL, hReplacement = NULL, hBackup = NULL; - DWORD error = ERROR_SUCCESS; - UINT replaced_flags; - BOOL ret = FALSE; + HANDLE hReplacement = NULL; NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; @@ -447,10 +443,6 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa return FALSE; } - unix_replaced_name.Buffer = NULL; - unix_replacement_name.Buffer = NULL; - unix_backup_name.Buffer = NULL; - attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -461,39 +453,21 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa /* Open the "replaced" file for reading */ if (!(RtlDosPathNameToNtPathName_U(lpReplacedFileName, &nt_replaced_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replaced_name, &unix_replaced_name, replaced_flags, FALSE); - RtlFreeUnicodeString(&nt_replaced_name); - if (status != STATUS_SUCCESS) - { - if (status == STATUS_OBJECT_NAME_NOT_FOUND) - error = ERROR_FILE_NOT_FOUND; - else - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* Replacement should fail if replaced is READ_ONLY */ - status = NtQueryInformationFile(hReplaced, &io, &info, sizeof(info), FileBasicInformation); + status = NtQueryAttributesFile(&attr, &info); + RtlFreeUnicodeString(&nt_replaced_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); if (info.FileAttributes & FILE_ATTRIBUTE_READONLY) { - error = ERROR_ACCESS_DENIED; - goto fail; + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; } /* @@ -502,65 +476,41 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa */ if (!(RtlDosPathNameToNtPathName_U(lpReplacementFileName, &nt_replacement_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } attr.ObjectName = &nt_replacement_name; status = NtOpenFile(&hReplacement, GENERIC_READ|GENERIC_WRITE|DELETE|WRITE_DAC|SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replacement_name, &unix_replacement_name, FILE_OPEN, FALSE); RtlFreeUnicodeString(&nt_replacement_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); + NtClose( hReplacement ); /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { - UNICODE_STRING nt_backup_name; - FILE_BASIC_INFORMATION replaced_info; - - /* Obtain the file attributes from the "replaced" file */ - status = NtQueryInformationFile(hReplaced, &io, &replaced_info, - sizeof(replaced_info), - FileBasicInformation); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } - - if (!(RtlDosPathNameToNtPathName_U(lpBackupFileName, &nt_backup_name, NULL, NULL))) - { - error = ERROR_PATH_NOT_FOUND; - goto fail; - } - attr.ObjectName = &nt_backup_name; - /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, - &attr, &io, NULL, replaced_info.FileAttributes, - FILE_SHARE_WRITE, FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, - NULL, 0); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_backup_name, &unix_backup_name, FILE_OPEN_IF, FALSE); - RtlFreeUnicodeString(&nt_backup_name); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + if (!MoveFileExW( lpReplacedFileName, lpBackupFileName, MOVEFILE_REPLACE_EXISTING )) + return FALSE; + } + else + { + /* ReplaceFile() can replace an open target. To do this, we need to move + * it out of the way first. */ + static const WCHAR prefixW[] = {'r','f',0}; + WCHAR temp_path[MAX_PATH], temp_file[MAX_PATH]; + + if (!GetTempPathW( ARRAY_SIZE(temp_path), temp_path ) + || !GetTempFileNameW( temp_path, prefixW, 0, temp_file ) + || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING )) + return FALSE; - /* If an existing backup exists then copy over it */ - if (rename(unix_replaced_name.Buffer, unix_backup_name.Buffer) == -1) + if (!DeleteFileW( temp_file )) { - error = ERROR_UNABLE_TO_REMOVE_REPLACED; /* is this correct? */ - goto fail; + SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); + return FALSE; } } @@ -568,37 +518,17 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa * Now that the backup has been performed (if requested), copy the replacement * into place */ - if (rename(unix_replacement_name.Buffer, unix_replaced_name.Buffer) == -1) + if (!MoveFileExW( lpReplacementFileName, lpReplacedFileName, 0 )) { - if (errno == EACCES) - { - /* Inappropriate permissions on "replaced", rename will fail */ - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* on failure we need to indicate whether a backup was made */ if (!lpBackupFileName) - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); else - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT_2; - goto fail; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 ); + return FALSE; } - /* Success! */ - ret = TRUE; - - /* Perform resource cleanup */ -fail: - if (hBackup) CloseHandle(hBackup); - if (hReplaced) CloseHandle(hReplaced); - if (hReplacement) CloseHandle(hReplacement); - RtlFreeAnsiString(&unix_backup_name); - RtlFreeAnsiString(&unix_replacement_name); - RtlFreeAnsiString(&unix_replaced_name); - - /* If there was an error, set the error code */ - if(!ret) - SetLastError(error); - return ret; + + return TRUE; }

1 0

Zebediah Figura : strmbase: Standardize aggregation of the seeking passthrough object.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: d30fd37176ba659c94596c36b438605b2ae6a25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30fd37176ba659c94596c36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:07 2020 -0500 strmbase: Standardize aggregation of the seeking passthrough object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/passthrough.c | 6 +-- dlls/strmbase/pospass.c | 112 ++++++++-------------------------------- 2 files changed, 25 insertions(+), 93 deletions(-) diff --git a/dlls/quartz/tests/passthrough.c b/dlls/quartz/tests/passthrough.c index 6042bc7f5a..ce7365928e 100644 --- a/dlls/quartz/tests/passthrough.c +++ b/dlls/quartz/tests/passthrough.c @@ -103,7 +103,7 @@ static void test_aggregation(void) hr = ISeekingPassThru_QueryInterface(passthrough, &IID_IUnknown, (void **)&unk2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); hr = ISeekingPassThru_QueryInterface(passthrough, &IID_ISeekingPassThru, (void **)&passthrough2); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -119,8 +119,8 @@ static void test_aggregation(void) ISeekingPassThru_Release(passthrough); ref = IUnknown_Release(unk); - todo_wine ok(!ref, "Got unexpected refcount %d.\n", ref); - todo_wine ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } START_TEST(passthrough) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 148d4fae3c..6920b37865 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -36,8 +36,6 @@ typedef struct PassThruImpl { LONG ref; IUnknown * outer_unk; IPin * pin; - BOOL bUnkOuterValid; - BOOL bAggregatable; BOOL renderer; CRITICAL_SECTION time_cs; BOOL timevalid; @@ -70,9 +68,6 @@ static HRESULT WINAPI SeekInner_QueryInterface(IUnknown * iface, PassThruImpl *This = impl_from_IUnknown_inner(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj); - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; - if (IsEqualGUID(&IID_IUnknown, riid)) { *ppvObj = &(This->IUnknown_inner); @@ -127,74 +122,25 @@ static const IUnknownVtbl IInner_VTable = SeekInner_Release }; -/* Generic functions for aggregation */ -static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv) -{ - if (This->bAggregatable) - This->bUnkOuterValid = TRUE; - - if (This->outer_unk) - { - if (This->bAggregatable) - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); - - if (IsEqualIID(riid, &IID_IUnknown)) - { - HRESULT hr; - - IUnknown_AddRef(&This->IUnknown_inner); - hr = IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); - IUnknown_Release(&This->IUnknown_inner); - This->bAggregatable = TRUE; - return hr; - } - - *ppv = NULL; - return E_NOINTERFACE; - } - - return IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); -} - -static ULONG SeekOuter_AddRef(PassThruImpl *This) -{ - if (This->outer_unk && This->bUnkOuterValid) - return IUnknown_AddRef(This->outer_unk); - return IUnknown_AddRef(&This->IUnknown_inner); -} - -static ULONG SeekOuter_Release(PassThruImpl *This) -{ - if (This->outer_unk && This->bUnkOuterValid) - return IUnknown_Release(This->outer_unk); - return IUnknown_Release(&This->IUnknown_inner); -} - -static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, REFIID iid, void **out) { - PassThruImpl *This = impl_from_ISeekingPassThru(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); + PassThruImpl *passthrough = impl_from_ISeekingPassThru(iface); - return SeekOuter_QueryInterface(This, riid, ppvObj); + return IUnknown_QueryInterface(passthrough->outer_unk, iid, out); } static ULONG WINAPI SeekingPassThru_AddRef(ISeekingPassThru *iface) { - PassThruImpl *This = impl_from_ISeekingPassThru(iface); + PassThruImpl *passthrough = impl_from_ISeekingPassThru(iface); - TRACE("(%p/%p)->()\n", This, iface); - - return SeekOuter_AddRef(This); + return IUnknown_AddRef(passthrough->outer_unk); } static ULONG WINAPI SeekingPassThru_Release(ISeekingPassThru *iface) { - PassThruImpl *This = impl_from_ISeekingPassThru(iface); + PassThruImpl *passthrough = impl_from_ISeekingPassThru(iface); - TRACE("(%p/%p)->()\n", This, iface); - - return SeekOuter_Release(This); + return IUnknown_Release(passthrough->outer_unk); } static HRESULT WINAPI SeekingPassThru_Init(ISeekingPassThru *iface, BOOL renderer, IPin *pin) @@ -246,9 +192,7 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru) if (!fimpl) return E_OUTOFMEMORY; - fimpl->outer_unk = pUnkOuter; - fimpl->bUnkOuterValid = FALSE; - fimpl->bAggregatable = FALSE; + fimpl->outer_unk = pUnkOuter ? pUnkOuter : &fimpl->IUnknown_inner; fimpl->IUnknown_inner.lpVtbl = &IInner_VTable; fimpl->ISeekingPassThru_iface.lpVtbl = &ISeekingPassThru_Vtbl; fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeekingPassThru_Vtbl; @@ -261,31 +205,25 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru) return S_OK; } -static HRESULT WINAPI MediaSeekingPassThru_QueryInterface(IMediaSeeking *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI MediaSeekingPassThru_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) { - PassThruImpl *This = impl_from_IMediaSeeking(iface); + PassThruImpl *passthrough = impl_from_IMediaSeeking(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return SeekOuter_QueryInterface(This, riid, ppvObj); + return IUnknown_QueryInterface(passthrough->outer_unk, iid, out); } static ULONG WINAPI MediaSeekingPassThru_AddRef(IMediaSeeking *iface) { - PassThruImpl *This = impl_from_IMediaSeeking(iface); + PassThruImpl *passthrough = impl_from_IMediaSeeking(iface); - TRACE("(%p/%p)->()\n", iface, This); - - return SeekOuter_AddRef(This); + return IUnknown_AddRef(passthrough->outer_unk); } static ULONG WINAPI MediaSeekingPassThru_Release(IMediaSeeking *iface) { - PassThruImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->()\n", iface, This); + PassThruImpl *passthrough = impl_from_IMediaSeeking(iface); - return SeekOuter_Release(This); + return IUnknown_Release(passthrough->outer_unk); } static HRESULT get_connected(PassThruImpl *This, REFIID riid, LPVOID *ppvObj) { @@ -644,31 +582,25 @@ static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl = MediaSeekingPassThru_GetPreroll }; -static HRESULT WINAPI MediaPositionPassThru_QueryInterface(IMediaPosition *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI MediaPositionPassThru_QueryInterface(IMediaPosition *iface, REFIID iid, void **out) { - PassThruImpl *This = impl_from_IMediaPosition(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); + PassThruImpl *passthrough = impl_from_IMediaPosition(iface); - return SeekOuter_QueryInterface(This, riid, ppvObj); + return IUnknown_QueryInterface(passthrough->outer_unk, iid, out); } static ULONG WINAPI MediaPositionPassThru_AddRef(IMediaPosition *iface) { - PassThruImpl *This = impl_from_IMediaPosition(iface); - - TRACE("(%p/%p)->()\n", iface, This); + PassThruImpl *passthrough = impl_from_IMediaPosition(iface); - return SeekOuter_AddRef(This); + return IUnknown_AddRef(passthrough->outer_unk); } static ULONG WINAPI MediaPositionPassThru_Release(IMediaPosition *iface) { - PassThruImpl *This = impl_from_IMediaPosition(iface); - - TRACE("(%p/%p)->()\n", iface, This); + PassThruImpl *passthrough = impl_from_IMediaPosition(iface); - return SeekOuter_Release(This); + return IUnknown_Release(passthrough->outer_unk); } static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *iface, UINT *count)

1 0