February 2020 - Wine-commits

Zebediah Figura : strmbase: Clean up source_Connect().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 1d1ca2f883a6e1e07f58c308773e783f9c9160b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1ca2f883a6e1e07f58c308… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 5 19:50:04 2020 -0600 strmbase: Clean up source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 127 +++++++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 71 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 3df9e3e333..44831d13f4 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -428,96 +428,81 @@ static inline struct strmbase_source *impl_source_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface); } -static HRESULT WINAPI source_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { + struct strmbase_source *pin = impl_source_from_IPin(iface); + AM_MEDIA_TYPE *candidate; + IEnumMediaTypes *enummt; + ULONG count; HRESULT hr; - struct strmbase_source *This = impl_source_from_IPin(iface); - TRACE("pin %p %s:%s, peer %p, mt %p.\n", This, debugstr_w(This->pin.filter->name), - debugstr_w(This->pin.name), pReceivePin, pmt); - strmbase_dump_media_type(pmt); + TRACE("pin %p %s:%s, peer %p, mt %p.\n", pin, debugstr_w(pin->pin.filter->name), + debugstr_w(pin->pin.name), peer, mt); + strmbase_dump_media_type(mt); - if (!pReceivePin) + if (!peer) return E_POINTER; /* If we try to connect to ourselves, we will definitely deadlock. * There are other cases where we could deadlock too, but this * catches the obvious case */ - assert(pReceivePin != iface); + assert(peer != iface); - EnterCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->csFilter); + + if (pin->pin.filter->state != State_Stopped) { - if (This->pin.filter->state != State_Stopped) - { - LeaveCriticalSection(&This->pin.filter->csFilter); - WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); - return VFW_E_NOT_STOPPED; - } + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } - /* if we have been a specific type to connect with, then we can either connect - * with that or fail. We cannot choose different AM_MEDIA_TYPE */ - if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) - hr = This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmt); - else + if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) && !IsEqualGUID(&mt->subtype, &GUID_NULL)) + { + hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt); + LeaveCriticalSection(&pin->pin.filter->csFilter); + return hr; + } + + if (SUCCEEDED(IPin_EnumMediaTypes(iface, &enummt))) + { + while (IEnumMediaTypes_Next(enummt, 1, &candidate, NULL) == S_OK) { - /* negotiate media type */ + if ((!mt || CompareMediaTypes(mt, candidate, TRUE)) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + DeleteMediaType(candidate); + IEnumMediaTypes_Release(enummt); + return S_OK; + } + DeleteMediaType(candidate); + } - IEnumMediaTypes * pEnumCandidates; - AM_MEDIA_TYPE * pmtCandidate = NULL; /* Candidate media type */ + IEnumMediaTypes_Release(enummt); + } - if (SUCCEEDED(hr = IPin_EnumMediaTypes(iface, &pEnumCandidates))) + if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt))) + { + while (IEnumMediaTypes_Next(enummt, 1, &candidate, &count) == S_OK) + { + if ((!mt || CompareMediaTypes(mt, candidate, TRUE)) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK) { - hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ - - /* try this filter's media types first */ - while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) - { - assert(pmtCandidate); - if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype) - && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) - assert(pmtCandidate->pbFormat); - if ((!pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE)) - && This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmtCandidate) == S_OK) - { - hr = S_OK; - DeleteMediaType(pmtCandidate); - break; - } - DeleteMediaType(pmtCandidate); - pmtCandidate = NULL; - } - IEnumMediaTypes_Release(pEnumCandidates); + LeaveCriticalSection(&pin->pin.filter->csFilter); + DeleteMediaType(candidate); + IEnumMediaTypes_Release(enummt); + return S_OK; } + DeleteMediaType(candidate); + } - /* then try receiver filter's media types */ - if (hr != S_OK && SUCCEEDED(hr = IPin_EnumMediaTypes(pReceivePin, &pEnumCandidates))) /* if we haven't already connected successfully */ - { - ULONG fetched; - - hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ - - while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, &fetched)) - { - assert(pmtCandidate); - strmbase_dump_media_type(pmtCandidate); - if ((!pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE)) - && This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmtCandidate) == S_OK) - { - hr = S_OK; - DeleteMediaType(pmtCandidate); - break; - } - DeleteMediaType(pmtCandidate); - pmtCandidate = NULL; - } /* while */ - IEnumMediaTypes_Release(pEnumCandidates); - } /* if not found */ - } /* if negotiate media type */ - } /* if succeeded */ - LeaveCriticalSection(&This->pin.filter->csFilter); + IEnumMediaTypes_Release(enummt); + } - TRACE(" -- %x\n", hr); - return hr; + LeaveCriticalSection(&pin->pin.filter->csFilter); + + return VFW_E_NO_ACCEPTABLE_TYPES; } static HRESULT WINAPI source_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt)

