[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

base/shell/rshell/CMenuBand.cpp

@@ -52,7 +52,7 @@ HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
     hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
-        site->Release();
+        delete site;
 #endif
 
     return hr;
@@ -255,8 +255,7 @@ HRESULT STDMETHODCALLTYPE  CMenuBand::GetSite(REFIID riid, PVOID *ppvSite)
     return m_site->QueryInterface(riid, ppvSite);
 }
 
-HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(
-    HWND *phwnd)
+HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd)
 {
     if (m_SFToolbar != NULL)
         return m_SFToolbar->GetWindow(phwnd);
@@ -264,6 +263,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(
     if (m_staticToolbar != NULL)
         return m_staticToolbar->GetWindow(phwnd);
 
+    if (phwnd) *phwnd = NULL;
+
     return E_FAIL;
 }
 
@@ -417,10 +418,25 @@ HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved)
     ShowDW(FALSE);
 
     if (m_staticToolbar != NULL)
-        return m_staticToolbar->Close();
+    {
+        m_staticToolbar->Close();
+        delete m_staticToolbar;
+        m_staticToolbar = NULL;
+    }
 
     if (m_SFToolbar != NULL)
-        return m_SFToolbar->Close();
+    {
+        m_SFToolbar->Close();
+        delete m_staticToolbar;
+        m_staticToolbar = NULL;
+    }
+
+    if (m_site) m_site.Release();
+    if (m_psmc) m_psmc.Release();
+    if (m_subMenuChild) m_subMenuChild.Release();
+    if (m_subMenuParent) m_subMenuParent.Release();
+    if (m_childBand) m_childBand.Release();
+    if (m_parentBand) m_parentBand.Release();
 
     return S_OK;
 }

base/shell/rshell/CMenuBand.h

@@ -69,7 +69,7 @@ private:
 
 public:
     CMenuBand();
-    ~CMenuBand();
+    virtual ~CMenuBand();
 
     DECLARE_NOT_AGGREGATABLE(CMenuBand)
     DECLARE_PROTECT_FINAL_CONSTRUCT()

base/shell/rshell/CMenuDeskBar.cpp

@@ -47,7 +47,7 @@ HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
     hr = deskbar->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
-        deskbar->Release();
+        delete deskbar;
 
 #endif
     return hr;

base/shell/rshell/CMenuDeskBar.h

@@ -52,7 +52,7 @@ private:
 
 public:
     CMenuDeskBar();
-    ~CMenuDeskBar();
+    virtual ~CMenuDeskBar();
 
     DECLARE_NOT_AGGREGATABLE(CMenuDeskBar)
     DECLARE_PROTECT_FINAL_CONSTRUCT()

base/shell/rshell/CMenuSite.cpp

@@ -45,7 +45,7 @@ HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
     hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
-        site->Release();
+        delete site;
 #endif
 
     return hr;

base/shell/rshell/CMenuSite.h

@@ -39,7 +39,7 @@ private:
 
 public:
     CMenuSite();
-    ~CMenuSite() {}
+    virtual ~CMenuSite() {}
 
     DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU)
 

base/shell/rshell/CMergedFolder.cpp

@@ -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;
 }

base/shell/rshell/CMergedFolder.h

@@ -29,7 +29,7 @@ private:
 
 public:
     CMergedFolder() {}
-    ~CMergedFolder() {}
+    virtual ~CMergedFolder() {}
 
     HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers);