July 2020 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Get rid of the QualityControlImpl typedef.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a881a730b0624637814a419e30215dde94b7a81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a881a730b0624637814a419e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:22 2020 -0500 strmbase: Get rid of the QualityControlImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++++---------------- dlls/strmbase/strmbase_private.h | 17 +++++++++-------- include/wine/strmbase.h | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 763108d46a..918757caa8 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,10 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl **ppv) +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) { - QualityControlImpl *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(QualityControlImpl)); + struct strmbase_qc *This; + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); if (!*ppv) return E_OUTOFMEMORY; This = *ppv; @@ -41,37 +41,37 @@ HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl * return S_OK; } -void QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(struct strmbase_qc *This) { HeapFree(GetProcessHeap(),0,This); } -static inline QualityControlImpl *impl_from_IQualityControl(IQualityControl *iface) +static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, QualityControlImpl, IQualityControl_iface); + return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); } HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(&This->pin->filter->IBaseFilter_iface, riid, ppv); } ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(&This->pin->filter->IBaseFilter_iface); } ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(&This->pin->filter->IBaseFilter_iface); } HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", @@ -96,7 +96,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK; @@ -114,7 +114,7 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) +void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; @@ -124,7 +124,7 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ } -static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME jitter, +static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, REFERENCE_TIME start, REFERENCE_TIME stop) { REFERENCE_TIME max_lateness = 200000; @@ -153,7 +153,7 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -void QualityControlRender_DoQOS(QualityControlImpl *priv) +void QualityControlRender_DoQOS(struct strmbase_qc *priv) { REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; @@ -266,7 +266,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop) +void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) { This->start = -1; @@ -299,7 +299,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s TRACE("Starting at %s.\n", debugstr_time(This->start)); } -void QualityControlRender_EndRender(QualityControlImpl *This) +void QualityControlRender_EndRender(struct strmbase_qc *This) { REFERENCE_TIME elapsed; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 0a23592bd2..8df1cac71e 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -54,7 +54,8 @@ static inline const char *debugstr_time(REFERENCE_TIME time) } /* Quality Control */ -typedef struct QualityControlImpl { +struct strmbase_qc +{ IQualityControl IQualityControl_iface; struct strmbase_pin *pin; IQualityControl *tonotify; @@ -65,20 +66,20 @@ typedef struct QualityControlImpl { double avg_rate; LONG64 rendered, dropped; BOOL qos_handled, is_dropped; -} QualityControlImpl; +}; -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl **out); -void QualityControlImpl_Destroy(QualityControlImpl *This); +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); +void QualityControlImpl_Destroy(struct strmbase_qc *qc); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart); -void QualityControlRender_DoQOS(QualityControlImpl *priv); -void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop); -void QualityControlRender_EndRender(QualityControlImpl *This); +void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); +void QualityControlRender_DoQOS(struct strmbase_qc *priv); +void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop); +void QualityControlRender_EndRender(struct strmbase_qc *This); void strmbase_passthrough_update_time(struct strmbase_passthrough *passthrough, REFERENCE_TIME time); void strmbase_passthrough_invalidate_time(struct strmbase_passthrough *passthrough); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 02a5469de1..b0fa68ecf1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -291,7 +291,7 @@ struct strmbase_renderer REFERENCE_TIME stream_start; IQualityControl *pQSink; - struct QualityControlImpl *qcimpl; + struct strmbase_qc *qcimpl; const struct strmbase_renderer_ops *pFuncsTable;

1 0

