marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Shell_MergeMenus should be declared in shlobj.h and exported by name.

oldstable
David Hedberg 2010-07-20 10:11:48 +02:00 committed by Alexandre Julliard
parent dbdedefe71
commit 65f6ab7c86
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/shell32.spec
View File

@ -62,7 +62,7 @@
64 stdcall -noname DriveType(long)
65 stdcall -noname InvalidateDriveType(long)
66 stdcall -noname IsNetDrive(long)
67 stdcall -noname Shell_MergeMenus(long long long long long long)
67 stdcall -ordinal Shell_MergeMenus(long long long long long long)
68 stdcall -noname SHGetSetSettings(ptr long long)
69 stub -noname SHGetNetResource
70 stdcall -noname SHCreateDefClassObject(long long long long long)

5
dlls/shell32/shell32_main.h
View File

@ -108,11 +108,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) \
{\

2
dlls/shell32/shlmenu.c
View File

@ -857,7 +857,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;

2
dlls/shell32/tests/shlfileop.c
View File

@ -2309,8 +2309,6 @@ static void test_unicode(void)
ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n");
}
extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
static void
test_shlmenu(void) {
HRESULT hres;

4
dlls/shell32/undocshell.h
View File

@ -191,10 +191,6 @@ int WINAPI Shell_GetCachedImageIndex(
UINT nIconIndex,
BOOL bSimulateDoc);
BOOL WINAPI Shell_GetImageLists(
HIMAGELIST *lphimlLarge,
HIMAGELIST *lphimlSmall);
HICON WINAPI SHGetFileIcon(
DWORD dwReserved,
LPCSTR lpszPath,

6
include/shlobj.h
View File

@ -82,6 +82,7 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT);
int WINAPI RestartDialog(HWND,LPCWSTR,DWORD);
int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD);
BOOL WINAPI IsUserAnAdmin(void);
UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG);
#define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */
#define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */
@ -116,6 +117,11 @@ BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR);
int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR);
/* Shell_MergeMenus flags */
#define MM_ADDSEPARATOR 0x00000001
#define MM_SUBMENUSHAVEIDS 0x00000002
#define MM_DONTREMOVESEPS 0x00000004
/*****************************************************************************
* IContextMenu interface
*/