Author: akhaldi Date: Sat Aug 27 18:23:04 2011 New Revision: 53472
URL: http://svn.reactos.org/svn/reactos?rev=53472&view=rev Log: [SHELL32] * Fix Shell_MergeMenus return type.
Modified: trunk/reactos/dll/win32/shell32/shlmenu.c trunk/reactos/include/psdk/shlobj.h
Modified: trunk/reactos/dll/win32/shell32/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.c... ============================================================================== --- trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] Sat Aug 27 18:23:04 2011 @@ -841,7 +841,7 @@ /************************************************************************* * 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;
Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=5... ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sat Aug 27 18:23:04 2011 @@ -1738,7 +1738,7 @@ #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);
/****************************************************************************