Zebediah Figura : qedit/tests: Abort on missing qedit.dll.

Alexandre Julliard julliard at winehq.org
Fri Apr 19 17:30:45 CDT 2019


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Apr 18 23:01:22 2019 -0500

qedit/tests: Abort on missing qedit.dll.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/qedit/tests/mediadet.c      | 12 ++++++++++++
 dlls/qedit/tests/samplegrabber.c | 12 ++++++++++++
 dlls/qedit/tests/timeline.c      | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c
index 34c43fd..311d77b 100644
--- a/dlls/qedit/tests/mediadet.c
+++ b/dlls/qedit/tests/mediadet.c
@@ -647,6 +647,9 @@ static void test_COM_sg_enumpins(void)
 
 START_TEST(mediadet)
 {
+    IMediaDet *detector;
+    HRESULT hr;
+
     if (!init_tests())
     {
         skip("Couldn't initialize tests!\n");
@@ -655,6 +658,15 @@ START_TEST(mediadet)
 
     CoInitialize(NULL);
 
+    if (FAILED(hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IMediaDet, (void **)&detector)))
+    {
+        /* qedit.dll does not exist on 2003. */
+        win_skip("Failed to create media detector object, hr %#x.\n", hr);
+        return;
+    }
+    IMediaDet_Release(detector);
+
     test_aggregation();
     test_mediadet();
     test_samplegrabber();
diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c
index 22f6ddb..8bc44b9 100644
--- a/dlls/qedit/tests/samplegrabber.c
+++ b/dlls/qedit/tests/samplegrabber.c
@@ -451,8 +451,20 @@ static void test_aggregation(void)
 
 START_TEST(samplegrabber)
 {
+    IBaseFilter *filter;
+    HRESULT hr;
+
     CoInitialize(NULL);
 
+    if (FAILED(hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IBaseFilter, (void **)&filter)))
+    {
+        /* qedit.dll does not exist on 2003. */
+        win_skip("Failed to create sample grabber filter, hr %#x.\n", hr);
+        return;
+    }
+    IBaseFilter_Release(filter);
+
     test_interfaces();
     test_enum_pins();
     test_find_pin();
diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c
index 9e24062..0d01d51 100644
--- a/dlls/qedit/tests/timeline.c
+++ b/dlls/qedit/tests/timeline.c
@@ -246,8 +246,20 @@ static void test_timelineobj_interfaces(void)
 
 START_TEST(timeline)
 {
+    IAMTimeline *timeline;
+    HRESULT hr;
+
     CoInitialize(NULL);
 
+    if (FAILED(hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IAMTimeline, (void **)&timeline)))
+    {
+        /* qedit.dll does not exist on 2003. */
+        win_skip("Failed to create timeline object, hr %#x.\n", hr);
+        return;
+    }
+    IAMTimeline_Release(timeline);
+
     test_aggregation();
     test_timeline();
     test_timelineobj_interfaces();




More information about the wine-cvs mailing list