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

Hans Leidekker : dnsapi: Fix data length returned for records that contain Unicode strings.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 0529e5b4b1ec45bc2f1a32b17003cb3f9e07410e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0529e5b4b1ec45bc2f1a32b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:34 2019 +0100 dnsapi: Fix data length returned for records that contain Unicode strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17a..dc6a113 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default:

1 0

Hans Leidekker : dnsapi: No longer prefer native.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: dde0313d9f0ef05c42c87964cde2edd1f7e763c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dde0313d9f0ef05c42c87964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:35 2019 +0100 dnsapi: No longer prefer native. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2..6cb3b49 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /****************************************************************************** * DnsAcquireContextHandle_A [DNSAPI.@] *

1 0

Alexandre Julliard : Release 4.3.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 9422b844b59282db04af533451f50661de56b9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9422b844b59282db04af5334… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:40:42 2019 +0100 Release 4.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 831 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 456 insertions(+), 397 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9422b844b59282db04af…

1 0

Tag wine-4.3 : Alexandre Julliard : Release 4.3
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: refs/tags/wine-4.3 Tag: 1265d2c909c8da0f0751db465643eb125991701b URL: https://source.winehq.org/git/wine.git/?a=tag;h=1265d2c909c8da0f0751db46564… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:40:42 2019 +0100 Release 4.3

1 0

Nikolay Sivov : mfplat: Initialize system queues on startup.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 7a120b0b2c75de8be2007de91b2ecf7501abc432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a120b0b2c75de8be2007de9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:07 2019 +0300 mfplat: Initialize system queues on startup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 26 +++++++-- dlls/mfplat/mfplat_private.h | 20 +++++++ dlls/mfplat/queue.c | 123 ++++++++++++++++++++++++++++++++++--------- include/mfapi.h | 8 +++ include/mfobjects.idl | 1 + 5 files changed, 150 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a120b0b2c75de8be200…

1 0

Nikolay Sivov : mfplat: Add MFAllocateWorkQueueEx().
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 493c2c323e5194b20bf2939f022acb71d26da1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493c2c323e5194b20bf2939f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:08 2019 +0300 mfplat: Add MFAllocateWorkQueueEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 39fd7a9..a218087 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -17,7 +17,7 @@ @ stub LFGetGlobalPool @ stub MFAddPeriodicCallback @ stdcall MFAllocateWorkQueue(ptr) -@ stub MFAllocateWorkQueueEx +@ stdcall MFAllocateWorkQueueEx(long ptr) @ stub MFAppendCollection @ stub MFAverageTimePerFrameToFrameRate @ stub MFBeginCreateFile diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 9a3922f..70efac3 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -388,6 +388,16 @@ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue) } /*********************************************************************** + * MFAllocateWorkQueueEx (mfplat.@) + */ +HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue) +{ + TRACE("%d, %p.\n", queue_type, queue); + + return alloc_user_queue(queue_type, queue); +} + +/*********************************************************************** * MFLockWorkQueue (mfplat.@) */ HRESULT WINAPI MFLockWorkQueue(DWORD queue)

1 0

Nikolay Sivov : mfplat: Add a helper to create async result objects.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 3a433af207cfa6a471af1afe83a1344a3f9f2342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a433af207cfa6a471af1afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:09 2019 +0300 mfplat: Add a helper to create async result objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 70efac3..3b59984 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -345,12 +345,10 @@ static const IMFAsyncResultVtbl async_result_vtbl = async_result_GetStateNoAddRef, }; -HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) +static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) { struct async_result *result; - TRACE("%p, %p, %p, %p.\n", object, callback, state, out); - if (!out) return E_INVALIDARG; @@ -374,10 +372,22 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, *out = &result->result.AsyncResult; + TRACE("Created async result object %p.\n", *out); + return S_OK; } /*********************************************************************** + * MFCreateAsyncResult (mfplat.@) + */ +HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) +{ + TRACE("%p, %p, %p, %p.\n", object, callback, state, out); + + return create_async_result(object, callback, state, out); +} + +/*********************************************************************** * MFAllocateWorkQueue (mfplat.@) */ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue)

