June 2020 - Wine-Devel - list.winehq.org

Wine not working when trying to run .exe application
by Zesh June 19, 2020

June 19, 2020

Hello when I am trying to run an .exe application this error shows up:"err:seh:setup_exception_record stack overflow 996 bytes in thread 0009 eip 7bc3e41f esp 00230f4c stack 0x230000-0x231000-0x330000", thanks.

2 2

[PATCH 1/3] ddraw: Thunk to surface1, not surface7 in blt.
by Stefan Dösinger June 19, 2020

June 19, 2020

This patch series makes FRAPS work with ddraw games. It hooks only version 1 methods of blt, unlock and flip to detect a front buffer modification. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- In the past FRAPS wouldn't work in Wine because it assumed that the offset of the hooked functions inside the library is the same in every process. This wasn't the case when we used Linux .so's, but it now works with PE builds of the d3d frontend DLLs. d3d8 is already working. For d3d9, FRAPS hooks D3DPERF_*. It happens to work as-is with my build, but I have a patch in my tree that adds DECLSPEC_HOTPATCH to those. Unfortunately this nowadays runs into bug 47633, so we won't be able to upstream it anytime soon. That means using fraps with a d3d9 game puts you at the mercy of your compiler. --- dlls/ddraw/surface.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e2a3c..46c5fa7da0f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1651,11 +1651,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons * D3D_OK on success, error code otherwise. * *****************************************************************************/ -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, - IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, + IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { - struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); struct wined3d_blt_fx wined3d_fx; DWORD unsupported_flags; DWORD fill_colour = 0; @@ -1834,6 +1834,19 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * } } +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, + IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +{ + struct ddraw_surface *dst = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(src_surface); + + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", + iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); + + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { @@ -1843,47 +1856,34 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 * TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src_surface); - - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", - iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); -} - -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, - IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) -{ - struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface2(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } /***************************************************************************** -- 2.26.2

3 4

[PATCH 1/3] amstream: Implement MediaStreamFilter::GetCurrentStreamTime.
by Anton Baskanov June 19, 2020

June 19, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 28 ++++++- dlls/amstream/tests/amstream.c | 137 +++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 05a02e3f66..3dff686b21 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -174,6 +174,7 @@ struct filter IAMMediaStream **streams; IAMMediaStream *seekable_stream; FILTER_STATE state; + REFERENCE_TIME start_time; }; static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -295,6 +296,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start EnterCriticalSection(&filter->cs); + filter->start_time = start; set_state(filter, State_Running); LeaveCriticalSection(&filter->cs); @@ -614,11 +616,31 @@ static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface return E_NOTIMPL; } -static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pCurrentStreamTime) +static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pCurrentStreamTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + if (!time) + return E_POINTER; + + EnterCriticalSection(&filter->cs); + + if (filter->state != State_Running || !filter->clock) + { + *time = 0; + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + IReferenceClock_GetTime(filter->clock, time); + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME WaitStreamTime) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2bc1310a96..e1f6a15ad3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2641,6 +2641,87 @@ static const IMediaSeekingVtbl testsource_seeking_vtbl = testsource_seeking_GetPreroll, }; +struct testclock +{ + IReferenceClock IReferenceClock_iface; + LONG refcount; + LONGLONG time; + HRESULT get_time_hr; +}; + +static inline struct testclock *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct testclock, IReferenceClock_iface); +} + +static HRESULT WINAPI testclock_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IReferenceClock) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + IReferenceClock_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI testclock_AddRef(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedIncrement(&clock->refcount); +} + +static ULONG WINAPI testclock_Release(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedDecrement(&clock->refcount); +} + +static HRESULT WINAPI testclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + if (SUCCEEDED(clock->get_time_hr)) + *time = clock->time; + return clock->get_time_hr; +} + +static HRESULT WINAPI testclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static IReferenceClockVtbl testclock_vtbl = +{ + testclock_QueryInterface, + testclock_AddRef, + testclock_Release, + testclock_GetTime, + testclock_AdviseTime, + testclock_AdvisePeriodic, + testclock_Unadvise, +}; + +static void testclock_init(struct testclock *clock) +{ + memset(clock, 0, sizeof(*clock)); + clock->IReferenceClock_iface.lpVtbl = &testclock_vtbl; +} + static void test_audiostream_get_format(void) { static const WAVEFORMATEX pin_format = @@ -4330,6 +4411,61 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_current_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 11111101, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4383,6 +4519,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); } -- 2.17.1

3 5

[PATCH v2 1/4] amstream: Get rid of the IDirectDrawStreamSampleImpl typedef.
by Gijs Vermeulen June 19, 2020

June 19, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 73 +++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 1c924e40a2..e2f24c3b4c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -952,21 +952,22 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) return S_OK; } -typedef struct { +struct ddraw_sample +{ IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; IDirectDrawSurface *surface; RECT rect; -} IDirectDrawStreamSampleImpl; +}; -static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) +static inline struct ddraw_sample *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) { - return CONTAINING_RECORD(iface, IDirectDrawStreamSampleImpl, IDirectDrawStreamSample_iface); + return CONTAINING_RECORD(iface, struct ddraw_sample, IDirectDrawStreamSample_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStreamSample *iface, +static HRESULT WINAPI ddraw_sample_QueryInterface(IDirectDrawStreamSample *iface, REFIID riid, void **ret_iface) { TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); @@ -986,43 +987,43 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStre return E_NOINTERFACE; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_AddRef(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_AddRef(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedIncrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedDecrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { - if (This->surface) - IDirectDrawSurface_Release(This->surface); - IMediaStream_Release(This->parent); - HeapFree(GetProcessHeap(), 0, This); + if (sample->surface) + IDirectDrawSurface_Release(sample->surface); + IMediaStream_Release(sample->parent); + HeapFree(GetProcessHeap(), 0, sample); } return ref; } /*** IStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) +static HRESULT WINAPI ddraw_sample_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) { FIXME("(%p)->(%p): stub\n", iface, media_stream); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); @@ -1030,7 +1031,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, const STREAM_TIME *end_time) { FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); @@ -1038,7 +1039,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, +static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC func_APC, DWORD APC_data) { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); @@ -1046,7 +1047,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) +static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) { FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); @@ -1054,27 +1055,27 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt } /*** IDirectDrawStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, +static HRESULT WINAPI ddraw_sample_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); if (ddraw_surface) { - *ddraw_surface = This->surface; + *ddraw_surface = sample->surface; if (*ddraw_surface) IDirectDrawSurface_AddRef(*ddraw_surface); } if (rect) - *rect = This->rect; + *rect = sample->rect; return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) +static HRESULT WINAPI ddraw_sample_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) { FIXME("(%p)->(%p): stub\n", iface, rect); @@ -1084,24 +1085,24 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSampl static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = { /*** IUnknown methods ***/ - IDirectDrawStreamSampleImpl_QueryInterface, - IDirectDrawStreamSampleImpl_AddRef, - IDirectDrawStreamSampleImpl_Release, + ddraw_sample_QueryInterface, + ddraw_sample_AddRef, + ddraw_sample_Release, /*** IStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetMediaStream, - IDirectDrawStreamSampleImpl_GetSampleTimes, - IDirectDrawStreamSampleImpl_SetSampleTimes, - IDirectDrawStreamSampleImpl_Update, - IDirectDrawStreamSampleImpl_CompletionStatus, + ddraw_sample_GetMediaStream, + ddraw_sample_GetSampleTimes, + ddraw_sample_SetSampleTimes, + ddraw_sample_Update, + ddraw_sample_CompletionStatus, /*** IDirectDrawStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetSurface, - IDirectDrawStreamSampleImpl_SetRect + ddraw_sample_GetSurface, + ddraw_sample_SetRect }; static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { - IDirectDrawStreamSampleImpl *object; + struct ddraw_sample *object; HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); -- 2.27.0

3 7

[PATCH] winegstreamer: Change blacklist to a more neutral word (try 2)
by André Hentschel June 19, 2020

June 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winegstreamer/gst_cbs.c | 16 ++++++++-------- dlls/winegstreamer/gst_cbs.h | 8 ++++---- dlls/winegstreamer/gstdemux.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..6959eb33a5a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -261,20 +261,20 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { - struct cb_data cbdata = { AUTOPLUG_BLACKLIST }; + struct cb_data cbdata = { AUTOPLUG_BANNED }; - cbdata.u.autoplug_blacklist_data.bin = bin; - cbdata.u.autoplug_blacklist_data.pad = pad; - cbdata.u.autoplug_blacklist_data.caps = caps; - cbdata.u.autoplug_blacklist_data.fact = fact; - cbdata.u.autoplug_blacklist_data.user = user; + cbdata.u.autoplug_banned_data.bin = bin; + cbdata.u.autoplug_banned_data.pad = pad; + cbdata.u.autoplug_banned_data.caps = caps; + cbdata.u.autoplug_banned_data.fact = fact; + cbdata.u.autoplug_banned_data.user = user; call_cb(&cbdata); - return cbdata.u.autoplug_blacklist_data.ret; + return cbdata.u.autoplug_banned_data.ret; } void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..5740a8e6e8f 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -40,7 +40,7 @@ enum CB_TYPE { EVENT_SINK, GOT_DATA_SINK, REMOVED_DECODED_PAD, - AUTOPLUG_BLACKLIST, + AUTOPLUG_BANNED, UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX @@ -108,14 +108,14 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct autoplug_blacklist_data { + struct autoplug_banned_data { GstElement *bin; GstPad *pad; GstCaps *caps; GstElementFactory *fact; gpointer user; GstAutoplugSelectResult ret; - } autoplug_blacklist_data; + } autoplug_banned_data; struct unknown_type_data { GstElement *bin; GstPad *pad; @@ -150,7 +150,7 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f82..8af0758ca02 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1232,12 +1232,12 @@ static void no_more_pads(GstElement *decodebin, gpointer user) SetEvent(filter->no_more_pads_event); } -static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) +static GstAutoplugSelectResult autoplug_banned(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + WARN("Banned a/52 decoder because it only works in Totem\n"); return GST_AUTOPLUG_SELECT_SKIP; } if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { @@ -1619,7 +1619,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_banned_wrapper), filter); g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); @@ -2276,10 +2276,10 @@ void perform_cb_gstdemux(struct cb_data *cbdata) removed_decoded_pad(data->element, data->pad, data->user); break; } - case AUTOPLUG_BLACKLIST: + case AUTOPLUG_BANNED: { - struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data; - cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin, + struct autoplug_banned_data *data = &cbdata->u.autoplug_banned_data; + cbdata->u.autoplug_banned_data.ret = autoplug_banned(data->bin, data->pad, data->caps, data->fact, data->user); break; } -- 2.17.1

1 0

[PATCH] ntdll: Increment num_busy_workers when queuing TP object.
by Paul Gofman June 19, 2020

June 19, 2020

Otherwise two consequative submits may have the same num_busy_workers value if threadpool_worker_proc did not have a chance to pick the work in between. A new thread is not created in tp_submit() for the second submit and if the first submit queues an (infinitely long) wait the next submitted callback is not called for indefinite time period. Fixes hang on exit in Detroit Become Human. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/threadpool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 451d441f572..84286fbee90 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1375,7 +1375,6 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) { InterlockedIncrement( &pool->refcount ); pool->num_workers++; - pool->num_busy_workers++; NtClose( thread ); } return status; @@ -2137,6 +2136,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa static void tp_object_prio_queue( struct threadpool_object *object ) { + ++object->pool->num_busy_workers; list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); } @@ -2330,7 +2330,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); - pool->num_busy_workers--; for (;;) { while ((ptr = threadpool_get_next_item( pool ))) @@ -2360,7 +2359,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Leave critical section and do the actual callback. */ object->num_associated_callbacks++; object->num_running_callbacks++; - pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); /* Initialize threadpool instance struct. */ @@ -2466,6 +2464,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) skip_cleanup: RtlEnterCriticalSection( &pool->cs ); + assert(pool->num_busy_workers); pool->num_busy_workers--; /* Simple callbacks are automatically shutdown after execution. */ -- 2.26.2

1 0

[PATCH V2 3/3] directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager.
by Vijay Kiran Kamuju June 19, 2020

June 19, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 2/3] directmanipulation: Implement IDirectManipulationFrameInfoProvider stub interface.
by Vijay Kiran Kamuju June 19, 2020

June 19, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 1/3] directmanipulation: Implement IDirectManipulationCompositor stub interface
by Vijay Kiran Kamuju June 19, 2020

June 19, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager.
by Vijay Kiran Kamuju June 19, 2020

June 19, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0