ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BROWSEUI]

Browse Source 
- Check for NULL return from LoadLibrary
CORE-10135 #resolve

svn path=/trunk/; revision=69113
This commit is contained in:
Thomas Faber
2015-09-08 11:39:10 +00:00
parent 2347d1a709
commit 7c0c51c8df
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/browseui/precomp.h
+14 -8
View File
@@ -65,12 +65,15 @@ HRESULT CreateMergedFolder(REFIID riid, void **ppv)
if (!hRShell)
hRShell = LoadLibrary(L"rshell.dll");
PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR)
GetProcAddress(hRShell, "CMergedFolder_Constructor");
if (pCMergedFolder_Constructor)
if (hRShell)
{
return pCMergedFolder_Constructor(riid, ppv);
PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR)
GetProcAddress(hRShell, "CMergedFolder_Constructor");
if (pCMergedFolder_Constructor)
{
return pCMergedFolder_Constructor(riid, ppv);
}
}
#endif
return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv);
@@ -85,10 +88,13 @@ HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv)
if (!hRShell)
hRShell = LoadLibraryW(L"rshell.dll");
PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor");
if (func)
if (hRShell)
{
return func(iid , ppv);
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);