Zebediah Figura : shell32: Move file menu definitions to shlmenu.c.
Alexandre Julliard
julliard at winehq.org
Wed Feb 2 16:38:02 CST 2022
Module: wine
Branch: master
Commit: ac987baee723ff3f47c9b2cfbcc87fd8d2c38ae0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac987baee723ff3f47c9b2cfbcc87fd8d2c38ae0
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Feb 1 19:32:49 2022 -0600
shell32: Move file menu definitions to shlmenu.c.
There's no need to document anything in a common header.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/shlmenu.c | 26 ++++++++--
dlls/shell32/undocshell.h | 130 ----------------------------------------------
2 files changed, 21 insertions(+), 135 deletions(-)
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index e4afe3dcfdc..60bb2a058c4 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -30,7 +30,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "shlobj.h"
-#include "undocshell.h"
#include "shlwapi.h"
#include "shell32_main.h"
@@ -38,13 +37,30 @@
#include "wine/debug.h"
#include "debughlp.h"
-#ifdef FM_SEPARATOR
-#undef FM_SEPARATOR
-#endif
-#define FM_SEPARATOR (LPCWSTR)1
+/* FileMenu_Create nSelHeight constants */
+#define FM_DEFAULT_SELHEIGHT -1
+#define FM_FULL_SELHEIGHT 0
+
+/* FileMenu_Create flags */
+#define FMF_SMALL_ICONS 0x00
+#define FMF_LARGE_ICONS 0x08
+#define FMF_NO_COLUMN_BREAK 0x10
+
+/* FileMenu_AppendItem constants */
+#define FM_SEPARATOR ((const WCHAR *)1)
+#define FM_BLANK_ICON -1
+#define FM_DEFAULT_HEIGHT 0
+
+/* FileMenu_InsertUsingPidl flags */
+#define FMF_NO_EMPTY_ITEM 0x01
+#define FMF_NO_PROGRAM_GROUPS 0x04
+
+/* FileMenu_InsertUsingPidl callback function */
+typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
static BOOL FileMenu_AppendItemW(HMENU hMenu, LPCWSTR lpText, UINT uID, int icon,
HMENU hMenuPopup, int nItemHeight);
+BOOL WINAPI FileMenu_DeleteAllItems(HMENU hMenu);
typedef struct
{
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 9b3d844b876..9af57b4fe7f 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -193,136 +193,6 @@ HICON WINAPI SHGetFileIcon(
BOOL WINAPI FileIconInit(BOOL bFullInit);
-/****************************************************************************
- * File Menu Routines
- */
-/* FileMenu_Create nSelHeight constants */
-#define FM_DEFAULT_SELHEIGHT -1
-#define FM_FULL_SELHEIGHT 0
-
-/* FileMenu_Create flags */
-#define FMF_SMALL_ICONS 0x00
-#define FMF_LARGE_ICONS 0x08
-#define FMF_NO_COLUMN_BREAK 0x10
-
-HMENU WINAPI FileMenu_Create(
- COLORREF crBorderColor,
- int nBorderWidth,
- HBITMAP hBorderBmp,
- int nSelHeight,
- UINT uFlags);
-
-void WINAPI FileMenu_Destroy(HMENU hMenu);
-
-/* FileMenu_AppendItem constants */
-#define FM_SEPARATOR (LPCSTR)1
-#define FM_BLANK_ICON -1
-#define FM_DEFAULT_HEIGHT 0
-
-BOOL WINAPI FileMenu_AppendItem(
- HMENU hMenu,
- LPCSTR lpszText,
- UINT uID,
- int iIcon,
- HMENU hMenuPopup,
- int nItemHeight);
-
-/* FileMenu_InsertUsingPidl flags */
-#define FMF_NO_EMPTY_ITEM 0x01
-#define FMF_NO_PROGRAM_GROUPS 0x04
-
-/* FileMenu_InsertUsingPidl callback function */
-typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
-
-int WINAPI FileMenu_InsertUsingPidl(
- HMENU hMenu,
- UINT uID,
- LPCITEMIDLIST pidl,
- UINT uFlags,
- UINT uEnumFlags,
- LPFNFMCALLBACK lpfnCallback);
-
-int WINAPI FileMenu_ReplaceUsingPidl(
- HMENU hMenu,
- UINT uID,
- LPCITEMIDLIST pidl,
- UINT uEnumFlags,
- LPFNFMCALLBACK lpfnCallback);
-
-void WINAPI FileMenu_Invalidate(HMENU hMenu);
-
-HMENU WINAPI FileMenu_FindSubMenuByPidl(
- HMENU hMenu,
- LPCITEMIDLIST pidl);
-
-BOOL WINAPI FileMenu_TrackPopupMenuEx(
- HMENU hMenu,
- UINT uFlags,
- int x,
- int y,
- HWND hWnd,
- LPTPMPARAMS lptpm);
-
-BOOL WINAPI FileMenu_GetLastSelectedItemPidls(
- UINT uReserved,
- LPCITEMIDLIST *ppidlFolder,
- LPCITEMIDLIST *ppidlItem);
-
-LRESULT WINAPI FileMenu_MeasureItem(
- HWND hWnd,
- LPMEASUREITEMSTRUCT lpmis);
-
-LRESULT WINAPI FileMenu_DrawItem(
- HWND hWnd,
- LPDRAWITEMSTRUCT lpdis);
-
-BOOL WINAPI FileMenu_InitMenuPopup(HMENU hMenu);
-
-void WINAPI FileMenu_AbortInitMenu(void);
-
-LRESULT WINAPI FileMenu_HandleMenuChar(
- HMENU hMenu,
- WPARAM wParam);
-
-BOOL WINAPI FileMenu_DeleteAllItems(HMENU hMenu);
-
-BOOL WINAPI FileMenu_DeleteItemByCmd(
- HMENU hMenu,
- UINT uID);
-
-BOOL WINAPI FileMenu_DeleteItemByIndex(
- HMENU hMenu,
- UINT uPos);
-
-BOOL WINAPI FileMenu_DeleteMenuItemByFirstID(
- HMENU hMenu,
- UINT uID);
-
-BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu);
-
-BOOL WINAPI FileMenu_EnableItemByCmd(
- HMENU hMenu,
- UINT uID,
- BOOL bEnable);
-
-DWORD WINAPI FileMenu_GetItemExtent(
- HMENU hMenu,
- UINT uPos);
-
-int WINAPI FileMenu_AppendFilesForPidl(
- HMENU hMenu,
- LPCITEMIDLIST pidl,
- BOOL bAddSeparator);
-
-int WINAPI FileMenu_AddFilesForPidl(
- HMENU hMenu,
- UINT uReserved,
- UINT uID,
- LPCITEMIDLIST pidl,
- UINT uFlags,
- UINT uEnumFlags,
- LPFNFMCALLBACK lpfnCallback);
-
/****************************************************************************
* Drag And Drop Routines
*/
More information about the wine-cvs
mailing list