Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- move Shell_MergeMenus to shlobj.h where it belongs

Browse source 
svn path=/trunk/; revision=30362
This commit is contained in:
Johannes Anderwald 2007-11-11 18:14:11 +00:00
parent 04be216fbb
commit ace89b703c
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/shell32/shell32_main.h
View file

@ -112,11 +112,6 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO
LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST);
LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST);
/* menu merging */
#define MM_ADDSEPARATOR 0x00000001L
#define MM_SUBMENUSHAVEIDS 0x00000002L
HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
/* initialisation for FORMATETC */
#define InitFormatEtc(fe, cf, med) \
{\

9
reactos/include/psdk/shlobj.h
View file

@ -1372,6 +1372,15 @@ HRESULT WINAPI ILSaveToStream(LPSTREAM,LPCITEMIDLIST);
#include <poppack.h>
/* menu merging */
#define MM_ADDSEPARATOR 0x00000001L
#define MM_SUBMENUSHAVEIDS 0x00000002L
#define MM_DONTREMOVESEPS 0x00000004L
HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
/****************************************************************************
* SHCreateDefaultContextMenu API
*/