From cb113b23c4602c60d0bc4f72935b978cedf66412 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev@web.de>
Date: Sun, 11 Nov 2007 20:19:15 +0100
Subject: [PATCH] shell32: Some undocumented defines and functions are now in
 the PSDK.

---
 dlls/shell32/undocshell.h | 18 ------------------
 include/shlobj.h          | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 5bba7da83d8..941e7b37988 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -411,11 +411,6 @@ BOOL WINAPI PathMakeUniqueNameAW(
 	LPCVOID lpszLongName,
 	LPCVOID lpszPathName);
 
-BOOL WINAPI PathYetAnotherMakeUniqueName(
-	LPWSTR lpszBuffer,
-	LPCWSTR lpszPathName,
-	LPCWSTR lpszShortName,
-	LPCWSTR lpszLongName);
 
 BOOL WINAPI PathQualifyA(LPCSTR path);
 BOOL WINAPI PathQualifyW(LPCWSTR path);
@@ -423,23 +418,10 @@ BOOL WINAPI PathQualifyW(LPCWSTR path);
 BOOL  WINAPI PathQualifyAW(LPCVOID path);
 
 
-/* PathResolve flags */
-#define PRF_CHECKEXISTANCE  0x01
-#define PRF_EXECUTABLE      0x02
-#define PRF_QUALIFYONPATH   0x04
-#define PRF_WINDOWS31       0x08
-
 BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags);
 
 VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath);
 
-/* PathProcessCommand flags */
-#define PPCF_QUOTEPATH        0x01 /* implies PPCF_INCLUDEARGS */
-#define PPCF_INCLUDEARGS      0x02
-#define PPCF_NODIRECTORIES    0x10
-#define PPCF_DONTRESOLVE      0x20
-#define PPCF_PATHISRELATIVE   0x40
-
 HRESULT WINAPI PathProcessCommandAW(LPCVOID lpszPath, LPVOID lpszBuff,
 				DWORD dwBuffSize, DWORD dwFlags);
 
diff --git a/include/shlobj.h b/include/shlobj.h
index bd531c898fb..f57883a29dc 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1292,8 +1292,26 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *);
 /****************************************************************************
  * Path Manipulation Routines
  */
+
+/* PathProcessCommand flags */
+#define PPCF_ADDQUOTES        0x01
+#define PPCF_INCLUDEARGS      0x02
+#define PPCF_ADDARGUMENTS     0x03
+#define PPCF_NODIRECTORIES    0x10
+#define PPCF_DONTRESOLVE      0x20
+#define PPCF_FORCEQUALIFY     0x40
+#define PPCF_LONGESTPOSSIBLE  0x80
+
+/* PathResolve flags */
+#define PRF_VERIFYEXISTS         0x01
+#define PRF_EXECUTABLE           0x02
+#define PRF_TRYPROGRAMEXTENSIONS 0x03
+#define PRF_FIRSTDIRDEF          0x04
+#define PRF_DONTFINDLINK         0x08
+
 VOID WINAPI PathGetShortPath(LPWSTR pszPath);
 LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD);
+BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
 
 /****************************************************************************
  * Drag And Drop Routines