1 0

Nikolay Sivov : mfplat: Add basic support for submitting work items.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: c0759107e7e2f1286242c5f14e460b77fd6066f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0759107e7e2f1286242c5f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:10 2019 +0300 mfplat: Add basic support for submitting work items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 3b59984..8c7cf19 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -33,9 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); #define FIRST_USER_QUEUE_HANDLE 5 #define MAX_USER_QUEUE_HANDLES 124 +struct work_item +{ + LONG refcount; + IMFAsyncResult *result; +}; + struct queue { TP_POOL *pool; + TP_CALLBACK_ENVIRON env; }; struct queue_handle @@ -86,9 +93,104 @@ enum system_queue_index static struct queue system_queues[SYS_QUEUE_COUNT]; +static struct queue *get_system_queue(DWORD queue_id) +{ + switch (queue_id) + { + case MFASYNC_CALLBACK_QUEUE_STANDARD: + case MFASYNC_CALLBACK_QUEUE_RT: + case MFASYNC_CALLBACK_QUEUE_IO: + case MFASYNC_CALLBACK_QUEUE_TIMER: + case MFASYNC_CALLBACK_QUEUE_MULTITHREADED: + case MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION: + return &system_queues[queue_id - 1]; + default: + return NULL; + } +} + +static void CALLBACK standard_queue_cleanup_callback(void *object_data, void *group_data) +{ +} + +static struct work_item * alloc_work_item(struct queue *queue, IMFAsyncResult *result) +{ + struct work_item *item; + + item = heap_alloc_zero(sizeof(*item)); + item->result = result; + IMFAsyncResult_AddRef(item->result); + item->refcount = 1; + + return item; +} + +static void release_work_item(struct work_item *item) +{ + if (InterlockedDecrement(&item->refcount) == 0) + { + IMFAsyncResult_Release(item->result); + heap_free(item); + } +} + static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *queue) { + unsigned int max_thread; + queue->pool = CreateThreadpool(NULL); + queue->env.Version = 1; + queue->env.Pool = queue->pool; + queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); + queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + + max_thread = (queue_type == MF_STANDARD_WORKQUEUE || queue_type == MF_WINDOW_WORKQUEUE) ? 1 : 4; + + SetThreadpoolThreadMinimum(queue->pool, 1); + SetThreadpoolThreadMaximum(queue->pool, max_thread); + + if (queue_type == MF_WINDOW_WORKQUEUE) + FIXME("MF_WINDOW_WORKQUEUE is not supported.\n"); +} + +static HRESULT grab_queue(DWORD queue_id, struct queue **ret) +{ + struct queue *queue = get_system_queue(queue_id); + MFASYNC_WORKQUEUE_TYPE queue_type; + struct queue_handle *entry; + + if (!system_queues[SYS_QUEUE_STANDARD].pool) + return MF_E_SHUTDOWN; + + if (queue && queue->pool) + { + *ret = queue; + return S_OK; + } + else if (queue) + { + EnterCriticalSection(&queues_section); + switch (queue_id) + { + case MFASYNC_CALLBACK_QUEUE_IO: + case MFASYNC_CALLBACK_QUEUE_MULTITHREADED: + case MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION: + queue_type = MF_MULTITHREADED_WORKQUEUE; + break; + default: + queue_type = MF_STANDARD_WORKQUEUE; + } + init_work_queue(queue_type, queue); + LeaveCriticalSection(&queues_section); + *ret = queue; + return S_OK; + } + + /* Handles user queues. */ + if ((entry = get_queue_obj(queue_id))) + *ret = entry->obj; + + return *ret ? S_OK : MF_E_INVALID_WORKQUEUE; } void init_system_queues(void) @@ -113,6 +215,7 @@ static void shutdown_queue(struct queue *queue) if (!queue->pool) return; + CloseThreadpoolCleanupGroupMembers(queue->env.CleanupGroup, TRUE, NULL); CloseThreadpool(queue->pool); queue->pool = NULL; } @@ -131,6 +234,47 @@ void shutdown_system_queues(void) LeaveCriticalSection(&queues_section); } +static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) +{ + struct work_item *item = context; + MFASYNCRESULT *result = (MFASYNCRESULT *)item->result; + + TRACE("result object %p.\n", result); + + IMFAsyncCallback_Invoke(result->pCallback, item->result); + + release_work_item(item); +} + +static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) +{ + struct work_item *item; + TP_WORK *work_object; + + if (!(item = alloc_work_item(queue, result))) + return E_OUTOFMEMORY; + + work_object = CreateThreadpoolWork(standard_queue_worker, item, &queue->env); + SubmitThreadpoolWork(work_object); + + TRACE("dispatched %p.\n", result); + + return S_OK; +} + +static HRESULT queue_put_work_item(DWORD queue_id, IMFAsyncResult *result) +{ + struct queue *queue; + HRESULT hr; + + if (FAILED(hr = grab_queue(queue_id, &queue))) + return hr; + + hr = queue_submit_item(queue, result); + + return hr; +} + static HRESULT alloc_user_queue(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue_id) { struct queue_handle *entry; @@ -440,7 +584,7 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - hr = MFPutWorkItemEx(queue, result); + hr = queue_put_work_item(queue, result); IMFAsyncResult_Release(result); @@ -452,9 +596,9 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * */ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) { - FIXME("%#x, %p\n", queue, result); + TRACE("%#x, %p\n", queue, result); - return E_NOTIMPL; + return queue_put_work_item(queue, result); } /***********************************************************************

