February 2020 - Wine-Commits

Nikolay Sivov : rtworkq: Add RtwqAllocateWorkQueue().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 0c91600efb750855d75574a338d30c6cadb01624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c91600efb750855d75574a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:12 2020 +0300 rtworkq: Add RtwqAllocateWorkQueue(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 4 ++-- include/rtworkq.idl | 2 ++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 16411bfc49..a6aac6abda 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -54,6 +54,8 @@ struct queue_handle static struct queue_handle user_queues[MAX_USER_QUEUE_HANDLES]; static struct queue_handle *next_free_user_queue; +static struct queue_handle *next_unused_user_queue = user_queues; +static WORD queue_generation; static CRITICAL_SECTION queues_section; static CRITICAL_SECTION_DEBUG queues_critsect_debug = @@ -559,6 +561,49 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) return hr; } +static HRESULT alloc_user_queue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue_id) +{ + struct queue_handle *entry; + struct queue *queue; + unsigned int idx; + + *queue_id = RTWQ_CALLBACK_QUEUE_UNDEFINED; + + if (platform_lock <= 0) + return RTWQ_E_SHUTDOWN; + + queue = heap_alloc_zero(sizeof(*queue)); + if (!queue) + return E_OUTOFMEMORY; + init_work_queue(queue_type, queue); + + EnterCriticalSection(&queues_section); + + entry = next_free_user_queue; + if (entry) + next_free_user_queue = entry->obj; + else if (next_unused_user_queue < user_queues + MAX_USER_QUEUE_HANDLES) + entry = next_unused_user_queue++; + else + { + LeaveCriticalSection(&queues_section); + heap_free(queue); + WARN("Out of user queue handles.\n"); + return E_OUTOFMEMORY; + } + + entry->refcount = 1; + entry->obj = queue; + if (++queue_generation == 0xffff) queue_generation = 1; + entry->generation = queue_generation; + idx = entry - user_queues + FIRST_USER_QUEUE_HANDLE; + *queue_id = (idx << 16) | entry->generation; + + LeaveCriticalSection(&queues_section); + + return S_OK; +} + struct async_result { RTWQASYNCRESULT result; @@ -999,6 +1044,20 @@ HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result) return invoke_async_callback(result); } +HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result) +{ + TRACE("%d, %d, %p.\n", queue, priority, result); + + return queue_put_work_item(queue, priority, result); +} + +HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue) +{ + TRACE("%d, %p.\n", queue_type, queue); + + return alloc_user_queue(queue_type, queue); +} + HRESULT WINAPI RtwqLockWorkQueue(DWORD queue) { TRACE("%#x.\n", queue); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 8846047d46..48bc17cbfc 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -1,6 +1,6 @@ @ stdcall RtwqAddPeriodicCallback(ptr ptr ptr) @ stub RtwqAllocateSerialWorkQueue -@ stub RtwqAllocateWorkQueue +@ stdcall RtwqAllocateWorkQueue(long ptr) @ stub RtwqBeginRegisterWorkQueueWithMMCSS @ stub RtwqBeginUnregisterWorkQueueWithMMCSS @ stub RtwqCancelDeadline @@ -20,7 +20,7 @@ @ stdcall RtwqLockWorkQueue(long) @ stub RtwqPutMultipleWaitingWorkItem @ stdcall RtwqPutWaitingWorkItem(long long ptr ptr) -@ stub RtwqPutWorkItem +@ stdcall RtwqPutWorkItem(long long ptr) @ stub RtwqRegisterPlatformEvents @ stub RtwqRegisterPlatformWithMMCSS @ stdcall RtwqRemovePeriodicCallback(long) diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 3c167460c8..001cf2c3e9 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -78,12 +78,14 @@ cpp_quote("} RTWQASYNCRESULT;") 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 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 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);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);")

1 0