1 0

Zebediah Figura : strmbase: Access our own media types directly in source_Connect().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: e14c5430ccc9ae63770e47c2bd6ada227fa4ca33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14c5430ccc9ae63770e47c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 5 19:50:05 2020 -0600 strmbase: Access our own media types directly in source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 44831d13f4..58778e5789 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -431,8 +431,9 @@ static inline struct strmbase_source *impl_source_from_IPin( IPin *iface ) static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct strmbase_source *pin = impl_source_from_IPin(iface); - AM_MEDIA_TYPE *candidate; + AM_MEDIA_TYPE candidate, *candidate_ptr; IEnumMediaTypes *enummt; + unsigned int i; ULONG count; HRESULT hr; @@ -464,37 +465,32 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return hr; } - if (SUCCEEDED(IPin_EnumMediaTypes(iface, &enummt))) + for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) { - while (IEnumMediaTypes_Next(enummt, 1, &candidate, NULL) == S_OK) + strmbase_dump_media_type(&candidate); + if ((!mt || CompareMediaTypes(mt, &candidate, TRUE)) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) { - if ((!mt || CompareMediaTypes(mt, candidate, TRUE)) - && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK) - { - LeaveCriticalSection(&pin->pin.filter->csFilter); - DeleteMediaType(candidate); - IEnumMediaTypes_Release(enummt); - return S_OK; - } - DeleteMediaType(candidate); + LeaveCriticalSection(&pin->pin.filter->csFilter); + FreeMediaType(&candidate); + return S_OK; } - - IEnumMediaTypes_Release(enummt); + FreeMediaType(&candidate); } if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt))) { - while (IEnumMediaTypes_Next(enummt, 1, &candidate, &count) == S_OK) + while (IEnumMediaTypes_Next(enummt, 1, &candidate_ptr, &count) == S_OK) { - if ((!mt || CompareMediaTypes(mt, candidate, TRUE)) - && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK) + if ((!mt || CompareMediaTypes(mt, candidate_ptr, TRUE)) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate_ptr) == S_OK) { LeaveCriticalSection(&pin->pin.filter->csFilter); - DeleteMediaType(candidate); + DeleteMediaType(candidate_ptr); IEnumMediaTypes_Release(enummt); return S_OK; } - DeleteMediaType(candidate); + DeleteMediaType(candidate_ptr); } IEnumMediaTypes_Release(enummt);

1 0

