March 2021 - Wine-Devel - list.winehq.org

[PATCH 1/5] strmbase: Merge qualitycontrol.c into renderer.c.
by Zebediah Figura March 7, 2021

March 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/qualitycontrol.c | 317 ------------------------------ dlls/strmbase/renderer.c | 326 +++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 5 - dlls/wineqtdecoder/Makefile.in | 1 - include/wine/strmbase.h | 2 - 6 files changed, 326 insertions(+), 326 deletions(-) delete mode 100644 dlls/strmbase/qualitycontrol.c diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index ec13acccf40..0fef7b6ff03 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -7,6 +7,5 @@ C_SRCS = \ outputqueue.c \ pin.c \ pospass.c \ - qualitycontrol.c \ renderer.c \ seeking.c diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c deleted file mode 100644 index d0bd070d447..00000000000 --- a/dlls/strmbase/qualitycontrol.c +++ /dev/null @@ -1,317 +0,0 @@ -/* - * Quality Control Interfaces - * - * Copyright 2010 Maarten Lankhorst for CodeWeavers - * - * rendering qos functions based on, the original can be found at - * gstreamer/libs/gst/base/gstbasesink.c which has copyright notice: - * - * Copyright (C) 2005-2007 Wim Taymans <wim.taymans(a)gmail.com> - * - * 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 "strmbase_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); - -static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) -{ - return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); -} - -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); -} - -static ULONG WINAPI quality_control_AddRef(IQualityControl *iface) -{ - struct strmbase_qc *This = impl_from_IQualityControl(iface); - return IBaseFilter_AddRef(&This->pin->filter->IBaseFilter_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); -} - -static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) -{ - 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", - iface, sender, qm.Type, qm.Proportion, debugstr_time(qm.Late), debugstr_time(qm.TimeStamp)); - - if (This->tonotify) - return IQualityControl_Notify(This->tonotify, &This->pin->filter->IBaseFilter_iface, qm); - - if (This->pin->peer) - { - IQualityControl *qc = NULL; - IPin_QueryInterface(This->pin->peer, &IID_IQualityControl, (void **)&qc); - if (qc) - { - hr = IQualityControl_Notify(qc, &This->pin->filter->IBaseFilter_iface, qm); - IQualityControl_Release(qc); - } - } - - return hr; -} - -static HRESULT WINAPI quality_control_SetSink(IQualityControl *iface, IQualityControl *tonotify) -{ - struct strmbase_qc *This = impl_from_IQualityControl(iface); - TRACE("%p %p\n", This, tonotify); - This->tonotify = tonotify; - 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)) - -/* generic running average, this has a neutral window size */ -#define UPDATE_RUNNING_AVG(avg,val) DO_RUNNING_AVG(avg,val,8) - -/* the windows for these running averages are experimentally obtained. - * positive values get averaged more while negative values use a small - * window so we can react faster to badness. */ -#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(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; - This->avg_rate = -1.0; - This->rendered = This->dropped = 0; - This->is_dropped = FALSE; - This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ -} - -static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - REFERENCE_TIME max_lateness = 200000; - - TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), - debugstr_time(start), debugstr_time(stop)); - - /* we can add a valid stop time */ - if (stop >= start) - max_lateness += stop; - else - max_lateness += start; - - /* if the jitter bigger than duration and lateness we are too late */ - if (start + jitter > max_lateness) { - WARN("buffer is too late %i > %i\n", (int)((start + jitter)/10000), (int)(max_lateness/10000)); - /* !!emergency!!, if we did not receive anything valid for more than a - * second, render it anyway so the user sees something */ - if (This->last_in_time < 0 || - start - This->last_in_time < 10000000) - return TRUE; - FIXME("A lot of buffers are being dropped.\n"); - FIXME("There may be a timestamping problem, or this computer is too slow.\n"); - } - This->last_in_time = start; - return FALSE; -} - -void QualityControlRender_DoQOS(struct strmbase_qc *priv) -{ - REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; - double rate; - - TRACE("%p\n", priv); - - if (!priv->pin->filter->clock || priv->current_rstart < 0) - return; - - start = priv->current_rstart; - stop = priv->current_rstop; - jitter = priv->current_jitter; - - if (jitter < 0) { - /* this is the time the buffer entered the sink */ - if (start < -jitter) - entered = 0; - else - entered = start + jitter; - left = start; - } else { - /* this is the time the buffer entered the sink */ - entered = start + jitter; - /* this is the time the buffer left the sink */ - left = start + jitter; - } - - /* calculate duration of the buffer */ - if (stop >= start) - duration = stop - start; - else - duration = 0; - - /* if we have the time when the last buffer left us, calculate - * processing time */ - if (priv->last_left >= 0) { - if (entered > priv->last_left) { - pt = entered - priv->last_left; - } else { - pt = 0; - } - } else { - pt = priv->avg_pt; - } - - TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", - debugstr_time(start), debugstr_time(entered), debugstr_time(left), - debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); - - TRACE("average duration %s, average pt %s, average rate %.16e.\n", - debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); - - /* collect running averages. for first observations, we copy the - * values */ - if (priv->avg_duration < 0) - priv->avg_duration = duration; - else - priv->avg_duration = UPDATE_RUNNING_AVG (priv->avg_duration, duration); - - if (priv->avg_pt < 0) - priv->avg_pt = pt; - else - priv->avg_pt = UPDATE_RUNNING_AVG (priv->avg_pt, pt); - - if (priv->avg_duration != 0) - rate = - (double)priv->avg_pt / - (double)priv->avg_duration; - else - rate = 0.0; - - if (priv->last_left >= 0) { - if (priv->is_dropped || priv->avg_rate < 0.0) { - priv->avg_rate = rate; - } else { - if (rate > 1.0) - priv->avg_rate = UPDATE_RUNNING_AVG_N (priv->avg_rate, rate); - else - priv->avg_rate = UPDATE_RUNNING_AVG_P (priv->avg_rate, rate); - } - } - - if (priv->avg_rate >= 0.0) { - HRESULT hr; - Quality q; - /* if we have a valid rate, start sending QoS messages */ - if (priv->current_jitter < 0) { - /* make sure we never go below 0 when adding the jitter to the - * timestamp. */ - if (priv->current_rstart < -priv->current_jitter) - priv->current_jitter = -priv->current_rstart; - } - else - priv->current_jitter += (priv->current_rstop - priv->current_rstart); - q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = (LONG)(1000. / priv->avg_rate); - if (q.Proportion < 200) - q.Proportion = 200; - else if (q.Proportion > 5000) - q.Proportion = 5000; - q.Late = priv->current_jitter; - q.TimeStamp = priv->current_rstart; - TRACE("Late: %s from %s, rate: %g\n", debugstr_time(q.Late), debugstr_time(q.TimeStamp), 1./priv->avg_rate); - hr = IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); - priv->qos_handled = hr == S_OK; - } - - /* record when this buffer will leave us */ - priv->last_left = left; -} - - -void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) -{ - This->start = -1; - - This->current_rstart = start; - This->current_rstop = max(stop, start); - - if (start >= 0) - { - REFERENCE_TIME now; - IReferenceClock_GetTime(This->pin->filter->clock, &now); - This->current_jitter = (now - This->clockstart) - start; - } - else - This->current_jitter = 0; - - /* FIXME: This isn't correct; we don't drop samples, nor should. */ - This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, - debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); - if (This->is_dropped) - This->dropped++; - else - This->rendered++; - - if (!This->pin->filter->clock) - return; - - IReferenceClock_GetTime(This->pin->filter->clock, &This->start); - - TRACE("Starting at %s.\n", debugstr_time(This->start)); -} - -void QualityControlRender_EndRender(struct strmbase_qc *This) -{ - REFERENCE_TIME elapsed; - - TRACE("%p\n", This); - - if (!This->pin->filter->clock || This->start < 0 - || FAILED(IReferenceClock_GetTime(This->pin->filter->clock, &This->stop))) - return; - - elapsed = This->start - This->stop; - if (elapsed < 0) - return; - if (This->avg_render < 0) - This->avg_render = elapsed; - else - This->avg_render = UPDATE_RUNNING_AVG (This->avg_render, elapsed); -} - -void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin) -{ - 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 8da3d81de61..f3869c868dc 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -22,6 +22,257 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +/* The following quality-of-service code is based on GstBaseSink QoS code, which + * is covered by the following copyright information: + * + * GStreamer + * Copyright (C) 2005-2007 Wim Taymans <wim.taymans(a)gmail.com> + * + * gstbasesink.c: Base class for sink elements + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library 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. + */ + +#define DO_RUNNING_AVG(avg,val,size) (((val) + ((size)-1) * (avg)) / (size)) + +/* Generic running average; this has a neutral window size. */ +#define UPDATE_RUNNING_AVG(avg,val) DO_RUNNING_AVG(avg,val,8) + +/* The windows for these running averages are experimentally obtained. + * Positive values get averaged more, while negative values use a small + * window so we can react faster to badness. */ +#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) + +static 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; + This->avg_rate = -1.0; + This->rendered = This->dropped = 0; + This->is_dropped = FALSE; + This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ +} + +static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, + REFERENCE_TIME start, REFERENCE_TIME stop) +{ + REFERENCE_TIME max_lateness = 200000; + + TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), + debugstr_time(start), debugstr_time(stop)); + + /* we can add a valid stop time */ + if (stop >= start) + max_lateness += stop; + else + max_lateness += start; + + /* if the jitter bigger than duration and lateness we are too late */ + if (start + jitter > max_lateness) { + WARN("buffer is too late %i > %i\n", (int)((start + jitter)/10000), (int)(max_lateness/10000)); + /* !!emergency!!, if we did not receive anything valid for more than a + * second, render it anyway so the user sees something */ + if (This->last_in_time < 0 || + start - This->last_in_time < 10000000) + return TRUE; + FIXME("A lot of buffers are being dropped.\n"); + FIXME("There may be a timestamping problem, or this computer is too slow.\n"); + } + This->last_in_time = start; + return FALSE; +} + +static void QualityControlRender_DoQOS(struct strmbase_qc *priv) +{ + REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; + double rate; + + TRACE("%p\n", priv); + + if (!priv->pin->filter->clock || priv->current_rstart < 0) + return; + + start = priv->current_rstart; + stop = priv->current_rstop; + jitter = priv->current_jitter; + + if (jitter < 0) + { + /* This is the time the buffer entered the sink. */ + if (start < -jitter) + entered = 0; + else + entered = start + jitter; + left = start; + } + else + { + /* This is the time the buffer entered the sink. */ + entered = start + jitter; + /* This is the time the buffer left the sink. */ + left = start + jitter; + } + + /* Calculate the duration of the buffer. */ + if (stop >= start) + duration = stop - start; + else + duration = 0; + + /* If we have the time when the last buffer left us, calculate processing + * time. */ + if (priv->last_left >= 0) + { + if (entered > priv->last_left) + pt = entered - priv->last_left; + else + pt = 0; + } + else + { + pt = priv->avg_pt; + } + + TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", + debugstr_time(start), debugstr_time(entered), debugstr_time(left), + debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); + + TRACE("average duration %s, average pt %s, average rate %.16e.\n", + debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); + + /* Collect running averages. For first observations, we copy the values. */ + if (priv->avg_duration < 0) + priv->avg_duration = duration; + else + priv->avg_duration = UPDATE_RUNNING_AVG(priv->avg_duration, duration); + + if (priv->avg_pt < 0) + priv->avg_pt = pt; + else + priv->avg_pt = UPDATE_RUNNING_AVG(priv->avg_pt, pt); + + if (priv->avg_duration != 0) + rate = (double)priv->avg_pt / (double)priv->avg_duration; + else + rate = 0.0; + + if (priv->last_left >= 0) + { + if (priv->is_dropped || priv->avg_rate < 0.0) + { + priv->avg_rate = rate; + } + else + { + if (rate > 1.0) + priv->avg_rate = UPDATE_RUNNING_AVG_N(priv->avg_rate, rate); + else + priv->avg_rate = UPDATE_RUNNING_AVG_P(priv->avg_rate, rate); + } + } + + if (priv->avg_rate >= 0.0) + { + HRESULT hr; + Quality q; + + /* If we have a valid rate, start sending QoS messages. */ + if (priv->current_jitter < 0) + { + /* Make sure we never go below 0 when adding the jitter to the + * timestamp. */ + if (priv->current_rstart < -priv->current_jitter) + priv->current_jitter = -priv->current_rstart; + } + else + { + priv->current_jitter += (priv->current_rstop - priv->current_rstart); + } + + q.Type = (jitter > 0 ? Famine : Flood); + q.Proportion = 1000.0 / priv->avg_rate; + if (q.Proportion < 200) + q.Proportion = 200; + else if (q.Proportion > 5000) + q.Proportion = 5000; + q.Late = priv->current_jitter; + q.TimeStamp = priv->current_rstart; + hr = IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); + priv->qos_handled = hr == S_OK; + } + + /* Record when this buffer will leave us. */ + priv->last_left = left; +} + +static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) +{ + This->start = -1; + + This->current_rstart = start; + This->current_rstop = max(stop, start); + + if (start >= 0) + { + REFERENCE_TIME now; + IReferenceClock_GetTime(This->pin->filter->clock, &now); + This->current_jitter = (now - This->clockstart) - start; + } + else + { + This->current_jitter = 0; + } + + /* FIXME: This isn't correct; we don't drop samples, nor should. */ + This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); + TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); + if (This->is_dropped) + This->dropped++; + else + This->rendered++; + + if (!This->pin->filter->clock) + return; + + IReferenceClock_GetTime(This->pin->filter->clock, &This->start); + + TRACE("Starting at %s.\n", debugstr_time(This->start)); +} + +static void QualityControlRender_EndRender(struct strmbase_qc *This) +{ + REFERENCE_TIME elapsed; + + TRACE("%p\n", This); + + if (!This->pin->filter->clock || This->start < 0 + || FAILED(IReferenceClock_GetTime(This->pin->filter->clock, &This->stop))) + return; + + elapsed = This->start - This->stop; + if (elapsed < 0) + return; + if (This->avg_render < 0) + This->avg_render = elapsed; + else + This->avg_render = UPDATE_RUNNING_AVG(This->avg_render, elapsed); +} + static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct strmbase_renderer, filter); @@ -319,6 +570,73 @@ static const struct strmbase_sink_ops sink_ops = .sink_end_flush = sink_end_flush, }; +static struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); +} + +static HRESULT WINAPI quality_control_QueryInterface(IQualityControl *iface, REFIID iid, void **out) +{ + struct strmbase_qc *qc = impl_from_IQualityControl(iface); + return IBaseFilter_QueryInterface(&qc->pin->filter->IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI quality_control_AddRef(IQualityControl *iface) +{ + struct strmbase_qc *qc = impl_from_IQualityControl(iface); + return IBaseFilter_AddRef(&qc->pin->filter->IBaseFilter_iface); +} + +static ULONG WINAPI quality_control_Release(IQualityControl *iface) +{ + struct strmbase_qc *qc = impl_from_IQualityControl(iface); + return IBaseFilter_Release(&qc->pin->filter->IBaseFilter_iface); +} + +static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) +{ + struct strmbase_qc *qc = impl_from_IQualityControl(iface); + HRESULT hr = S_FALSE; + + TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + iface, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (qc->tonotify) + return IQualityControl_Notify(qc->tonotify, &qc->pin->filter->IBaseFilter_iface, q); + + if (qc->pin->peer) + { + IQualityControl *peer_qc = NULL; + IPin_QueryInterface(qc->pin->peer, &IID_IQualityControl, (void **)&peer_qc); + if (peer_qc) + { + hr = IQualityControl_Notify(peer_qc, &qc->pin->filter->IBaseFilter_iface, q); + IQualityControl_Release(peer_qc); + } + } + + return hr; +} + +static HRESULT WINAPI quality_control_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + struct strmbase_qc *qc = impl_from_IQualityControl(iface); + + TRACE("iface %p, sink %p.\n", iface, sink); + + qc->tonotify = sink; + return S_OK; +} + +static const IQualityControlVtbl quality_control_vtbl = +{ + quality_control_QueryInterface, + quality_control_AddRef, + quality_control_Release, + quality_control_Notify, + quality_control_SetSink, +}; + void strmbase_renderer_cleanup(struct strmbase_renderer *filter) { if (filter->sink.pin.peer) @@ -334,6 +652,14 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_filter_cleanup(&filter->filter); } +static void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin) +{ + memset(qc, 0, sizeof(*qc)); + qc->pin = pin; + qc->current_rstart = qc->current_rstop = -1; + qc->IQualityControl_iface.lpVtbl = &quality_control_vtbl; +} + void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index ff82d942813..9ac0b24bb1a 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -53,9 +53,4 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -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); - #endif /* __WINE_STRMBASE_PRIVATE_H */ diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 2b7179f2316..41a96709beb 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ qtsplitter.c \ qtutils.c \ qtvdecoder.c \ - qualitycontrol.c \ seeking.c RC_SRCS = \ diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4bb9d898a1a..51dcb3a8c55 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -286,8 +286,6 @@ struct strmbase_qc BOOL qos_handled, is_dropped; }; -void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin); - struct strmbase_renderer { struct strmbase_filter filter; -- 2.20.1