Nikolay Sivov : rtworkq: Add periodic callbacks.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: be4529146df5e094ab27d89ca095ff60c2ec4ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4529146df5e094ab27d89c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:11 2020 +0300 rtworkq: Add periodic callbacks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 4 +- include/rtworkq.idl | 4 ++ 3 files changed, 147 insertions(+), 2 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index dc6f6efeb1..16411bfc49 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -838,6 +838,147 @@ HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTW return schedule_work_item(result, timeout, key); } +struct periodic_callback +{ + IRtwqAsyncCallback IRtwqAsyncCallback_iface; + LONG refcount; + RTWQPERIODICCALLBACK callback; +}; + +static struct periodic_callback *impl_from_IRtwqAsyncCallback(IRtwqAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct periodic_callback, IRtwqAsyncCallback_iface); +} + +static HRESULT WINAPI periodic_callback_QueryInterface(IRtwqAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IRtwqAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IRtwqAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI periodic_callback_AddRef(IRtwqAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IRtwqAsyncCallback(iface); + ULONG refcount = InterlockedIncrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI periodic_callback_Release(IRtwqAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IRtwqAsyncCallback(iface); + ULONG refcount = InterlockedDecrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + heap_free(callback); + + return refcount; +} + +static HRESULT WINAPI periodic_callback_GetParameters(IRtwqAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI periodic_callback_Invoke(IRtwqAsyncCallback *iface, IRtwqAsyncResult *result) +{ + struct periodic_callback *callback = impl_from_IRtwqAsyncCallback(iface); + IUnknown *context = NULL; + + if (FAILED(IRtwqAsyncResult_GetObject(result, &context))) + WARN("Expected object to be set for result object.\n"); + + callback->callback(context); + + if (context) + IUnknown_Release(context); + + return S_OK; +} + +static const IRtwqAsyncCallbackVtbl periodic_callback_vtbl = +{ + periodic_callback_QueryInterface, + periodic_callback_AddRef, + periodic_callback_Release, + periodic_callback_GetParameters, + periodic_callback_Invoke, +}; + +static HRESULT create_periodic_callback_obj(RTWQPERIODICCALLBACK callback, IRtwqAsyncCallback **out) +{ + struct periodic_callback *object; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IRtwqAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl; + object->refcount = 1; + object->callback = callback; + + *out = &object->IRtwqAsyncCallback_iface; + + return S_OK; +} + +HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key) +{ + IRtwqAsyncCallback *periodic_callback; + RTWQWORKITEM_KEY workitem_key; + IRtwqAsyncResult *result; + struct queue *queue; + HRESULT hr; + + TRACE("%p, %p, %p.\n", callback, context, key); + + if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + if (FAILED(hr = create_periodic_callback_obj(callback, &periodic_callback))) + return hr; + + hr = create_async_result(context, periodic_callback, NULL, &result); + IRtwqAsyncCallback_Release(periodic_callback); + if (FAILED(hr)) + return hr; + + /* Same period MFGetTimerPeriodicity() returns. */ + hr = queue_submit_timer(queue, result, 0, 10, key ? &workitem_key : NULL); + + IRtwqAsyncResult_Release(result); + + if (key) + *key = workitem_key; + + return S_OK; +} + +HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key) +{ + struct queue *queue; + HRESULT hr; + + TRACE("%#x.\n", key); + + if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + return queue_cancel_item(queue, get_item_key(SCHEDULED_ITEM_KEY_MASK, key)); +} + HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key) { struct queue *queue; diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index eb3d73d8e7..8846047d46 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -1,4 +1,4 @@ -@ stub RtwqAddPeriodicCallback +@ stdcall RtwqAddPeriodicCallback(ptr ptr ptr) @ stub RtwqAllocateSerialWorkQueue @ stub RtwqAllocateWorkQueue @ stub RtwqBeginRegisterWorkQueueWithMMCSS @@ -23,7 +23,7 @@ @ stub RtwqPutWorkItem @ stub RtwqRegisterPlatformEvents @ stub RtwqRegisterPlatformWithMMCSS -@ stub RtwqRemovePeriodicCallback +@ stdcall RtwqRemovePeriodicCallback(long) @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 36468304b4..3c167460c8 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -75,12 +75,16 @@ cpp_quote(" DWORD dwBytesTransferred;") cpp_quote(" HANDLE hEvent;") cpp_quote("} RTWQASYNCRESULT;") +cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") + +cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") 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 RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);")

