Moved all the documented shlwapi functions out of undocshell.h into

shlwapi.h.  Nothing but files in dlls/shell32 will now include
undocshell.h.

dlls/shell32/clipboard.c

@@ -24,6 +24,7 @@
 #include "debugtools.h"
 
 #include "pidl.h"
+#include "shlwapi.h"
 #include "wine/undocshell.h"
 #include "shell32_main.h"
 

dlls/shell32/enumidlist.c

@@ -9,6 +9,7 @@
 #include "debugtools.h"
 #include "winreg.h"
 #include "wine/undocshell.h"
+#include "shlwapi.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"

dlls/shell32/pidl.c

@@ -19,6 +19,7 @@
 #include "wine/undocshell.h"
 #include "shell32_main.h"
 #include "shellapi.h"
+#include "shlwapi.h"
 
 #include "pidl.h"
 
@@ -1412,7 +1413,7 @@ BOOL _ILIsPidlSimple ( LPCITEMIDLIST pidl)
  *
  * gets the text for the first item in the pidl (eg. simple pidl)
  *
- * returns the lenght of the string
+ * returns the length of the string
  */
 DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
 {

dlls/shell32/shellpath.c

@@ -19,7 +19,6 @@
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
-#define isSlash(x) ((x)=='\\' || (x)=='/')
 /*
 	########## Combining and Constructing paths ##########
 */
@@ -493,7 +492,7 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
 /*************************************************************************
  * PathCleanupSpecAW	[SHELL32]
  */
-DWORD WINAPI PathCleanupSpecAW (LPVOID x, LPVOID y)
+DWORD WINAPI PathCleanupSpecAW (LPCVOID x, LPVOID y)
 {
     FIXME("(%p, %p) stub\n",x,y);
     return TRUE;

dlls/shell32/shlfileop.c

@@ -9,6 +9,7 @@
 #include "shresdef.h"
 #include "shell32_main.h"
 #include "wine/undocshell.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/shlmenu.c

@@ -8,7 +8,7 @@
 #include "wine/obj_enumidlist.h"
 #include "wine/obj_shellfolder.h"
 #include "wine/undocshell.h"
-
+#include "shlwapi.h"
 #include "heap.h"
 #include "debugtools.h"
 #include "shell32_main.h"

dlls/shlwapi/ordinal.c

@@ -8,8 +8,12 @@
 #include <stdio.h>
 
 #include "windef.h"
-#include "wine/undocshell.h"
+#include "winnls.h"
+#include "winbase.h"
 #include "wine/unicode.h"
+#include "wine/obj_base.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);

dlls/shlwapi/path.c

@@ -7,10 +7,13 @@
 
 #include "winerror.h"
 #include "wine/unicode.h"
-#include "wine/undocshell.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "shlwapi.h"
 #include "debugtools.h"
 
+
 DEFAULT_DEBUG_CHANNEL(shell);
 
 #define isSlash(x) ((x)=='\\' || (x)=='/')

dlls/shlwapi/reg.c

@@ -5,8 +5,8 @@
 #include "windef.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "wine/undocshell.h"
 #include "debugtools.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

include/shlwapi.h

@@ -27,75 +27,131 @@ extern "C" {
 #define URL_ESCAPE_UNSAFE            0x20000000
 #define URL_DONT_SIMPLIFY            0x40000000
 
-
+LPSTR  WINAPI PathAddBackslashA(LPSTR path);	
-BOOL WINAPI PathAppendA(LPSTR lpszPath1,LPCSTR lpszPath2);
+LPWSTR WINAPI PathAddBackslashW(LPWSTR path);	
-BOOL WINAPI PathAppendW(LPWSTR lpszPath1,LPCWSTR lpszPath2);
+#define PathAddBackslash WINELIB_NAME_AW(PathAddBackslash)
-
-LPSTR WINAPI PathBuildRootA(LPSTR lpszPath, int drive);
-LPWSTR WINAPI PathBuildRootW(LPWSTR lpszPath, int drive);
-
-LPSTR WINAPI PathGetArgsA(LPCSTR lpszPath);
-LPWSTR WINAPI PathGetArgsW(LPCWSTR lpszPath);
-
-BOOL WINAPI PathRemoveFileSpecA(LPSTR lpszPath);
-BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath);
-
-void WINAPI PathStripPathA(LPSTR lpszPath);
-void WINAPI PathStripPathW(LPWSTR lpszPath);
-
-void WINAPI PathRemoveArgsA(LPSTR lpszPath);
-void WINAPI PathRemoveArgsW(LPWSTR lpszPath);
-
-void WINAPI PathRemoveExtensionA(LPSTR lpszPath);
-void WINAPI PathRemoveExtensionW(LPWSTR lpszPath);
-
-void WINAPI PathUnquoteSpacesA(LPSTR str);
-void WINAPI PathUnquoteSpacesW(LPWSTR str);
-
-int WINAPI PathParseIconLocationA(LPSTR lpszPath);
-int WINAPI PathParseIconLocationW(LPWSTR lpszPath);
-
-BOOL WINAPI PathIsDirectoryA(LPCSTR lpszPath);
-BOOL WINAPI PathIsDirectoryW(LPCWSTR lpszPath);
-
-BOOL WINAPI PathFileExistsA(LPCSTR lpszPath);
-BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath);
-
-BOOL WINAPI PathIsSameRootA(LPCSTR lpszPath1, LPCSTR lpszPath2);
-BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2);
-
-BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath);
-BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath);
-
-LPSTR WINAPI PathFindFileNameA(LPCSTR pPath);
-LPWSTR WINAPI PathFindFileNameW(LPCWSTR pPath);
-#define PathFindFileName WINELIB_NAME_AW(PathFindFileName)
-LPVOID WINAPI PathFindFileNameAW(LPCVOID path); 
-
-int WINAPI PathGetDriveNumberA(LPCSTR lpszPath);
-int WINAPI PathGetDriveNumberW(LPCWSTR lpszPath);
-#define PathGetDriveNumber WINELIB_NAME_AW(PathGetDriveNumber)
-
-BOOL WINAPI PathCanonicalizeA(LPSTR lpszDst, LPCSTR lpszSrc);
-BOOL WINAPI PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc);
-#define PathCanonicalize WINELIB_NAME_AW(PathCanonicalize)
-
-LPSTR WINAPI PathFindNextComponentA(LPCSTR pszPath);
-LPWSTR WINAPI PathFindNextComponentW(LPCWSTR pszPath);
-#define PathFindNextComponent WINELIB_NAME_AW(PathFindNextComponent)
-
-BOOL WINAPI PathIsURLA(LPCSTR pszPath);
-BOOL WINAPI PathIsURLW(LPCWSTR pszPath);
-#define PathIsURL WINELIB_NAME_AW(PathIsURL)
 
 BOOL WINAPI PathAddExtensionA(LPSTR pszPath, LPCSTR pszExt);
 BOOL WINAPI PathAddExtensionW(LPWSTR pszPath, LPCWSTR pszExt);
 #define PathAddExtension WINELIB_NAME_AW(PathAddExtension)
 
