diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c
index 9055dfa36e..d9b16d6a94 100644
--- a/dlls/dswave/dswave_main.c
+++ b/dlls/dswave/dswave_main.c
@@ -37,13 +37,24 @@ typedef struct {
 /******************************************************************
  *		DirectMusicWave ClassFactory
  */
-static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppobj)
+static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppv)
 {
-	FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+        if (ppv == NULL)
+                return E_POINTER;
 
-	if (ppobj == NULL) return E_POINTER;
-	
-	return E_NOINTERFACE;
+        if (IsEqualGUID(&IID_IUnknown, riid))
+                TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv);
+        else if (IsEqualGUID(&IID_IClassFactory, riid))
+                TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv);
+        else {
+                FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
+                *ppv = NULL;
+                return E_NOINTERFACE;
+        }
+
+        *ppv = iface;
+        IUnknown_AddRef((IUnknown*)*ppv);
+        return S_OK;
 }
 
 static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface)