https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8de32aeab542944f2fa0a436f408b69b8c4b0eb1
commit 8de32aeab542944f2fa0a436f408b69b8c4b0eb1 Author: winesync <[email protected]> AuthorDate: Fri Sep 11 15:57:35 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:41 2020 +0200 [WINESYNC] include: Add missing SYMOPT_* defines. Signed-off-by: Alistair Leslie-Hughes <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 620da60f7f7939261192680d10012e31426ba5b3 by Alistair Leslie-Hughes <[email protected]> --- sdk/include/psdk/dbghelp.h | 59 ++++++++++++++++++++++-------------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 5da7c94e574..00843b69978 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -163,7 +163,7 @@ typedef struct _tagADDRESS64 #define SYMF_THUNK 0x00002000 #define SYMF_TLSREL 0x00004000 -typedef enum +typedef enum { SymNone = 0, SymCoff, @@ -554,10 +554,13 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_FLAT_DIRECTORY 0x00400000 #define SYMOPT_FAVOR_COMPRESSED 0x00800000 #define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 -#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 -#define SYMOPT_READONLY_CACHE 0x04000000 -#define SYMOPT_SYMPATH_LAST 0x08000000 -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME { @@ -598,7 +601,7 @@ typedef struct _DBGHELP_MODLOAD_DATA typedef DWORD RVA; typedef ULONG64 RVA64; -typedef enum _MINIDUMP_TYPE +typedef enum _MINIDUMP_TYPE { MiniDumpNormal = 0x0000, MiniDumpWithDataSegs = 0x0001, @@ -637,7 +640,7 @@ typedef struct _MINIDUMP_THREAD_CALLBACK ULONG64 StackEnd; } MINIDUMP_THREAD_CALLBACK, *PMINIDUMP_THREAD_CALLBACK; -typedef struct _MINIDUMP_THREAD_EX_CALLBACK +typedef struct _MINIDUMP_THREAD_EX_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; @@ -654,7 +657,7 @@ typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK ULONG ThreadId; } MINIDUMP_INCLUDE_THREAD_CALLBACK, *PMINIDUMP_INCLUDE_THREAD_CALLBACK; -typedef enum _THREAD_WRITE_FLAGS +typedef enum _THREAD_WRITE_FLAGS { ThreadWriteThread = 0x0001, ThreadWriteStack = 0x0002, @@ -665,7 +668,7 @@ typedef enum _THREAD_WRITE_FLAGS ThreadWriteThreadInfo = 0x0040 } THREAD_WRITE_FLAGS; -typedef struct _MINIDUMP_MODULE_CALLBACK +typedef struct _MINIDUMP_MODULE_CALLBACK { PWCHAR FullPath; ULONG64 BaseOfImage; @@ -679,12 +682,12 @@ typedef struct _MINIDUMP_MODULE_CALLBACK ULONG SizeOfMiscRecord; } MINIDUMP_MODULE_CALLBACK, *PMINIDUMP_MODULE_CALLBACK; -typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK +typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK { ULONG64 BaseOfImage; } MINIDUMP_INCLUDE_MODULE_CALLBACK, *PMINIDUMP_INCLUDE_MODULE_CALLBACK; -typedef enum _MODULE_WRITE_FLAGS +typedef enum _MODULE_WRITE_FLAGS { ModuleWriteModule = 0x0001, ModuleWriteDataSeg = 0x0002, @@ -695,12 +698,12 @@ typedef enum _MODULE_WRITE_FLAGS ModuleWriteCodeSegs = 0x0040, } MODULE_WRITE_FLAGS; -typedef struct _MINIDUMP_CALLBACK_INPUT +typedef struct _MINIDUMP_CALLBACK_INPUT { ULONG ProcessId; HANDLE ProcessHandle; ULONG CallbackType; - union + union { MINIDUMP_THREAD_CALLBACK Thread; MINIDUMP_THREAD_EX_CALLBACK ThreadEx; @@ -712,7 +715,7 @@ typedef struct _MINIDUMP_CALLBACK_INPUT typedef struct _MINIDUMP_CALLBACK_OUTPUT { - union + union { ULONG ModuleWriteFlags; ULONG ThreadWriteFlags; @@ -730,25 +733,25 @@ typedef BOOL _In_ const PMINIDUMP_CALLBACK_INPUT, _Inout_ PMINIDUMP_CALLBACK_OUTPUT); -typedef struct _MINIDUMP_CALLBACK_INFORMATION +typedef struct _MINIDUMP_CALLBACK_INFORMATION { MINIDUMP_CALLBACK_ROUTINE CallbackRoutine; void* CallbackParam; } MINIDUMP_CALLBACK_INFORMATION, *PMINIDUMP_CALLBACK_INFORMATION; -typedef struct _MINIDUMP_LOCATION_DESCRIPTOR +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR { ULONG DataSize; RVA Rva; } MINIDUMP_LOCATION_DESCRIPTOR; -typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 { ULONG64 DataSize; RVA64 Rva; } MINIDUMP_LOCATION_DESCRIPTOR64; -typedef struct _MINIDUMP_DIRECTORY +typedef struct _MINIDUMP_DIRECTORY { ULONG StreamType; MINIDUMP_LOCATION_DESCRIPTOR Location; @@ -772,7 +775,7 @@ typedef struct _MINIDUMP_EXCEPTION_INFORMATION BOOL ClientPointers; } MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION; -typedef struct MINIDUMP_EXCEPTION_STREAM +typedef struct MINIDUMP_EXCEPTION_STREAM { ULONG ThreadId; ULONG __alignment; @@ -780,14 +783,14 @@ typedef struct MINIDUMP_EXCEPTION_STREAM MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; } MINIDUMP_EXCEPTION_STREAM, *PMINIDUMP_EXCEPTION_STREAM; -typedef struct _MINIDUMP_HEADER +typedef struct _MINIDUMP_HEADER { DWORD Signature; DWORD Version; DWORD NumberOfStreams; RVA StreamDirectoryRva; DWORD CheckSum; - union + union { DWORD Reserved; DWORD TimeDateStamp; @@ -795,7 +798,7 @@ typedef struct _MINIDUMP_HEADER ULONG64 Flags; } MINIDUMP_HEADER, *PMINIDUMP_HEADER; -typedef struct _MINIDUMP_MEMORY_DESCRIPTOR +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR { ULONG64 StartOfMemoryRange; MINIDUMP_LOCATION_DESCRIPTOR Memory; @@ -847,7 +850,7 @@ typedef struct _MINIDUMP_MODULE ULONG64 Reserved1; } MINIDUMP_MODULE, *PMINIDUMP_MODULE; -typedef struct _MINIDUMP_MODULE_LIST +typedef struct _MINIDUMP_MODULE_LIST { ULONG NumberOfModules; MINIDUMP_MODULE Modules[1]; /* FIXME: 0-sized array not supported */ @@ -889,16 +892,16 @@ typedef struct _MINIDUMP_SYSTEM_INFO USHORT Reserved2; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME1; - union _CPU_INFORMATION + union _CPU_INFORMATION { - struct + struct { ULONG VendorId[3]; ULONG VersionInformation; ULONG FeatureInformation; ULONG AMDExtendedCpuFeatures; } X86CpuInfo; - struct + struct { ULONG64 ProcessorFeatures[2]; } OtherCpuInfo; @@ -1183,7 +1186,7 @@ typedef struct _SYMBOL_INFO_PACKAGEW WCHAR name[MAX_SYM_NAME+1]; } SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; -typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO +typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG, TI_GET_SYMNAME, @@ -1238,7 +1241,7 @@ typedef struct _IMAGEHLP_GET_TYPE_INFO_PARAMS PULONG64 ReqsValid; } IMAGEHLP_GET_TYPE_INFO_PARAMS, *PIMAGEHLP_GET_TYPE_INFO_PARAMS; -typedef struct _TI_FINDCHILDREN_PARAMS +typedef struct _TI_FINDCHILDREN_PARAMS { ULONG Count; ULONG Start; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 3a107b62be3..a88dc0c535a 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: d5a372abbba2e174de78855bdd4a004b56cdc006 + wine: 620da60f7f7939261192680d10012e31426ba5b3