+BOOL WINAPI PathAppendA(LPSTR lpszPath1,LPCSTR lpszPath2);
+BOOL WINAPI PathAppendW(LPWSTR lpszPath1,LPCWSTR lpszPath2);
+#define PathAppend WINELIB_NAME_AW(PathAppend)
+
+LPSTR WINAPI PathBuildRootA(LPSTR lpszPath, int drive);
+LPWSTR WINAPI PathBuildRootW(LPWSTR lpszPath, int drive);
+#define PathBuildRoot WINELIB_NAME_AW(PathBuiltRoot)
+
+BOOL WINAPI PathCanonicalizeA(LPSTR lpszDst, LPCSTR lpszSrc);
+BOOL WINAPI PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc);
+#define PathCanonicalize WINELIB_NAME_AW(PathCanonicalize)
+
+LPSTR  WINAPI PathCombineA(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile);
+LPWSTR WINAPI PathCombineW(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile);
+#define PathCombine WINELIB_NAME_AW(PathCombine)
+
+BOOL WINAPI PathFileExistsA(LPCSTR lpszPath);
+BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath);
+#define PathFileExists WINELIB_NAME_AW(PathFileExists)
+
+LPSTR WINAPI PathFindExtensionA(LPCSTR path);
+LPWSTR WINAPI PathFindExtensionW(LPCWSTR path);
+#define PathFindExtension WINELIB_NAME_AW(PathFindExtension)
+
+LPSTR WINAPI PathFindFileNameA(LPCSTR pPath);
+LPWSTR WINAPI PathFindFileNameW(LPCWSTR pPath);
+#define PathFindFileName WINELIB_NAME_AW(PathFindFileName)
+
+LPSTR WINAPI PathFindNextComponentA(LPCSTR pszPath);
+LPWSTR WINAPI PathFindNextComponentW(LPCWSTR pszPath);
+#define PathFindNextComponent WINELIB_NAME_AW(PathFindNextComponent)
+
+BOOL WINAPI PathFindOnPathA(LPSTR sFile, LPCSTR sOtherDirs);
+BOOL WINAPI PathFindOnPathW(LPWSTR sFile, LPCWSTR sOtherDirs);
+#define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath)
+
+LPSTR WINAPI PathGetArgsA(LPCSTR lpszPath);
+LPWSTR WINAPI PathGetArgsW(LPCWSTR lpszPath);
+#define PathGetArgs WINELIB_NAME_AW(PathGetArgs)
+
+int WINAPI PathGetDriveNumberA(LPCSTR lpszPath);
+int WINAPI PathGetDriveNumberW(LPCWSTR lpszPath);
+#define PathGetDriveNumber WINELIB_NAME_AW(PathGetDriveNumber)
+
+BOOL WINAPI PathIsDirectoryA(LPCSTR lpszPath);
+BOOL WINAPI PathIsDirectoryW(LPCWSTR lpszPath);
+#define PathIsDirectory WINELIB_NAME_AW(PathIsDirectory)
+
+BOOL WINAPI PathIsRelativeA(LPCSTR lpszPath);
+BOOL WINAPI PathIsRelativeW(LPCWSTR lpszPath);
+#define PathIsRelative WINELIB_NAME_AW(PathIsRelative)
+
+BOOL WINAPI PathIsRootA(LPCSTR x);
+BOOL WINAPI PathIsRootW(LPCWSTR x);
+#define PathIsRoot WINELIB_NAME_AW(PathIsRoot)
+
+BOOL WINAPI PathIsSameRootA(LPCSTR lpszPath1, LPCSTR lpszPath2);
+BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2);
+#define PathIsSameRoot WINELIB_NAME_AW(PathIsSameRoot)
+
+BOOL WINAPI PathIsUNCA(LPCSTR lpszPath);
+BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath);
+#define PathIsUNC WINELIB_NAME_AW(PathIsUNC)
+
+BOOL WINAPI PathIsURLA(LPCSTR pszPath);
+BOOL WINAPI PathIsURLW(LPCWSTR pszPath);
+#define PathIsURL WINELIB_NAME_AW(PathIsURL)
+
+BOOL WINAPI PathMatchSpecA(LPCSTR lpszPath, LPCSTR lpszSpec);
+BOOL WINAPI PathMatchSpecW(LPCWSTR lpszPath, LPCWSTR lpszSpec);
+#define PathMatchSpec WINELIB_NAME_AW(PathMatchSpec)
+
+int WINAPI PathParseIconLocationA(LPSTR lpszPath);
+int WINAPI PathParseIconLocationW(LPWSTR lpszPath);
+#define PathParseIconLocation WINELIB_NAME_AW(PathParseIconLocation)
+
+LPSTR  WINAPI PathQuoteSpacesA(LPSTR path);	
+LPWSTR WINAPI PathQuoteSpacesW(LPWSTR path);	
+#define PathQuoteSpaces WINELIB_NAME_AW(PathQuoteSpaces)
+
+void WINAPI PathRemoveArgsA(LPSTR lpszPath);
+void WINAPI PathRemoveArgsW(LPWSTR lpszPath);
+#define PathRemoveArgs WINELIB_NAME_AW(PathRemoveArgs)
+
+LPSTR WINAPI PathRemoveBackslashA(LPSTR lpszPath);
+LPWSTR WINAPI PathRemoveBackslashW(LPWSTR lpszPath);
+#define PathRemoveBackslash WINELIB_NAME_AW(PathRemoveBackslash)
+
+void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
+void WINAPI PathRemoveBlanksW(LPWSTR lpszPath);
+#define PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
+
+void WINAPI PathRemoveExtensionA(LPSTR lpszPath);
+void WINAPI PathRemoveExtensionW(LPWSTR lpszPath);
+#define PathRemoveExtension WINELIB_NAME_AW(PathRemoveExtension)
+
+BOOL WINAPI PathRemoveFileSpecA(LPSTR lpszPath);
+BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath);
+#define PathRemoveFileSpec WINELIB_NAME_AW(PathRemoveFileSpec)
+
+BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath);
+BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath);
+#define PathSetDlgItemPath WINELIB_NAME_AW(PathSetDlgItemPath)
+
+void WINAPI PathStripPathA(LPSTR lpszPath);
+void WINAPI PathStripPathW(LPWSTR lpszPath);
+#define PathStripPath WINELIB_NAME_AW(PathStripPath)
+
 BOOL WINAPI PathStripToRootA(LPSTR pszPath);
 BOOL WINAPI PathStripToRootW(LPWSTR pszPath);
 #define PathStripToRoot WINELIB_NAME_AW(PathStripToRoot)
 
