From dd16a49144a35cdbda758b5eacb51e47f2789365 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 26 Sep 2017 18:10:11 +0200 Subject: [PATCH] mscoree: Use CreateConfigStream in parse_config_file. Signed-off-by: Jacek Caban Signed-off-by: Vincent Povirk Signed-off-by: Alexandre Julliard --- dlls/mscoree/config.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index af2ccf243fa..48f12f4d53d 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -34,7 +34,6 @@ #include "cordebug.h" #include "wine/list.h" #include "mscoree_private.h" -#include "shlwapi.h" #include "wine/debug.h" @@ -664,20 +663,18 @@ HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) init_config(result); - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - hr = SHCreateStreamOnFileW(filename, STGM_SHARE_DENY_WRITE | STGM_READ | STGM_FAILIFTHERE, &stream); - if (SUCCEEDED(hr)) - { - V_VT(&var) = VT_UNKNOWN; - V_UNKNOWN(&var) = (IUnknown*)stream; + hr = CreateConfigStream(filename, &stream); + if (FAILED(hr)) + return hr; - hr = parse_config(var, result); + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; - IStream_Release(stream); - } + hr = parse_config(var, result); + IStream_Release(stream); if (SUCCEEDED(initresult)) CoUninitialize(); -- 2.11.4.GIT