urlmon: Simplify get_feature_from_process.

This commit is contained in:
Jacek Caban 2013-11-15 13:34:08 +01:00 committed by Alexandre Julliard
parent 72edda27a1
commit c356d450fb

View File

@ -637,21 +637,16 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature)
static HRESULT get_feature_from_process(INTERNETFEATURELIST feature) static HRESULT get_feature_from_process(INTERNETFEATURELIST feature)
{ {
HRESULT hres; HRESULT hres = S_OK;
EnterCriticalSection(&process_features_cs); EnterCriticalSection(&process_features_cs);
/* Try loading the feature from the registry, if it hasn't already /* Try loading the feature from the registry, if it hasn't already
* been done. * been done.
*/ */
if(process_feature_controls[feature].check_registry) { if(process_feature_controls[feature].check_registry)
hres = load_process_feature(feature); hres = load_process_feature(feature);
if(FAILED(hres)) { if(SUCCEEDED(hres))
LeaveCriticalSection(&process_features_cs);
return hres;
}
}
hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE; hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE;
LeaveCriticalSection(&process_features_cs); LeaveCriticalSection(&process_features_cs);