November 2020 - Wine-Commits

Anton Baskanov : amstream: Implement AMDirectDrawStream::GetTimePerFrame.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: e5d12458429f4cd3982101ac6ff87d8134d362a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d12458429f4cd3982101ac… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 16 22:31:48 2020 +0700 amstream: Implement AMDirectDrawStream::GetTimePerFrame. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 23 ++++++++++++++--- dlls/amstream/tests/amstream.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 341fd4dff16..d6f07e1b10a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -717,11 +717,28 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, - STREAM_TIME *pFrameTime) + STREAM_TIME *frame_time) { - FIXME("(%p)->(%p) stub!\n", iface, pFrameTime); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - return E_NOTIMPL; + TRACE("stream %p, frame_time %p.\n", stream, frame_time); + + if (!frame_time) + return E_POINTER; + + EnterCriticalSection(&stream->cs); + + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + *frame_time = ((VIDEOINFO *)stream->mt.pbFormat)->AvgTimePerFrame; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static const struct IDirectDrawMediaStreamVtbl ddraw_IDirectDrawMediaStream_Vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f5014395832..c5fd5abe620 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5623,6 +5623,63 @@ static void test_ddrawstream_new_segment(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_get_time_per_frame(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + struct testfilter source; + STREAM_TIME frame_time; + IGraphBuilder *graph; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, &frame_time); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.AvgTimePerFrame = 12345678; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + frame_time = 0xdeadbeefdeadbeef; + hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, &frame_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(frame_time == 12345678, "Got frame time %s.\n", wine_dbgstr_longlong(frame_time)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -8813,6 +8870,7 @@ START_TEST(amstream) test_ddrawstream_receive(); test_ddrawstream_begin_flush_end_flush(); test_ddrawstream_new_segment(); + test_ddrawstream_get_time_per_frame(); test_ddrawstreamsample_get_media_stream(); test_ddrawstreamsample_update();

1 0

Alexandre Julliard : msvcrt: Reimplement _isnan().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: d6476e0097948107088df9d73904c0be1c70d510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6476e0097948107088df9d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 12:18:03 2020 +0100 msvcrt: Reimplement _isnan(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 94a20e663fe..4b33630b438 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -242,12 +242,10 @@ int CDECL MSVCRT__finitef( float num ) /********************************************************************* * _isnanf (MSVCRT.@) */ -INT CDECL MSVCRT__isnanf( float num ) +int CDECL MSVCRT__isnanf( float num ) { - /* Some implementations return -1 for true(glibc), msvcrt/crtdll return 1. - * Do the same, as the result may be used in calculations - */ - return isnan(num) != 0; + union { float f; UINT32 i; } u = { num }; + return (u.i & 0x7fffffff) > 0x7f800000; } /********************************************************************* @@ -2234,12 +2232,10 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) /********************************************************************* * _isnan (MSVCRT.@) */ -INT CDECL MSVCRT__isnan(double num) +int CDECL MSVCRT__isnan(double num) { - /* Some implementations return -1 for true(glibc), msvcrt/crtdll return 1. - * Do the same, as the result may be used in calculations - */ - return isnan(num) != 0; + union { double f; UINT64 i; } u = { num }; + return (u.i & ~0ull >> 1) > 0x7ffull << 52; } /*********************************************************************

1 0

Nikolay Sivov : include: Guard MFVideoNormalizedRect definition in mfmediaengine.idl.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: a2eb9995499a4591212cae2ba6ea265970062b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2eb9995499a4591212cae2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 17:50:18 2020 +0300 include: Guard MFVideoNormalizedRect definition in mfmediaengine.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfmediaengine.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index b914cb3600b..c00e364116e 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -76,6 +76,8 @@ typedef enum MF_MEDIA_ENGINE_CANPLAY MF_MEDIA_ENGINE_CANPLAY_PROBABLY, } MF_MEDIA_ENGINE_CANPLAY; +cpp_quote("#ifndef _MFVideoNormalizedRect_") +cpp_quote("#define _MFVideoNormalizedRect_") typedef struct MFVideoNormalizedRect { float left; @@ -83,6 +85,7 @@ typedef struct MFVideoNormalizedRect float right; float bottom; } MFVideoNormalizedRect; +cpp_quote("#endif") typedef enum MF_MEDIA_ENGINE_CREATEFLAGS {

1 0

Nikolay Sivov : mfplat: Add EVRConfig_* attributes to tracing.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 600c8186282d826b057d3f2f39112c690f3b12be URL: https://source.winehq.org/git/wine.git/?a=commit;h=600c8186282d826b057d3f2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 17:50:19 2020 +0300 mfplat: Add EVRConfig_* attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1c51fafff1e..44f29522487 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -33,6 +33,7 @@ #include "ole2.h" #include "propsys.h" #include "dxgi.h" +#include "uuids.h" #include "wine/debug.h" #include "wine/list.h" @@ -1543,18 +1544,28 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_MARKIN_HERE), X(MF_MT_H264_SUPPORTED_SYNC_FRAME_TYPES), X(MF_TOPONODE_MARKOUT_HERE), + X(EVRConfig_ForceBob), X(MF_TOPONODE_DECODER), + X(EVRConfig_AllowDropToBob), X(MF_TOPOLOGY_PROJECTSTART), + X(EVRConfig_ForceThrottle), X(MF_VIDEO_MAX_MB_PER_SEC), X(MF_TOPOLOGY_PROJECTSTOP), X(MF_SINK_WRITER_ENCODER_CONFIG), + X(EVRConfig_AllowDropToThrottle), X(MF_TOPOLOGY_NO_MARKIN_MARKOUT), + X(EVRConfig_ForceHalfInterlace), + X(EVRConfig_AllowDropToHalfInterlace), + X(EVRConfig_ForceScaling), X(MF_MT_H264_CAPABILITIES), + X(EVRConfig_AllowScaling), X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), X(MFT_PREFERRED_ENCODER_PROFILE), + X(EVRConfig_ForceBatching), + X(EVRConfig_AllowBatching), X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), - X(MF_MT_MPEG2_PROFILE), X(MF_MT_VIDEO_PROFILE), + X(MF_MT_MPEG2_PROFILE), X(MF_MT_DV_AAUX_CTRL_PACK_1), X(MF_MT_ALPHA_MODE), X(MF_MT_MPEG2_TIMECODE), @@ -1743,8 +1754,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_DISABLE_PREROLL), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SOURCE_READER_D3D_MANAGER), X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_SOURCE_READER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_MT_H264_USAGE), X(MF_MEDIA_ENGINE_EME_CALLBACK),

1 0

Esme Povirk : windowscodecs: Start interface for unix encoders.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 19033430ae5c2d466d861aa89bdec6122368364f URL: https://source.winehq.org/git/wine.git/?a=commit;h=19033430ae5c2d466d861aa8… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Nov 15 14:12:24 2020 -0600 windowscodecs: Start interface for unix encoders. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 55 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 42 +++++++++++++++++++------- dlls/windowscodecs/unix_iface.c | 50 +++++++++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 12 +++++++- dlls/windowscodecs/wincodecs_common.h | 5 ++++ dlls/windowscodecs/wincodecs_private.h | 34 +++++++++++++++++++++ 6 files changed, 186 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19033430ae5c2d466d86…

1 0

Nikolay Sivov : mfplat/tests: Add a helper to check for supported interfaces.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: bf7e6d1773a87d375965d61f7cf442fa37242380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7e6d1773a87d375965d61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 17:50:17 2020 +0300 mfplat/tests: Add a helper to check for supported interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 90 +++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c9a01644c6b..474d6281f5f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -70,6 +70,21 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); @@ -867,8 +882,8 @@ if(0) hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(mediatype, &IID_IMFVideoMediaType, FALSE); + hr = IMFMediaType_QueryInterface(mediatype, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unk == (IUnknown *)mediatype, "Unexpected pointer.\n"); @@ -899,13 +914,9 @@ if(0) hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFMediaType, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(video_type, &IID_IMFMediaType, TRUE); + check_interface(video_type, &IID_IMFVideoMediaType, TRUE); /* Major and subtype are set on creation. */ hr = IMFVideoMediaType_GetCount(video_type, &count); @@ -917,8 +928,7 @@ if(0) hr = IMFVideoMediaType_GetCount(video_type, &count); ok(!count, "Unexpected attribute count %#x.\n", hr); - hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(video_type, &IID_IMFVideoMediaType, FALSE); IMFVideoMediaType_Release(video_type); @@ -928,8 +938,8 @@ if(0) hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFAudioMediaType, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(mediatype, &IID_IMFAudioMediaType, FALSE); + hr = IMFMediaType_QueryInterface(mediatype, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unk == (IUnknown *)mediatype, "Unexpected pointer.\n"); @@ -1620,17 +1630,10 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 2, "got %u\n", ref); - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFByteStreamBuffering, (void **)&unknown); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFByteStreamCacheControl, (void **)&unknown); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFMediaEventGenerator, (void **)&unknown); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFGetService, (void **)&unknown); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(bytestream, &IID_IMFByteStreamBuffering, FALSE); + check_interface(bytestream, &IID_IMFByteStreamCacheControl, FALSE); + check_interface(bytestream, &IID_IMFMediaEventGenerator, FALSE); + check_interface(bytestream, &IID_IMFGetService, FALSE); hr = IMFByteStream_GetCapabilities(bytestream, &caps); ok(hr == S_OK, "Failed to get stream capabilities, hr %#x.\n", hr); @@ -1666,7 +1669,6 @@ static void test_file_stream(void) WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; - IUnknown *unk; HRESULT hr; WCHAR *str; BOOL eos; @@ -1680,18 +1682,10 @@ static void test_file_stream(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFByteStreamBuffering, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFByteStreamCacheControl, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFGetService, (void **)&unk); - ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(bytestream, &IID_IMFByteStreamBuffering, FALSE); + check_interface(bytestream, &IID_IMFByteStreamCacheControl, FALSE); + check_interface(bytestream, &IID_IMFMediaEventGenerator, FALSE); + check_interface(bytestream, &IID_IMFGetService, TRUE); hr = IMFByteStream_GetCapabilities(bytestream, &caps); ok(hr == S_OK, "Failed to get stream capabilities, hr %#x.\n", hr); @@ -1818,7 +1812,6 @@ static void test_system_memory_buffer(void) HRESULT hr; DWORD length, max; BYTE *data, *data2; - IUnknown *unk; hr = MFCreateMemoryBuffer(1024, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -1837,8 +1830,7 @@ static void test_system_memory_buffer(void) hr = MFCreateMemoryBuffer(1024, &buffer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(buffer, &IID_IMFGetService, FALSE); hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -4443,7 +4435,6 @@ static void test_create_property_store(void) PROPVARIANT value = {0}; PROPERTYKEY key; ULONG refcount; - IUnknown *unk; DWORD count; HRESULT hr; @@ -4458,10 +4449,8 @@ static void test_create_property_store(void) ok(store2 != store, "Expected different store objects.\n"); IPropertyStore_Release(store2); - hr = IPropertyStore_QueryInterface(store, &IID_IPropertyStoreCache, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - hr = IPropertyStore_QueryInterface(store, &IID_IPersistSerializedPropStorage, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(store, &IID_IPropertyStoreCache, FALSE); + check_interface(store, &IID_IPersistSerializedPropStorage, FALSE); hr = IPropertyStore_GetCount(store, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -5195,7 +5184,6 @@ static void test_MFCreate2DMediaBuffer(void) IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; int i, pitch, pitch2; - IUnknown *unk; HRESULT hr; BOOL ret; @@ -5218,9 +5206,7 @@ static void test_MFCreate2DMediaBuffer(void) hr = pMFCreate2DMediaBuffer(2, 3, MAKEFOURCC('N','V','1','2'), FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + check_interface(buffer, &IID_IMFGetService, TRUE); /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); @@ -5450,7 +5436,6 @@ static void test_MFCreateMediaBufferFromMediaType(void) HRESULT hr; IMFMediaType *media_type; unsigned int i; - IUnknown *unk; if (!pMFCreateMediaBufferFromMediaType) { @@ -5483,8 +5468,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) if (FAILED(hr)) break; - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(buffer, &IID_IMFGetService, FALSE); hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); @@ -5827,7 +5811,6 @@ done: static void test_MFCreateTrackedSample(void) { IMFTrackedSample *tracked_sample; - IMFDesiredSample *desired_sample; IMFSample *sample; IUnknown *unk; HRESULT hr; @@ -5852,8 +5835,7 @@ static void test_MFCreateTrackedSample(void) IMFSample_Release(sample); - hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFDesiredSample, (void **)&desired_sample); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(tracked_sample, &IID_IMFDesiredSample, FALSE); IMFTrackedSample_Release(tracked_sample); }

1 0

Nikolay Sivov : evr/presenter: Expose all interfaces for MR_VIDEO_RENDER_SERVICE.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 26aae271bbad7e3ac83519e32e77ee5bde680c68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26aae271bbad7e3ac83519e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 17:50:23 2020 +0300 evr/presenter: Expose all interfaces for MR_VIDEO_RENDER_SERVICE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 13 +------------ dlls/evr/tests/evr.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 97b9029c70e..84ef223e0fc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1254,18 +1254,7 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj); if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service)) - { - if (IsEqualIID(riid, &IID_IMFVideoDisplayControl) || - IsEqualIID(riid, &IID_IMFVideoPositionMapper)) - { - return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); - } - else - { - FIXME("Unsupported interface %s.\n", debugstr_guid(riid)); - return E_NOTIMPL; - } - } + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); FIXME("Unimplemented service %s.\n", debugstr_guid(service)); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 244d4310bbc..c456bcf5653 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1150,8 +1150,14 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFQualityAdvise, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); - todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); - todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTopologyServiceLookupClient, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IQualProp, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid);