Zebediah Figura : strmbase: Simplify CompareMediaTypes().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 09b0d9d4564fdb087aebe39d640ba6e52c48680e URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b0d9d4564fdb087aebe39d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 5 19:50:06 2020 -0600 strmbase: Simplify CompareMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 58778e5789..90064c25d4 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -247,12 +247,6 @@ static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *a return hr; } -static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) -{ - return (((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && - ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); -} - HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { return VFW_S_NO_MORE_ITEMS; @@ -428,6 +422,24 @@ static inline struct strmbase_source *impl_source_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface); } +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + if (!a) + return TRUE; + + if (!IsEqualGUID(&a->majortype, &b->majortype) + && !IsEqualGUID(&a->majortype, &GUID_NULL) + && !IsEqualGUID(&b->majortype, &GUID_NULL)) + return FALSE; + + if (!IsEqualGUID(&a->subtype, &b->subtype) + && !IsEqualGUID(&a->subtype, &GUID_NULL) + && !IsEqualGUID(&b->subtype, &GUID_NULL)) + return FALSE; + + return TRUE; +} + static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct strmbase_source *pin = impl_source_from_IPin(iface); @@ -468,7 +480,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) { strmbase_dump_media_type(&candidate); - if ((!mt || CompareMediaTypes(mt, &candidate, TRUE)) + if (compare_media_types(mt, &candidate) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) { LeaveCriticalSection(&pin->pin.filter->csFilter); @@ -482,7 +494,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP { while (IEnumMediaTypes_Next(enummt, 1, &candidate_ptr, &count) == S_OK) { - if ((!mt || CompareMediaTypes(mt, candidate_ptr, TRUE)) + if (compare_media_types(mt, candidate_ptr) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate_ptr) == S_OK) { LeaveCriticalSection(&pin->pin.filter->csFilter);

1 0

Zebediah Figura : strmbase: Check if the pin is already connected in source_Connect().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: d1897cf96ba3041e17416f618197302c996c8115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1897cf96ba3041e17416f61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 5 19:50:07 2020 -0600 strmbase: Check if the pin is already connected in source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 90064c25d4..18631410b7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -463,6 +463,13 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.peer) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Pin is already connected, returning VFW_E_ALREADY_CONNECTED.\n"); + return VFW_E_ALREADY_CONNECTED; + } + if (pin->pin.filter->state != State_Stopped) { LeaveCriticalSection(&pin->pin.filter->csFilter);

1 0

Nikolay Sivov : rtworkq: Add RtwqSetLongRunning().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: baeb8c2d45f92f749cdf4b0e11f205db06bc6711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baeb8c2d45f92f749cdf4b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 6 10:06:04 2020 +0300 rtworkq: Add RtwqSetLongRunning(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index a6aac6abda..13bce0836a 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1071,3 +1071,24 @@ HRESULT WINAPI RtwqUnlockWorkQueue(DWORD queue) return unlock_user_queue(queue); } + +HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) +{ + struct queue *queue; + HRESULT hr; + int i; + + TRACE("%#x, %d.\n", queue_id, enable); + + lock_user_queue(queue_id); + + if (SUCCEEDED(hr = grab_queue(queue_id, &queue))) + { + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + queue->envs[i].u.s.LongFunction = !!enable; + } + + unlock_user_queue(queue_id); + + return hr; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 48bc17cbfc..2d0d3b40e6 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -27,7 +27,7 @@ @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 -@ stub RtwqSetLongRunning +@ stdcall RtwqSetLongRunning(long long) @ stdcall RtwqShutdown() @ stdcall RtwqStartup() @ stub RtwqUnjoinWorkQueue diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 001cf2c3e9..6ddb232fbd 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -88,6 +88,7 @@ cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IR cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);") cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);")

1 0

Nikolay Sivov : rtworkq: Add partial implementation of RtwqLockSharedWorkQueue().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 4e3e8f54ae71701296bdf3e137a74fdfbc84546b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e3e8f54ae71701296bdf3e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 6 10:06:05 2020 +0300 rtworkq: Add partial implementation of RtwqLockSharedWorkQueue(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 7 +++++++ dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 13bce0836a..5e9ca51c60 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1092,3 +1092,10 @@ HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) return hr; } + +HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, DWORD *taskid, DWORD *queue) +{ + FIXME("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + + return RtwqAllocateWorkQueue(RTWQ_STANDARD_WORKQUEUE, queue); +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 2d0d3b40e6..c619b3a867 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -16,7 +16,7 @@ @ stdcall RtwqInvokeCallback(ptr) @ stub RtwqJoinWorkQueue @ stdcall RtwqLockPlatform() -@ stub RtwqLockSharedWorkQueue +@ stdcall RtwqLockSharedWorkQueue(wstr long ptr ptr) @ stdcall RtwqLockWorkQueue(long) @ stub RtwqPutMultipleWaitingWorkItem @ stdcall RtwqPutWaitingWorkItem(long long ptr ptr) diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 6ddb232fbd..b27cce49fd 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -83,6 +83,7 @@ cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqLockPlatform(void);") +cpp_quote("HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, DWORD *taskid, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);")

1 0

Nikolay Sivov : rtworkq: Add deadline management stubs.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 9f27848d90c6583be546d0cf17dbbb7a75762739 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f27848d90c6583be546d0cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 6 10:06:06 2020 +0300 rtworkq: Add deadline management stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +++--- include/rtworkq.idl | 3 +++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 5e9ca51c60..a2fb3824c3 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1099,3 +1099,24 @@ HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, D return RtwqAllocateWorkQueue(RTWQ_STANDARD_WORKQUEUE, queue); } + +HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request) +{ + FIXME("%#x, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), request); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqSetDeadline2(DWORD queue_id, LONGLONG deadline, LONGLONG predeadline, HANDLE *request) +{ + FIXME("%#x, %s, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), wine_dbgstr_longlong(predeadline), request); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqCancelDeadline(HANDLE request) +{ + FIXME("%p.\n", request); + + return E_NOTIMPL; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index c619b3a867..1a8909e098 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -3,7 +3,7 @@ @ stdcall RtwqAllocateWorkQueue(long ptr) @ stub RtwqBeginRegisterWorkQueueWithMMCSS @ stub RtwqBeginUnregisterWorkQueueWithMMCSS -@ stub RtwqCancelDeadline +@ stdcall RtwqCancelDeadline(long) @ stub RtwqCancelMultipleWaitingWorkItem @ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) @@ -25,8 +25,8 @@ @ stub RtwqRegisterPlatformWithMMCSS @ stdcall RtwqRemovePeriodicCallback(long) @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) -@ stub RtwqSetDeadline -@ stub RtwqSetDeadline2 +@ stdcall RtwqSetDeadline(long int64 ptr) +@ stdcall RtwqSetDeadline2(long int64 int64 ptr) @ stdcall RtwqSetLongRunning(long long) @ stdcall RtwqShutdown() @ stdcall RtwqStartup() diff --git a/include/rtworkq.idl b/include/rtworkq.idl index b27cce49fd..325bebfde5 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -79,6 +79,7 @@ cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") +cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") @@ -89,6 +90,8 @@ cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IR cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request);") +cpp_quote("HRESULT WINAPI RtwqSetDeadline2(DWORD queue_id, LONGLONG deadline, LONGLONG predeadline, HANDLE *request);") cpp_quote("HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);")

1 0

Liam Middlebrook : winevulkan: Handle bitmask pointers for spec generation.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 936d28e2c5f418bf30933cbad67472f1e7b068f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=936d28e2c5f418bf30933cba… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Feb 5 22:36:34 2020 -0800 winevulkan: Handle bitmask pointers for spec generation. Fixes a bug where pointer types for the following functions would be marked as long: vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 6 +++--- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/winevulkan.spec | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 88e4eb72f5..625e50ed70 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -158,9 +158,9 @@ @ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetBufferMemoryRequirements @ stdcall vkGetBufferMemoryRequirements2(ptr ptr ptr) winevulkan.wine_vkGetBufferMemoryRequirements2 @ stdcall vkGetDescriptorSetLayoutSupport(ptr ptr ptr) winevulkan.wine_vkGetDescriptorSetLayoutSupport -@ stdcall vkGetDeviceGroupPeerMemoryFeatures(ptr long long long long) winevulkan.wine_vkGetDeviceGroupPeerMemoryFeatures +@ stdcall vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr) winevulkan.wine_vkGetDeviceGroupPeerMemoryFeatures @ stdcall vkGetDeviceGroupPresentCapabilitiesKHR(ptr ptr) winevulkan.wine_vkGetDeviceGroupPresentCapabilitiesKHR -@ stdcall vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 long) winevulkan.wine_vkGetDeviceGroupSurfacePresentModesKHR +@ stdcall vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 ptr) winevulkan.wine_vkGetDeviceGroupSurfacePresentModesKHR @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue @@ -198,7 +198,7 @@ @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2 @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR -@ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR +@ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR @ stdcall vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceSupportKHR @ stdcall vkGetPhysicalDeviceWin32PresentationSupportKHR(ptr long) winevulkan.wine_vkGetPhysicalDeviceWin32PresentationSupportKHR @ stdcall vkGetPipelineCacheData(ptr int64 ptr ptr) winevulkan.wine_vkGetPipelineCacheData diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5eebc0f3b2..52ef25948c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1491,12 +1491,12 @@ class VkParam(object): def spec(self): """ Generate spec file entry for this parameter. """ - if self.type_info["category"] in ["bitmask", "enum"]: - return "long" if self.is_pointer() and self.type == "char": return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" + if self.type_info["category"] in ["bitmask", "enum"]: + return "long" if self.is_handle() and not self.is_dispatchable(): return "int64" if self.type == "float": diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 57ee94abe2..8cdf387857 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -161,9 +161,9 @@ @ stdcall -private wine_vkGetBufferMemoryRequirements(ptr int64 ptr) @ stdcall -private wine_vkGetBufferMemoryRequirements2(ptr ptr ptr) @ stdcall -private wine_vkGetDescriptorSetLayoutSupport(ptr ptr ptr) -@ stdcall -private wine_vkGetDeviceGroupPeerMemoryFeatures(ptr long long long long) +@ stdcall -private wine_vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr) @ stdcall -private wine_vkGetDeviceGroupPresentCapabilitiesKHR(ptr ptr) -@ stdcall -private wine_vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 long) +@ stdcall -private wine_vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 ptr) @ stdcall -private wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall -private wine_vkGetDeviceProcAddr(ptr str) @ stdcall -private wine_vkGetDeviceQueue(ptr long long ptr) @@ -201,7 +201,7 @@ @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) -@ stdcall -private wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) +@ stdcall -private wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) @ stdcall -private wine_vkGetPhysicalDeviceWin32PresentationSupportKHR(ptr long) @ stdcall -private wine_vkGetPipelineCacheData(ptr int64 ptr ptr)