1 4

[PATCH] ntdll: Don't set error status if volume serial number is missing.
by Roman Pišl March 7, 2021

March 7, 2021

Fixes regression from b14eee69c7240658252bc96b6302e98948f2c62c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50781 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcaf03a2d02..c169b49343f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4108,7 +4108,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino; -- 2.20.1

1 0

[PATCH] kernelbase: Support FileRenameInfo in SetFileInformationByHandle.
by Gijs Vermeulen March 6, 2021

March 6, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50756 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index abfdade04ed..765bb41ab98 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3526,7 +3526,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO switch (class) { case FileNameInfo: - case FileRenameInfo: case FileAllocationInfo: case FileStreamInfo: case FileIdBothDirectoryInfo: @@ -3554,6 +3553,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileIoPriorityHintInfo: status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break; + case FileRenameInfo: + status = NtSetInformationFile( file, &io, info, size, FileRenameInformation ); + break; case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: -- 2.30.1

1 0

winegcc library creation/import broken.
by Peter Dons Tychsen March 6, 2021

March 6, 2021

Hi WineHQ, I have an older library that i have create using winelib (and an application that uses it). It use to work fine. In later wine builds this does not work any more. I have tried allot of different combinations, and i cannot seem to get was has broken. 1) Every time a call is made into the library the program crashes immediately. 2) If i compile all the files into one program from the beginning the program works fine. 3) Using "winemaker" to create a library and app shows the exact same problem. 4) It seems to be related to importing the library or maybe the calling convention? I have a feeling this is just broken somewhere, or have i done something wrong all along, and first now do i get punished for it because something changed? Again, winemaker shows the exact same problem. I created a simple library setup to test it (a tiny lib and tine app): commands: winegcc -Wall -Werror -mwindows -mno-cygwin -fPIC -g -O0 -c lib.c -o lib.o winegcc -Wall -Werror -mwindows -mno-cygwin -fPIC -g -O0 -c test.c -o test.o winegcc -shared -olibtest.so lib.o -mwindows -mno-cygwin winegcc -Wl,-rpath,"\$ORIGIN" -mwindows -mno-cygwin -ltest -L. test.o -otest.exe --- lib.c (library): #include <stdio.h> #include <stdlib.h> void lib_call(void) { printf("oh\n"); exit(0); } --- test.c (app): #include <windows.h> extern void lib_call(void); INT WINAPI WinMain(HINSTANCE inst, HINSTANCE prev_inst, PSTR cmd_line, INT cmd_show) { lib_call(); return 0; } --- Can anyone figure this out. I would be very thankful. Thanks, /pedro

