Zebediah Figura : shell32: Move PIDL definitions from undocshell.h to pidl.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c7f58d2be35bffdf747b28c1b49fdb121b712a50
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c7f58d2be35bffdf747b28c1b...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Tue Feb  1 19:32:50 2022 -0600

shell32: Move PIDL definitions from undocshell.h to pidl.h.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/shell32/changenotify.c |  1 +
 dlls/shell32/pidl.h         |  8 ++++++++
 dlls/shell32/undocshell.h   | 29 -----------------------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index f8714627eb6..40ccb891589 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -26,6 +26,7 @@
 #include "wine/list.h"
 #include "wine/debug.h"
 #include "shell32_main.h"
+#include "pidl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index fc14ab3c1c8..7aaea904a68 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -270,6 +270,14 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN;
 LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) DECLSPEC_HIDDEN;
 LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) DECLSPEC_HIDDEN;
 
+/* type parameter for ILGetDisplayNameEx() */
+#define ILGDN_FORPARSING  0
+#define ILGDN_NORMAL      1
+#define ILGDN_INFOLDER    2
+
 BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) DECLSPEC_HIDDEN;
+HRESULT SHILCreateFromPathW(const WCHAR *path, LPITEMIDLIST *pidl, DWORD *attributes);
+LPITEMIDLIST SHSimpleIDListFromPathA(const char *path);
+LPITEMIDLIST SHSimpleIDListFromPathW(const WCHAR *path);
 
 #endif
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 9af57b4fe7f..b606f1789d6 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -31,35 +31,6 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
-/****************************************************************************
- *	IDList Functions
- */
-BOOL WINAPI ILGetDisplayName(
-	LPCITEMIDLIST pidl,
-	LPVOID path);
-
-/* type parameter for ILGetDisplayNameEx() */
-#define ILGDN_FORPARSING  0
-#define ILGDN_NORMAL      1
-#define ILGDN_INFOLDER    2
-
-BOOL WINAPI ILGetDisplayNameEx(
-	LPSHELLFOLDER psf,
-	LPCITEMIDLIST pidl,
-	LPVOID path,
-	DWORD type);
-
-LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl);
-void WINAPI ILGlobalFree(LPITEMIDLIST pidl);
-
-LPITEMIDLIST SHSimpleIDListFromPathA (LPCSTR lpszPath);
-LPITEMIDLIST SHSimpleIDListFromPathW (LPCWSTR lpszPath);
-
-HRESULT SHILCreateFromPathW (
-	LPCWSTR path,
-	LPITEMIDLIST * ppidl,
-	DWORD *attributes);
-
 /*
 	string functions
 */