1 0

Nikolay Sivov : rtworkq: Add RtwqScheduleWorkItem().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 6f1d3c4e9152a72ce3300ce3dace9090c5151f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1d3c4e9152a72ce3300ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:10 2020 +0300 rtworkq: Add RtwqScheduleWorkItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 4 +- include/rtworkq.idl | 2 + 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 2797f292ce..dc6f6efeb1 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -428,6 +428,39 @@ static void CALLBACK waiting_item_cancelable_callback(TP_CALLBACK_INSTANCE *inst release_work_item(item); } +static void CALLBACK scheduled_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = context; + + TRACE("result object %p.\n", item->result); + + invoke_async_callback(item->result); + + release_work_item(item); +} + +static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = context; + + TRACE("result object %p.\n", item->result); + + queue_release_pending_item(item); + + invoke_async_callback(item->result); + + release_work_item(item); +} + +static void CALLBACK periodic_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = grab_work_item(context); + + invoke_async_callback(item->result); + + release_work_item(item); +} + static void queue_mark_item_pending(DWORD mask, struct work_item *item, RTWQWORKITEM_KEY *key) { *key = generate_item_key(mask); @@ -465,6 +498,40 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit return S_OK; } +static HRESULT queue_submit_timer(struct queue *queue, IRtwqAsyncResult *result, INT64 timeout, DWORD period, + RTWQWORKITEM_KEY *key) +{ + PTP_TIMER_CALLBACK callback; + struct work_item *item; + FILETIME filetime; + LARGE_INTEGER t; + + if (!(item = alloc_work_item(queue, result))) + return E_OUTOFMEMORY; + + if (key) + { + queue_mark_item_pending(SCHEDULED_ITEM_KEY_MASK, item, key); + } + + if (period) + callback = periodic_item_callback; + else + callback = key ? scheduled_item_cancelable_callback : scheduled_item_callback; + + t.QuadPart = timeout * 1000 * 10; + filetime.dwLowDateTime = t.u.LowPart; + filetime.dwHighDateTime = t.u.HighPart; + + item->u.timer_object = CreateThreadpoolTimer(callback, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]); + SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); + + TRACE("dispatched %p.\n", result); + + return S_OK; +} + static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) { HRESULT hr = RTWQ_E_NOT_FOUND; @@ -751,6 +818,26 @@ HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncRes return hr; } +static HRESULT schedule_work_item(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key) +{ + struct queue *queue; + HRESULT hr; + + if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return queue_submit_timer(queue, result, timeout, 0, key); +} + +HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key) { struct queue *queue; @@ -764,6 +851,13 @@ HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key) return queue_cancel_item(queue, key); } +HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result) +{ + TRACE("%p.\n", result); + + return invoke_async_callback(result); +} + HRESULT WINAPI RtwqLockWorkQueue(DWORD queue) { TRACE("%#x.\n", queue); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 04da2a9573..eb3d73d8e7 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -13,7 +13,7 @@ @ stub RtwqGetWorkQueueMMCSSClass @ stub RtwqGetWorkQueueMMCSSPriority @ stub RtwqGetWorkQueueMMCSSTaskId -@ stub RtwqInvokeCallback +@ stdcall RtwqInvokeCallback(ptr) @ stub RtwqJoinWorkQueue @ stdcall RtwqLockPlatform() @ stub RtwqLockSharedWorkQueue @@ -24,7 +24,7 @@ @ stub RtwqRegisterPlatformEvents @ stub RtwqRegisterPlatformWithMMCSS @ stub RtwqRemovePeriodicCallback -@ stub RtwqScheduleWorkItem +@ stdcall RtwqScheduleWorkItem(ptr int64 ptr) @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 @ stub RtwqSetLongRunning diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 8cc205a7eb..36468304b4 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -77,9 +77,11 @@ cpp_quote("} RTWQASYNCRESULT;") 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 RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);") cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);")

