shell32: Merge enumidlist.h into the main header file.

dlls/shell32/cpanelfolder.c

@@ -42,7 +42,6 @@
 
 #include "commctrl.h"
 #include "cpanel.h"
-#include "enumidlist.h"
 #include "pidl.h"
 #include "undocshell.h"
 #include "shell32_main.h"

dlls/shell32/enumidlist.c

@@ -32,7 +32,7 @@
 #include "shlwapi.h"
 
 #include "pidl.h"
-#include "enumidlist.h"
+#include "shell32_main.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/enumidlist.h

-/*
- * 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 __ENUMIDLIST_H__
-#define __ENUMIDLIST_H__
-
-#include "shlobj.h"
-
-/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */
-LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN;
-BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN;
-
-/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and
- * adds them to the already-created list.
- */
-BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN;
-
-#endif /* ndef __ENUMIDLIST_H__ */

dlls/shell32/recyclebin.c

@@ -41,7 +41,6 @@
 #include "wine/debug.h"
 
 #include "shell32_main.h"
-#include "enumidlist.h"
 #include "xdg.h"
 #include "pidl.h"
 

dlls/shell32/shell32_main.h

@@ -204,4 +204,14 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN;
 /* Detect Shell Links */
 BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN;
 
+
+/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */
+LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN;
+BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN;
+
+/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and
+ * adds them to the already-created list.
+ */
+BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN;
+
 #endif

dlls/shell32/shfldr_desktop.c

@@ -42,7 +42,6 @@
 #include "ole2.h"
 #include "shlguid.h"
 
-#include "enumidlist.h"
 #include "pidl.h"
 #include "undocshell.h"
 #include "shell32_main.h"

dlls/shell32/shfldr_fs.c

@@ -42,7 +42,6 @@
 #include "ole2.h"
 #include "shlguid.h"
 
-#include "enumidlist.h"
 #include "pidl.h"
 #include "undocshell.h"
 #include "shell32_main.h"

dlls/shell32/shfldr_mycomp.c

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

dlls/shell32/shfldr_netplaces.c

@@ -38,7 +38,6 @@
 #include "winreg.h"
 
 #include "pidl.h"
-#include "enumidlist.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"