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,6 +65,8 @@ HRESULT CreateMergedFolder(REFIID riid, void **ppv)
|
|||
if (!hRShell)
|
||||
hRShell = LoadLibrary(L"rshell.dll");
|
||||
|
||||
if (hRShell)
|
||||
{
|
||||
PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR)
|
||||
GetProcAddress(hRShell, "CMergedFolder_Constructor");
|
||||
|
||||
|
@ -72,6 +74,7 @@ HRESULT CreateMergedFolder(REFIID riid, void **ppv)
|
|||
{
|
||||
return pCMergedFolder_Constructor(riid, ppv);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv);
|
||||
}
|
||||
|
@ -85,11 +88,14 @@ HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv)
|
|||
if (!hRShell)
|
||||
hRShell = LoadLibraryW(L"rshell.dll");
|
||||
|
||||
if (hRShell)
|
||||
{
|
||||
PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor");
|
||||
if (func)
|
||||
{
|
||||
return func(iid , ppv);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue