Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- Fail CDefView::CreateViewWindow if a window already exists
- Don't return IOleWindow from CDefView::QueryInterface
Fixes reference leaks during shell32_winetest:shlview
CORE-9867

svn path=/trunk/; revision=68762
This commit is contained in:
Thomas Faber 2015-08-19 08:28:24 +00:00
parent fcd430d3a1
commit f85fcfe77b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/shell32/CDefView.cpp
View file

@ -320,7 +320,8 @@ class CDefView :
END_MSG_MAP()
BEGIN_COM_MAP(CDefView)
COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
// Windows returns E_NOINTERFACE for IOleWindow
// COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView)
COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView)
COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView)
@ -2193,7 +2194,7 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom);
/* Validate the Shell Browser */
if (psb == NULL)
if (psb == NULL || m_hWnd)
return E_UNEXPECTED;
/*set up the member variables*/