[DBGHELP]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61749

reactos/dll/win32/dbghelp/coff.c

@@ -32,26 +32,7 @@
  *	Add symbol size to internal symbol table.
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <assert.h>
-//#include <stdlib.h>
-
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-//#include <stdarg.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winternl.h"
-
-//#include "wine/exception.h"
-#include <wine/debug.h>
 #include "dbghelp_private.h"
-#include <wine/mscvpdb.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_coff);
 

reactos/dll/win32/dbghelp/compat.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <stdarg.h>
 #include "dbghelp_private.h"
 
 void* __HeapAlloc(int heap, int flags, size_t size)

reactos/dll/win32/dbghelp/cpu_arm.c

@@ -19,13 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <assert.h>
-
-//#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
-//#include "winternl.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/cpu_arm64.c

@@ -19,13 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
-#include "winternl.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/cpu_i386.c

@@ -18,18 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
-#ifndef DBGHELP_STATIC_LIB
-#include "ntstatus.h"
-#endif
-
 #include "dbghelp_private.h"
 
 #ifndef DBGHELP_STATIC_LIB
-#include "wine/winbase16.h"
+#include <wine/winbase16.h>
-#include "winternl.h"
-#include "wine/debug.h"
 #endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);

reactos/dll/win32/dbghelp/cpu_ppc.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
-#include "winternl.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/cpu_x86_64.c

@@ -19,15 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
-#include "winternl.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/crc32.c

@@ -19,11 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdio.h>
-
 #include "dbghelp_private.h"
 
 /* Copyright (C) 1986 Gary S. Brown

reactos/dll/win32/dbghelp/dbghelp.c

@@ -18,17 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include "dbghelp_private.h"
-#include "wdbgexts.h"
 
-#ifndef DBGHELP_STATIC_LIB
+#include "wdbgexts.h"
-#include "winerror.h"
-#include "psapi.h"
-#include "wine/debug.h"
-#include "winnls.h"
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/dbghelp_private.h

@@ -21,31 +21,56 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include <config.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #ifndef DBGHELP_STATIC_LIB
+
+#include <wine/port.h>
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <winver.h>
+#include <winternl.h>
 #include <dbghelp.h>
 #include <objbase.h>
 #include <cvconst.h>
+#include <psapi.h>
+
+#include <wine/debug.h>
+#include <wine/mscvpdb.h>
 #include <wine/unicode.h>
-#else
+
+#else /* DBGHELP_STATIC_LIB */
+
 #include <string.h>
 #include "compat.h"
-#endif
 
-//#include "oaidl.h"
+#endif /* DBGHELP_STATIC_LIB */
-//#include "winnls.h"
+
 #include <wine/list.h>
 #include <wine/rbtree.h>
 
-
 /* #define USE_STATS */
 
 struct pool /* poor's man */
@@ -815,3 +840,5 @@ extern struct symt_pointer*
 extern struct symt_typedef*
                     symt_new_typedef(struct module* module, struct symt* ref, 
                                      const char* name) DECLSPEC_HIDDEN;
+
+#include "image_private.h"

reactos/dll/win32/dbghelp/dwarf.c

@@ -20,46 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
+#include "dbghelp_private.h"
-
-#include <config.h>
-
-//#include <sys/types.h>
-//#include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-//#include <limits.h>
-//#include <stdlib.h>
-//#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-//#include <stdio.h>
-#include <assert.h>
-#include <stdarg.h>
 
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "ole2.h"
-//#include "oleauto.h"
-
-#ifndef DBGHELP_STATIC_LIB
-#include <winternl.h>
-#include <wine/debug.h>
-#endif
-
-#include "dbghelp_private.h"
-#include "image_private.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf);
 
 /* FIXME:

reactos/dll/win32/dbghelp/dwarf.h

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 typedef enum dwarf_tag_e
 {
   DW_TAG_padding                        = 0x00,

reactos/dll/win32/dbghelp/elf_module.c

@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
+#include "dbghelp_private.h"
-#include "wine/port.h"
 
 #if defined(__svr4__) || defined(__sun)
 #define __ELF__ 1
@@ -29,26 +28,10 @@
 #define _FILE_OFFSET_BITS 32
 #endif
 
-#include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
-#include "dbghelp_private.h"
+#include <wine/library.h>
-
-#include "image_private.h"
-
-#include "wine/library.h"
-#include "wine/debug.h"
 
 #ifdef __ELF__
 

reactos/dll/win32/dbghelp/image.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <string.h>
-
 #include "dbghelp_private.h"
-#include <winternl.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/image_private.h

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 #ifdef HAVE_ELF_H
 # include <elf.h>
 #endif

reactos/dll/win32/dbghelp/macho_module.c

@@ -21,22 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dbghelp_private.h"
 
 #ifdef HAVE_MACH_O_LOADER_H
 
-#include <assert.h>
-#include <stdarg.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
-
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>

reactos/dll/win32/dbghelp/minidump.c

@@ -18,17 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <time.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
-#include "winternl.h"
+
-#include "psapi.h"
+#include <time.h>
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/module.c

@@ -19,20 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <assert.h>
-
 #include "dbghelp_private.h"
 
-#ifndef DBGHELP_STATIC_LIB
-#include <psapi.h>
-#include <wine/debug.h>
-#endif
-//#include "winternl.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 
 const WCHAR        S_ElfW[]         = {'<','e','l','f','>','\0'};

reactos/dll/win32/dbghelp/msc.c

@@ -32,29 +32,9 @@
  *	Add symbol size to internal symbol table.
  */
 
