mscoree: Use CreateConfigStream in parse_config_file.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mscoree: Use CreateConfigStream in parse_config_file.
dd16a491 · Jacek Caban · Alexandre Julliard · 8fff6813 · dd16a491
Commit dd16a491 authored Sep 26, 2017 by Jacek Caban Committed by Alexandre Julliard Sep 28, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

config.c dlls/mscoree/config.c +4 -7

No files found.
--- 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);
+    hr = CreateConfigStream(filename, &stream);
+    if (FAILED(hr))
+        return hr;

-    if (SUCCEEDED(hr))
-    {
+    initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
    V_VT(&var) = VT_UNKNOWN;
    V_UNKNOWN(&var) = (IUnknown*)stream;

    hr = parse_config(var, result);

    IStream_Release(stream);
-    }
-
    if (SUCCEEDED(initresult))
        CoUninitialize();