mirror of
https://github.com/reactos/reactos.git
synced 2025-06-25 00:49:43 +00:00
[SHELL32]
* Fix gcc compilation. [BROWSEUI/RSHELL] * Use virtual destructors and cleanup with delete in the creator functions. * Try to fix a bit the "close" flow, so that less circular references remain when the filebrowser windows are closed. svn path=/branches/shell-experiments/; revision=63539
This commit is contained in:
parent
580b89e9b6
commit
72aa759dd4
16 changed files with 328 additions and 266 deletions
|
@ -36,7 +36,7 @@ private:
|
|||
|
||||
public:
|
||||
CEnumMergedFolder() : m_UserLocal(NULL), m_AllUSers(NULL), m_FirstDone(FALSE) {}
|
||||
~CEnumMergedFolder() {}
|
||||
virtual ~CEnumMergedFolder() {}
|
||||
|
||||
DECLARE_NOT_AGGREGATABLE(CEnumMergedFolder)
|
||||
DECLARE_PROTECT_FINAL_CONSTRUCT()
|
||||
|
@ -139,7 +139,7 @@ HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder*
|
|||
|
||||
hr = fld->QueryInterface(riid, ppv);
|
||||
if (FAILED_UNEXPECTEDLY(hr))
|
||||
fld->Release();
|
||||
delete fld;
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue