summaryrefslogtreecommitdiff
path: root/plugins/ShellExt/src/shlcom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ShellExt/src/shlcom.cpp')
-rw-r--r--plugins/ShellExt/src/shlcom.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index b2de97009b..e64ba8832c 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -584,7 +584,6 @@ TShlComRec::TShlComRec()
HRESULT TShlComRec::QueryInterface(REFIID riid, void **ppvObject)
{
- *ppvObject = NULL;
// IShellExtInit is given when the TShlRec is created
if (riid == IID_IContextMenu || riid == IID_IContextMenu2 || riid == IID_IContextMenu3) {
*ppvObject = (IContextMenu3*)this;
@@ -600,6 +599,7 @@ HRESULT TShlComRec::QueryInterface(REFIID riid, void **ppvObject)
return S_OK;
}
+ *ppvObject = NULL;
return CLASS_E_CLASSNOTAVAILABLE;
}
@@ -1031,7 +1031,7 @@ HRESULT TClassFactoryRec::CreateInstance(IUnknown *pUnkOuter, REFIID riid, void
}
if (riid == IID_IShellExtInit) {
TShlComRec *p = new TShlComRec();
- *ppvObject = (IContextMenu3*)p;
+ *ppvObject = (IShellExtInit*)p;
return S_OK;
}