Nikolay Sivov : mfreadwrite/tests: Initialize COM only for tests that need it.

Alexandre Julliard julliard at winehq.org
Thu Feb 21 14:50:11 CST 2019


Module: wine
Branch: master
Commit: 4bca67bd474e0265ccaacabb987311f6b700fc6f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4bca67bd474e0265ccaacabb987311f6b700fc6f

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Feb 21 15:34:58 2019 +0300

mfreadwrite/tests: Initialize COM only for tests that need it.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfreadwrite/tests/mfplat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index de5f359..b2675dc 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -96,6 +96,8 @@ static void test_factory(void)
     IMFReadWriteClassFactory *factory, *factory2;
     HRESULT hr;
 
+    CoInitialize(NULL);
+
     hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory,
             (void **)&factory);
     ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr);
@@ -105,14 +107,14 @@ static void test_factory(void)
     ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr);
 
     IMFReadWriteClassFactory_Release(factory);
+
+    CoUninitialize();
 }
 
 START_TEST(mfplat)
 {
     HRESULT hr;
 
-    CoInitialize(NULL);
-
     hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
     ok(hr == S_OK, "got 0x%08x\n", hr);
 
@@ -122,6 +124,4 @@ START_TEST(mfplat)
     test_factory();
 
     MFShutdown();
-
-    CoUninitialize();
 }




More information about the wine-cvs mailing list