wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Gijs Vermeulen : include: Add INetworkEvents and some enums to netlistmgr.idl.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 1c4350ac8f98d552ca264408a22c454bd5c5438a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4350ac8f98d552ca264408… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 14:52:20 2020 +0100 include: Add INetworkEvents and some enums to netlistmgr.idl. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netlistmgr.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e098f7225ab..d12b4a5f4b7 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,10 +27,26 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkConnectionEvents; interface INetworkCostManager; +interface INetworkEvents; interface INetworkListManager; interface INetworkListManagerEvents; +typedef [v1_enum] enum NLM_NETWORK_CLASS +{ + NLM_NETWORK_IDENTIFYING = 0x01, + NLM_NETWORK_IDENTIFIED = 0x02, + NLM_NETWORK_UNIDENTIFIED = 0x03 +} NLM_NETWORK_CLASS; + +typedef [v1_enum] enum NLM_INTERNET_CONNECTIVITY +{ + NLM_INTERNET_CONNECTIVITY_WEBHIJACK = 0x01, + NLM_INTERNET_CONNECTIVITY_PROXIED = 0x02, + NLM_INTERNET_CONNECTIVITY_CORPORATE = 0x04 +} NLM_INTERNET_CONNECTIVITY; + typedef [v1_enum] enum NLM_CONNECTIVITY { NLM_CONNECTIVITY_DISCONNECTED = 0x0000, @@ -390,3 +406,35 @@ interface INetwork : IDispatch HRESULT SetCategory( [in] NLM_NETWORK_CATEGORY NewCategory); } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(dcb00004-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkEvents : IUnknown +{ + typedef enum NLM_NETWORK_PROPERTY_CHANGE + { + NLM_NETWORK_PROPERTY_CHANGE_CONNECTION = 0x01, + NLM_NETWORK_PROPERTY_CHANGE_DESCRIPTION = 0x02, + NLM_NETWORK_PROPERTY_CHANGE_NAME = 0x04, + NLM_NETWORK_PROPERTY_CHANGE_ICON = 0x08, + NLM_NETWORK_PROPERTY_CHANGE_CATEGORY_VALUE = 0x10 + } NLM_NETWORK_PROPERTY_CHANGE; + + HRESULT NetworkAdded ( + [in] GUID networkId); + + HRESULT NetworkDeleted ( + [in] GUID networkId); + + HRESULT NetworkConnectivityChanged ( + [in] GUID networkId, + [in] NLM_CONNECTIVITY newConnectivity); + + HRESULT NetworkPropertyChanged( + [in] GUID networkId, + [in] NLM_NETWORK_PROPERTY_CHANGE flags); +}

1 0

Alistair Leslie-Hughes : include: Add missing DBPARAM* types and enums.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 026ccc44a6dc469d32fc361e490f1b8171eff24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=026ccc44a6dc469d32fc361e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 26 18:19:45 2020 +1100 include: Add missing DBPARAM* types and enums. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 65fd5b1d365..63617c88c00 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -800,3 +800,28 @@ typedef struct tagDBCOLUMNINFO { BYTE bScale; DBID columnid; } DBCOLUMNINFO; + +typedef DWORD DBPARAMFLAGS; + +enum DBPARAMFLAGSENUM { + DBPARAMFLAGS_ISINPUT = 0x001, + DBPARAMFLAGS_ISOUTPUT = 0x002, + DBPARAMFLAGS_ISSIGNED = 0x010, + DBPARAMFLAGS_ISNULLABLE = 0x040, + DBPARAMFLAGS_ISLONG = 0x080 +}; + +enum DBPARAMFLAGSENUM20 { + DBPARAMFLAGS_SCALEISNEGATIVE = 0x100 +}; + +typedef struct tagDBPARAMINFO { + DBPARAMFLAGS dwFlags; + DBORDINAL iOrdinal; + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBLENGTH ulParamSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBPARAMINFO;

1 0

Nikolay Sivov : mf/evr: Implement OnClockSetRate().
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 0ca0b5a5ef9488d0b8de1191c2ad075fceeeee15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca0b5a5ef9488d0b8de1191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:23 2020 +0300 mf/evr: Implement OnClockSetRate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 1b18e1c07a3..e408b204304 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1499,9 +1499,23 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + IMFClockStateSink *sink; - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + EnterCriticalSection(&renderer->cs); + + IMFVideoPresenter_OnClockSetRate(renderer->presenter, systime, rate); + if (SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFClockStateSink, (void **)&sink))) + { + IMFClockStateSink_OnClockSetRate(sink, systime, rate); + IMFClockStateSink_Release(sink); + } + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl =

1 0

