shell32: Remove redundant definitions of undocumented shell functions.

dlls/shell32/autocomplete.c

@@ -36,7 +36,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "undocshell.h"
 #include "shlwapi.h"
 #include "winerror.h"
 #include "objbase.h"

dlls/shell32/brsfolder.c

@@ -28,10 +28,9 @@
 #define NONAMELESSUNION
 
 #include "wine/debug.h"
-#include "undocshell.h"
-#include "commoncontrols.h"
 #include "pidl.h"
 #include "shell32_main.h"
+#include "commoncontrols.h"
 #include "shellapi.h"
 #include "shresdef.h"
 #include "shellfolder.h"

dlls/shell32/clipboard.c

@@ -43,7 +43,6 @@
 #include "winreg.h"
 #include "wingdi.h"
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shlwapi.h"
 

dlls/shell32/cpanelfolder.c

@@ -39,7 +39,6 @@
 #include "commctrl.h"
 #include "cpanel.h"
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"

dlls/shell32/dataobject.c

@@ -30,7 +30,6 @@
 #include "winerror.h"
 #include "shell32_main.h"
 #include "wine/debug.h"
-#include "undocshell.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/dialogs.c

@@ -34,7 +34,6 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 #include "shresdef.h"
-#include "undocshell.h"
 
 /* RunFileDlg flags */
 #define RFF_NOBROWSE        0x01

dlls/shell32/folders.c

@@ -28,7 +28,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "objbase.h"
-#include "undocshell.h"
 #include "shlguid.h"
 
 #include "wine/debug.h"

dlls/shell32/iconcache.c

@@ -35,7 +35,6 @@
 #include "objbase.h"
 #include "pidl.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 #include "shresdef.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);

dlls/shell32/pidl.c

@@ -37,7 +37,6 @@
 #include "shlguid.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shlwapi.h"
 

dlls/shell32/shell32_main.c

@@ -40,7 +40,6 @@
 #include "propsys.h"
 #include "commoncontrols.h"
 
-#include "undocshell.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "version.h"

dlls/shell32/shell32_main.h

@@ -32,7 +32,6 @@
 #include "commctrl.h"
 #include "objbase.h"
 #include "docobj.h"
-#include "undocshell.h"
 #include "shlobj.h"
 #include "shellapi.h"
 #include "wine/heap.h"

dlls/shell32/shelllink.c

@@ -45,7 +45,6 @@
 #include "winuser.h"
 #include "wingdi.h"
 #include "shlobj.h"
-#include "undocshell.h"
 
 #include "pidl.h"
 #include "shell32_main.h"

dlls/shell32/shellole.c

@@ -39,7 +39,6 @@
 #include "winreg.h"
 #include "winerror.h"
 
-#include "undocshell.h"
 #include "shell32_main.h"
 
 #include "wine/debug.h"

dlls/shell32/shellord.c

@@ -41,7 +41,6 @@
 #include "winuser.h"
 #include "shlobj.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 #include "pidl.h"
 #include "shlwapi.h"
 #include "commdlg.h"

dlls/shell32/shellpath.c

@@ -46,7 +46,6 @@
 #include "shtypes.h"
 #include "shresdef.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 #include "pidl.h"
 #include "shlwapi.h"
 #include "sddl.h"

dlls/shell32/shellreg.c

@@ -30,7 +30,6 @@
 #include "shlobj.h"
 #include "winreg.h"
 
-#include "undocshell.h"
 #include "shell32_main.h"
 
 #include "wine/debug.h"

dlls/shell32/shellstring.c

@@ -34,11 +34,12 @@
 #include "shlobj.h"
 #include "shlwapi.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
+DWORD WINAPI CheckEscapesW(WCHAR *string, DWORD len);
+
 /************************* STRRET functions ****************************/
 
 static const char *debugstr_strret(STRRET *s)

dlls/shell32/shfldr_desktop.c

@@ -39,7 +39,6 @@
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"

dlls/shell32/shfldr_fs.c

@@ -39,7 +39,6 @@
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"

dlls/shell32/shfldr_mycomp.c

@@ -35,7 +35,6 @@
 #include "wingdi.h"
 #include "pidl.h"
 #include "shlguid.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"

dlls/shell32/shfldr_netplaces.c

@@ -33,7 +33,6 @@
 #include "winreg.h"
 
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "wine/debug.h"

dlls/shell32/shlfileop.c

@@ -41,7 +41,6 @@
 #include "shlwapi.h"
 #include "shell32_main.h"
 #include "shfldr.h"
-#include "undocshell.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);

dlls/shell32/shlfolder.c

@@ -40,7 +40,6 @@
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "undocshell.h"
 #include "shell32_main.h"
 #include "shlwapi.h"
 #include "wine/debug.h"

dlls/shell32/shlview.c

@@ -55,7 +55,6 @@
 #include "winuser.h"
 #include "shlobj.h"
 #include "shobjidl.h"
-#include "undocshell.h"
 #include "shresdef.h"
 #include "wine/debug.h"
 

dlls/shell32/shlview_cmenu.c

@@ -29,7 +29,6 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "pidl.h"
-#include "undocshell.h"
 #include "shlobj.h"
 #include "winreg.h"
 #include "prsht.h"

