March 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Implement Compare() for attributes.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 780378b20327b8876dce40f2834b4f08f3e71857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780378b20327b8876dce40f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:00:56 2019 +0300 mfplat: Implement Compare() for attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 101 ++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 223 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 315 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=780378b20327b8876dce…

1 0

Nikolay Sivov : mfplat: Get rid of variant coercion calls.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: ced0a1de7e016a4bf10a188c4ebe10365cd8e220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced0a1de7e016a4bf10a188c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:00:57 2019 +0300 mfplat: Get rid of variant coercion calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 72 ++++++++++++++++++++++++++++++++-------------- dlls/mfplat/tests/mfplat.c | 4 ++- 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4589840..7481b77 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -37,6 +37,7 @@ #include "mfplat_private.h" #include "mfreadwrite.h" #include "propvarutil.h" +#include "strsafe.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -857,7 +858,8 @@ static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, attrval.vt = VT_UI4; hr = attributes_get_item(attributes, key, &attrval); if (SUCCEEDED(hr)) - hr = PropVariantToUInt32(&attrval, value); + *value = attrval.u.ulVal; + return hr; } @@ -873,7 +875,8 @@ static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, attrval.vt = VT_UI8; hr = attributes_get_item(attributes, key, &attrval); if (SUCCEEDED(hr)) - hr = PropVariantToUInt64(&attrval, value); + *value = attrval.u.uhVal.QuadPart; + return hr; } @@ -889,7 +892,8 @@ static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, attrval.vt = VT_R8; hr = attributes_get_item(attributes, key, &attrval); if (SUCCEEDED(hr)) - hr = PropVariantToDouble(&attrval, value); + *value = attrval.u.dblVal; + return hr; } @@ -905,7 +909,7 @@ static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GU attrval.vt = VT_CLSID; hr = attributes_get_item(attributes, key, &attrval); if (SUCCEEDED(hr)) - hr = PropVariantToGUID(&attrval, value); + *value = *attrval.u.puuid; return hr; } @@ -913,17 +917,25 @@ static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GU static HRESULT WINAPI mfattributes_GetStringLength(IMFAttributes *iface, REFGUID key, UINT32 *length) { struct attributes *attributes = impl_from_IMFAttributes(iface); - PROPVARIANT attrval; - HRESULT hr; + struct attribute *attribute; + HRESULT hr = S_OK; TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); - PropVariantInit(&attrval); - attrval.vt = VT_LPWSTR; - hr = attributes_get_item(attributes, key, &attrval); - if (SUCCEEDED(hr) && length) - *length = lstrlenW(attrval.u.pwszVal); - PropVariantClear(&attrval); + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_STRING) + *length = strlenW(attribute->value.u.pwszVal); + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); return hr; } @@ -932,19 +944,35 @@ static HRESULT WINAPI mfattributes_GetString(IMFAttributes *iface, REFGUID key, UINT32 size, UINT32 *length) { struct attributes *attributes = impl_from_IMFAttributes(iface); - PROPVARIANT attrval; - HRESULT hr; + struct attribute *attribute; + HRESULT hr = S_OK; TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), value, size, length); - PropVariantInit(&attrval); - attrval.vt = VT_LPWSTR; - hr = attributes_get_item(attributes, key, &attrval); - if (SUCCEEDED(hr)) - hr = PropVariantToString(&attrval, value, size); - if (SUCCEEDED(hr) && length) - *length = lstrlenW(value); - PropVariantClear(&attrval); + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_STRING) + { + int len = strlenW(attribute->value.u.pwszVal); + + if (length) + *length = len; + + if (size <= len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + memcpy(value, attribute->value.u.pwszVal, (len + 1) * sizeof(WCHAR)); + } + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); return hr; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7c36210..31b6ba1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -708,9 +708,11 @@ static void test_attributes(void) ok(!lstrcmpW(bufferW, stringW), "Unexpected string %s.\n", wine_dbgstr_w(bufferW)); memset(bufferW, 0, sizeof(bufferW)); - hr = IMFAttributes_GetString(attributes, &DUMMY_GUID1, bufferW, 1, NULL); + string_length = 0; + hr = IMFAttributes_GetString(attributes, &DUMMY_GUID1, bufferW, 1, &string_length); ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); ok(!bufferW[0], "Unexpected string %s.\n", wine_dbgstr_w(bufferW)); + ok(string_length, "Unexpected length.\n"); string_length = 0xdeadbeef; hr = IMFAttributes_GetStringLength(attributes, &GUID_NULL, &string_length);

1 0

Nikolay Sivov : mfplat: Take a shortcut when comparing attribute with mismatching type.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 98500d8dbbc86fc06adbea2460423a5b30df9617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98500d8dbbc86fc06adbea24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:00:58 2019 +0300 mfplat: Take a shortcut when comparing attribute with mismatching type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7481b77..0024531 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -757,7 +757,10 @@ static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key EnterCriticalSection(&attributes->cs); if ((attribute = attributes_find_item(attributes, key, NULL))) - *result = !PropVariantCompareEx(&attribute->value, value, PVCU_DEFAULT, PVCF_DEFAULT); + { + *result = attribute->value.vt == value->vt && + !PropVariantCompareEx(&attribute->value, value, PVCU_DEFAULT, PVCF_DEFAULT); + } LeaveCriticalSection(&attributes->cs);