2 3

[PATCH v2 1/4] windows.media.speech: Add stub dll.
by Rémi Bernon March 5, 2021

March 5, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 1 + dlls/windows.media.speech.dll/Makefile.in | 9 + dlls/windows.media.speech.dll/classes.idl | 19 +++ dlls/windows.media.speech.dll/main.c | 159 ++++++++++++++++++ .../windows.media.speech.spec | 3 + 5 files changed, 191 insertions(+) create mode 100644 dlls/windows.media.speech.dll/Makefile.in create mode 100644 dlls/windows.media.speech.dll/classes.idl create mode 100644 dlls/windows.media.speech.dll/main.c create mode 100644 dlls/windows.media.speech.dll/windows.media.speech.spec diff --git a/configure.ac b/configure.ac index 6a4e9568c40..0e4329c99c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3798,6 +3798,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.media.speech.dll/Makefile.in b/dlls/windows.media.speech.dll/Makefile.in new file mode 100644 index 00000000000..2c55daa04be --- /dev/null +++ b/dlls/windows.media.speech.dll/Makefile.in @@ -0,0 +1,9 @@ +MODULE = windows.media.speech.dll +IMPORTS = combase uuid + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech.dll/classes.idl b/dlls/windows.media.speech.dll/classes.idl new file mode 100644 index 00000000000..6c141bf4768 --- /dev/null +++ b/dlls/windows.media.speech.dll/classes.idl @@ -0,0 +1,19 @@ +/* + * 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 + */ + +#pragma makedep register + +#include "windows.media.speechsynthesis.idl" diff --git a/dlls/windows.media.speech.dll/main.c b/dlls/windows.media.speech.dll/main.c new file mode 100644 index 00000000000..909ea6db748 --- /dev/null +++ b/dlls/windows.media.speech.dll/main.c @@ -0,0 +1,159 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2021 Rémi Bernon 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 <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#include "windows.foundation.h" +#include "windows.media.speechsynthesis.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_speech +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_speech *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = &impl->IActivationFactory_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_Release( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_speech_QueryInterface, + windows_media_speech_AddRef, + windows_media_speech_Release, + /* IInspectable methods */ + windows_media_speech_GetIids, + windows_media_speech_GetRuntimeClassName, + windows_media_speech_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_speech_ActivateInstance, +}; + +static struct windows_media_speech windows_media_speech = +{ + {&activation_factory_vtbl}, + 0 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_speech.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.media.speech.dll/windows.media.speech.spec b/dlls/windows.media.speech.dll/windows.media.speech.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.speech.dll/windows.media.speech.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.30.0