1 0

Alistair Leslie-Hughes : include: Add X3DAUDIO_CALCULATE_* defines.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: c2bd9deac83e98d4c878af24b4efdcfdac1ed032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2bd9deac83e98d4c878af24… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 5 23:05:54 2020 +0000 include: Add X3DAUDIO_CALCULATE_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/x3daudio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index a503507a40..0fd9a30092 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -87,6 +87,16 @@ typedef struct X3DAUDIO_DSP_SETTINGS { float ListenerVelocityComponent; } X3DAUDIO_DSP_SETTINGS; +#define X3DAUDIO_CALCULATE_MATRIX 0x00000001 +#define X3DAUDIO_CALCULATE_DELAY 0x00000002 +#define X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +#define X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +#define X3DAUDIO_CALCULATE_REVERB 0x00000010 +#define X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +#define X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 +#define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 +#define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE];

1 0

Alexandre Julliard : wmc: Reimplement input format detection to correctly handle Unicode BOM.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: b7b44224d1274df2bf2b851099c4c4deb4bddc5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b44224d1274df2bf2b8510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 15:06:10 2020 +0100 wmc: Reimplement input format detection to correctly handle Unicode BOM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcl.c | 212 +++++++++++++++++++------------------------------------- 1 file changed, 72 insertions(+), 140 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 56c5ca640c..1319113fff 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -160,14 +160,13 @@ void set_codepage(int cp) /* * Input functions */ +#define INPUTBUFFER_SIZE 2048 /* Must be larger than 4 and approx. large enough to hold a line */ + static int nungetstack = 0; static int allocungetstack = 0; static char *ungetstack = NULL; static int ninputbuffer = 0; -static WCHAR *inputbuffer = NULL; -static char *xlatebuffer = NULL; - -#define INPUTBUFFER_SIZE 2048 /* Must be larger than 4 and approx. large enough to hold a line */ +static WCHAR inputbuffer[INPUTBUFFER_SIZE]; /* * Fill the input buffer with *one* line of input. @@ -179,141 +178,74 @@ static char *xlatebuffer = NULL; */ static int fill_inputbuffer(void) { - int n; - static const char err_fatalread[] = "Fatal: reading input failed"; - static int endian = -1; - - if(!inputbuffer) - { - inputbuffer = xmalloc(INPUTBUFFER_SIZE*sizeof(WCHAR)); - xlatebuffer = xmalloc(INPUTBUFFER_SIZE); - } - -try_again: - if(!unicodein) - { - char *cptr; - cptr = fgets(xlatebuffer, INPUTBUFFER_SIZE, yyin); - if(!cptr && ferror(yyin)) - xyyerror(err_fatalread); - else if(!cptr) - return 0; - if (codepage == CP_UTF8) - { - WCHAR *buf = utf8_to_unicode( xlatebuffer, strlen(xlatebuffer), &n ); - memcpy( inputbuffer, buf, (n + 1) * sizeof(WCHAR) ); - free( buf ); - } - else - { - n = wmc_mbstowcs(codepage, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); - if(n < 0) - internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); - } - if(n <= 1) - goto try_again; /* Should not happen */ - n--; /* Strip added conversion '\0' from input length */ - /* - * FIXME: - * Detect UTF-8 in the first time we read some bytes by - * checking the special sequence "FE..." or something like - * that. I need to check www.unicode.org for details. - */ - } - else - { - if(endian == -1) - { - n = fread(inputbuffer, 1, 8, yyin); - if(n != 8) - { - if(!n && ferror(yyin)) - xyyerror(err_fatalread); - else - xyyerror("Fatal: file too short to determine byteorder (should never happen)\n"); - } - if(isisochar(inputbuffer[0]) && - isisochar(inputbuffer[1]) && - isisochar(inputbuffer[2]) && - isisochar(inputbuffer[3])) - { -#ifdef WORDS_BIGENDIAN - endian = WMC_BO_BIG; -#else - endian = WMC_BO_LITTLE; -#endif - } - else if(isisochar(BYTESWAP_WORD(inputbuffer[0])) && - isisochar(BYTESWAP_WORD(inputbuffer[1])) && - isisochar(BYTESWAP_WORD(inputbuffer[2])) && - isisochar(BYTESWAP_WORD(inputbuffer[3]))) - { -#ifdef WORDS_BIGENDIAN - endian = WMC_BO_LITTLE; -#else - endian = WMC_BO_BIG; -#endif - } - else - xyyerror("Fatal: cannot determine file's byteorder\n"); - /* FIXME: - * Determine the file-endian with the leader-bytes - * "FF FE..."; can't remember the exact sequence. - */ - n /= 2; -#ifdef WORDS_BIGENDIAN - if(endian == WMC_BO_LITTLE) -#else - if(endian == WMC_BO_BIG) -#endif - { - inputbuffer[0] = BYTESWAP_WORD(inputbuffer[0]); - inputbuffer[1] = BYTESWAP_WORD(inputbuffer[1]); - inputbuffer[2] = BYTESWAP_WORD(inputbuffer[2]); - inputbuffer[3] = BYTESWAP_WORD(inputbuffer[3]); - } - - } - else - { - int i; - n = 0; - for(i = 0; i < INPUTBUFFER_SIZE; i++) - { - int t; - t = fread(&inputbuffer[i], 2, 1, yyin); - if(!t && ferror(yyin)) - xyyerror(err_fatalread); - else if(!t && n) - break; - n++; -#ifdef WORDS_BIGENDIAN - if(endian == WMC_BO_LITTLE) -#else - if(endian == WMC_BO_BIG) -#endif - { - if((inputbuffer[i] = BYTESWAP_WORD(inputbuffer[i])) == '\n') - break; - } - else - { - if(inputbuffer[i] == '\n') - break; - } - } - } - - } - - if(!n) - { - mcy_warning("Re-read line (input was or converted to zilch)\n"); - goto try_again; /* Should not happen, but could be due to stdin reading and a signal */ - } - - ninputbuffer += n; - return 1; + static enum input_mode { INPUT_UNKNOWN, INPUT_ASCII, INPUT_UTF8, INPUT_UNICODE } mode; + static int swapped; + static unsigned char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; + WCHAR *wbuf; + int i, pos = 0, len = 0; + char buffer[INPUTBUFFER_SIZE]; + + if (mode == INPUT_UNKNOWN) + { + len = fread( buffer, 1, 8, yyin ); + wbuf = (WCHAR *)buffer; + if (len >= 3 && !memcmp( buffer, utf8_bom, 3 )) + { + mode = INPUT_UTF8; + memmove( buffer, buffer + 3, len - 3 ); + len -= 3; + } + else if (len == 8) + { + if (wbuf[0] == 0xfeff || wbuf[0] == 0xfffe) + { + mode = INPUT_UNICODE; + pos = 1; + swapped = (wbuf[0] == 0xfffe); + } + else if (!((wbuf[0] | wbuf[1] | wbuf[2] | wbuf[3]) & 0xff00)) + { + mode = INPUT_UNICODE; + } + else if (!((wbuf[0] | wbuf[1] | wbuf[2] | wbuf[3]) & 0x00ff)) + { + mode = INPUT_UNICODE; + swapped = 1; + } + } + + if (mode == INPUT_UNICODE) + { + len = 4 - pos; + memcpy( inputbuffer, wbuf + pos, len * sizeof(WCHAR) ); + } + else if (mode == INPUT_UNKNOWN) mode = unicodein ? INPUT_UTF8 : INPUT_ASCII; + } + + switch (mode) + { + case INPUT_ASCII: + if (!fgets( buffer + len, sizeof(buffer) - len, yyin )) break; + ninputbuffer = wmc_mbstowcs( codepage, 0, buffer, strlen(buffer), inputbuffer, INPUTBUFFER_SIZE ); + if (ninputbuffer < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode\n"); + return 1; + case INPUT_UTF8: + if (!fgets( buffer + len, sizeof(buffer) - len, yyin )) break; + wbuf = utf8_to_unicode( buffer, strlen(buffer), &ninputbuffer ); + memcpy( inputbuffer, wbuf, ninputbuffer * sizeof(WCHAR) ); + free( wbuf ); + return 1; + case INPUT_UNICODE: + len += fread( inputbuffer + len, sizeof(WCHAR), INPUTBUFFER_SIZE - len, yyin ); + if (!len) break; + if (swapped) for (i = 0; i < len; i++) inputbuffer[i] = BYTESWAP_WORD( inputbuffer[i] ); + ninputbuffer = len; + return 1; + case INPUT_UNKNOWN: + break; + } + if (ferror(yyin)) xyyerror( "Fatal: reading input failed\n" ); + return 0; } static int get_unichar(void) @@ -332,7 +264,7 @@ static int get_unichar(void) } ninputbuffer--; - return (int)(*b++ & 0xffff); + return *b++; } static void unget_unichar(int ch)

1 0