[BROWSEUI] CBandSiteMenu: Use CSimpleArray and CComHeapPtr.

[reactos.git] / dll / win32 / browseui / precomp.h

diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h
index d2ded2e..3303834 100644 (file)
--- a/dll/win32/browseui/precomp.h
+++ b/dll/win32/browseui/precomp.h
@@ -13,6 +13,7 @@
 #include <wingdi.h>
 #include <shlobj.h>
 #include <tlogstg.h>
+#include <shellapi.h>
 #include <shlobj_undoc.h>
 #include <shlguid_undoc.h>
 #include <shdeprecated.h>
@@ -20,6 +21,7 @@
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlwin.h>
+#include <atlsimpcoll.h>
 #include <undocuser.h>
 #include <perhist.h>
 #include <exdispid.h>
@@ -39,8 +41,9 @@
 #include "addresseditbox.h"
 #include "CAutoComplete.h"
 #include "bandproxy.h"
-#include "bandsite.h"
-#include "bandsitemenu.h"
+#include "shellbars/CBandSite.h"
+#include "shellbars/CBandSiteMenu.h"
+#include "shellbars/CISFBand.h"
 #include "brandband.h"
 #include "internettoolbar.h"
 #include "commonbrowser.h"
@@ -48,57 +51,9 @@
 #include "regtreeoptions.h"
 #include "explorerband.h"
 #include "CProgressDialog.h"
+#include "browseui.h"
 #include <stdio.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(browseui);
 
-
-#define USE_CUSTOM_MENUBAND 1
-
-typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
-typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv);
-
-static inline
-HRESULT CreateMergedFolder(REFIID riid, void **ppv)
-{
-#if 1
-    HMODULE hRShell = GetModuleHandle(L"rshell.dll");
-    if (!hRShell)
-        hRShell = LoadLibrary(L"rshell.dll");
-
-    if (hRShell)
-    {
-        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);
-}
-
-static inline
-HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv)
-{
-#if USE_CUSTOM_MENUBAND
-    HMODULE hRShell = GetModuleHandleW(L"rshell.dll");
-
-    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);
-}
-
 #endif /* _BROWSEUI_PCH_ */