5 12

[PATCH] kernel32: add Wow64GetThreadSelectorEntry stub
by Rafał Harabień March 5, 2021

March 5, 2021

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee2e3f8ad31..016d346a2ad 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1615,7 +1615,7 @@ @ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64GetThreadContext(long ptr) -# @ stub Wow64GetThreadSelectorEntry +@ stdcall Wow64GetThreadSelectorEntry(long long ptr) @ stdcall -import Wow64RevertWow64FsRedirection(ptr) @ stdcall Wow64SetThreadContext(long ptr) # @ stub Wow64SuspendThread diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1f4f938af51..0786e294960 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -30,8 +30,10 @@ #include "winternl.h" #include "wine/asm.h" +#include "wine/debug.h" #include "kernel_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(thread); /*********************************************************************** * BaseThreadInitThunk (KERNEL32.@) @@ -99,6 +101,16 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) } +/*********************************************************************** + * Wow64GetThreadSelectorEntry [KERNEL32.@] + */ +BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry) +{ + FIXME("(%p %lu %p): stub!\n", thread, selector, selector_entry); + return set_ntstatus( STATUS_NOT_IMPLEMENTED ); +} + + /********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ -- 2.25.1

1 0

[PATCH v2 1/6] server: Add process argument to find_rawinput_device.
by Rémi Bernon March 5, 2021