Zebediah Figura : strmbase: Set the IQualityControl vtbl in QualityControlImpl_Create().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 461a928f14fffe74c3de0adb626212c315b504de URL: https://source.winehq.org/git/wine.git/?a=commit;h=461a928f14fffe74c3de0adb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:23 2020 -0500 strmbase: Set the IQualityControl vtbl in QualityControlImpl_Create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 48 ++++++++++++++++++++++++---------------- dlls/strmbase/renderer.c | 9 -------- dlls/strmbase/strmbase_private.h | 5 ----- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 918757caa8..c4e055858e 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,20 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) -{ - struct strmbase_qc *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); - if (!*ppv) - return E_OUTOFMEMORY; - This = *ppv; - This->pin = pin; - This->tonotify = NULL; - This->current_rstart = This->current_rstop = -1; - TRACE("-> %p\n", This); - return S_OK; -} - void QualityControlImpl_Destroy(struct strmbase_qc *This) { HeapFree(GetProcessHeap(),0,This); @@ -51,25 +37,25 @@ static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *ifa return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); } -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +static HRESULT WINAPI quality_control_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(&This->pin->filter->IBaseFilter_iface, riid, ppv); } -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) +static ULONG WINAPI quality_control_AddRef(IQualityControl *iface) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(&This->pin->filter->IBaseFilter_iface); } -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) +static ULONG WINAPI quality_control_Release(IQualityControl *iface) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(&This->pin->filter->IBaseFilter_iface); } -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct strmbase_qc *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; @@ -94,7 +80,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se return hr; } -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +static HRESULT WINAPI quality_control_SetSink(IQualityControl *iface, IQualityControl *tonotify) { struct strmbase_qc *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); @@ -102,6 +88,15 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro return S_OK; } +static const IQualityControlVtbl quality_control_vtbl = +{ + quality_control_QueryInterface, + quality_control_AddRef, + quality_control_Release, + quality_control_Notify, + quality_control_SetSink, +}; + /* Macros copied from gstreamer, weighted average between old average and new ones */ #define DO_RUNNING_AVG(avg,val,size) (((val) + ((size)-1) * (avg)) / (size)) @@ -317,3 +312,18 @@ void QualityControlRender_EndRender(struct strmbase_qc *This) else This->avg_render = UPDATE_RUNNING_AVG (This->avg_render, elapsed); } + +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) +{ + struct strmbase_qc *This; + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); + if (!*ppv) + return E_OUTOFMEMORY; + This = *ppv; + This->pin = pin; + This->tonotify = NULL; + This->current_rstart = This->current_rstop = -1; + This->IQualityControl_iface.lpVtbl = &quality_control_vtbl; + TRACE("-> %p\n", This); + return S_OK; +} diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index f1e74f6476..3895cb3119 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -27,14 +27,6 @@ static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbas return CONTAINING_RECORD(iface, struct strmbase_renderer, filter); } -static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; - static inline struct strmbase_renderer *impl_from_IPin(IPin *iface) { return CONTAINING_RECORD(iface, struct strmbase_renderer, sink.pin.IPin_iface); @@ -406,5 +398,4 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl; } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 8df1cac71e..15be9498e7 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -70,11 +70,6 @@ struct strmbase_qc HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); void QualityControlImpl_Destroy(struct strmbase_qc *qc); -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); void QualityControlRender_DoQOS(struct strmbase_qc *priv);

1 0

