Jacek Caban : mscoree: Use CreateConfigStream in parse_config_file.

Alexandre Julliard julliard at winehq.org
Wed Sep 27 17:54:50 CDT 2017


Module: wine
Branch: master
Commit: dd16a49144a35cdbda758b5eacb51e47f2789365
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd16a49144a35cdbda758b5eacb51e47f2789365

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Sep 26 18:10:11 2017 +0200

mscoree: Use CreateConfigStream in parse_config_file.

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

---

 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 af2ccf2..48f12f4 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();
 




More information about the wine-cvs mailing list