qedit: Add stub implementation of MediaDet.

dlls/qedit/Makefile.in

@@ -8,6 +8,7 @@ EXTRALIBS = -lstrmiids -luuid
 
 C_SRCS = \
 	main.c \
+	mediadet.c \
 	regsvr.c
 
 @MAKE_DLL_RULES@

dlls/qedit/main.c

@@ -52,6 +52,7 @@ struct object_creation_info
 
 static const struct object_creation_info object_creation[] =
 {
+    { &CLSID_MediaDet, MediaDet_create },
 };
 
 static HRESULT WINAPI

dlls/qedit/mediadet.c

@@ -0,0 +1,234 @@
+/*              DirectShow Media Detector object (QEDIT.DLL)
+ *
+ * Copyright 2008 Google (Lei Zhang)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "qedit_private.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+
+typedef struct MediaDetImpl {
+    const IMediaDetVtbl *MediaDet_Vtbl;
+    LONG refCount;
+} MediaDetImpl;
+
+static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    ULONG refCount = InterlockedIncrement(&This->refCount);
+    TRACE("(%p)->() AddRef from %d\n", This, refCount - 1);
+    return refCount;
+}
+
+static ULONG WINAPI MediaDet_Release(IMediaDet* iface)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    ULONG refCount = InterlockedDecrement(&This->refCount);
+    TRACE("(%p)->() Release from %d\n", This, refCount + 1);
+
+    if (refCount == 0)
+    {
+        CoTaskMemFree(This);
+        return 0;
+    }
+
+    return refCount;
+}
+
+static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid,
+                                              void **ppvObject)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
+
+    if (IsEqualIID(riid, &IID_IUnknown) ||
+        IsEqualIID(riid, &IID_IMediaDet)) {
+        MediaDet_AddRef(iface);
+        *ppvObject = This;
+        return S_OK;
+    }
+    *ppvObject = NULL;
+    WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject);
+    return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, newVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%ld)\n", This, newVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, debugstr_guid(pVal));
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, newVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface,
+                                             double StreamTime,
+                                             long *pBufferSize, char *pBuffer,
+                                             long Width, long Height)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%f %p %p %ld %ld)\n", This, StreamTime, pBufferSize, pBuffer,
+          Width, Height);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface,
+                                               double StreamTime, long Width,
+                                               long Height, BSTR Filename)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%f %ld %ld %p)\n", This, StreamTime, Width, Height, Filename);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface,
+                                                   AM_MEDIA_TYPE *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface,
+                                                ISampleGrabber **ppVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, ppVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%p)\n", This, pVal);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface,
+                                                   double SeekTime)
+{
+    MediaDetImpl *This = (MediaDetImpl *)iface;
+    FIXME("(%p)->(%f)\n", This, SeekTime);
+    return E_NOTIMPL;
+}
+
+static const IMediaDetVtbl IMediaDet_VTable =
+{
+    MediaDet_QueryInterface,
+    MediaDet_AddRef,
+    MediaDet_Release,
+    MediaDet_get_Filter,
+    MediaDet_put_Filter,
+    MediaDet_get_OutputStreams,
+    MediaDet_get_CurrentStream,
+    MediaDet_put_CurrentStream,
+    MediaDet_get_StreamType,
+    MediaDet_get_StreamTypeB,
+    MediaDet_get_StreamLength,
+    MediaDet_get_Filename,
+    MediaDet_put_Filename,
+    MediaDet_GetBitmapBits,
+    MediaDet_WriteBitmapBits,
+    MediaDet_get_StreamMediaType,
+    MediaDet_GetSampleGrabber,
+    MediaDet_get_FrameRate,
+    MediaDet_EnterBitmapGrabMode,
+};
+
+HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) {
+    MediaDetImpl* obj = NULL;
+
+    TRACE("(%p,%p)\n", ppv, pUnkOuter);
+
+    if (pUnkOuter)
+        return CLASS_E_NOAGGREGATION;
+
+    obj = CoTaskMemAlloc(sizeof(MediaDetImpl));
+    if (NULL == obj) {
+        *ppv = NULL;
+        return E_OUTOFMEMORY;
+    }
+    ZeroMemory(obj, sizeof(MediaDetImpl));
+
+    obj->refCount = 1;
+    obj->MediaDet_Vtbl = &IMediaDet_VTable;
+    *ppv = obj;
+
+    return S_OK;
+}

dlls/qedit/qedit_private.h

@@ -35,4 +35,6 @@
 #include "dshow.h"
 #include "qedit.h"
 
+HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj);
+
 #endif /* __QEDIT_PRIVATE_INCLUDED__ */

dlls/qedit/tests/mediadet.c

@@ -32,10 +32,11 @@ static void test_mediadet(void)
 
     hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER,
             &IID_IMediaDet, (LPVOID*)&pM);
-    todo_wine {
     ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr);
     ok(pM != NULL, "pM is NULL\n");
-    }
+
+    hr = IMediaDet_Release(pM);
+    ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);
 }
 
 START_TEST(mediadet)