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

Piotr Caban : hid: Set button values in HidP_SetUsages function.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 42be0b770181afa9fb956d4aa255461e810c88ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=42be0b770181afa9fb956d4a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:19 2019 +0200 hid: Set button values in HidP_SetUsages function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 20 ++++++++++---------- include/ddk/hidpi.h | 3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0add2cb..0416426 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -190,9 +190,9 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } -static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, +static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_HID_ELEMENT *element) + WINE_ELEMENT_TYPE ElementType, WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_ELEMENT *elems = HID_ELEMS(data); @@ -232,7 +232,7 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { HIDP_VALUE_CAPS *value = &elems[report->elementIdx + i].caps.value; - if (elems[report->elementIdx + i].ElementType != ValueElement || + if (elems[report->elementIdx + i].ElementType != ElementType || value->UsagePage != UsagePage) continue; @@ -240,13 +240,13 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { *element = elems[report->elementIdx + i]; element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); - element->bitCount = value->BitSize; + element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize: 1; return HIDP_STATUS_SUCCESS; } else if (value->u.NotRange.Usage == Usage) { *element = elems[report->elementIdx + i]; - element->bitCount = value->BitSize; + element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize : 1; return HIDP_STATUS_SUCCESS; } } @@ -288,7 +288,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -314,7 +314,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -568,7 +568,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -593,8 +593,8 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH for (i = 0; i < *UsageLength; i++) { - rc = find_value(ReportType, UsagePage, LinkCollection, - UsageList[i], PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, + UsageList[i], PreparsedData, Report, ButtonElement, &element); if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 1df789f..042c84d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -187,6 +187,9 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, + USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Zebediah Figura : setupapi: Handle an empty string for the source file in SetupQueueCopySection().
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 86724af01241b257a4b4b39682031c9c7a3aaeaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=86724af01241b257a4b4b396… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 10:28:51 2019 -0500 setupapi: Handle an empty string for the source file in SetupQueueCopySection(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47185 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index f267380..cacab2d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -795,6 +795,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, SP_FILE_COPY_PARAMS_W params; INT flags; BOOL ret = FALSE; + DWORD len; TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n", queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style); @@ -830,7 +831,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, if (!SetupGetStringFieldW( &context, 1, dst_file, ARRAY_SIZE( dst_file ), NULL )) goto end; - if (!SetupGetStringFieldW( &context, 2, src_file, ARRAY_SIZE( src_file ), NULL )) + if (!SetupGetStringFieldW( &context, 2, src_file, ARRAY_SIZE( src_file ), &len ) || len <= sizeof(WCHAR)) strcpyW( src_file, dst_file ); if (!SetupGetIntField( &context, 4, &flags )) flags = 0; /* FIXME */

1 0

Michael Stefaniuc : mfplat: Print the debug strings and not the pointers.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 40fef0fb71b079c1bf9667d80384cc43ec7f11fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=40fef0fb71b079c1bf9667d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 13 21:49:52 2019 +0200 mfplat: Print the debug strings and not the pointers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index b0b5ccc..0303759 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -438,7 +438,7 @@ static HRESULT WINAPI sample_DeleteItem(IMFSample *iface, REFGUID key) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %p.\n", iface, debugstr_attr(key)); + TRACE("%p, %s.\n", iface, debugstr_attr(key)); return attributes_DeleteItem(&sample->attributes, key); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d10e643..14b9e23 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5918,7 +5918,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR mfmediaevent *object; HRESULT hr; - TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, + TRACE("%s, %s, %08x, %s, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );

1 0

Martin Storsjo : msvcrt: Hook up _setjmpex for arm64 as well.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 869e0a63606917e8a43278102dd3af619c767b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=869e0a63606917e8a4327810… Author: Martin Storsjo <martin(a)martin.st> Date: Fri May 10 13:49:33 2019 +0300 msvcrt: Hook up _setjmpex for arm64 as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7958a7a..952de55 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -902,7 +902,7 @@ @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) MSVCRT__setjmpex +@ cdecl -arch=x86_64,arm,arm64 -norelay _setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio @ cdecl _setmbcp(long) @ cdecl _setmode(long long) MSVCRT__setmode

