system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:55:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtworkq: Fix leak of thread pool work items.

Browse source
This commit is contained in:
Yuxuan Shui 2023-09-25 18:23:21 +01:00 committed by Alexandre Julliard
parent 20f88c831e
commit 34319496d8
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/rtworkq/queue.c
View file

@ -118,6 +118,13 @@ enum system_queue_index
SYS_QUEUE_COUNT,
};
enum work_item_type
{
WORK_ITEM_WORK,
WORK_ITEM_TIMER,
WORK_ITEM_WAIT,
};
struct work_item
{
IUnknown IUnknown_iface;
@ -129,10 +136,11 @@ struct work_item
RTWQWORKITEM_KEY key;
LONG priority;
DWORD flags;
TP_WORK *work_object;
PTP_SIMPLE_CALLBACK finalization_callback;
enum work_item_type type;
union
{
TP_WORK *work_object;
TP_WAIT *wait_object;
TP_TIMER *timer_object;
} u;
@ -387,8 +395,9 @@ static void pool_queue_submit(struct queue *queue, struct work_item *item)
we need finalization callback. */
if (item->finalization_callback)
IUnknown_AddRef(&item->IUnknown_iface);
item->work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env);
SubmitThreadpoolWork(item->work_object);
item->u.work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env);
item->type = WORK_ITEM_WORK;
SubmitThreadpoolWork(item->u.work_object);
TRACE("dispatched %p.\n", item->result);
}
@ -549,8 +558,18 @@ static ULONG WINAPI work_item_Release(IUnknown *iface)
if (!refcount)
{
if (item->work_object)
CloseThreadpoolWork(item->work_object);
switch (item->type)
{
case WORK_ITEM_WORK:
if (item->u.work_object) CloseThreadpoolWork(item->u.work_object);
break;
case WORK_ITEM_WAIT:
if (item->u.wait_object) CloseThreadpoolWait(item->u.wait_object);
break;
case WORK_ITEM_TIMER:
if (item->u.timer_object) CloseThreadpoolTimer(item->u.timer_object);
break;
}
if (item->reply_result)
IRtwqAsyncResult_Release(item->reply_result);
IRtwqAsyncResult_Release(item->result);
@ -814,6 +833,7 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit
item->u.wait_object = CreateThreadpoolWait(callback, item,
(TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]);
item->type = WORK_ITEM_WAIT;
SetThreadpoolWait(item->u.wait_object, event, NULL);
TRACE("dispatched %p.\n", result);
@ -848,6 +868,7 @@ static HRESULT queue_submit_timer(struct queue *queue, IRtwqAsyncResult *result,
item->u.timer_object = CreateThreadpoolTimer(callback, item,
(TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]);
item->type = WORK_ITEM_TIMER;
SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0);
TRACE("dispatched %p.\n", result);