March 5, 2021

We need to be able to iterate all registered rawinput devices for foreign processes, not only the current one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remove the dubious device handle, it will have to be implemented somehow but that can be done later. Also did a bit of splitting and reordering to have refactor patches first and start sending hardware messages earlier, they won't be dispatched to the applications until the last patch though, but they can be monitored on +server. Supersedes: 199658-199662 server/queue.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index e47980a4aa8..1735d0d6d26 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1489,11 +1489,11 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( unsigned short usage_page, unsigned short usage ) +static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { struct rawinput_device_entry *e; - LIST_FOR_EACH_ENTRY( e, &current->process->rawinput_devices, struct rawinput_device_entry, entry ) + LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) { if (e->device.usage_page != usage_page || e->device.usage != usage) continue; return e; @@ -1506,7 +1506,7 @@ static void update_rawinput_device(const struct rawinput_device *device) { struct rawinput_device_entry *e; - if (!(e = find_rawinput_device( device->usage_page, device->usage ))) + if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) { if (!(e = mem_alloc( sizeof(*e) ))) return; list_add_tail( &current->process->rawinput_devices, &e->entry ); @@ -3313,9 +3313,9 @@ DECL_HANDLER(update_rawinput_devices) update_rawinput_device(&devices[i]); } - e = find_rawinput_device( 1, 2 ); + e = find_rawinput_device( current->process, 1, 2 ); current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( 1, 6 ); + e = find_rawinput_device( current->process, 1, 6 ); current->process->rawinput_kbd = e ? &e->device : NULL; } -- 2.30.0