+void WINAPI PathUnquoteSpacesA(LPSTR str);
+void WINAPI PathUnquoteSpacesW(LPWSTR str);
+#define PathUnquoteSpaces WINELIB_NAME_AW(PathUnquoteSpaces)
+
+
 INT WINAPI StrCSpnA(LPCSTR lpStr, LPCSTR lpSet);
 INT WINAPI StrCSpnW(LPCWSTR lpStr, LPCWSTR lpSet);
 #define StrCSpn WINELIB_NAME_AW(StrCSpn)
@@ -132,17 +188,18 @@ LPSTR WINAPI StrDupA(LPCSTR lpSrc);
 LPWSTR WINAPI StrDupW(LPCWSTR lpSrc);
 #define StrDup WINELIB_NAME_AW(StrDup)
 
+LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf );
+LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf );
+#define StrFormatByteSize WINELIB_NAME_AW(StrFormatByteSize)
+
+
+
 struct _STRRET;
 struct _ITEMIDLIST;
 HRESULT WINAPI StrRetToBufA(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPSTR dest, DWORD len);
 HRESULT WINAPI StrRetToBufW(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
 #define StrRetToBuf WINELIB_NAME_AW(StrRetToBuf)
 
-void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
-void WINAPI PathRemoveBlanksW(LPWSTR lpszPath);
-#define  PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
-void WINAPI PathRemoveBlanksAW(LPVOID lpszPath);
-
 HRESULT WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey);
 HRESULT WINAPI SHDeleteKeyW(HKEY hkey, LPCWSTR pszSubKey);
 #define  SHDeleteKey WINELIB_NAME_AW(SHDeleteKey)