1 0

Nikolay Sivov : mfplat/tests: Add some tests for serial queues.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 859f9bacc2ac0202b836f711d644f039590cb898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859f9bacc2ac0202b836f711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:11 2019 +0300 mfplat/tests: Add some tests for serial queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cc8a0f4..e5e074e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -44,6 +44,7 @@ static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); +static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -312,7 +313,8 @@ static void init_functions(void) { HMODULE mod = GetModuleHandleA("mfplat.dll"); -#define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFAllocateSerialWorkQueue); X(MFCopyImage); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); @@ -1092,6 +1094,63 @@ todo_wine ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); } +static void test_serial_queue(void) +{ + static const DWORD queue_ids[] = + { + MFASYNC_CALLBACK_QUEUE_STANDARD, + MFASYNC_CALLBACK_QUEUE_RT, + MFASYNC_CALLBACK_QUEUE_IO, + MFASYNC_CALLBACK_QUEUE_TIMER, + MFASYNC_CALLBACK_QUEUE_MULTITHREADED, + MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION, + }; + DWORD queue, serial_queue; + unsigned int i; + HRESULT hr; + + if (!pMFAllocateSerialWorkQueue) + { + skip("Serial queues are not supported.\n"); + return; + } + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(queue_ids); ++i) + { + BOOL broken_types = queue_ids[i] == MFASYNC_CALLBACK_QUEUE_TIMER || + queue_ids[i] == MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION; + + hr = pMFAllocateSerialWorkQueue(queue_ids[i], &serial_queue); + ok(hr == S_OK || broken(broken_types && hr == E_INVALIDARG) /* Win8 */, + "%u: failed to allocate a queue, hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + { + hr = MFUnlockWorkQueue(serial_queue); + ok(hr == S_OK, "%u: failed to unlock the queue, hr %#x.\n", i, hr); + } + } + + /* Chain them together. */ + hr = pMFAllocateSerialWorkQueue(MFASYNC_CALLBACK_QUEUE_STANDARD, &serial_queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + + hr = pMFAllocateSerialWorkQueue(serial_queue, &queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(serial_queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1114,6 +1173,7 @@ START_TEST(mfplat) test_MFCreateCollection(); test_MFHeapAlloc(); test_scheduled_items(); + test_serial_queue(); CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Implement waiting items with ability to cancel.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 1a53a655d19249c06799f4ca5195049acdd0d7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a53a655d19249c06799f4ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:12 2019 +0300 mfplat: Implement waiting items with ability to cancel. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/queue.c | 288 +++++++++++++++++++++++++++++++++++---------- dlls/mfplat/tests/mfplat.c | 5 +- 3 files changed, 233 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a53a655d19249c06799…

1 0