Nikolay Sivov : mf/evr: Notify mixer and presenter on clock state changes.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 8680afcc06832d709c3e3b20d6801bc0d1de353e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8680afcc06832d709c3e3b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:22 2020 +0300 mf/evr: Notify mixer and presenter on clock state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 68 +++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 537d859d229..1b18e1c07a3 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -860,7 +860,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, *stream = &renderer->streams[i]->IMFStreamSink_iface; IMFStreamSink_AddRef(*stream); } - } LeaveCriticalSection(&renderer->cs); @@ -1382,21 +1381,30 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink * EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + if (renderer->state == EVR_STATE_STOPPED) { - struct video_stream *stream = renderer->streams[i]; + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; - EnterCriticalSection(&stream->cs); - if (!(stream->flags & EVR_STREAM_PREROLLED)) - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, - &GUID_NULL, S_OK, NULL); - stream->flags |= EVR_STREAM_PREROLLED; - LeaveCriticalSection(&stream->cs); + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & EVR_STREAM_PREROLLED)) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } } + renderer->state = EVR_STATE_RUNNING; + IMFVideoPresenter_OnClockStart(renderer->presenter, systime, offset); + LeaveCriticalSection(&renderer->cs); return S_OK; @@ -1411,16 +1419,28 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *i EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + IMFVideoPresenter_OnClockStop(renderer->presenter, systime); + + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_COMMAND_FLUSH, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_FLUSH, 0); + + if (renderer->state == EVR_STATE_RUNNING || + renderer->state == EVR_STATE_PAUSED) { - struct video_stream *stream = renderer->streams[i]; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_ENDSTREAMING, 0); - EnterCriticalSection(&stream->cs); - stream->flags &= ~EVR_STREAM_PREROLLED; - LeaveCriticalSection(&stream->cs); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + stream->flags &= ~EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_STOPPED; } - renderer->state = EVR_STATE_STOPPED; LeaveCriticalSection(&renderer->cs); @@ -1436,11 +1456,17 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink * EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + IMFVideoPresenter_OnClockPause(renderer->presenter, systime); + + if (renderer->state == EVR_STATE_RUNNING) { - struct video_stream *stream = renderer->streams[i]; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + } } + renderer->state = EVR_STATE_PAUSED; LeaveCriticalSection(&renderer->cs); @@ -1457,6 +1483,8 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink EnterCriticalSection(&renderer->cs); + IMFVideoPresenter_OnClockRestart(renderer->presenter, systime); + for (i = 0; i < renderer->stream_count; ++i) { struct video_stream *stream = renderer->streams[i];

1 0

Nikolay Sivov : evr/mixer: Add IMFClockStateSink stub.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 21355680e50970ff1edf8af53a67c310e9f39b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21355680e50970ff1edf8af5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:21 2020 +0300 evr/mixer: Add IMFClockStateSink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 86 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 59d75c0476b..20b5e3b2bba 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -74,6 +74,7 @@ struct video_mixer IMFVideoProcessor IMFVideoProcessor_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFClockStateSink IMFClockStateSink_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -153,6 +154,11 @@ static struct video_mixer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFQualityAdvise_iface); } +static struct video_mixer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFClockStateSink_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -251,6 +257,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &mixer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2181,6 +2191,77 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = video_mixer_quality_advise_DropTime, }; +static HRESULT WINAPI video_mixer_clock_state_sink_QueryInterface(IMFClockStateSink *iface, + REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_clock_state_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_clock_state_sink_Release(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStart(IMFClockStateSink *iface, + MFTIME systime, LONGLONG offset) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStop(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockPause(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockRestart(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockSetRate(IMFClockStateSink *iface, + MFTIME systime, float rate) +{ + FIXME("%p, %f.\n", iface, rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_mixer_clock_state_sink_vtbl = +{ + video_mixer_clock_state_sink_QueryInterface, + video_mixer_clock_state_sink_AddRef, + video_mixer_clock_state_sink_Release, + video_mixer_clock_state_sink_OnClockStart, + video_mixer_clock_state_sink_OnClockStop, + video_mixer_clock_state_sink_OnClockPause, + video_mixer_clock_state_sink_OnClockRestart, + video_mixer_clock_state_sink_OnClockSetRate, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -2212,6 +2293,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_mixer_quality_advise_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_mixer_clock_state_sink_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0158a0320a7..8c82ae34f8d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -465,6 +465,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFClockStateSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Giovanni Mascellani : d2d1: Implement D2D1Vec3Length().
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 4905921fa587bb6c194134da43827d4723bd64e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4905921fa587bb6c194134da… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:29 2020 +0330 d2d1: Implement D2D1Vec3Length(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 27 ++++++++++++++++++++++++++- include/d2d1_1.idl | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 7b624c7096e..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -8,4 +8,4 @@ @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) @ stdcall D2D1Tan(float) -@ stub D2D1Vec3Length +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9c5337590cd..6b6eab766c7 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -728,6 +728,13 @@ float WINAPI D2D1Tan(float angle) return tanf(angle); } +float WINAPI D2D1Vec3Length(float x, float y, float z) +{ + TRACE("x %.8e, y %.8e, z %.8e.\n", x, y, z); + + return sqrtf(x * x + y * y + z * z); +} + 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 b269770365f..d571cfe8d15 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9427,8 +9427,8 @@ static void test_wic_bitmap_format(void) static void test_math(void) { + float s, c, t, l; unsigned int i; - float s, c, t; static const struct { @@ -9459,6 +9459,24 @@ static void test_math(void) {M_PI, 8.74227766e-008f}, }; + static const struct + { + float x; + float y; + float z; + float l; + } + l_data[] = + { + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 1.0f, 1.73205078f}, + {1.0f, 2.0f, 2.0f, 3.0f}, + {1.0f, 2.0f, 3.0f, 3.74165750f}, + }; + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { D2D1SinCos(sc_data[i].x, &s, &c); @@ -9474,6 +9492,13 @@ static void test_math(void) ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } + + for (i = 0; i < ARRAY_SIZE(l_data); ++i) + { + l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + ok(compare_float(l, l_data[i].l, 0), + "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); + } } START_TEST(d2d1) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index bd111bd6628..6eab3959cd1 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -796,3 +796,4 @@ interface ID2D1Factory1 : ID2D1Factory const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); [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);

1 0

Giovanni Mascellani : d2d1: Implement D2D1Tan().
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 9cf8fab9528f9e6bffd6d96073de2e0c919bd957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cf8fab9528f9e6bffd6d960… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:28 2020 +0330 d2d1: Implement D2D1Tan(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 23 ++++++++++++++++++++++- include/d2d1_1.idl | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 410abfa5de6..7b624c7096e 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -7,5 +7,5 @@ @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) -@ stub D2D1Tan +@ stdcall D2D1Tan(float) @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 943347d7884..9c5337590cd 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -721,6 +721,13 @@ void WINAPI D2D1SinCos(float angle, float *s, float *c) *c = cosf(angle); } +float WINAPI D2D1Tan(float angle) +{ + TRACE("angle %.8e.\n", angle); + + return tanf(angle); +} + 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 df1df01c051..b269770365f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9428,7 +9428,7 @@ static void test_wic_bitmap_format(void) static void test_math(void) { unsigned int i; - float s, c; + float s, c, t; static const struct { @@ -9445,6 +9445,20 @@ static void test_math(void) {M_PI, -8.74227766e-008f, -1.0f}, }; + static const struct + { + float x; + float t; + } + t_data[] = + { + {0.0f, 0.0f}, + {1.0f, 1.55740774f}, + {2.0f, -2.18503976f}, + {M_PI / 2.0f, -2.28773320e+007f}, + {M_PI, 8.74227766e-008f}, + }; + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { D2D1SinCos(sc_data[i].x, &s, &c); @@ -9453,6 +9467,13 @@ static void test_math(void) ok(compare_float(c, sc_data[i].c, 0), "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); } + + for (i = 0; i < ARRAY_SIZE(t_data); ++i) + { + t = D2D1Tan(t_data[i].x); + ok(compare_float(t, t_data[i].t, 1), + "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); + } } START_TEST(d2d1) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 6fa893edbda..bd111bd6628 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -795,3 +795,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); +[local] float __stdcall D2D1Tan(float angle);

1 0

Giovanni Mascellani : d2d1: Implement D2D1SinCos().
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 4f6bd00a8495c80fd6faf940cef09e875bf1a5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6bd00a8495c80fd6faf940… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:27 2020 +0330 d2d1: Implement D2D1SinCos(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 8 ++++++++ dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..943347d7884 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,14 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + TRACE("angle %.8e, s %p, c %p.\n", angle, s, c); + + *s = sinf(angle); + *c = cosf(angle); +} + 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 166cdfccda6..df1df01c051 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,36 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + unsigned int i; + float s, c; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0f, 0.0f, 1.0f}, + {1.0f, 8.41470957e-001f, 5.40302277e-001f}, + {2.0f, 9.09297407e-001f, -4.16146845e-001f}, + {M_PI / 2.0f, 1.0f, -4.37113883e-008f}, + {M_PI, -8.74227766e-008f, -1.0f}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), + "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), + "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9507,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c);

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: a6d1ee860c620e802f2f3619bb495704c7e80d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d1ee860c620e802f2f3619… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:23 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index b682aa10adf..df18bd5f2d5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5bbc107cc2d..a24dbc62977 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -611,7 +611,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count) *out = &filter->IVMRMixerControl9_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig) && !is_vmr9(filter)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && filter->mode != VMR9Mode_Renderless && is_vmr9(filter))

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 80fa0b93a69a8784d35fc672136240fa701595be URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fa0b93a69a8784d35fc672… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:22 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7f8ce5b26f4..b682aa10adf 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -254,7 +254,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8bad3f5bdb7..5bbc107cc2d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -603,7 +603,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020