mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 14:37:45 +00:00
[BROWSEUI]
- Check for NULL return from LoadLibrary CORE-10135 #resolve svn path=/trunk/; revision=69113
This commit is contained in:
parent
2347d1a709
commit
7c0c51c8df
|
@ -65,12 +65,15 @@ HRESULT CreateMergedFolder(REFIID riid, void **ppv)
|
||||||
if (!hRShell)
|
if (!hRShell)
|
||||||
hRShell = LoadLibrary(L"rshell.dll");
|
hRShell = LoadLibrary(L"rshell.dll");
|
||||||
|
|
||||||
PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR)
|
if (hRShell)
|
||||||
GetProcAddress(hRShell, "CMergedFolder_Constructor");
|
|
||||||
|
|
||||||
if (pCMergedFolder_Constructor)
|
|
||||||
{
|
{
|
||||||
return pCMergedFolder_Constructor(riid, ppv);
|
PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR)
|
||||||
|
GetProcAddress(hRShell, "CMergedFolder_Constructor");
|
||||||
|
|
||||||
|
if (pCMergedFolder_Constructor)
|
||||||
|
{
|
||||||
|
return pCMergedFolder_Constructor(riid, ppv);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv);
|
return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv);
|
||||||
|
@ -85,10 +88,13 @@ HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv)
|
||||||
if (!hRShell)
|
if (!hRShell)
|
||||||
hRShell = LoadLibraryW(L"rshell.dll");
|
hRShell = LoadLibraryW(L"rshell.dll");
|
||||||
|
|
||||||
PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor");
|
if (hRShell)
|
||||||
if (func)
|
|
||||||
{
|
{
|
||||||
return func(iid , ppv);
|
PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor");
|
||||||
|
if (func)
|
||||||
|
{
|
||||||
|
return func(iid , ppv);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv);
|
return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv);
|
||||||
|
|
Loading…
Reference in a new issue