3 13

[PATCH] configure: Fix the libsane pkg-config name.
by Francois Gouget March 5, 2021

March 5, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Verified on Debian 7, 8, 10, Testing, Ubuntu 20.10, Fedora 33, Manjaro 20.05 (Arch), openSUSE 15.2. All use sane-backends as the package name for pkg-config, and not libsane. I guess the reason it was not found earlier is that the only impact is the SANE_LIBS variable in the top-level makefile which is unused anyway since we use SONAME_LIBSANE instead. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6a4e9568c40..8ed3b0c2669 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], dnl **** Check for SANE **** if test "x$with_sane" != "xno" then - WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], + WINE_PACKAGE_FLAGS(SANE,[sane-backends],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], [AC_CHECK_HEADER(sane/sane.h, [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])], [SANE_CFLAGS=""])]) -- 2.20.1

1 0

[PATCH] d2d1: Implement D2D1ConvertColorSpace().
by Henri Verbeet March 5, 2021

March 5, 2021

From: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 200966. dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/d2d1_private.h | 7 +++ dlls/d2d1/factory.c | 77 +++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 102 +++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 2 + 5 files changed, 189 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ae894109fb2..3fa85a93bae9 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -3,7 +3,7 @@ @ stdcall D2D1MakeSkewMatrix(float float float float ptr) @ stdcall D2D1IsMatrixInvertible(ptr) @ stdcall D2D1InvertMatrix(ptr) -@ stub D2D1ConvertColorSpace +@ stdcall D2D1ConvertColorSpace(long long ptr) @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4546d5c1e3a1..199439b46165 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -640,6 +640,13 @@ static inline D2D1_INTERPOLATION_MODE d2d1_1_interp_mode_from_d2d1(D2D1_BITMAP_I return (D2D1_INTERPOLATION_MODE)mode; } +static inline const char *debug_d2d_color_f(const D2D1_COLOR_F *colour) +{ + if (!colour) + return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", colour->r, colour->g, colour->b, colour->a); +} + static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) { if (!point) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 6b6eab766c7b..2a9de448c6ec 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -735,6 +735,83 @@ float WINAPI D2D1Vec3Length(float x, float y, float z) return sqrtf(x * x + y * y + z * z); } +/* See IEC 61966-2-1:1999; also described in the EXT_texture_sRGB OpenGL + * extension, among others. */ +static float srgb_transfer_function(float x) +{ + if (x <= 0.0f) + return 0.0f; + else if (x >= 1.0f) + return 1.0f; + else if (x <= 0.0031308f) + return 12.92f * x; + else + return 1.055f * powf(x, 1.0f / 2.4f) - 0.055f; +} + +static float srgb_inverse_transfer_function(float x) +{ + if (x <= 0.0f) + return 0.0f; + else if (x >= 1.0f) + return 1.0f; + else if (x <= 0.04045f) + return x / 12.92f; + else + return powf((x + 0.055f) / 1.055f, 2.4f); +} + +D2D1_COLOR_F WINAPI D2D1ConvertColorSpace(D2D1_COLOR_SPACE src_colour_space, + D2D1_COLOR_SPACE dst_colour_space, const D2D1_COLOR_F *colour) +{ + D2D1_COLOR_F ret; + + TRACE("src_colour_space %#x, dst_colour_space %#x, colour %s.\n", + src_colour_space, dst_colour_space, debug_d2d_color_f(colour)); + + if (src_colour_space == D2D1_COLOR_SPACE_CUSTOM || dst_colour_space == D2D1_COLOR_SPACE_CUSTOM) + { + ret.r = 0.0f; + ret.g = 0.0f; + ret.b = 0.0f; + ret.a = 0.0f; + + return ret; + } + + if (src_colour_space == dst_colour_space) + return *colour; + + if (src_colour_space == D2D1_COLOR_SPACE_SRGB && dst_colour_space == D2D1_COLOR_SPACE_SCRGB) + { + ret.r = srgb_inverse_transfer_function(colour->r); + ret.g = srgb_inverse_transfer_function(colour->g); + ret.b = srgb_inverse_transfer_function(colour->b); + ret.a = colour->a; + + return ret; + } + + if (src_colour_space == D2D1_COLOR_SPACE_SCRGB && dst_colour_space == D2D1_COLOR_SPACE_SRGB) + { + ret.r = srgb_transfer_function(colour->r); + ret.g = srgb_transfer_function(colour->g); + ret.b = srgb_transfer_function(colour->b); + ret.a = colour->a; + + return ret; + } + + FIXME("Unhandled conversion from source colour space %#x to destination colour space %#x.\n", + src_colour_space, dst_colour_space); + ret.r = 0.0f; + ret.g = 0.0f; + ret.b = 0.0f; + ret.a = 0.0f; + + return ret; +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8d5846058198..1dc7a27ca5bd 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -34,6 +34,8 @@ static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); static float (WINAPI *pD2D1Tan)(float angle); static float (WINAPI *pD2D1Vec3Length)(float x, float y, float z); +static D2D1_COLOR_F (WINAPI *pD2D1ConvertColorSpace)(D2D1_COLOR_SPACE src_colour_space, + D2D1_COLOR_SPACE dst_colour_space, const D2D1_COLOR_F *colour); static BOOL use_mt = TRUE; @@ -461,6 +463,11 @@ static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, u return ((DWORD *)((BYTE *)rb->data + y * rb->pitch))[x]; } +static float clamp_float(float f, float lower, float upper) +{ + return f < lower ? lower : f > upper ? upper : f; +} + static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) { unsigned int diff = x > y ? x - y : y - x; @@ -492,6 +499,14 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_colour_f(const D2D1_COLOR_F *colour, float r, float g, float b, float a, unsigned int ulps) +{ + return compare_float(colour->r, r, ulps) + && compare_float(colour->g, g, ulps) + && compare_float(colour->b, b, ulps) + && compare_float(colour->a, a, ulps); +} + static BOOL compare_point(const D2D1_POINT_2F *point, float x, float y, unsigned int ulps) { return compare_float(point->x, x, ulps) @@ -9466,6 +9481,91 @@ static void test_math(BOOL d3d11) } } +static void test_colour_space(BOOL d3d11) +{ + D2D1_COLOR_F src_colour, dst_colour, expected; + D2D1_COLOR_SPACE src_space, dst_space; + unsigned i, j, k; + + static const D2D1_COLOR_SPACE colour_spaces[] = + { + D2D1_COLOR_SPACE_CUSTOM, + D2D1_COLOR_SPACE_SRGB, + D2D1_COLOR_SPACE_SCRGB, + }; + static struct + { + D2D1_COLOR_F srgb; + D2D1_COLOR_F scrgb; + } + const test_data[] = + { + {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, + {{0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + /* Samples in the non-linear region. */ + {{0.2f, 0.4f, 0.6f, 0.8f}, {0.0331047624f, 0.132868335f, 0.318546832f, 0.8f}}, + {{0.3f, 0.5f, 0.7f, 0.9f}, {0.0732389688f, 0.214041144f, 0.447988421f, 0.9f}}, + /* Samples in the linear region. */ + {{0.0002f, 0.0004f, 0.0006f, 0.0008f}, {1.54798763e-005f, 3.09597526e-005f, 4.64396289e-005f, 0.0008f}}, + {{0.0003f, 0.0005f, 0.0007f, 0.0009f}, {2.32198145e-005f, 3.86996908e-005f, 5.41795634e-005f, 0.0009f}}, + /* Out of range samples */ + {{-0.3f, 1.5f, -0.7f, 2.0f}, { 0.0f, 1.0f, 0.0f, 2.0f}}, + {{ 1.5f, -0.3f, 2.0f, -0.7f}, { 1.0f, 0.0f, 1.0f, -0.7f}}, + {{ 0.0f, 1.0f, 0.0f, 1.5f}, {-0.7f, 2.0f, -0.3f, 1.5f}}, + {{ 1.0f, 0.0f, 1.0f, -0.3f}, { 2.0f, -0.7f, 1.5f, -0.3f}}, + }; + + if (!pD2D1ConvertColorSpace) + { + win_skip("D2D1ConvertColorSpace() not available, skipping test.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(colour_spaces); ++i) + { + src_space = colour_spaces[i]; + for (j = 0; j < ARRAY_SIZE(colour_spaces); ++j) + { + dst_space = colour_spaces[j]; + for (k = 0; k < ARRAY_SIZE(test_data); ++k) + { + if (src_space == D2D1_COLOR_SPACE_SCRGB) + src_colour = test_data[k].scrgb; + else + src_colour = test_data[k].srgb; + + if (dst_space == D2D1_COLOR_SPACE_SCRGB) + expected = test_data[k].scrgb; + else + expected = test_data[k].srgb; + + if (src_space == D2D1_COLOR_SPACE_CUSTOM || dst_space == D2D1_COLOR_SPACE_CUSTOM) + { + set_color(&expected, 0.0f, 0.0f, 0.0f, 0.0f); + } + else if (src_space != dst_space) + { + expected.r = clamp_float(expected.r, 0.0f, 1.0f); + expected.g = clamp_float(expected.g, 0.0f, 1.0f); + expected.b = clamp_float(expected.b, 0.0f, 1.0f); + } + + dst_colour = pD2D1ConvertColorSpace(src_space, dst_space, &src_colour); + ok(compare_colour_f(&dst_colour, expected.r, expected.g, expected.b, expected.a, 1), + "Got unexpected destination colour {%.8e, %.8e, %.8e, %.8e}, " + "expected destination colour {%.8e, %.8e, %.8e, %.8e} for " + "source colour {%.8e, %.8e, %.8e, %.8e}, " + "source colour space %#x, destination colour space %#x.\n", + dst_colour.r, dst_colour.g, dst_colour.b, dst_colour.a, + expected.r, expected.g, expected.b, expected.a, + src_colour.r, src_colour.g, src_colour.b, src_colour.a, + src_space, dst_space); + } + } + } +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9476,6 +9576,7 @@ START_TEST(d2d1) pD2D1SinCos = (void *)GetProcAddress(d2d1_dll, "D2D1SinCos"); pD2D1Tan = (void *)GetProcAddress(d2d1_dll, "D2D1Tan"); pD2D1Vec3Length = (void *)GetProcAddress(d2d1_dll, "D2D1Vec3Length"); + pD2D1ConvertColorSpace = (void *)GetProcAddress(d2d1_dll, "D2D1ConvertColorSpace"); use_mt = !getenv("WINETEST_NO_MT_D3D"); @@ -9523,6 +9624,7 @@ START_TEST(d2d1) queue_test(test_dpi); queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); + queue_d3d10_test(test_colour_space); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1bcadab01d53..257a970968f8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -962,3 +962,5 @@ interface ID2D1Multithread : IUnknown [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); [local] float __stdcall D2D1Tan(float angle); [local] float __stdcall D2D1Vec3Length(float x, float y, float z); +[local] D2D1_COLOR_F __stdcall D2D1ConvertColorSpace(D2D1_COLOR_SPACE src_colour_space, + D2D1_COLOR_SPACE dst_colour_space, const D2D1_COLOR_F *colour); -- 2.20.1

1 0

[PATCH] ntdll: Lookup build dir dlls with a dot using their full name.
by Rémi Bernon March 5, 2021

March 5, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Either that or it needs to be some changes to the way dots are handled in the build, to support modules named like "windows.media.speech". I had a patch for that initially but I don't remember where it was. dlls/ntdll/unix/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df8d99ce489..8b17bf9830a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1450,7 +1450,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = file + pos; namelen = len + 1; file[pos + len + 1] = 0; - if (ext && !strcmp( ext, ".dll" )) namelen -= 4; + if (ext && !strcmp( ext, ".dll" ) && strchr( ptr, '.' ) == ext) namelen -= 4; ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); @@ -1461,7 +1461,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = file + pos; namelen = len + 1; file[pos + len + 1] = 0; - if (ext && !strcmp( ext, ".exe" )) namelen -= 4; + if (ext && !strcmp( ext, ".exe" ) && strchr( ptr, '.' ) == ext) namelen -= 4; ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); -- 2.30.0

1 0