include/wine/undocshell.h

@@ -531,94 +531,62 @@ HRESULT WINAPI CIDLData_CreateFromIDArray(
  * Path Manipulation Routines
  */
 
-LPSTR WINAPI PathAppend(
+BOOL WINAPI PathAppendAW(LPVOID lpszPath1, LPCVOID lpszPath2);
-	LPSTR lpszPath1,
-	LPCSTR lpszPath2);
 
-LPSTR  WINAPI PathCombineA(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile);
-LPWSTR WINAPI PathCombineW(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile);
-#define  PathCombine WINELIB_NAME_AW(PathCombine)
 LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile);
 
-LPSTR  WINAPI PathAddBackslashA(LPSTR path);	
-LPWSTR WINAPI PathAddBackslashW(LPWSTR path);	
-#define  PathAddBackslash WINELIB_NAME_AW(PathAddBackslash)
 LPVOID  WINAPI PathAddBackslashAW(LPVOID path);	
 
-LPSTR WINAPI PathRemoveBackslashA(LPSTR lpszPath);
+LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive);
-LPWSTR WINAPI PathRemoveBackslashW(LPWSTR lpszPath);
-#define  PathRemoveBackslash WINELIB_NAME_AW(PathRemoveBackslash)
 
-LPSTR WINAPI PathBuildRoot(
-	LPSTR lpszPath,
-	int drive);
-
-LPSTR WINAPI PathFindExtensionA(LPCSTR path);
-LPWSTR WINAPI PathFindExtensionW(LPCWSTR path);
-#define  PathFindExtension WINELIB_NAME_AW(PathFindExtension)
 LPVOID WINAPI PathFindExtensionAW(LPCVOID path); 
 
