Commit f5075f73 authored by Lei Zhang's avatar Lei Zhang Committed by Alexandre Julliard

quartz: Set *ppvObject to NULL if QueryInterface fails.

parent 29cc256b
...@@ -89,6 +89,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( ...@@ -89,6 +89,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface(
return S_OK; return S_OK;
} }
*ppvObj = NULL;
FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -89,6 +89,7 @@ DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) ...@@ -89,6 +89,7 @@ DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
return S_OK; return S_OK;
} }
*ppobj = NULL;
WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -210,6 +210,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF ...@@ -210,6 +210,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF
return S_OK; return S_OK;
} }
*ppobj = NULL;
WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppobj); WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -38,9 +38,7 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IRefere ...@@ -38,9 +38,7 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IRefere
hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF);
ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr);
todo_wine {
ok(pF == NULL, "pF is not NULL\n"); ok(pF == NULL, "pF is not NULL\n");
}
hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF);
ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment