From c356d450fbf05f76c320f9977cef8829ab5d1c24 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 15 Nov 2013 13:34:08 +0100 Subject: [PATCH] urlmon: Simplify get_feature_from_process. --- dlls/urlmon/internet.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index d4a49b5e55c..e5d41b64198 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -637,22 +637,17 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature) static HRESULT get_feature_from_process(INTERNETFEATURELIST feature) { - HRESULT hres; + HRESULT hres = S_OK; EnterCriticalSection(&process_features_cs); /* Try loading the feature from the registry, if it hasn't already * been done. */ - if(process_feature_controls[feature].check_registry) { + if(process_feature_controls[feature].check_registry) hres = load_process_feature(feature); - if(FAILED(hres)) { - LeaveCriticalSection(&process_features_cs); - return hres; - } - } - - hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE; + if(SUCCEEDED(hres)) + hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE; LeaveCriticalSection(&process_features_cs);