+LPVOID WINAPI PathFindFileNameAW(LPCVOID path); 
+
 LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath); 
 
-LPSTR WINAPI PathGetArgs(LPCSTR lpszPath);
+LPVOID WINAPI PathGetArgsAW(LPVOID lpszPath);
 
-BOOL WINAPI PathRemoveFileSpec(LPSTR lpszPath);
+BOOL WINAPI PathRemoveFileSpecAW(LPVOID lpszPath);
 
-LPSTR WINAPI PathGetShortPath(LPSTR lpszPath);
+LPVOID WINAPI PathGetShortPathAW(LPVOID lpszPath);
+
+void WINAPI PathRemoveBlanksAW(LPVOID lpszPath);
 
-LPSTR  WINAPI PathQuoteSpacesA(LPSTR path);	
-LPWSTR WINAPI PathQuoteSpacesW(LPWSTR path);	
-#define  PathQuoteSpaces WINELIB_NAME_AW(PathQuoteSpaces)
 LPVOID  WINAPI PathQuoteSpacesAW(LPVOID path);	
 
-void WINAPI PathUnquoteSpaces(LPSTR lpszPath);
+void WINAPI PathUnquoteSpacesAW(LPVOID lpszPath);
 
-BOOL WINAPI PathIsUNCA(LPCSTR lpszPath);
-BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath);
-#define  PathIsUNC WINELIB_NAME_AW(PathIsUNC)
 BOOL WINAPI PathIsUNCAW(LPCVOID lpszPath);
 
-BOOL WINAPI PathIsRelativeA(LPCSTR lpszPath);
-BOOL WINAPI PathIsRelativeW(LPCWSTR lpszPath);
-#define  PathIsRelative WINELIB_NAME_AW(PathIsRelative)
 BOOL WINAPI PathIsRelativeAW(LPCVOID lpszPath);
 
-BOOL WINAPI PathIsRootA(LPCSTR x);
-BOOL WINAPI PathIsRootW(LPCWSTR x);
-#define  PathIsRoot WINELIB_NAME_AW(PathIsRoot)
 BOOL WINAPI PathIsRootAW(LPCVOID x);
 
-BOOL WINAPI PathIsExe(LPCSTR lpszPath);
+BOOL WINAPI PathIsExeAW(LPCVOID lpszPath);
 
-BOOL WINAPI PathIsDirectory(LPCSTR lpszPath);
+BOOL WINAPI PathIsDirectoryAW(LPCVOID lpszPath);
 
-BOOL WINAPI PathFileExists(LPCSTR lpszPath);
+BOOL WINAPI PathFileExistsAW(LPCVOID lpszPath);
 
-BOOL WINAPI PathMatchSpecA(
-	LPCSTR lpszPath,
-	LPCSTR lpszSpec);
-BOOL WINAPI PathMatchSpecW(
-	LPCWSTR lpszPath,
-	LPCWSTR lpszSpec);
-#define  PathMatchSpec WINELIB_NAME_AW(PathMatchSpec)
 BOOL WINAPI PathMatchSpecAW(LPVOID lpszPath, LPVOID lpszSpec);
 
-BOOL WINAPI PathMakeUniqueName(
+BOOL WINAPI PathMakeUniqueNameAW(
-	LPSTR lpszBuffer, 
+	LPVOID lpszBuffer, 
 	DWORD dwBuffSize,
-	LPCSTR lpszShortName,
+	LPCVOID lpszShortName,
-	LPCSTR lpszLongName, 
+	LPCVOID lpszLongName, 
-	LPCSTR lpszPathName);
+	LPCVOID lpszPathName);
 