Zebediah Figura : strmbase: Store the quality control object directly in strmbase_renderer.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a9fbbda429f28ba74de207b1bd2fd1ce32133bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9fbbda429f28ba74de207b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:24 2020 -0500 strmbase: Store the quality control object directly in strmbase_renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 22 +++++----------------- dlls/strmbase/renderer.c | 16 +++++++--------- dlls/strmbase/strmbase_private.h | 18 ------------------ include/wine/strmbase.h | 20 +++++++++++++++++--- 4 files changed, 29 insertions(+), 47 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index c4e055858e..d0bd070d44 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -void QualityControlImpl_Destroy(struct strmbase_qc *This) -{ - HeapFree(GetProcessHeap(),0,This); -} - static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) { return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); @@ -313,17 +308,10 @@ void QualityControlRender_EndRender(struct strmbase_qc *This) This->avg_render = UPDATE_RUNNING_AVG (This->avg_render, elapsed); } -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) +void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin) { - struct strmbase_qc *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); - if (!*ppv) - return E_OUTOFMEMORY; - This = *ppv; - This->pin = pin; - This->tonotify = NULL; - This->current_rstart = This->current_rstop = -1; - This->IQualityControl_iface.lpVtbl = &quality_control_vtbl; - TRACE("-> %p\n", This); - return S_OK; + memset(qc, 0, sizeof(*qc)); + qc->pin = pin; + qc->current_rstart = qc->current_rstop = -1; + qc->IQualityControl_iface.lpVtbl = &quality_control_vtbl; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3895cb3119..939811bfa9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -63,7 +63,7 @@ static HRESULT renderer_query_interface(struct strmbase_filter *iface, REFIID ii else if (IsEqualGUID(iid, &IID_IMediaSeeking)) *out = &filter->passthrough.IMediaSeeking_iface; else if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->qc.IQualityControl_iface; else return E_NOINTERFACE; @@ -93,7 +93,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI SetEvent(filter->state_event); if (filter->sink.pin.peer) filter->eos = FALSE; - QualityControlRender_Start(filter->qcimpl, filter->stream_start); + QualityControlRender_Start(&filter->qc, filter->stream_start); if (filter->sink.pin.peer && filter->pFuncsTable->renderer_start_stream) filter->pFuncsTable->renderer_start_stream(filter); @@ -234,7 +234,7 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) EnterCriticalSection(&filter->csRenderLock); filter->eos = FALSE; - QualityControlRender_Start(filter->qcimpl, filter->stream_start); + QualityControlRender_Start(&filter->qc, filter->stream_start); strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); @@ -272,7 +272,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) CloseHandle(filter->state_event); CloseHandle(filter->advise_event); CloseHandle(filter->flush_event); - QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); } @@ -367,12 +366,12 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa if (SUCCEEDED(hr)) { - QualityControlRender_BeginRender(This->qcimpl, start, stop); + QualityControlRender_BeginRender(&This->qc, start, stop); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(This->qcimpl); + QualityControlRender_EndRender(&This->qc); } - QualityControlRender_DoQOS(This->qcimpl); + QualityControlRender_DoQOS(&This->qc); LeaveCriticalSection(&This->csRenderLock); @@ -386,6 +385,7 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, strmbase_filter_init(&filter->filter, outer, clsid, &filter_ops); strmbase_passthrough_init(&filter->passthrough, (IUnknown *)&filter->filter.IBaseFilter_iface); ISeekingPassThru_Init(&filter->passthrough.ISeekingPassThru_iface, TRUE, &filter->sink.pin.IPin_iface); + strmbase_qc_init(&filter->qc, &filter->sink.pin); filter->pFuncsTable = ops; @@ -396,6 +396,4 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 15be9498e7..d589213b71 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -53,24 +53,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -/* Quality Control */ -struct strmbase_qc -{ - IQualityControl IQualityControl_iface; - struct strmbase_pin *pin; - IQualityControl *tonotify; - - /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; - REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; - double avg_rate; - LONG64 rendered, dropped; - BOOL qos_handled, is_dropped; -}; - -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); -void QualityControlImpl_Destroy(struct strmbase_qc *qc); - void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); void QualityControlRender_DoQOS(struct strmbase_qc *priv); void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b0fa68ecf1..2e84edb7cd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -271,10 +271,27 @@ struct strmbase_passthrough void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknown *outer); void strmbase_passthrough_cleanup(struct strmbase_passthrough *passthrough); +struct strmbase_qc +{ + IQualityControl IQualityControl_iface; + struct strmbase_pin *pin; + IQualityControl *tonotify; + + /* Render stuff */ + REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; + REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; + double avg_rate; + LONG64 rendered, dropped; + BOOL qos_handled, is_dropped; +}; + +void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin); + struct strmbase_renderer { struct strmbase_filter filter; struct strmbase_passthrough passthrough; + struct strmbase_qc qc; struct strmbase_sink sink; @@ -290,9 +307,6 @@ struct strmbase_renderer HANDLE flush_event; REFERENCE_TIME stream_start; - IQualityControl *pQSink; - struct strmbase_qc *qcimpl; - const struct strmbase_renderer_ops *pFuncsTable; BOOL eos;

1 0

Alexandre Julliard : Release 5.13.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 536aec511612afd002808508d76bd5640f359f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=536aec511612afd002808508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:29:13 2020 +0200 Release 5.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 952 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 4 +- VERSION | 2 +- configure | 18 +- 5 files changed, 509 insertions(+), 468 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=536aec511612afd00280…

1 0

Tag wine-5.13 : Alexandre Julliard : Release 5.13
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: refs/tags/wine-5.13 Tag: ca73d7efceff2251cecfc738372c83245ad7c97f URL: https://source.winehq.org/git/wine.git/?a=tag;h=ca73d7efceff2251cecfc738372… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:29:13 2020 +0200 Release 5.13

1 0

Alexandre Julliard : ntdll: Move some timer stub functions to the Unix library.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: e7c60141d616b609b99e59a19375fc9759c3e4fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c60141d616b609b99e59a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:52:26 2020 +0200 ntdll: Move some timer stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 12 ------------ dlls/ntdll/ntdll.spec | 12 ++++++------ dlls/ntdll/sync.c | 33 --------------------------------- dlls/ntdll/unix/sync.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ed2f60333a..d27dca4be0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -826,18 +826,6 @@ NTSTATUS WINAPI NtReplyWaitReceivePort( * Misc */ - /****************************************************************************** - * NtSetIntervalProfile [NTDLL.@] - * ZwSetIntervalProfile [NTDLL.@] - */ -NTSTATUS WINAPI NtSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE Source) -{ - FIXME("%u,%d\n", Interval, Source); - return STATUS_SUCCESS; -} - /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f6d8811ba8..22cb9d1942 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -320,7 +320,7 @@ @ stdcall -syscall NtQuerySystemInformationEx(long ptr long ptr long ptr) @ stdcall -syscall NtQuerySystemTime(ptr) @ stdcall -syscall NtQueryTimer(ptr long ptr long ptr) -@ stdcall NtQueryTimerResolution(ptr ptr ptr) +@ stdcall -syscall NtQueryTimerResolution(ptr ptr ptr) @ stdcall -syscall NtQueryValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVirtualMemory(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVolumeInformationFile(long ptr ptr long long) @@ -380,7 +380,7 @@ @ stdcall -syscall NtSetInformationProcess(long long ptr long) @ stdcall -syscall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) -@ stdcall NtSetIntervalProfile(long long) +@ stdcall -syscall NtSetIntervalProfile(long long) @ stdcall -syscall NtSetIoCompletion(ptr long long long long) @ stdcall -syscall NtSetLdtEntries(long int64 long int64) @ stub NtSetLowEventPair @@ -396,7 +396,7 @@ @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) -@ stdcall NtSetTimerResolution(long long ptr) +@ stdcall -syscall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @ stdcall -syscall NtSetValueKey(long ptr long long ptr long) @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) @@ -1307,7 +1307,7 @@ @ stdcall -private -syscall ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private -syscall ZwQuerySystemTime(ptr) NtQuerySystemTime @ stdcall -private -syscall ZwQueryTimer(ptr long ptr long ptr) NtQueryTimer -@ stdcall -private ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution +@ stdcall -private -syscall ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution @ stdcall -private -syscall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall -private -syscall ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall -private -syscall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @@ -1367,7 +1367,7 @@ @ stdcall -private -syscall ZwSetInformationProcess(long long ptr long) NtSetInformationProcess @ stdcall -private -syscall ZwSetInformationThread(long long ptr long) NtSetInformationThread @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken -@ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile +@ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries @ stub ZwSetLowEventPair @@ -1383,7 +1383,7 @@ @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer -@ stdcall -private ZwSetTimerResolution(long long ptr) NtSetTimerResolution +@ stdcall -private -syscall ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed @ stdcall -private -syscall ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b5768f244d..8aa36c75eb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -37,8 +37,6 @@ #include "wine/debug.h" #include "ntdll_misc.h" -WINE_DEFAULT_DEBUG_CHANNEL(sync); - /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) @@ -122,37 +120,6 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a return STATUS_SUCCESS; } -/* - * Timers - */ - -/****************************************************************************** - * NtQueryTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryTimerResolution(OUT ULONG* min_resolution, - OUT ULONG* max_resolution, - OUT ULONG* current_resolution) -{ - FIXME("(%p,%p,%p), stub!\n", - min_resolution, max_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, - IN BOOLEAN set_resolution, - OUT ULONG* current_resolution ) -{ - FIXME("(%u,%u,%p), stub!\n", - resolution, set_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - - /****************************************************************** * RtlRunOnceInitialize (NTDLL.@) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7dda01923c..cdfb8295c0 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1424,6 +1424,36 @@ NTSTATUS WINAPI NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) } +/*********************************************************************** + * NtQueryTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *current_res ) +{ + FIXME( "(%p,%p,%p), stub!\n", min_res, max_res, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * NtSetTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res ) +{ + FIXME( "(%u,%u,%p), stub!\n", res, set, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetIntervalProfile (NTDLL.@) + */ +NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) +{ + FIXME( "%u,%d\n", interval, source ); + return STATUS_SUCCESS; +} + + /****************************************************************************** * NtGetTickCount (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move some power stub functions to the Unix library.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: e0a2f85b788b5cd764582a71fadaee11f06ab979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a2f85b788b5cd764582a71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:54:24 2020 +0200 ntdll: Move some power stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 65 ------------------------------------------------ dlls/ntdll/ntdll.spec | 20 +++++++-------- dlls/ntdll/unix/system.c | 55 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 75 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d27dca4be0..cc13672b2b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -885,71 +885,6 @@ NTSTATUS WINAPI NtDisplayString ( PUNICODE_STRING string ) return ret; } -/****************************************************************************** - * NtInitiatePowerAction [NTDLL.@] - * - */ -NTSTATUS WINAPI NtInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous) -{ - FIXME("(%d,%d,0x%08x,%d),stub\n", - SystemAction,MinSystemState,Flags,Asynchronous); - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetThreadExecutionState [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) -{ - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - *old_state = current; - - WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state ); - - if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) - current = new_state; - return STATUS_SUCCESS; -} - -/****************************************************************************** - * NtCreatePowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) -{ - FIXME( "(%p, %p): stub\n", handle, context ); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetPowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtClearPowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - - return STATUS_NOT_IMPLEMENTED; -} - /****************************************************************************** * NtAllocateLocallyUniqueId (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 22cb9d1942..6293dc81ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -149,7 +149,7 @@ @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) @ stdcall -syscall NtCancelTimer(long ptr) @ stdcall -syscall NtClearEvent(long) -@ stdcall NtClearPowerRequest(long long) +@ stdcall -syscall NtClearPowerRequest(long long) @ stdcall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys @@ -175,7 +175,7 @@ @ stdcall -syscall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall NtCreatePort(ptr ptr long long ptr) -@ stdcall NtCreatePowerRequest(ptr ptr) +@ stdcall -syscall NtCreatePowerRequest(ptr ptr) @ stub NtCreateProcess # @ stub NtCreateProcessEx @ stub NtCreateProfile @@ -230,7 +230,7 @@ @ stub NtImpersonateClientOfPort @ stub NtImpersonateThread @ stub NtInitializeRegistry -@ stdcall NtInitiatePowerAction (long long long long) +@ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) # @ stub NtIsSystemResumeAutomatic @ stdcall NtListenPort(ptr ptr) @@ -386,7 +386,7 @@ @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread -@ stdcall NtSetPowerRequest(long long) +@ stdcall -syscall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall NtSetSecurityObject(long long ptr) @ stub NtSetSystemEnvironmentValue @@ -394,7 +394,7 @@ @ stdcall -syscall NtSetSystemInformation(long ptr long) @ stub NtSetSystemPowerState @ stdcall -syscall NtSetSystemTime(ptr ptr) -@ stdcall NtSetThreadExecutionState(long ptr) +@ stdcall -syscall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) @ stdcall -syscall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @@ -1138,7 +1138,7 @@ @ stdcall -private -syscall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall -private -syscall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent -@ stdcall -private ZwClearPowerRequest(long long) NtClearPowerRequest +@ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys @@ -1163,7 +1163,7 @@ @ stdcall -private -syscall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall -private ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private ZwCreatePort(ptr ptr long long ptr) NtCreatePort -@ stdcall -private ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest +@ stdcall -private -syscall ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest @ stub ZwCreateProcess # @ stub ZwCreateProcessEx @ stub ZwCreateProfile @@ -1217,7 +1217,7 @@ @ stub ZwImpersonateClientOfPort @ stub ZwImpersonateThread @ stub ZwInitializeRegistry -@ stdcall -private ZwInitiatePowerAction(long long long long) NtInitiatePowerAction +@ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob # @ stub ZwIsSystemResumeAutomatic @ stdcall -private ZwListenPort(ptr ptr) NtListenPort @@ -1373,7 +1373,7 @@ @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread -@ stdcall -private ZwSetPowerRequest(long long) NtSetPowerRequest +@ stdcall -private -syscall ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject @ stub ZwSetSystemEnvironmentValue @@ -1381,7 +1381,7 @@ @ stdcall -private -syscall ZwSetSystemInformation(long ptr long) NtSetSystemInformation @ stub ZwSetSystemPowerState @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime -@ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState +@ stdcall -private -syscall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer @ stdcall -private -syscall ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 80478c59ed..7f85b41645 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3019,3 +3019,58 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, return STATUS_NOT_IMPLEMENTED; } } + + +/****************************************************************************** + * NtInitiatePowerAction (NTDLL.@) + */ +NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE state, + ULONG flags, BOOLEAN async ) +{ + FIXME( "(%d,%d,0x%08x,%d),stub\n", action, state, flags, async ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtCreatePowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) +{ + FIXME( "(%p, %p): stub\n", handle, context ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetPowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtClearPowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetThreadExecutionState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) +{ + static EXECUTION_STATE current = ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; + + WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state ); + *old_state = current; + if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) current = new_state; + return STATUS_SUCCESS; +}