1 0

Nikolay Sivov : rtworkq: Add RtwqStartup()/RtwqShutdown().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 9ca02920f1afeefe83d358243ed213b124b88a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ca02920f1afeefe83d35824… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:07 2020 +0300 rtworkq: Add RtwqStartup()/RtwqShutdown(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 4 +- include/rtworkq.idl | 11 +++ 3 files changed, 186 insertions(+), 2 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 7897ef5dc9..31a17c68ae 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -23,11 +23,108 @@ #include "rtworkq.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static CRITICAL_SECTION queues_section; +static CRITICAL_SECTION_DEBUG queues_critsect_debug = +{ + 0, 0, &queues_section, + { &queues_critsect_debug.ProcessLocksList, &queues_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": queues_section") } +}; +static CRITICAL_SECTION queues_section = { &queues_critsect_debug, -1, 0, 0, 0, 0 }; + static LONG platform_lock; +enum system_queue_index +{ + SYS_QUEUE_STANDARD = 0, + SYS_QUEUE_RT, + SYS_QUEUE_IO, + SYS_QUEUE_TIMER, + SYS_QUEUE_MULTITHREADED, + SYS_QUEUE_DO_NOT_USE, + SYS_QUEUE_LONG_FUNCTION, + SYS_QUEUE_COUNT, +}; + +struct work_item +{ + struct list entry; + LONG refcount; + IRtwqAsyncResult *result; + struct queue *queue; + RTWQWORKITEM_KEY key; + union + { + TP_WAIT *wait_object; + TP_TIMER *timer_object; + } u; +}; + +static const TP_CALLBACK_PRIORITY priorities[] = +{ + TP_CALLBACK_PRIORITY_HIGH, + TP_CALLBACK_PRIORITY_NORMAL, + TP_CALLBACK_PRIORITY_LOW, +}; + +struct queue +{ + TP_POOL *pool; + TP_CALLBACK_ENVIRON_V3 envs[ARRAY_SIZE(priorities)]; + CRITICAL_SECTION cs; + struct list pending_items; +}; + +static struct queue system_queues[SYS_QUEUE_COUNT]; + +static void CALLBACK standard_queue_cleanup_callback(void *object_data, void *group_data) +{ +} + +static void release_work_item(struct work_item *item) +{ + if (InterlockedDecrement(&item->refcount) == 0) + { + IRtwqAsyncResult_Release(item->result); + heap_free(item); + } +} + +static void init_work_queue(RTWQ_WORKQUEUE_TYPE queue_type, struct queue *queue) +{ + TP_CALLBACK_ENVIRON_V3 env; + unsigned int max_thread, i; + + queue->pool = CreateThreadpool(NULL); + + memset(&env, 0, sizeof(env)); + env.Version = 3; + env.Size = sizeof(env); + env.Pool = queue->pool; + env.CleanupGroup = CreateThreadpoolCleanupGroup(); + env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + { + queue->envs[i] = env; + queue->envs[i].CallbackPriority = priorities[i]; + } + list_init(&queue->pending_items); + InitializeCriticalSection(&queue->cs); + + max_thread = (queue_type == RTWQ_STANDARD_WORKQUEUE || queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; + + SetThreadpoolThreadMinimum(queue->pool, 1); + SetThreadpoolThreadMaximum(queue->pool, max_thread); + + if (queue_type == RTWQ_WINDOW_WORKQUEUE) + FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); +} + struct async_result { RTWQASYNCRESULT result; @@ -217,3 +314,79 @@ HRESULT WINAPI RtwqUnlockPlatform(void) return S_OK; } + +static void init_system_queues(void) +{ + /* Always initialize standard queue, keep the rest lazy. */ + + EnterCriticalSection(&queues_section); + + if (system_queues[SYS_QUEUE_STANDARD].pool) + { + LeaveCriticalSection(&queues_section); + return; + } + + init_work_queue(RTWQ_STANDARD_WORKQUEUE, &system_queues[SYS_QUEUE_STANDARD]); + + LeaveCriticalSection(&queues_section); +} + +HRESULT WINAPI RtwqStartup(void) +{ + if (InterlockedIncrement(&platform_lock) == 1) + { + init_system_queues(); + } + + return S_OK; +} + +static void shutdown_queue(struct queue *queue) +{ + struct work_item *item, *item2; + + if (!queue->pool) + return; + + CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); + CloseThreadpool(queue->pool); + queue->pool = NULL; + + EnterCriticalSection(&queue->cs); + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &queue->pending_items, struct work_item, entry) + { + list_remove(&item->entry); + release_work_item(item); + } + LeaveCriticalSection(&queue->cs); + + DeleteCriticalSection(&queue->cs); +} + +static void shutdown_system_queues(void) +{ + unsigned int i; + + EnterCriticalSection(&queues_section); + + for (i = 0; i < ARRAY_SIZE(system_queues); ++i) + { + shutdown_queue(&system_queues[i]); + } + + LeaveCriticalSection(&queues_section); +} + +HRESULT WINAPI RtwqShutdown(void) +{ + if (platform_lock <= 0) + return S_OK; + + if (InterlockedExchangeAdd(&platform_lock, -1) == 1) + { + shutdown_system_queues(); + } + + return S_OK; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 900aa5f230..8c352593ff 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -28,8 +28,8 @@ @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 @ stub RtwqSetLongRunning -@ stub RtwqShutdown -@ stub RtwqStartup +@ stdcall RtwqShutdown() +@ stdcall RtwqStartup() @ stub RtwqUnjoinWorkQueue @ stdcall RtwqUnlockPlatform() @ stub RtwqUnlockWorkQueue diff --git a/include/rtworkq.idl b/include/rtworkq.idl index d22b09ca50..c2e8237bba 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -18,6 +18,15 @@ import "unknwn.idl"; +typedef enum +{ + RTWQ_STANDARD_WORKQUEUE = 0, + RTWQ_WINDOW_WORKQUEUE = 1, + RTWQ_MULTITHREADED_WORKQUEUE = 2, +} RTWQ_WORKQUEUE_TYPE; + +typedef unsigned __int64 RTWQWORKITEM_KEY; + [ object, uuid(ac6b7889-0740-4d51-8619-905994a55cc6), @@ -59,4 +68,6 @@ cpp_quote("} RTWQASYNCRESULT;") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqLockPlatform(void);") +cpp_quote("HRESULT WINAPI RtwqShutdown(void);") +cpp_quote("HRESULT WINAPI RtwqStartup(void);") cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);")

1 0

Nikolay Sivov : rtworkq: Add RtwqCreateAsyncResult().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: fa420eddba89a181e61eaeb4b94cd9d339d0f70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa420eddba89a181e61eaeb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:06 2020 +0300 rtworkq: Add RtwqCreateAsyncResult(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/Makefile.in | 3 + dlls/rtworkq/queue.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +- include/Makefile.in | 1 + include/rtworkq.idl | 62 +++++++++++++ 5 files changed, 288 insertions(+), 3 deletions(-) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in index d6d7d6f715..a224198986 100644 --- a/dlls/rtworkq/Makefile.in +++ b/dlls/rtworkq/Makefile.in @@ -2,3 +2,6 @@ MODULE = rtworkq.dll IMPORTLIB = rtworkq EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + queue.c diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c new file mode 100644 index 0000000000..7897ef5dc9 --- /dev/null +++ b/dlls/rtworkq/queue.c @@ -0,0 +1,219 @@ +/* + * Copyright 2019-2020 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 +#define NONAMELESSUNION + +#include "initguid.h" +#include "rtworkq.h" +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static LONG platform_lock; + +struct async_result +{ + RTWQASYNCRESULT result; + LONG refcount; + IUnknown *object; + IUnknown *state; +}; + +static struct async_result *impl_from_IRtwqAsyncResult(IRtwqAsyncResult *iface) +{ + return CONTAINING_RECORD(iface, struct async_result, result.AsyncResult); +} + +static HRESULT WINAPI async_result_QueryInterface(IRtwqAsyncResult *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IRtwqAsyncResult) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IRtwqAsyncResult_AddRef(iface); + return S_OK; + } + + *obj = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI async_result_AddRef(IRtwqAsyncResult *iface) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + ULONG refcount = InterlockedIncrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI async_result_Release(IRtwqAsyncResult *iface) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + ULONG refcount = InterlockedDecrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + { + if (result->result.pCallback) + IRtwqAsyncCallback_Release(result->result.pCallback); + if (result->object) + IUnknown_Release(result->object); + if (result->state) + IUnknown_Release(result->state); + if (result->result.hEvent) + CloseHandle(result->result.hEvent); + heap_free(result); + + RtwqUnlockPlatform(); + } + + return refcount; +} + +static HRESULT WINAPI async_result_GetState(IRtwqAsyncResult *iface, IUnknown **state) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + + TRACE("%p, %p.\n", iface, state); + + if (!result->state) + return E_POINTER; + + *state = result->state; + IUnknown_AddRef(*state); + + return S_OK; +} + +static HRESULT WINAPI async_result_GetStatus(IRtwqAsyncResult *iface) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->result.hrStatusResult; +} + +static HRESULT WINAPI async_result_SetStatus(IRtwqAsyncResult *iface, HRESULT status) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + + TRACE("%p, %#x.\n", iface, status); + + result->result.hrStatusResult = status; + + return S_OK; +} + +static HRESULT WINAPI async_result_GetObject(IRtwqAsyncResult *iface, IUnknown **object) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + + TRACE("%p, %p.\n", iface, object); + + if (!result->object) + return E_POINTER; + + *object = result->object; + IUnknown_AddRef(*object); + + return S_OK; +} + +static IUnknown * WINAPI async_result_GetStateNoAddRef(IRtwqAsyncResult *iface) +{ + struct async_result *result = impl_from_IRtwqAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->state; +} + +static const IRtwqAsyncResultVtbl async_result_vtbl = +{ + async_result_QueryInterface, + async_result_AddRef, + async_result_Release, + async_result_GetState, + async_result_GetStatus, + async_result_SetStatus, + async_result_GetObject, + async_result_GetStateNoAddRef, +}; + +static HRESULT create_async_result(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **out) +{ + struct async_result *result; + + if (!out) + return E_INVALIDARG; + + result = heap_alloc_zero(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + RtwqLockPlatform(); + + result->result.AsyncResult.lpVtbl = &async_result_vtbl; + result->refcount = 1; + result->object = object; + if (result->object) + IUnknown_AddRef(result->object); + result->result.pCallback = callback; + if (result->result.pCallback) + IRtwqAsyncCallback_AddRef(result->result.pCallback); + result->state = state; + if (result->state) + IUnknown_AddRef(result->state); + + *out = &result->result.AsyncResult; + + TRACE("Created async result object %p.\n", *out); + + return S_OK; +} + +HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, + IRtwqAsyncResult **out) +{ + TRACE("%p, %p, %p, %p.\n", object, callback, state, out); + + return create_async_result(object, callback, state, out); +} + +HRESULT WINAPI RtwqLockPlatform(void) +{ + InterlockedIncrement(&platform_lock); + + return S_OK; +} + +HRESULT WINAPI RtwqUnlockPlatform(void) +{ + InterlockedDecrement(&platform_lock); + + return S_OK; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 29e56846c6..900aa5f230 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -6,7 +6,7 @@ @ stub RtwqCancelDeadline @ stub RtwqCancelMultipleWaitingWorkItem @ stub RtwqCancelWorkItem -@ stub RtwqCreateAsyncResult +@ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) @ stub RtwqEndRegisterWorkQueueWithMMCSS @ stub RtwqEndUnregisterWorkQueueWithMMCSS @ stub RtwqGetPlatform @@ -15,7 +15,7 @@ @ stub RtwqGetWorkQueueMMCSSTaskId @ stub RtwqInvokeCallback @ stub RtwqJoinWorkQueue -@ stub RtwqLockPlatform +@ stdcall RtwqLockPlatform() @ stub RtwqLockSharedWorkQueue @ stub RtwqLockWorkQueue @ stub RtwqPutMultipleWaitingWorkItem @@ -31,7 +31,7 @@ @ stub RtwqShutdown @ stub RtwqStartup @ stub RtwqUnjoinWorkQueue -@ stub RtwqUnlockPlatform +@ stdcall RtwqUnlockPlatform() @ stub RtwqUnlockWorkQueue @ stub RtwqUnregisterPlatformEvents @ stub RtwqUnregisterPlatformFromMMCSS diff --git a/include/Makefile.in b/include/Makefile.in index 5f967b616d..a91372eb4d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -579,6 +579,7 @@ SOURCES = \ rstloc.idl \ rstnot.idl \ rtutils.h \ + rtworkq.idl \ sal.h \ sapi.idl \ sapiaut.idl \ diff --git a/include/rtworkq.idl b/include/rtworkq.idl new file mode 100644 index 0000000000..d22b09ca50 --- /dev/null +++ b/include/rtworkq.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2020 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 + */ + +import "unknwn.idl"; + +[ + object, + uuid(ac6b7889-0740-4d51-8619-905994a55cc6), + local +] +interface IRtwqAsyncResult : IUnknown +{ + HRESULT GetState([out] IUnknown **state); + HRESULT GetStatus(); + HRESULT SetStatus([in] HRESULT status); + HRESULT GetObject([out] IUnknown **object); + IUnknown *GetStateNoAddRef(); +} + +[ + object, + uuid(a27003cf-2354-4f2a-8d6a-ab7cff15437e), + local +] +interface IRtwqAsyncCallback : IUnknown +{ + HRESULT GetParameters([out] DWORD *flags, [out] DWORD *queue); + HRESULT Invoke([in] IRtwqAsyncResult *result); +} + +cpp_quote("#ifdef __WINESRC__") +cpp_quote("typedef struct tagRTWQASYNCRESULT") +cpp_quote("{") +cpp_quote(" IRtwqAsyncResult AsyncResult;") +cpp_quote("#else") +cpp_quote("typedef struct tagRTWQASYNCRESULT : public IRtwqAsyncResult {") +cpp_quote("#endif") +cpp_quote(" OVERLAPPED overlapped;") +cpp_quote(" IRtwqAsyncCallback *pCallback;") +cpp_quote(" HRESULT hrStatusResult;") +cpp_quote(" DWORD dwBytesTransferred;") +cpp_quote(" HANDLE hEvent;") +cpp_quote("} RTWQASYNCRESULT;") + +cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") +cpp_quote("HRESULT WINAPI RtwqLockPlatform(void);") +cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);")

1 0

Nikolay Sivov : gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: dc9267dc1c73d297deffb5b80a305333cb26501c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9267dc1c73d297deffb5b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 13:17:35 2020 +0300 gdi32: Retry with hinting disabled if glyph load failed in hinted mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..03bd097af2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7620,9 +7620,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + if (err && !(load_flags & FT_LOAD_NO_HINTING)) + { + WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err); + load_flags |= FT_LOAD_NO_HINTING; + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + } if(err) { - WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); + WARN("Failed to load glyph %#x, error %#x.\n", glyph_index, err); return GDI_ERROR; }

