Zebediah Figura : shell32: Move IShellFolderViewCB definitions to shlview.c.
Alexandre Julliard
julliard at winehq.org
Wed Feb 2 16:38:02 CST 2022
Module: wine
Branch: master
Commit: ebdd0c1c70801fc0ce0f15bf1dcf6bcc14439afb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebdd0c1c70801fc0ce0f15bf1dcf6bcc14439afb
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Feb 1 19:32:53 2022 -0600
shell32: Move IShellFolderViewCB definitions to shlview.c.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/shlview.c | 39 +++++++++++++++++++++++++++++++++++++++
dlls/shell32/undocshell.h | 42 ------------------------------------------
2 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index a2afc72b7a9..0ffe2e4e9cf 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -66,6 +66,45 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
+/* Generic structure used by several messages */
+typedef struct
+{
+ DWORD dwReserved;
+ DWORD dwReserved2;
+ LPCITEMIDLIST pidl;
+ DWORD *lpdwUser;
+} SFVCBINFO;
+
+/* SFVCB_SELECTIONCHANGED structure */
+typedef struct
+{
+ UINT uOldState;
+ UINT uNewState;
+ LPCITEMIDLIST pidl;
+ DWORD *lpdwUser;
+} SFVSELECTSTATE;
+
+/* SFVCB_COPYHOOKCALLBACK structure */
+typedef struct
+{
+ HWND hwnd;
+ UINT wFunc;
+ UINT wFlags;
+ const char *pszSrcFile;
+ DWORD dwSrcAttribs;
+ const char *pszDestFile;
+ DWORD dwDestAttribs;
+} SFVCOPYHOOKINFO;
+
+/* SFVCB_GETDETAILSOF structure */
+typedef struct
+{
+ LPCITEMIDLIST pidl;
+ int fmt;
+ int cx;
+ STRRET lpText;
+} SFVCOLUMNINFO;
+
typedef struct
{ BOOL bIsAscending;
INT nHeaderID;
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index b0975559c6f..5ed8d25f234 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -204,48 +204,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs);
* Shell Namespace Routines
*/
-/* Generic structure used by several messages */
-typedef struct
-{
- DWORD dwReserved;
- DWORD dwReserved2;
- LPCITEMIDLIST pidl;
- LPDWORD lpdwUser;
-} SFVCBINFO, * LPSFVCBINFO;
-typedef const SFVCBINFO * LPCSFVCBINFO;
-
-/* SFVCB_SELECTIONCHANGED structure */
-typedef struct
-{
- UINT uOldState;
- UINT uNewState;
- LPCITEMIDLIST pidl;
- LPDWORD lpdwUser;
-} SFVSELECTSTATE, * LPSFVSELECTSTATE;
-typedef const SFVSELECTSTATE * LPCSFVSELECTSTATE;
-
-/* SFVCB_COPYHOOKCALLBACK structure */
-typedef struct
-{
- HWND hwnd;
- UINT wFunc;
- UINT wFlags;
- LPCSTR pszSrcFile;
- DWORD dwSrcAttribs;
- LPCSTR pszDestFile;
- DWORD dwDestAttribs;
-} SFVCOPYHOOKINFO, * LPSFVCOPYHOOKINFO;
-typedef const SFVCOPYHOOKINFO * LPCSFVCOPYHOOKINFO;
-
-/* SFVCB_GETDETAILSOF structure */
-typedef struct
-{
- LPCITEMIDLIST pidl;
- int fmt;
- int cx;
- STRRET lpText;
-} SFVCOLUMNINFO, * LPSFVCOLUMNINFO;
-
/****************************************************************************
* Misc Stuff
*/
More information about the wine-cvs
mailing list