1 0

Nikolay Sivov : mfplat: Add sample timestamp and duration methods.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 23237173b9ddb26fe26eb5b11b658dc78709f51e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23237173b9ddb26fe26eb5b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:00:59 2019 +0300 mfplat: Add sample timestamp and duration methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 63 ++++++++++++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 25 ++++++++++++++++-- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index b07ec87..de08b1b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -34,6 +34,12 @@ struct memory_buffer DWORD current_length; }; +enum sample_prop_flags +{ + SAMPLE_PROP_HAS_DURATION = 1 << 0, + SAMPLE_PROP_HAS_TIMESTAMP = 1 << 1, +}; + struct sample { struct attributes attributes; @@ -44,6 +50,9 @@ struct sample size_t capacity; DWORD flags; CRITICAL_SECTION cs; + DWORD prop_flags; + LONGLONG duration; + LONGLONG timestamp; }; static inline struct memory_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) @@ -487,32 +496,66 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) return S_OK; } -static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *sampletime) +static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp) { - FIXME("%p, %p.\n", iface, sampletime); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, timestamp); + + EnterCriticalSection(&sample->cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) + *timestamp = sample->timestamp; + else + hr = MF_E_NO_SAMPLE_TIMESTAMP; + LeaveCriticalSection(&sample->cs); + + return hr; } -static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG sampletime) +static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(sampletime)); + struct sample *sample = impl_from_IMFSample(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); + + EnterCriticalSection(&sample->cs); + sample->timestamp = timestamp; + sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; + LeaveCriticalSection(&sample->cs); + + return S_OK; } static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) { - FIXME("%p, %p.\n", iface, duration); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, duration); + + EnterCriticalSection(&sample->cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) + *duration = sample->duration; + else + hr = MF_E_NO_SAMPLE_DURATION; + LeaveCriticalSection(&sample->cs); + + return hr; } static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG duration) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + struct sample *sample = impl_from_IMFSample(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + + EnterCriticalSection(&sample->cs); + sample->duration = duration; + sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; + LeaveCriticalSection(&sample->cs); + + return S_OK; } static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 31b6ba1..ba9e8c3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1280,6 +1280,7 @@ static void test_sample(void) { IMFMediaBuffer *buffer, *buffer2; DWORD count, flags, length; + IMFAttributes *attributes; IMFSample *sample; LONGLONG time; HRESULT hr; @@ -1287,6 +1288,11 @@ static void test_sample(void) hr = MFCreateSample( &sample ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFSample_QueryInterface(sample, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "Failed to get attributes interface, hr %#x.\n", hr); + + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetBufferCount(sample, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1305,11 +1311,9 @@ static void test_sample(void) ok(flags == 0x123, "Unexpected flags %#x.\n", flags); hr = IMFSample_GetSampleTime(sample, &time); -todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); hr = IMFSample_GetSampleDuration(sample, &time); -todo_wine ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); @@ -1363,6 +1367,23 @@ todo_wine IMFMediaBuffer_Release(buffer); + /* Duration */ + hr = IMFSample_SetSampleDuration(sample, 10); + ok(hr == S_OK, "Failed to set duration, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetSampleDuration(sample, &time); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(time == 10, "Unexpected duration.\n"); + + /* Timestamp */ + hr = IMFSample_SetSampleTime(sample, 1); + ok(hr == S_OK, "Failed to set timestamp, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == 1, "Unexpected timestamp.\n"); + + IMFAttributes_Release(attributes); IMFSample_Release(sample); }

1 0