-BOOL WINAPI PathYetAnotherMakeUniqueName(
+BOOL WINAPI PathYetAnotherMakeUniqueNameA(
 	LPSTR lpszBuffer,
 	LPCSTR lpszPathName,
 	LPCSTR lpszShortName,
 	LPCSTR lpszLongName);
 
-BOOL WINAPI PathFindOnPath(
+BOOL WINAPI PathFindOnPathAW(
-	LPSTR lpszFile, 
+	LPVOID lpszFile, 
-	LPCSTR *alpszPaths);
+	LPCVOID alpszPaths);
 
 /* PathCleanupSpec return values */
 #define PCS_REPLACEDCHARS  0x00000001
@@ -626,13 +594,11 @@ BOOL WINAPI PathFindOnPath(
 #define PCS_SHORTENED      0x00000004
 #define PCS_PATHTOOLONG    0x80000008
 
-DWORD WINAPI PathCleanupSpec(
+DWORD WINAPI PathCleanupSpecAW(LPCVOID lpszPath, LPVOID lpszFile);
-	LPCSTR lpszPath, 
-	LPSTR lpszFile);
 
-BOOL  WINAPI PathQualifyA(LPCSTR path);	
+BOOL WINAPI PathQualifyA(LPCSTR path);	
 BOOL WINAPI PathQualifyW(LPCWSTR path);	
-#define  PathQualify WINELIB_NAME_AW(PathQualify)
+#define PathQualify WINELIB_NAME_AW(PathQualify)
 BOOL  WINAPI PathQualifyAW(LPCVOID path);	
 
 
@@ -642,15 +608,9 @@ BOOL  WINAPI PathQualifyAW(LPCVOID path);
 #define PRF_QUALIFYONPATH   0x04
 #define PRF_WINDOWS31       0x08
 
-BOOL WINAPI PathResolve(
+BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags);
-	LPSTR lpszPath,
-	LPCSTR *alpszPaths, 
-	DWORD dwFlags);
 
-BOOL WINAPI PathSetDlgItemPath(
+BOOL WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath);
-	HWND hDlg,
-	int nIDDlgItem, 
-	LPCSTR lpszPath);
 
 /* PathProcessCommand flags */
 #define PPCF_QUOTEPATH        0x01 /* implies PPCF_INCLUDEARGS */
@@ -659,35 +619,23 @@ BOOL WINAPI PathSetDlgItemPath(
 #define PPCF_DONTRESOLVE      0x20
 #define PPCF_PATHISRELATIVE   0x40
 
-int WINAPI PathProcessCommand(
+HRESULT WINAPI PathProcessCommandAW(LPCVOID lpszPath, LPVOID lpszBuff,
-	LPCWSTR lpszPath,
+				DWORD dwBuffSize, DWORD dwFlags);
-	LPWSTR lpszBuff, 
-	DWORD dwBuffSize,
-	DWORD dwFlags);
 
-void WINAPI PathStripPath(LPWSTR lpszPath);
+void WINAPI PathStripPathAW(LPVOID lpszPath);
 
 BOOL WINAPI PathStripToRootAW(LPVOID lpszPath);
 
-void WINAPI PathRemoveArgs(LPWSTR lpszPath);
+void WINAPI PathRemoveArgsAW(LPVOID lpszPath);
 
-void WINAPI PathRemoveExtension(LPWSTR lpszPath);
+void WINAPI PathRemoveExtensionAW(LPVOID lpszPath);
 
-int WINAPI PathParseIconLocation(LPWSTR lpszPath);
+int WINAPI PathParseIconLocationAW(LPVOID lpszPath);
 
-BOOL WINAPI PathIsSameRoot(
+BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2);
-	LPCWSTR lpszPath1,
-	LPCWSTR lpszPath2);
 
-BOOL WINAPI PathFindOnPathA(LPSTR sFile, LPCSTR sOtherDirs);
-BOOL WINAPI PathFindOnPathW(LPWSTR sFile, LPCWSTR sOtherDirs);
-#define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath)
 BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs);
 
-LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf );
-LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf );
-#define  StrFormatByteSize WINELIB_NAME_AW(StrFormatByteSize)
-
 /****************************************************************************
  * Shell Namespace Routines
  */
@@ -943,4 +891,4 @@ BOOL WINAPI SHInitRestricted(LPSTR, LPSTR);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_SHLOBJ_H */
+#endif /* __WINE_UNDOCSHELL_H */