1 0

Alexandre Julliard : msvcrt: Reimplement _finite().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 9f088d019bc838946b1a500e41a34c48aae93469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f088d019bc838946b1a500e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 12:17:52 2020 +0100 msvcrt: Reimplement _finite(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index aa0c6f2f3de..94a20e663fe 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -235,7 +235,8 @@ int CDECL MSVCRT__fpclassf( float num ) */ int CDECL MSVCRT__finitef( float num ) { - return finitef(num) != 0; /* See comment for _isnan() */ + union { float f; UINT32 i; } u = { num }; + return (u.i & 0x7fffffff) < 0x7f800000; } /********************************************************************* @@ -2138,7 +2139,8 @@ double CDECL MSVCRT__copysign(double num, double sign) */ int CDECL MSVCRT__finite(double num) { - return isfinite(num) != 0; /* See comment for _isnan() */ + union { double f; UINT64 i; } u = { num }; + return (u.i & ~0ull >> 1) < 0x7ffull << 52; } /*********************************************************************

1 0

Alexandre Julliard : msvcrt: Reimplement _dsign().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 4619140b1c3fa4f5e5f9ed1439400d0abe115073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4619140b1c3fa4f5e5f9ed14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 12:21:16 2020 +0100 msvcrt: Reimplement _dsign(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4b33630b438..6ed8a50330d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3873,7 +3873,8 @@ double CDECL MSVCR120_fdim(double x, double y) */ int CDECL MSVCR120__fdsign(float x) { - return signbit(x) ? 0x8000 : 0; + union { float f; UINT32 i; } u = { x }; + return (u.i >> 16) & 0x8000; } /********************************************************************* @@ -3881,7 +3882,8 @@ int CDECL MSVCR120__fdsign(float x) */ int CDECL MSVCR120__dsign(double x) { - return signbit(x) ? 0x8000 : 0; + union { double f; UINT64 i; } u = { x }; + return (u.i >> 48) & 0x8000; }

1 0

Alexandre Julliard : msvcrt: Reimplement _chgsign().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: dbda71f74d10325a78288fd418d1990e5046a044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbda71f74d10325a78288fd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 15:04:00 2020 +0100 msvcrt: Reimplement _chgsign(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6ed8a50330d..8e8324b8fbe 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -170,8 +170,9 @@ int CDECL MSVCRT__set_FMA3_enable(int flag) */ float CDECL MSVCRT__chgsignf( float num ) { - /* FIXME: +-infinity,Nan not tested */ - return -num; + union { float f; UINT32 i; } u = { num }; + u.i ^= 0x80000000; + return u.f; } /********************************************************************* @@ -1786,8 +1787,9 @@ double CDECL MSVCRT__cabs(struct MSVCRT__complex num) */ double CDECL MSVCRT__chgsign(double num) { - /* FIXME: +-infinity,Nan not tested */ - return -num; + union { double f; UINT64 i; } u = { num }; + u.i ^= 1ull << 63; + return u.f; } /*********************************************************************

1 0