[PATCH 3/3] browseui: Handle NULL as output pointer in Progressdialog_QueryInterface
Detlef Riekenberg
wine.dev at web.de
Sun Apr 15 15:08:38 CDT 2012
---
dlls/browseui/progressdlg.c | 5 ++++-
dlls/browseui/tests/progressdlg.c | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index 2807622..d04baf1 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -274,8 +274,11 @@ static void ProgressDialog_Destructor(ProgressDialog *This)
static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut)
{
ProgressDialog *This = impl_from_IProgressDialog(iface);
- *ppvOut = NULL;
+ if (!ppvOut)
+ return E_POINTER;
+
+ *ppvOut = NULL;
if (IsEqualIID(iid, &IID_IUnknown))
{
*ppvOut = This;
diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c
index 5bbef0a..e4d0e2f 100644
--- a/dlls/browseui/tests/progressdlg.c
+++ b/dlls/browseui/tests/progressdlg.c
@@ -39,6 +39,9 @@ static void test_IProgressDialog_QueryInterface(void)
return;
}
+ hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL);
+ ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr);
+
hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk);
ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr);
if (SUCCEEDED(hr)) {
--
1.7.5.4
More information about the wine-patches
mailing list