1 0

Nikolay Sivov : mf: Add stubs to create audio renderer sink.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 12a02e98a52f1c7d2c491e91391c8b31cbf5e7ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a02e98a52f1c7d2c491e91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 10 18:44:33 2019 +0300 mf: Add stubs to create audio renderer sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 2 +- dlls/mf/mf.spec | 4 +-- dlls/mf/mf_private.h | 2 +- dlls/mf/samplegrabber.c | 4 +-- dlls/mf/sar.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 2eb9b34..ecedea6 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = mfplat mfuuid C_SRCS = \ main.c \ samplegrabber.c \ + sar.c \ session.c \ topology.c diff --git a/dlls/mf/main.c b/dlls/mf/main.c index c2e5eb4..b5b4b0e 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -392,7 +392,7 @@ static HRESULT WINAPI activate_object_ActivateObject(IMFActivate *iface, REFIID if (!activate->object) { - if (FAILED(hr = activate->funcs->create_object(activate->context, &object))) + if (FAILED(hr = activate->funcs->create_object((IMFAttributes *)iface, activate->context, &object))) return hr; if (!InterlockedCompareExchangePointer((void **)&activate->object, object, NULL)) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 6131495..6e64404 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -23,8 +23,8 @@ @ stub MFCreateASFStreamingMediaSinkActivate @ stub MFCreateAggregateSource @ stub MFCreateAppSourceProxy -@ stub MFCreateAudioRenderer -@ stub MFCreateAudioRendererActivate +@ stdcall MFCreateAudioRenderer(ptr ptr) +@ stdcall MFCreateAudioRendererActivate(ptr) @ stub MFCreateByteCacheFile @ stub MFCreateCacheManager @ stub MFCreateCredentialCache diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 45a3834..0b7d1c6 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -49,7 +49,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co struct activate_funcs { - HRESULT (*create_object)(void *context, IUnknown **object); + HRESULT (*create_object)(IMFAttributes *attributes, void *context, IUnknown **object); void (*free_private)(void *context); }; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 1ffa3ba..7b35364 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -40,9 +40,9 @@ static void sample_grabber_free_private(void *user_context) heap_free(context); } -static HRESULT sample_grabber_create_object(void *user_context, IUnknown **obj) +static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { - FIXME("%p, %p.\n", user_context, obj); + FIXME("%p, %p, %p.\n", attributes, user_context, obj); return E_NOTIMPL; } diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c new file mode 100644 index 0000000..c0c1803 --- /dev/null +++ b/dlls/mf/sar.c @@ -0,0 +1,76 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +#define COBJMACROS + +#include "mfidl.h" +#include "mf_private.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void sar_free_private(void *user_context) +{ +} + +static const struct activate_funcs sar_activate_funcs = +{ + sar_create_object, + sar_free_private, +}; + +/*********************************************************************** + * MFCreateAudioRendererActivate (mf.@) + */ +HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate) +{ + TRACE("%p.\n", activate); + + if (!activate) + return E_POINTER; + + return create_activation_object(NULL, &sar_activate_funcs, activate); +} + +/*********************************************************************** + * MFCreateAudioRenderer (mf.@) + */ +HRESULT WINAPI MFCreateAudioRenderer(IMFAttributes *attributes, IMFMediaSink **sink) +{ + IUnknown *object; + HRESULT hr; + + TRACE("%p, %p.\n", attributes, sink); + + if (SUCCEEDED(hr = sar_create_object(attributes, NULL, &object))) + { + hr = IUnknown_QueryInterface(object, &IID_IMFMediaSink, (void **)sink); + IUnknown_Release(object); + } + + return hr; +}

1 0

Nikolay Sivov : mf: Add support for async commands for media session.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: a005e250f0598a44afd482be5a00445878853dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a005e250f0598a44afd482be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 10 18:44:34 2019 +0300 mf: Add support for async commands for media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/session.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/topology.c | 4 - include/mfidl.idl | 12 +++ 4 files changed, 217 insertions(+), 9 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index ecedea6..d9c85c4 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,6 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf -IMPORTS = mfplat mfuuid +IMPORTS = mfplat uuid mfuuid C_SRCS = \ main.c \ diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a433a30..7923581 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -33,12 +33,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum session_command +{ + SESSION_CLEAR_TOPOLOGIES, +}; + +struct session_op +{ + IUnknown IUnknown_iface; + LONG refcount; + enum session_command command; +}; + +struct queued_topology +{ + struct list entry; + IMFTopology *topology; +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; IMFGetService IMFGetService_iface; + IMFAsyncCallback commands_callback; LONG refcount; IMFMediaEventQueue *event_queue; + struct list topologies; + CRITICAL_SECTION cs; }; struct clock_sink @@ -93,11 +114,21 @@ static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *i return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); } +static struct media_session *impl_from_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, commands_callback); +} + static struct media_session *impl_from_IMFGetService(IMFGetService *iface) { return CONTAINING_RECORD(iface, struct media_session, IMFGetService_iface); } +static struct session_op *impl_op_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct session_op, IUnknown_iface); +} + static struct presentation_clock *impl_from_IMFPresentationClock(IMFPresentationClock *iface) { return CONTAINING_RECORD(iface, struct presentation_clock, IMFPresentationClock_iface); @@ -128,6 +159,79 @@ static struct sink_notification *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct sink_notification, IUnknown_iface); } +static HRESULT WINAPI session_op_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI session_op_AddRef(IUnknown *iface) +{ + struct session_op *op = impl_op_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&op->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI session_op_Release(IUnknown *iface) +{ + struct session_op *op = impl_op_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&op->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(op); + } + + return refcount; +} + +static IUnknownVtbl session_op_vtbl = +{ + session_op_QueryInterface, + session_op_AddRef, + session_op_Release, +}; + +static HRESULT create_session_op(enum session_command command, IUnknown **ret) +{ + struct session_op *op; + + if (!(op = heap_alloc(sizeof(*op)))) + return E_OUTOFMEMORY; + + op->IUnknown_iface.lpVtbl = &session_op_vtbl; + op->refcount = 1; + op->command = command; + + *ret = &op->IUnknown_iface; + + return S_OK; +} + +static void session_clear_topologies(struct media_session *session) +{ + struct queued_topology *ptr, *next; + + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &session->topologies, struct queued_topology, entry) + { + list_remove(&ptr->entry); + IMFTopology_Release(ptr->topology); + heap_free(ptr); + } +} + static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) { struct media_session *session = impl_from_IMFMediaSession(iface); @@ -173,8 +277,10 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) if (!refcount) { + session_clear_topologies(session); if (session->event_queue) IMFMediaEventQueue_Release(session->event_queue); + DeleteCriticalSection(&session->cs); heap_free(session); } @@ -220,16 +326,44 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) { - FIXME("(%p)->(%#x, %p)\n", iface, flags, topology); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct queued_topology *queued_topology; - return E_NOTIMPL; + FIXME("%p, %#x, %p.\n", iface, flags, topology); + + if (!(queued_topology = heap_alloc(sizeof(*queued_topology)))) + return E_OUTOFMEMORY; + + queued_topology->topology = topology; + IMFTopology_AddRef(queued_topology->topology); + + EnterCriticalSection(&session->cs); + list_add_tail(&session->topologies, &queued_topology->entry); + LeaveCriticalSection(&session->cs); + + return S_OK; +} + +static HRESULT session_submit_command(struct media_session *session, IUnknown *op) +{ + return MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, op); } static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) { - FIXME("(%p)\n", iface); + struct media_session *session = impl_from_IMFMediaSession(iface); + IUnknown *op; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (FAILED(hr = create_session_op(SESSION_CLEAR_TOPOLOGIES, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(op); + + return hr; } static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) @@ -346,6 +480,69 @@ static const IMFGetServiceVtbl session_get_service_vtbl = session_get_service_GetService, }; +static HRESULT WINAPI session_commands_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI session_commands_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_commands_callback_Release(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); + struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); + + switch (op->command) + { + case SESSION_CLEAR_TOPOLOGIES: + EnterCriticalSection(&session->cs); + session_clear_topologies(session); + LeaveCriticalSection(&session->cs); + + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, &GUID_NULL, + S_OK, NULL); + break; + default: + ; + } + + return S_OK; +} + +static const IMFAsyncCallbackVtbl session_commands_callback_vtbl = +{ + session_commands_callback_QueryInterface, + session_commands_callback_AddRef, + session_commands_callback_Release, + session_commands_callback_GetParameters, + session_commands_callback_Invoke, +}; + /*********************************************************************** * MFCreateMediaSession (mf.@) */ @@ -365,12 +562,15 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; object->IMFGetService_iface.lpVtbl = &session_get_service_vtbl; + object->commands_callback.lpVtbl = &session_commands_callback_vtbl; object->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) { IMFMediaSession_Release(&object->IMFMediaSession_iface); return hr; } + list_init(&object->topologies); + InitializeCriticalSection(&object->cs); *session = &object->IMFMediaSession_iface; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e10bc8b..1d72d8b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -26,10 +26,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" -#include "ole2.h" -#include "ocidl.h" - #undef INITGUID #include <guiddef.h> #include "mfapi.h" diff --git a/include/mfidl.idl b/include/mfidl.idl index 702434a..5db737e 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -64,6 +64,18 @@ typedef enum _MFCLOCK_CHARACTERISTICS_FLAGS MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK = 0x00000008, } MFCLOCK_CHARACTERISTICS_FLAGS; +typedef enum MFSESSION_SETTOPOLOGY_FLAGS +{ + MFSESSION_SETTOPOLOGY_IMMEDIATE = 0x00000001, + MFSESSION_SETTOPOLOGY_NORESOLUTION = 0x00000002, + MFSESSION_SETTOPOLOGY_CLEAR_CURRENT = 0x00000004, +} MFSESSION_SETTOPOLOGY_FLAGS; + +typedef enum MFSESSION_GETFULLTOPOLOGY_FLAGS +{ + MFSESSION_GETFULLTOPOLOGY_CURRENT = 0x00000001, +} MFSESSION_GETFULLTOPOLOGY_FLAGS; + [ object, uuid(2eb1e945-18b8-4139-9b1a-d5d584818530),

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_update_tex_unit_map().
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 48b0c209554977a38d011a6bedc5ff31a27a7f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b0c209554977a38d011a6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_update_tex_unit_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a197604..f62ba27 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3435,15 +3435,15 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_ } } -static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) +static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); if (!ps) - context_update_fixed_function_usage_map(context, state); + context_update_fixed_function_usage_map(&context_gl->c, state); /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders * need a 1:1 map at the moment. @@ -3956,7 +3956,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - context_update_tex_unit_map(context, state); + wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL],

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to draw_primitive_immediate_mode().
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 045f9b51cb39914e2fd741e120d65242d1c6bfbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=045f9b51cb39914e2fd741e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:04 2019 +0430 wined3d: Pass a wined3d_context_gl structure to draw_primitive_immediate_mode(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f62ba27..13deb54 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4508,14 +4508,14 @@ static unsigned int get_stride_idx(const void *idx_data, unsigned int idx_size, } /* Context activation is done by the caller. */ -static void draw_primitive_immediate_mode(struct wined3d_context *context, const struct wined3d_state *state, +static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_stream_info *si, const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, unsigned int vertex_count, unsigned int instance_count) { const BYTE *position = NULL, *normal = NULL, *diffuse = NULL, *specular = NULL; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int coord_idx, stride_idx, texture_idx, vertex_idx; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_stream_info_element *element; const BYTE *tex_coords[WINED3DDP_MAXTEXCOORD]; unsigned int texture_unit, texture_stages; @@ -4542,7 +4542,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const /* Immediate mode drawing can't make use of indices in a VBO - get the * data from the index buffer. */ if (idx_size) - idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context) + state->index_offset; + idx_data = wined3d_buffer_load_sysmem(state->index_buffer, &context_gl->c) + state->index_offset; ops = &d3d_info->ffp_attrib_ops; @@ -4578,7 +4578,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const else gl_info->gl_ops.gl.p_glNormal3f(0.0f, 0.0f, 0.0f); - untracked_material_count = context->num_untracked_materials; + untracked_material_count = context_gl->c.num_untracked_materials; if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) { element = &si->elements[WINED3D_FFP_DIFFUSE]; @@ -4636,7 +4636,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const if (!ps && !state->textures[texture_idx]) continue; - texture_unit = context->tex_unit_map[texture_idx]; + texture_unit = context_gl->c.tex_unit_map[texture_idx]; if (texture_unit == WINED3D_UNMAPPED_STAGE) continue; @@ -4690,7 +4690,8 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const wined3d_color_from_d3dcolor(&color, *(const DWORD *)ptr); for (i = 0; i < untracked_material_count; ++i) { - gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, context->untracked_materials[i], &color.r); + gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, + context_gl->c.untracked_materials[i], &color.r); } } } @@ -4713,7 +4714,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; ptr = tex_coords[coord_idx] + (stride_idx * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( - GL_TEXTURE0_ARB + context->tex_unit_map[texture_idx], ptr); + GL_TEXTURE0_ARB + context_gl->c.tex_unit_map[texture_idx], ptr); } if (position) @@ -5004,7 +5005,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s instance_count = context->instance_count; if (context->use_immediate_mode_draw || emulation) - draw_primitive_immediate_mode(context, state, stream_info, idx_data, + draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, idx_size, parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); else

