Jacek Caban : urlmon: Make session object thread safe.
Alexandre Julliard
julliard at winehq.org
Thu Feb 21 07:42:54 CST 2008
Module: wine
Branch: master
Commit: a821cc34f6f437af5f9ba83896299274ec9dd984
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a821cc34f6f437af5f9ba83896299274ec9dd984
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Feb 21 13:08:44 2008 +0100
urlmon: Make session object thread safe.
---
dlls/urlmon/session.c | 76 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c
index 20be8c5..72308e1 100644
--- a/dlls/urlmon/session.c
+++ b/dlls/urlmon/session.c
@@ -43,6 +43,15 @@ typedef struct mime_filter {
static name_space *name_space_list = NULL;
static mime_filter *mime_filter_list = NULL;
+static CRITICAL_SECTION session_cs;
+static CRITICAL_SECTION_DEBUG session_cs_dbg =
+{
+ 0, 0, &session_cs,
+ { &session_cs_dbg.ProcessLocksList, &session_cs_dbg.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": session") }
+};
+static CRITICAL_SECTION session_cs = { &session_cs_dbg, -1, 0, 0, 0, 0 };
+
static name_space *find_name_space(LPCWSTR protocol)
{
name_space *iter;
@@ -115,9 +124,13 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto
new_name_space->urlmon = urlmon_protocol;
new_name_space->protocol = heap_strdupW(protocol);
+ EnterCriticalSection(&session_cs);
+
new_name_space->next = name_space_list;
name_space_list = new_name_space;
+ LeaveCriticalSection(&session_cs);
+
return S_OK;
}
@@ -125,6 +138,8 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol)
{
name_space *iter, *last = NULL;
+ EnterCriticalSection(&session_cs);
+
for(iter = name_space_list; iter; iter = iter->next) {
if(iter->cf == cf && !strcmpW(iter->protocol, protocol))
break;
@@ -136,7 +151,11 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol)
last->next = iter->next;
else
name_space_list = iter->next;
+ }
+
+ LeaveCriticalSection(&session_cs);
+ if(iter) {
if(!iter->urlmon)
IClassFactory_Release(iter->cf);
heap_free(iter->protocol);
@@ -183,20 +202,20 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url)
if(FAILED(hres) || !schema_len)
return NULL;
- ns = find_name_space(schema);
- if(ns) {
- if(ns->urlmon)
- return NULL;
+ EnterCriticalSection(&session_cs);
+ ns = find_name_space(schema);
+ if(ns && !ns->urlmon) {
hres = IClassFactory_QueryInterface(ns->cf, &IID_IInternetProtocolInfo, (void**)&ret);
- if(SUCCEEDED(hres))
- return ret;
-
- hres = IClassFactory_CreateInstance(ns->cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret);
- if(SUCCEEDED(hres))
- return ret;
+ if(FAILED(hres))
+ hres = IClassFactory_CreateInstance(ns->cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret);
}
+ LeaveCriticalSection(&session_cs);
+
+ if(ns && SUCCEEDED(hres))
+ return ret;
+
hres = get_protocol_cf(schema, schema_len, NULL, &cf);
if(FAILED(hres))
return NULL;
@@ -216,20 +235,28 @@ HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret)
DWORD schema_len;
HRESULT hres;
+ *ret = NULL;
+
hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]),
&schema_len, 0);
if(FAILED(hres) || !schema_len)
return schema_len ? hres : E_FAIL;
+ EnterCriticalSection(&session_cs);
+
ns = find_name_space(schema);
if(ns) {
*ret = ns->cf;
IClassFactory_AddRef(*ret);
if(clsid)
*clsid = ns->clsid;
- return S_OK;
}
+ LeaveCriticalSection(&session_cs);
+
+ if(*ret)
+ return S_OK;
+
return get_protocol_cf(schema, schema_len, clsid, ret);
}
@@ -305,9 +332,13 @@ static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface
filter->clsid = *rclsid;
filter->mime = heap_strdupW(pwzType);
+ EnterCriticalSection(&session_cs);
+
filter->next = mime_filter_list;
mime_filter_list = filter;
+ LeaveCriticalSection(&session_cs);
+
return S_OK;
}
@@ -318,23 +349,28 @@ static HRESULT WINAPI InternetSession_UnregisterMimeFilter(IInternetSession *ifa
TRACE("(%p %s)\n", pCF, debugstr_w(pwzType));
+ EnterCriticalSection(&session_cs);
+
for(iter = mime_filter_list; iter; iter = iter->next) {
if(iter->cf == pCF && !strcmpW(iter->mime, pwzType))
break;
prev = iter;
}
- if(!iter)
- return S_OK;
+ if(iter) {
+ if(prev)
+ prev->next = iter->next;
+ else
+ mime_filter_list = iter->next;
+ }
- if(prev)
- prev->next = iter->next;
- else
- mime_filter_list = iter->next;
+ LeaveCriticalSection(&session_cs);
- IClassFactory_Release(iter->cf);
- heap_free(iter->mime);
- heap_free(iter);
+ if(iter) {
+ IClassFactory_Release(iter->cf);
+ heap_free(iter->mime);
+ heap_free(iter);
+ }
return S_OK;
}
More information about the wine-cvs
mailing list