[DBGHELP] Sync with Wine Staging 3.3. CORE-14434

This commit is contained in:
Amine Khaldi 2018-03-04 23:54:20 +01:00
parent a9068cc8d3
commit 8d51a38cbc
30 changed files with 412 additions and 93 deletions

View file

@ -21,58 +21,32 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef _DBGHELP_PRIVATE_H_
#define _DBGHELP_PRIVATE_H_
#pragma once
#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
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <stdarg.h>
#ifndef DBGHELP_STATIC_LIB
#include <wine/port.h>
#include "windef.h"
#include "winbase.h"
#include "winver.h"
#include "dbghelp.h"
#include "objbase.h"
#include "oaidl.h"
#include "winnls.h"
#include "wine/list.h"
#include "wine/unicode.h"
#include "wine/rbtree.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>
#include "cvconst.h"
#else /* DBGHELP_STATIC_LIB */
#include <string.h>
#include "compat.h"
#endif /* DBGHELP_STATIC_LIB */
#include <wine/list.h>
#include <wine/rbtree.h>
#endif /* DBGHELP_STATIC_LIB */
/* #define USE_STATS */
@ -401,6 +375,7 @@ struct module
{
struct process* process;
IMAGEHLP_MODULEW64 module;
WCHAR modulename[64]; /* used for enumeration */
struct module* next;
enum module_type type : 16;
unsigned short is_virtual : 1;
@ -844,7 +819,3 @@ 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"
#endif /* _DBGHELP_PRIVATE_H_ */