1 0

Henri Verbeet : wined3d: Move the texture unit map from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 3171193bcfcdc585fd869a31aaf5968df205bb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171193bcfcdc585fd869a31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:05 2019 +0430 wined3d: Move the texture unit map from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 7 +++-- dlls/wined3d/ati_fragment_shader.c | 11 +++---- dlls/wined3d/context.c | 58 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 13 +++++--- dlls/wined3d/state.c | 23 +++++++------- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/utils.c | 4 +-- dlls/wined3d/view.c | 4 +-- dlls/wined3d/wined3d_private.h | 6 ++-- 9 files changed, 69 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3171193bcfcdc585fd86…

1 0

Henri Verbeet : wined3d: Move the "blit_vbo" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: de16768de7f08cc1677df6aac9b5c666732f958b URL: https://source.winehq.org/git/wine.git/?a=commit;h=de16768de7f08cc1677df6aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:06 2019 +0430 wined3d: Move the "blit_vbo" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c291c4c..443c6d5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1444,9 +1444,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) } } - if (context->blit_vbo) - GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo)); - checkGLcall("context cleanup"); } @@ -1494,6 +1491,9 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); + if (context_gl->blit_vbo) + GL_EXTCALL(glDeleteBuffers(1, &context_gl->blit_vbo)); + checkGLcall("context cleanup"); } @@ -5630,9 +5630,9 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te /* Draw a quad. */ if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - if (!context->blit_vbo) - GL_EXTCALL(glGenBuffers(1, &context->blit_vbo)); - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo)); + if (!context_gl->blit_vbo) + GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); context_unload_vertex_data(context); context_unload_numbered_arrays(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48b97d7..c308b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2013,8 +2013,6 @@ struct wined3d_context struct wined3d_fence *buffer_fences[MAX_ATTRIBS]; unsigned int buffer_fence_count; - GLuint blit_vbo; - unsigned int viewport_count; unsigned int scissor_rect_count; }; @@ -2033,6 +2031,8 @@ struct wined3d_context_gl GLenum *texture_type; + GLuint blit_vbo; + unsigned int tex_unit_map[WINED3D_MAX_COMBINED_SAMPLERS]; unsigned int rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS];

1 0