1 0

Rémi Bernon : dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d806203850c9666ff32637f5215fbb21a0f2bc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d806203850c9666ff32637f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 16 17:26:52 2020 +0200 dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 166 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 123 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d806203850c9666ff326…

1 0

Rémi Bernon : dxgi: Implement IDXGISwapChain4 stub.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 5079d31e3a3e64a6cea9340f8d87814001fa6d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5079d31e3a3e64a6cea9340f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 16 17:26:53 2020 +0200 dxgi: Implement IDXGISwapChain4 stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 157 +++++++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5079d31e3a3e64a6cea9…

1 0

Matteo Bruni : wined3d: Disable depth textures with backbuffer ORM.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 29dc8534f15d4265caf1beb1a270627a301cc5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=29dc8534f15d4265caf1beb1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:04 2020 +0200 wined3d: Disable depth textures with backbuffer ORM. We currently don't have any way to copy the depth buffer from the DRAWABLE to the TEXTURE location, aside from FBOs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index eaa391fafb..8d790c5294 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3034,15 +3034,17 @@ static void query_internal_format(struct wined3d_adapter *adapter, if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write_supported) format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); + } - if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) - { - format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; - } + if ((!gl_info->supported[ARB_DEPTH_TEXTURE] || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + && (format->f.depth_size || format->f.stencil_size)) + { + TRACE("Disabling texturing support for depth / stencil format %s.\n", debug_d3dformat(format->f.id)); + format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; } query_view_class(format);

1 0