1 0

Piotr Caban : msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: daff3be7d2bfe890b3acce369cd21c92ea35a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=daff3be7d2bfe890b3acce36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 5 13:08:55 2020 +0100 msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48561 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index bf75949dbe..74529e9019 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -314,7 +314,7 @@ logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_nam #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else @@ -560,7 +560,7 @@ static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_n #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else

1 0

Derek Lesho : mfplat: Make functionality of GetMediaTypeHandler more clear.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 7929583bb633c82ddfe3b57e59337cdb76f777ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7929583bb633c82ddfe3b57e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 4 11:17:13 2020 -0600 mfplat: Make functionality of GetMediaTypeHandler more clear. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index aace04fe84..893eb3e778 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -967,7 +967,7 @@ static HRESULT WINAPI stream_descriptor_GetMediaTypeHandler(IMFStreamDescriptor TRACE("%p, %p.\n", iface, handler); *handler = &stream_desc->IMFMediaTypeHandler_iface; - IMFStreamDescriptor_AddRef(iface); + IMFMediaTypeHandler_AddRef(*handler); return S_OK; }

1 0

Nikolay Sivov : mfplat: Forward async queue functionality to rtworkq.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 7b87278dcf64f37da343e44f244c518273af4e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b87278dcf64f37da343e44f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:13 2020 +0300 mfplat: Forward async queue functionality to rtworkq. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 44 +- dlls/mfplat/mfplat.spec | 18 +- dlls/mfplat/mfplat_private.h | 4 - dlls/mfplat/queue.c | 1041 +----------------------------------------- 5 files changed, 37 insertions(+), 1072 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b87278dcf64f37da343…