dlls/shell32/undocshell.h

-/*
- * Copyright 1999, 2000 Juergen Schmied
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_UNDOCSHELL_H
-#define __WINE_UNDOCSHELL_H
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "commctrl.h"
-#include "shlobj.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-/****************************************************************************
- * System Imagelist Routines
- */
-
-int WINAPI Shell_GetCachedImageIndex(
-	LPCSTR lpszFileName,
-	UINT nIconIndex,
-	BOOL bSimulateDoc);
-
-HICON WINAPI SHGetFileIcon(
-	DWORD dwReserved,
-	LPCSTR lpszPath,
-	DWORD dwFileAttributes,
-	UINT uFlags);
-
-BOOL WINAPI FileIconInit(BOOL bFullInit);
-
-/****************************************************************************
- * Drag And Drop Routines
- */
-
-HRESULT WINAPI SHRegisterDragDrop(
-	HWND hWnd,
-	LPDROPTARGET lpDropTarget);
-
-HRESULT WINAPI SHRevokeDragDrop(HWND hWnd);
-
-BOOL WINAPI DAD_DragEnter(HWND hWnd);
-
-BOOL WINAPI DAD_SetDragImageFromListView(
-	HWND hWnd,
-	POINT pt);
-
-BOOL WINAPI DAD_ShowDragImage(BOOL bShow);
-
-HRESULT WINAPI CIDLData_CreateFromIDArray(
-	LPCITEMIDLIST pidlFolder,
-	DWORD cpidlFiles,
-	LPCITEMIDLIST *lppidlFiles,
-	LPDATAOBJECT *ppdataObject);
-
-/****************************************************************************
- * Path Manipulation Routines
- */
-
-BOOL WINAPI PathAppendAW(LPVOID lpszPath1, LPCVOID lpszPath2);
-
-LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile);
-
-LPVOID  WINAPI PathAddBackslashAW(LPVOID path);
-
-LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive);
-
-LPVOID WINAPI PathFindExtensionAW(LPCVOID path);
-
-LPVOID WINAPI PathFindFileNameAW(LPCVOID path);
-
-LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath,  DWORD void1, DWORD void2);
-
-LPVOID WINAPI PathGetArgsAW(LPVOID lpszPath);
-
-BOOL WINAPI PathRemoveFileSpecAW(LPVOID lpszPath);
-
-void WINAPI PathRemoveBlanksAW(LPVOID lpszPath);
-
-VOID  WINAPI PathQuoteSpacesAW(LPVOID path);
-
-void WINAPI PathUnquoteSpacesAW(LPVOID lpszPath);
-
-BOOL WINAPI PathIsUNCAW(LPCVOID lpszPath);
-
-BOOL WINAPI PathIsRelativeAW(LPCVOID lpszPath);
-
-BOOL WINAPI PathIsRootAW(LPCVOID x);
-
-BOOL WINAPI PathIsExeAW(LPCVOID lpszPath);
-
-BOOL WINAPI PathIsDirectoryAW(LPCVOID lpszPath);
-
-BOOL WINAPI PathFileExistsAW(LPCVOID lpszPath);
-
-BOOL WINAPI PathMatchSpecAW(LPVOID lpszPath, LPVOID lpszSpec);
-
-BOOL WINAPI PathMakeUniqueNameAW(
-	LPVOID lpszBuffer,
-	DWORD dwBuffSize,
-	LPCVOID lpszShortName,
-	LPCVOID lpszLongName,
-	LPCVOID lpszPathName);
-
-
-BOOL  WINAPI PathQualifyAW(LPCVOID path);
-
-BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags);
-
-VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath);
-
-HRESULT WINAPI PathProcessCommandAW(LPCVOID lpszPath, LPVOID lpszBuff,
-				DWORD dwBuffSize, DWORD dwFlags);
-
-void WINAPI PathStripPathAW(LPVOID lpszPath);
-
-BOOL WINAPI PathStripToRootAW(LPVOID lpszPath);
-
-void WINAPI PathRemoveArgsAW(LPVOID lpszPath);
-
-void WINAPI PathRemoveExtensionAW(LPVOID lpszPath);
-
-int WINAPI PathParseIconLocationAW(LPVOID lpszPath);
-
-BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2);
-
-BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs);
-
-/****************************************************************************
- * Shell Namespace Routines
- */
-
-/****************************************************************************
- * Misc Stuff
- */
-
-WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect,
-        WORD cKids, const HWND *lpKids);
-
-/* SHCreateDefClassObject callback function */
-typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)(
-	LPUNKNOWN pUnkOuter,
-	REFIID riidObject,
-	LPVOID *ppvObject);
-
-HRESULT WINAPI SHCreateDefClassObject(
-	REFIID riidFactory,
-	LPVOID *ppvFactory,
-	LPFNCDCOCALLBACK lpfnCallback,
-	LPDWORD lpdwUsage,
-	REFIID riidObject);
-
-void WINAPI SHFreeUnusedLibraries(void);
-
-DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len);
-DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len);
-
-/* policy functions */
-BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __WINE_UNDOCSHELL_H */