-#define NONAMELESSUNION
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winternl.h"
-
-#include "wine/exception.h"
-#include "wine/debug.h"
 #include "dbghelp_private.h"
-#include "wine/mscvpdb.h"
+
+#include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc);
 

reactos/dll/win32/dbghelp/path.c

@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <string.h>
-
 #include "dbghelp_private.h"
-//#include "winnls.h"
-#include <winternl.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/pe_module.c

@@ -21,20 +21,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
 #include "dbghelp_private.h"
-#include "image_private.h"
-#ifndef DBGHELP_STATIC_LIB
-#include "winternl.h"
-#include "wine/debug.h"
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/rosstubs.c

@@ -20,8 +20,7 @@
 
 #include "dbghelp_private.h"
 
-ULONG __cdecl DbgPrint(IN PCCH Format, IN ...);
+WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
-#define UNIMPLEMENTED DbgPrint("DBGHELP: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
 #define PDBGHELP_CREATE_USER_DUMP_CALLBACK PVOID
 #define PSYM_ENUMPROCESSES_CALLBACK PVOID

reactos/dll/win32/dbghelp/source.c

@@ -18,18 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include <config.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <assert.h>
 
 #include "dbghelp_private.h"
 
-#ifndef DBGHELP_STATIC_LIB
-#include <wine/debug.h>
-#endif
-
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 
 static struct module*   rb_module;

reactos/dll/win32/dbghelp/stabs.c

@@ -29,41 +29,12 @@
  *     available (hopefully) from http://sources.redhat.com/gdb/onlinedocs
  */
 
-#include <config.h>
+#include "dbghelp_private.h"
-//#include "wine/port.h"
-
-//#include <sys/types.h>
-//#include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-//#include <limits.h>
-//#include <stdlib.h>
-//#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-//#include <stdio.h>
-#include <assert.h>
-//#include <stdarg.h>
 
 #ifdef HAVE_MACH_O_NLIST_H
 # include <mach-o/nlist.h>
 #endif
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-
-#include "dbghelp_private.h"
-
-#ifndef DBGHELP_STATIC_LIB
-#include <wine/debug.h>
-#endif
-
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);
 
 #ifndef DBGHELP_STATIC_LIB

reactos/dll/win32/dbghelp/stack.c

@@ -21,14 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <assert.h>
-
 #include "dbghelp_private.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 

reactos/dll/win32/dbghelp/storage.c

@@ -19,16 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#include "config.h"
-#include <assert.h>
-#include <stdlib.h>
-
-#ifndef DBGHELP_STATIC_LIB
-#include "wine/debug.h"
-#endif
-
 #include "dbghelp_private.h"
+
 #ifdef USE_STATS
 #include <math.h>
 #endif

reactos/dll/win32/dbghelp/symbol.c

@@ -19,25 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <assert.h>
-
 #include "dbghelp_private.h"
 
-#ifndef DBGHELP_STATIC_LIB
-#include "wine/debug.h"
-#include "winnls.h"
-#endif
-
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt);
 

reactos/dll/win32/dbghelp/type.c

@@ -22,20 +22,6 @@
  * upon which full support for datatype handling will eventually be built.
  */
 
-#define NONAMELESSUNION
-
-#include "config.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#ifndef DBGHELP_STATIC_LIB
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wine/debug.h"
-#endif
-
 #include "dbghelp_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);

reactos/dll/win32/dbghelp/wdbgexts.h

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 typedef struct EXT_API_VERSION
 {
     USHORT  MajorVersion;