1 0

Alexandre Julliard : libport: Move the digitmap table back to libwine and stop updating it.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 599166bd3536513dc43bba1b4ec2058760200a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599166bd3536513dc43bba1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:40 2020 +0100 libport: Move the digitmap table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/digitmap.c | 6 ++++++ tools/make_unicode | 24 +++--------------------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 6e3edcf719..260140a391 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -79,7 +79,6 @@ C_SRCS = \ compose.c \ cptable.c \ decompose.c \ - digitmap.c \ ffs.c \ fstatvfs.c \ getopt.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 9b2b8f643d..d26f0c2589 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ config.c \ cpsymbol.c \ debug.c \ + digitmap.c \ fold.c \ ldt.c \ loader.c \ diff --git a/libs/port/digitmap.c b/libs/wine/digitmap.c similarity index 99% rename from libs/port/digitmap.c rename to libs/wine/digitmap.c index ea21fb0ab9..41689f4413 100644 --- a/libs/port/digitmap.c +++ b/libs/wine/digitmap.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] = @@ -287,3 +291,5 @@ const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index 3f1d3e55a9..cd2f406793 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -409,7 +409,6 @@ my @unicode_aliases = (); my @tolower_table = (); my @toupper_table = (); my @digitmap_table = (); -my @compatmap_table = (); my @category_table = (); my @joining_table = (); my @direction_table = (); @@ -582,11 +581,6 @@ sub load_data($) if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known - if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd)) - { - # Single char decomposition in the compatibility range - $compatmap_table[$src] = hex $2; - } if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial") { ${joining_forms{$1}}[hex $2] = $src; @@ -623,12 +617,6 @@ sub load_data($) { # Single char decomposition $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ]; - - if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd)) - { - # Single char decomposition in the compatibility range - $compatmap_table[$src] = hex $1; - } } } else @@ -1816,9 +1804,9 @@ sub dump_vertical($) ################################################################ # dump the digit folding tables -sub dump_digit_folding($$) +sub dump_digit_folding($) { - my ($filename, $compat) = @_; + my ($filename) = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Unicode digit folding mappings */\n"; @@ -1827,11 +1815,6 @@ sub dump_digit_folding($$) print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table ); - if ($compat) - { - print OUTPUT "\n"; - dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); - } close OUTPUT; save_file($filename); } @@ -2755,8 +2738,7 @@ dump_bidi_dir_table( "dlls/gdi32/direction.c" ); dump_bidi_dir_table( "dlls/usp10/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" ); -dump_digit_folding( "libs/port/digitmap.c", 1 ); -dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 ); +dump_digit_folding( "dlls/kernelbase/digitmap.c" ); dump_combining_class( "dlls/ntdll/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" );

1 0