ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wsdapi: Add critical section around notification sinks. 

Signed-off-by: Owen Rudge <orudge@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Owen Rudge 2018-06-13 19:11:20 +01:00 committed by Alexandre Julliard
parent e69f09746e
commit e4c79c13b2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wsdapi/discovery.c
View File

@ -97,6 +97,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa
HeapFree(GetProcessHeap(), 0, sink);
}
DeleteCriticalSection(&This->notification_sink_critical_section);
HeapFree(GetProcessHeap(), 0, This);
}
@ -148,7 +149,9 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_RegisterNotificationSink(IWSDisc
sink->notificationSink = pSink;
IWSDiscoveryPublisherNotify_AddRef(pSink);
EnterCriticalSection(&impl->notification_sink_critical_section);
list_add_tail(&impl->notificationSinks, &sink->entry);
LeaveCriticalSection(&impl->notification_sink_critical_section);
if ((!impl->publisherStarted) && (!init_networking(impl)))
return E_FAIL;
@ -168,6 +171,8 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi
return E_INVALIDARG;
}
EnterCriticalSection(&impl->notification_sink_critical_section);
LIST_FOR_EACH_ENTRY(sink, &impl->notificationSinks, struct notificationSink, entry)
{
if (sink->notificationSink == pSink)
@ -176,10 +181,13 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi
list_remove(&sink->entry);
HeapFree(GetProcessHeap(), 0, sink);
LeaveCriticalSection(&impl->notification_sink_critical_section);
return S_OK;
}
}
LeaveCriticalSection(&impl->notification_sink_critical_section);
/* Notification sink is not registered */
return E_FAIL;
}
@ -391,6 +399,7 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover
return ret;
}
InitializeCriticalSection(&obj->notification_sink_critical_section);
list_init(&obj->notificationSinks);
*ppPublisher = &obj->IWSDiscoveryPublisher_iface;

1
dlls/wsdapi/wsdapi_internal.h
View File

@ -48,6 +48,7 @@ typedef struct IWSDiscoveryPublisherImpl {
IWSDXMLContext *xmlContext;
DWORD addressFamily;
struct list notificationSinks;
CRITICAL_SECTION notification_sink_critical_section;
BOOL publisherStarted;
HANDLE thread_handles[MAX_WSD_THREADS];
int num_thread_handles;