From 9a6c1ebd070526472b4c66a068827e35374c0606 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 27 Aug 2011 18:23:04 +0000 Subject: [PATCH] [SHELL32] * Fix Shell_MergeMenus return type. svn path=/trunk/; revision=53472 --- reactos/dll/win32/shell32/shlmenu.c | 2 +- reactos/include/psdk/shlobj.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/shlmenu.c b/reactos/dll/win32/shell32/shlmenu.c index c25667e633c..821bf50687a 100644 --- a/reactos/dll/win32/shell32/shlmenu.c +++ b/reactos/dll/win32/shell32/shlmenu.c @@ -841,7 +841,7 @@ static BOOL _SHIsMenuSeparator(HMENU hm, int i) /************************************************************************* * Shell_MergeMenus [SHELL32.67] */ -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) +UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) { int nItem; HMENU hmSubMenu; BOOL bAlreadySeparated; diff --git a/reactos/include/psdk/shlobj.h b/reactos/include/psdk/shlobj.h index 57497f0eb11..b5f6d3673ff 100644 --- a/reactos/include/psdk/shlobj.h +++ b/reactos/include/psdk/shlobj.h @@ -1738,7 +1738,7 @@ HRESULT WINAPI ILSaveToStream(LPSTREAM,LPCITEMIDLIST); #define MM_SUBMENUSHAVEIDS 0x00000002L #define MM_DONTREMOVESEPS 0x00000004L -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); +UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); /****************************************************************************