Nikolay Sivov : mfplat: Add some sample attributes guids.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 1fb58907c086650726228ed8becc0df1124b862f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb58907c086650726228ed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:01:00 2019 +0300 mfplat: Add some sample attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 +++ include/mfapi.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0024531..ccd0a03 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -575,6 +575,7 @@ static const char *debugstr_attr(const GUID *guid) X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_USER_DATA), X(MF_READWRITE_DISABLE_CONVERTERS), + X(MFSampleExtension_Token), X(MF_PD_SAMI_STYLELIST), X(MF_SD_LANGUAGE), X(MF_SD_PROTECTED), @@ -589,12 +590,14 @@ static const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_MT_MAJOR_TYPE), X(MF_PD_ADAPTIVE_STREAMING), + X(MFSampleExtension_Timestamp), X(MF_MT_SUBTYPE), X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), X(MF_SINK_WRITER_D3D_MANAGER), X(MF_MT_INTERLACE_MODE), X(MF_READWRITE_MMCSS_PRIORITY), + X(MFSampleExtension_DecodeTimestamp), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), diff --git a/include/mfapi.h b/include/mfapi.h index 21876fe..a586991 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -118,6 +118,10 @@ DEFINE_GUID(MFMediaType_Stream, 0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x5 DEFINE_GUID(MFMediaType_Subtitle, 0xa6d13581, 0xed50, 0x4e65, 0xae, 0x08, 0x26, 0x06, 0x55, 0x76, 0xaa, 0xcc); DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(MFSampleExtension_DecodeTimestamp, 0x73a954d4, 0x09e2, 0x4861, 0xbe, 0xfc, 0x94, 0xbd, 0x97, 0xc0, 0x8e, 0x6e); +DEFINE_GUID(MFSampleExtension_Timestamp, 0x1e436999, 0x69be, 0x4c7a, 0x93, 0x69, 0x70, 0x06, 0x8c, 0x02, 0x60, 0xcb); +DEFINE_GUID(MFSampleExtension_Token, 0x8294da66, 0xf328, 0x4805, 0xb5, 0x51, 0x00, 0xde, 0xb4, 0xc5, 0x7a, 0x61); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum

1 0

Nikolay Sivov : mfreadwrite: Query presentation descriptor on reader creation.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: fcae0bc7550850a0b2800017045ba5121eb708c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcae0bc7550850a0b2800017… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:01:01 2019 +0300 mfreadwrite: Query presentation descriptor on reader creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 034d5f8..df8f89a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -76,6 +76,7 @@ typedef struct source_reader IMFSourceReader IMFSourceReader_iface; LONG refcount; IMFMediaSource *source; + IMFPresentationDescriptor *descriptor; } srcreader; struct sink_writer @@ -135,6 +136,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (!refcount) { + if (reader->descriptor) + IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source); heap_free(reader); } @@ -279,7 +282,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->source = source; IMFMediaSource_AddRef(object->source); + if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) + goto failed; + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + +failed: IMFSourceReader_Release(&object->IMFSourceReader_iface); return hr; }

1 0

Nikolay Sivov : mfplat/tests: Skip more tests on older systems.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: dd67345ea4de70cc8357c3e971abb18a7ac771d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd67345ea4de70cc8357c3e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 14:58:31 2019 +0300 mfplat/tests: Skip more tests on older systems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ba9e8c3..4c878c9 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1449,16 +1449,19 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul hr = IMFMediaEventQueue_GetEvent(queue, 0, &event); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Failed to get event, hr %#x.\n", hr); - } - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); - ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); + + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); + + IMFMediaEvent_Release(event); + } hr = IMFAsyncResult_GetObject(result, &obj); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IMFMediaEvent_Release(event); - IMFMediaEventQueue_Release(queue); SetEvent(callback->event);

1 0

Sebastian Lackner : winex11: Forward all clipping requests to the right thread.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: e2389c015c69a036aab183eaf16a2dd1e7341330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2389c015c69a036aab183ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 18 13:39:57 2019 +0100 winex11: Forward all clipping requests to the right thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38087 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d678706..f737a30 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -464,6 +464,8 @@ void reset_clipping_window(void) ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ } +BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); + /*********************************************************************** * clip_cursor_notify * @@ -492,12 +494,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) } else if (hwnd == GetForegroundWindow()) /* request to clip */ { - RECT clip, virtual_rect = get_virtual_screen_rect(); + RECT clip; GetClipCursor( &clip ); - if (clip.left > virtual_rect.left || clip.right < virtual_rect.right || - clip.top > virtual_rect.top || clip.bottom < virtual_rect.bottom) - return grab_clipping_window( &clip ); + X11DRV_ClipCursor( &clip ); } return 0; } @@ -1471,22 +1471,22 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (grab_pointer) { HWND foreground = GetForegroundWindow(); + DWORD tid, pid; + + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + return TRUE; + } /* we are clipping if the clip rectangle is smaller than the screen */ if (clip->left > virtual_rect.left || clip->right < virtual_rect.right || clip->top > virtual_rect.top || clip->bottom < virtual_rect.bottom) { - DWORD tid, pid; - - /* forward request to the foreground window if it's in a different thread */ - tid = GetWindowThreadProcessId( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) - { - TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); - return TRUE; - } - else if (grab_clipping_window( clip )) return TRUE; + if (grab_clipping_window( clip )) return TRUE; } else /* if currently clipping, check if we should switch to fullscreen clipping */ {

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetVertexShader() helper.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 73a05456bf6eb1102c5e3cc361f906e65f62cfcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a05456bf6eb1102c5e3cc3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:11 2019 +0100 d3dx9: Merge the d3dx_effect_GetVertexShader() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a52940..d2e03f5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,24 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) - { - if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) - IDirect3DVertexShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3533,14 +3515,25 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DVertexShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + { + if ((*shader = *(IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end)

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_valid_parameter().
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 6ecc2c51b3849d313ad670a4b0ff14ca50aeb26a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ecc2c51b3849d313ad670a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:12 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_valid_parameter(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ecc2c51b3849d313ad6…

1 0