Author: akhaldi Date: Tue Jan 21 18:04:09 2014 New Revision: 61749
URL: http://svn.reactos.org/svn/reactos?rev=61749&view=rev Log: [DBGHELP] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716
Modified: trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/compat.c trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/cpu_arm64.c trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/crc32.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/dwarf.h trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/rosstubs.c trunk/reactos/dll/win32/dbghelp/source.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/dll/win32/dbghelp/storage.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/dll/win32/dbghelp/wdbgexts.h
Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?re... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/coff.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/coff.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.c?... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -1,5 +1,3 @@ -#include <stdio.h> -#include <stdarg.h> #include "dbghelp_private.h"
void* __HeapAlloc(int heap, int flags, size_t size)
Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.c... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm64... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm64.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386.... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,18 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> +#include "dbghelp_private.h"
#ifndef DBGHELP_STATIC_LIB -#include "ntstatus.h" -#endif - -#include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include "wine/winbase16.h" -#include "winternl.h" -#include "wine/debug.h" +#include <wine/winbase16.h> #endif
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.c... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_ppc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_ppc.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_6... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/crc32.c?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/crc32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/crc32.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,11 +18,6 @@ * License along with this library; if not, write to the Free Software * 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"
Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.c... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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 "winerror.h" -#include "psapi.h" -#include "wine/debug.h" -#include "winnls.h" -#endif
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_p... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,30 +21,55 @@ * 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" -//#include "winnls.h" + +#endif /* DBGHELP_STATIC_LIB */ + #include <wine/list.h> #include <wine/rbtree.h> -
/* #define USE_STATS */
@@ -815,3 +840,5 @@ extern struct symt_typedef* symt_new_typedef(struct module* module, struct symt* ref, const char* name) DECLSPEC_HIDDEN; + +#include "image_private.h"
Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -20,45 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION - -#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> +#include "dbghelp_private.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);
Modified: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once
typedef enum dwarf_tag_e {
Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modul... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include "dbghelp_private.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 "image_private.h" - -#include "wine/library.h" -#include "wine/debug.h" + +#include <wine/library.h>
#ifdef __ELF__
Modified: trunk/reactos/dll/win32/dbghelp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image.c?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/image.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pri... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once
#ifdef HAVE_ELF_H # include <elf.h>
Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mod... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,21 +21,9 @@ * 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>
Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump.... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "dbghelp_private.h" + #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 "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c?... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,19 +19,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" - -#ifndef DBGHELP_STATIC_LIB -#include <psapi.h> -#include <wine/debug.h> -#endif -//#include "winternl.h"
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?rev... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?re... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_module... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/rosstubs.... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -20,8 +20,7 @@
#include "dbghelp_private.h"
-ULONG __cdecl DbgPrint(IN PCCH Format, IN ...); -#define UNIMPLEMENTED DbgPrint("DBGHELP: %s is unimplemented, please try again later.\n", __FUNCTION__); +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
#define PDBGHELP_CREATE_USER_DUMP_CALLBACK PVOID #define PSYM_ENUMPROCESSES_CALLBACK PVOID
Modified: trunk/reactos/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/source.c?... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/source.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,17 +18,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 <wine/debug.h> -#endif
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -29,39 +29,10 @@ * available (hopefully) from http://sources.redhat.com/gdb/onlinedocs */
-#include <config.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> +#include "dbghelp_private.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);
Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?r... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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);
Modified: trunk/reactos/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/storage.c... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -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
Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c?... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,24 +19,7 @@ * 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);
Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?re... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,20 +21,6 @@ * Note: This really doesn't do much at the moment, but it forms the framework * 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"
Modified: trunk/reactos/dll/win32/dbghelp/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/wdbgexts.... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/wdbgexts.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once
typedef struct EXT_API_VERSION {