[PATCH 1/8] shell32: Merge enumidlist.h into the main header file.

[Michael Stefaniuc]

---
 dlls/shell32/cpanelfolder.c     |    1 -
 dlls/shell32/enumidlist.c       |    2 +-
 dlls/shell32/enumidlist.h       |   30 ------------------------------
 dlls/shell32/recyclebin.c       |    1 -
 dlls/shell32/shell32_main.h     |   10 ++++++++++
 dlls/shell32/shfldr_desktop.c   |    1 -
 dlls/shell32/shfldr_fs.c        |    1 -
 dlls/shell32/shfldr_mycomp.c    |    1 -
 dlls/shell32/shfldr_netplaces.c |    1 -
 9 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 dlls/shell32/enumidlist.h

diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 611be0f..d6c8f5c 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/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"
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index c3d363c..643e039 100644
--- a/dlls/shell32/enumidlist.c
+++ b/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);
 
diff --git a/dlls/shell32/enumidlist.h b/dlls/shell32/enumidlist.h
deleted file mode 100644
index 3fb27d0..0000000
--- a/dlls/shell32/enumidlist.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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__ */
diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c
index 4a8cec4..44e99fc 100644
--- a/dlls/shell32/recyclebin.c
+++ b/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"
 
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 96b3098..9359a3a 100644
--- a/dlls/shell32/shell32_main.h
+++ b/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
diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 9bf08ef..808b920 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 969f18d..dd0231a 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index b9cbea4..265c5a4 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c
index 0ab0470..4c95d3e 100644
--- a/dlls/shell32/shfldr_netplaces.c
+++ b/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"
-- 
1.7.6.4