Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI] Rename CISFBand_CreateInstance and add a CISFBand_CreateInstance macro that makes easy to switch between the system implementation or the local one.

Browse source
This commit is contained in:
Giannis Adamopoulos 2017-10-20 16:02:13 +03:00 committed by Giannis Adamopoulos
parent ee1cbf51e1
commit 8a52080dcc
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/shell/rshell/CQuickLaunchBand.cpp
View file

@ -34,7 +34,7 @@
#include "CQuickLaunchBand.h" #include "CQuickLaunchBand.h"
extern "C" extern "C"
HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv); HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv);
// {260CB95D-4544-44F6-A079-575BAA60B72F} // {260CB95D-4544-44F6-A079-575BAA60B72F}
const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } };
@ -114,7 +114,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0
*--*/ *--*/
HRESULT CQuickLaunchBand::FinalConstruct() HRESULT CQuickLaunchBand::FinalConstruct()
{ {
HRESULT hr = CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB));
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;

2
dll/win32/browseui/shellbars/CISFBand.cpp
View file

@ -578,7 +578,7 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent)
/*****************************************************************************/ /*****************************************************************************/
// C Constructor // C Constructor
extern "C" extern "C"
HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv) HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv)
{ {
return ShellObjectCreator<CISFBand>(riid, ppv); return ShellObjectCreator<CISFBand>(riid, ppv);
} }

4
dll/win32/browseui/shellbars/CISFBand.h
View file

@ -191,6 +191,4 @@ public:
END_COM_MAP() END_COM_MAP()
}; };
// C Constructor extern "C" HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv);
extern "C"
HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv);

8
dll/win32/browseui/shellbars/shellbars.h
View file

@ -37,4 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
#define USE_SYSTEM_ISFBAND 0
#if USE_SYSTEM_ISFBAND
#define CISFBand_CreateInstance(riid, ppv) (CoCreateInstance(CLSID_ISFBand, NULL, CLSCTX_INPROC_SERVER,riid, ppv))
#else
#define CISFBand_CreateInstance RSHELL_CISFBand_CreateInstance
#endif
#endif /* _BROWSEUI_PCH_ */ #endif /* _BROWSEUI_PCH_ */