Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 20:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused check for pClassFactory (#1419)

Browse Source 
* Update dllmain.cpp

* Update dllmain.cpp
This commit is contained in:
pi1024e
2020-03-07 19:25:12 -05:00
committed by GitHub
parent 1cf8634152
commit bea8e647d9
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/powerrename/dll/dllmain.cpp
View File

@@ -59,16 +59,13 @@ public:
{ {
hr = CLASS_E_NOAGGREGATION; hr = CLASS_E_NOAGGREGATION;
} }
else if (m_clsid == CLSID_PowerRenameMenu)
{
hr = CPowerRenameMenu::s_CreateInstance(punkOuter, riid, ppv);
}
else else
{ {
if (m_clsid == CLSID_PowerRenameMenu) hr = CLASS_E_CLASSNOTAVAILABLE;
{
hr = CPowerRenameMenu::s_CreateInstance(punkOuter, riid, ppv);
}
else
{
hr = CLASS_E_CLASSNOTAVAILABLE;
}
} }
return hr; return hr;
} }
@@ -126,13 +123,9 @@ STDAPI DllCanUnloadNow(void)
STDAPI DllGetClassObject(_In_ REFCLSID clsid, _In_ REFIID riid, _Outptr_ void** ppv) STDAPI DllGetClassObject(_In_ REFCLSID clsid, _In_ REFIID riid, _Outptr_ void** ppv)
{ {
*ppv = NULL; *ppv = NULL;
HRESULT hr = E_OUTOFMEMORY;
CPowerRenameClassFactory* pClassFactory = new CPowerRenameClassFactory(clsid); CPowerRenameClassFactory* pClassFactory = new CPowerRenameClassFactory(clsid);
if (pClassFactory) HRESULT hr = pClassFactory->QueryInterface(riid, ppv);
{ pClassFactory->Release();
hr = pClassFactory->QueryInterface(riid, ppv);
pClassFactory->Release();
}
return hr; return hr;
} }