Headers diff for tdh.dll between 6.0.6001.18000-Windows 6.0 and 6.1.7600.16385-Windows 7.0 versions

tdh.h (6.0.6001.18000-Windows 6.0)		tdh.h (6.1.7600.16385-Windows 7.0)
/*++		/*++

Copyright (c) Microsoft Corporation		Copyright (c) Microsoft Corporation

Module Name:		Module Name:

Tdh.h		Tdh.h

Abstract:		Abstract:


ETW Event payload parsing API && ETW trace providers browsing API		ETW Event payload parsing API && ETW trace providers browsing API.

--*/		--*/

#ifndef __TDH_H__		#ifndef __TDH_H__
#define __TDH_H__		#define __TDH_H__

#ifdef __cplusplus		#ifdef __cplusplus
extern "C" {		extern "C" {
#endif		#endif


		#include <wmistr.h>
#include <evntrace.h>		#include <evntrace.h>
#include <evntcons.h>		#include <evntcons.h>


typedef ULONG TDHSTATUS;		#pragma warning(push)
#define TDHAPI TDHSTATUS __stdcall		#pragma warning (disable:4201) // nameless struct/union.


#define TDHCACHE_LINE 8		typedef __success(return == ERROR_SUCCESS) ULONG TDHSTATUS;
#define TDHCACHE_ALIGN __declspec(align(TDHCACHE_LINE))		#define TDHAPI TDHSTATUS __stdcall


typedef TDHCACHE_ALIGN struct _EVENT_MAP_ENTRY {		typedef struct _EVENT_MAP_ENTRY {
ULONG OutputOffset;		ULONG OutputOffset;
union {		union {

ULONG Value; // For ULONG value (valuemap and bitmap)		ULONG Value; // For ULONG value (valuemap and bitmap).
ULONG InputOffset; // For String value (patternmap or valuemap in WBEM)		ULONG InputOffset; // For String value (patternmap or valuemap in WBEM)
		.
};		};
} EVENT_MAP_ENTRY;		} EVENT_MAP_ENTRY;
typedef EVENT_MAP_ENTRY *PEVENT_MAP_ENTRY;		typedef EVENT_MAP_ENTRY *PEVENT_MAP_ENTRY;

typedef enum _MAP_FLAGS {		typedef enum _MAP_FLAGS {
EVENTMAP_INFO_FLAG_MANIFEST_VALUEMAP = 0x1,		EVENTMAP_INFO_FLAG_MANIFEST_VALUEMAP = 0x1,
EVENTMAP_INFO_FLAG_MANIFEST_BITMAP = 0x2,		EVENTMAP_INFO_FLAG_MANIFEST_BITMAP = 0x2,
EVENTMAP_INFO_FLAG_MANIFEST_PATTERNMAP = 0x4,		EVENTMAP_INFO_FLAG_MANIFEST_PATTERNMAP = 0x4,
EVENTMAP_INFO_FLAG_WBEM_VALUEMAP = 0x8,		EVENTMAP_INFO_FLAG_WBEM_VALUEMAP = 0x8,
EVENTMAP_INFO_FLAG_WBEM_BITMAP = 0x10,		EVENTMAP_INFO_FLAG_WBEM_BITMAP = 0x10,
EVENTMAP_INFO_FLAG_WBEM_FLAG = 0x20,		EVENTMAP_INFO_FLAG_WBEM_FLAG = 0x20,
EVENTMAP_INFO_FLAG_WBEM_NO_MAP = 0x40		EVENTMAP_INFO_FLAG_WBEM_NO_MAP = 0x40
} MAP_FLAGS;		} MAP_FLAGS;

typedef enum _MAP_VALUETYPE {		typedef enum _MAP_VALUETYPE {
EVENTMAP_ENTRY_VALUETYPE_ULONG,		EVENTMAP_ENTRY_VALUETYPE_ULONG,
EVENTMAP_ENTRY_VALUETYPE_STRING		EVENTMAP_ENTRY_VALUETYPE_STRING
} MAP_VALUETYPE;		} MAP_VALUETYPE;


typedef TDHCACHE_ALIGN struct _EVENT_MAP_INFO {		typedef struct _EVENT_MAP_INFO {
ULONG NameOffset;		ULONG NameOffset;
MAP_FLAGS Flag;		MAP_FLAGS Flag;
ULONG EntryCount;		ULONG EntryCount;
union {		union {
MAP_VALUETYPE MapEntryValueType;		MAP_VALUETYPE MapEntryValueType;
ULONG FormatStringOffset;		ULONG FormatStringOffset;
};		};
__field_ecount(EntryCount) EVENT_MAP_ENTRY MapEntryArray[ANYSIZE_ARRAY];		__field_ecount(EntryCount) EVENT_MAP_ENTRY MapEntryArray[ANYSIZE_ARRAY];
} EVENT_MAP_INFO;		} EVENT_MAP_INFO;
typedef EVENT_MAP_INFO *PEVENT_MAP_INFO;		typedef EVENT_MAP_INFO *PEVENT_MAP_INFO;


// Intypes and outtypes are defined in winmeta.xml		// Intypes and outtypes are defined in winmeta.xml.

enum _TDH_IN_TYPE {		enum _TDH_IN_TYPE {
TDH_INTYPE_NULL,		TDH_INTYPE_NULL,
TDH_INTYPE_UNICODESTRING,		TDH_INTYPE_UNICODESTRING,
TDH_INTYPE_ANSISTRING,		TDH_INTYPE_ANSISTRING,
TDH_INTYPE_INT8,		TDH_INTYPE_INT8,
TDH_INTYPE_UINT8,		TDH_INTYPE_UINT8,
TDH_INTYPE_INT16,		TDH_INTYPE_INT16,
TDH_INTYPE_UINT16,		TDH_INTYPE_UINT16,
TDH_INTYPE_INT32,		TDH_INTYPE_INT32,

skipping to change at line 91		skipping to change at line 92
TDH_INTYPE_FLOAT,		TDH_INTYPE_FLOAT,
TDH_INTYPE_DOUBLE,		TDH_INTYPE_DOUBLE,
TDH_INTYPE_BOOLEAN,		TDH_INTYPE_BOOLEAN,
TDH_INTYPE_BINARY,		TDH_INTYPE_BINARY,
TDH_INTYPE_GUID,		TDH_INTYPE_GUID,
TDH_INTYPE_POINTER,		TDH_INTYPE_POINTER,
TDH_INTYPE_FILETIME,		TDH_INTYPE_FILETIME,
TDH_INTYPE_SYSTEMTIME,		TDH_INTYPE_SYSTEMTIME,
TDH_INTYPE_SID,		TDH_INTYPE_SID,
TDH_INTYPE_HEXINT32,		TDH_INTYPE_HEXINT32,

TDH_INTYPE_HEXINT64, // end of winmeta intypes		TDH_INTYPE_HEXINT64, // End of winmeta intypes.
TDH_INTYPE_COUNTEDSTRING = 300, // start of TDH intypes for WBEM		TDH_INTYPE_COUNTEDSTRING = 300, // Start of TDH intypes for WBEM.
TDH_INTYPE_COUNTEDANSISTRING,		TDH_INTYPE_COUNTEDANSISTRING,
TDH_INTYPE_REVERSEDCOUNTEDSTRING,		TDH_INTYPE_REVERSEDCOUNTEDSTRING,
TDH_INTYPE_REVERSEDCOUNTEDANSISTRING,		TDH_INTYPE_REVERSEDCOUNTEDANSISTRING,
TDH_INTYPE_NONNULLTERMINATEDSTRING,		TDH_INTYPE_NONNULLTERMINATEDSTRING,
TDH_INTYPE_NONNULLTERMINATEDANSISTRING,		TDH_INTYPE_NONNULLTERMINATEDANSISTRING,
TDH_INTYPE_UNICODECHAR,		TDH_INTYPE_UNICODECHAR,
TDH_INTYPE_ANSICHAR,		TDH_INTYPE_ANSICHAR,
TDH_INTYPE_SIZET,		TDH_INTYPE_SIZET,
TDH_INTYPE_HEXDUMP,		TDH_INTYPE_HEXDUMP,
TDH_INTYPE_WBEMSID		TDH_INTYPE_WBEMSID

skipping to change at line 135		skipping to change at line 136
TDH_OUTTYPE_HEXINT64,		TDH_OUTTYPE_HEXINT64,
TDH_OUTTYPE_PID,		TDH_OUTTYPE_PID,
TDH_OUTTYPE_TID,		TDH_OUTTYPE_TID,
TDH_OUTTYPE_PORT,		TDH_OUTTYPE_PORT,
TDH_OUTTYPE_IPV4,		TDH_OUTTYPE_IPV4,
TDH_OUTTYPE_IPV6,		TDH_OUTTYPE_IPV6,
TDH_OUTTYPE_SOCKETADDRESS,		TDH_OUTTYPE_SOCKETADDRESS,
TDH_OUTTYPE_CIMDATETIME,		TDH_OUTTYPE_CIMDATETIME,
TDH_OUTTYPE_ETWTIME,		TDH_OUTTYPE_ETWTIME,
TDH_OUTTYPE_XML,		TDH_OUTTYPE_XML,

TDH_OUTYTPE_ERRORCODE, // end of winmeta outtypes		TDH_OUTTYPE_ERRORCODE,
TDH_OUTTYPE_REDUCEDSTRING = 300, // start of TDH outtypes for WBEM		TDH_OUTTYPE_WIN32ERROR,
		TDH_OUTTYPE_NTSTATUS,
		TDH_OUTTYPE_HRESULT, // End of winmeta outtypes.
		TDH_OUTTYPE_CULTURE_INSENSITIVE_DATETIME, //Culture neutral datetime string.
		TDH_OUTTYPE_REDUCEDSTRING = 300, // Start of TDH outtypes for WBEM.
TDH_OUTTYPE_NOPRINT		TDH_OUTTYPE_NOPRINT
};		};


		#define TDH_OUTYTPE_ERRORCODE TDH_OUTTYPE_ERRORCODE

typedef enum _PROPERTY_FLAGS		typedef enum _PROPERTY_FLAGS
{		{

PropertyStruct = 0x1, // type is struct.		PropertyStruct = 0x1, // Type is struct.
PropertyParamLength = 0x2, // length field is index of param with leng		PropertyParamLength = 0x2, // Length field is index of param with leng
th		th.
PropertyParamCount = 0x4, // count file is index of param with count		PropertyParamCount = 0x4, // Count file is index of param with count.
PropertyWBEMXmlFragment = 0x8, // WBEM extension flag for property		PropertyWBEMXmlFragment = 0x8, // WBEM extension flag for property.
PropertyParamFixedLength = 0x10 // length of the parameter is fixed.		PropertyParamFixedLength = 0x10 // Length of the parameter is fixed.
} PROPERTY_FLAGS;		} PROPERTY_FLAGS;


typedef TDHCACHE_ALIGN struct _EVENT_PROPERTY_INFO {		typedef struct _EVENT_PROPERTY_INFO {
PROPERTY_FLAGS Flags;		PROPERTY_FLAGS Flags;
ULONG NameOffset;		ULONG NameOffset;
union {		union {
struct _nonStructType {		struct _nonStructType {
USHORT InType;		USHORT InType;
USHORT OutType;		USHORT OutType;
ULONG MapNameOffset;		ULONG MapNameOffset;
} nonStructType;		} nonStructType;
struct _structType {		struct _structType {
USHORT StructStartIndex;		USHORT StructStartIndex;

skipping to change at line 185		skipping to change at line 192

typedef enum _DECODING_SOURCE {		typedef enum _DECODING_SOURCE {
DecodingSourceXMLFile,		DecodingSourceXMLFile,
DecodingSourceWbem,		DecodingSourceWbem,
DecodingSourceWPP		DecodingSourceWPP
} DECODING_SOURCE;		} DECODING_SOURCE;

// Copy from Binres.h		// Copy from Binres.h
typedef enum _TEMPLATE_FLAGS		typedef enum _TEMPLATE_FLAGS
{		{

TEMPLATE_EVENT_DATA = 1, // used when custom xml is not specified		TEMPLATE_EVENT_DATA = 1, // Used when custom xml is not specified.
TEMPLATE_USER_DATA = 2 // used when custom xml is specified		TEMPLATE_USER_DATA = 2 // Used when custom xml is specified.
} TEMPLATE_FLAGS;		} TEMPLATE_FLAGS;


typedef TDHCACHE_ALIGN struct _TRACE_EVENT_INFO {		typedef struct _TRACE_EVENT_INFO {
GUID ProviderGuid;		GUID ProviderGuid;
GUID EventGuid;		GUID EventGuid;

EVENT_DESCRIPTOR EventDescriptor; // Loghorn 128 bits event description		EVENT_DESCRIPTOR EventDescriptor;
DECODING_SOURCE DecodingSource;		DECODING_SOURCE DecodingSource;
ULONG ProviderNameOffset;		ULONG ProviderNameOffset;
ULONG LevelNameOffset;		ULONG LevelNameOffset;
ULONG ChannelNameOffset;		ULONG ChannelNameOffset;
ULONG KeywordsNameOffset;		ULONG KeywordsNameOffset;
ULONG TaskNameOffset;		ULONG TaskNameOffset;
ULONG OpcodeNameOffset;		ULONG OpcodeNameOffset;
ULONG EventMessageOffset;		ULONG EventMessageOffset;
ULONG ProviderMessageOffset;		ULONG ProviderMessageOffset;
ULONG BinaryXMLOffset;		ULONG BinaryXMLOffset;
ULONG BinaryXMLSize;		ULONG BinaryXMLSize;
ULONG ActivityIDNameOffset;		ULONG ActivityIDNameOffset;
ULONG RelatedActivityIDNameOffset;		ULONG RelatedActivityIDNameOffset;
ULONG PropertyCount;		ULONG PropertyCount;
ULONG TopLevelPropertyCount;		ULONG TopLevelPropertyCount;
TEMPLATE_FLAGS Flags;		TEMPLATE_FLAGS Flags;
__field_ecount(PropertyCount) EVENT_PROPERTY_INFO EventPropertyInfoArray[ANY SIZE_ARRAY];		__field_ecount(PropertyCount) EVENT_PROPERTY_INFO EventPropertyInfoArray[ANY SIZE_ARRAY];
} TRACE_EVENT_INFO;		} TRACE_EVENT_INFO;
typedef TRACE_EVENT_INFO *PTRACE_EVENT_INFO;		typedef TRACE_EVENT_INFO *PTRACE_EVENT_INFO;


typedef TDHCACHE_ALIGN struct _PROPERTY_DATA_DESCRIPTOR {		typedef struct _PROPERTY_DATA_DESCRIPTOR {
ULONGLONG PropertyName; // Pointer to property name		ULONGLONG PropertyName; // Pointer to property name.
ULONG ArrayIndex; // Array Index		ULONG ArrayIndex; // Array Index.
ULONG Reserved;		ULONG Reserved;
} PROPERTY_DATA_DESCRIPTOR;		} PROPERTY_DATA_DESCRIPTOR;
typedef PROPERTY_DATA_DESCRIPTOR *PPROPERTY_DATA_DESCRIPTOR;		typedef PROPERTY_DATA_DESCRIPTOR *PPROPERTY_DATA_DESCRIPTOR;


// Provider Enumeration		//
		// Provider-side filters.
		//

		typedef struct _PROVIDER_FILTER_INFO {
		UCHAR Id;
		UCHAR Version;
		ULONG MessageOffset;
		ULONG Reserved;
		ULONG PropertyCount;
		__field_ecount(PropertyCount) EVENT_PROPERTY_INFO EventPropertyInfoArray[ANY
		SIZE_ARRAY];
		} PROVIDER_FILTER_INFO, *PPROVIDER_FILTER_INFO;

		// Provider Enumeration.

typedef enum _EVENT_FIELD_TYPE {		typedef enum _EVENT_FIELD_TYPE {
EventKeywordInformation = 0,		EventKeywordInformation = 0,
EventLevelInformation,		EventLevelInformation,
EventChannelInformation,		EventChannelInformation,
EventTaskInformation,		EventTaskInformation,
EventOpcodeInformation,		EventOpcodeInformation,
EventInformationMax		EventInformationMax
} EVENT_FIELD_TYPE;		} EVENT_FIELD_TYPE;


typedef TDHCACHE_ALIGN struct _PROVIDER_FIELD_INFO {		typedef struct _PROVIDER_FIELD_INFO {
ULONG NameOffset; // English only		ULONG NameOffset; // English only.
ULONG DescriptionOffset; // Localization String		ULONG DescriptionOffset; // Localizable String.
ULONGLONG Value;		ULONGLONG Value;
} PROVIDER_FIELD_INFO;		} PROVIDER_FIELD_INFO;
typedef PROVIDER_FIELD_INFO *PPROVIDER_FIELD_INFO;		typedef PROVIDER_FIELD_INFO *PPROVIDER_FIELD_INFO;


typedef TDHCACHE_ALIGN struct _PROVIDER_FIELD_INFOARRAY {		typedef struct _PROVIDER_FIELD_INFOARRAY {
ULONG NumberOfElements;		ULONG NumberOfElements;
EVENT_FIELD_TYPE FieldType;		EVENT_FIELD_TYPE FieldType;
PROVIDER_FIELD_INFO FieldInfoArray[ANYSIZE_ARRAY];		PROVIDER_FIELD_INFO FieldInfoArray[ANYSIZE_ARRAY];
} PROVIDER_FIELD_INFOARRAY;		} PROVIDER_FIELD_INFOARRAY;
typedef PROVIDER_FIELD_INFOARRAY *PPROVIDER_FIELD_INFOARRAY;		typedef PROVIDER_FIELD_INFOARRAY *PPROVIDER_FIELD_INFOARRAY;


typedef TDHCACHE_ALIGN struct _TRACE_PROVIDER_INFO {		typedef struct _TRACE_PROVIDER_INFO {
GUID ProviderGuid;		GUID ProviderGuid;
ULONG SchemaSource;		ULONG SchemaSource;
ULONG ProviderNameOffset;		ULONG ProviderNameOffset;
} TRACE_PROVIDER_INFO;		} TRACE_PROVIDER_INFO;
typedef TRACE_PROVIDER_INFO *PTRACE_PROVIDER_INFO;		typedef TRACE_PROVIDER_INFO *PTRACE_PROVIDER_INFO;


typedef TDHCACHE_ALIGN struct _PROVIDER_ENUMERATION_INFO {		typedef struct _PROVIDER_ENUMERATION_INFO {
ULONG NumberOfProviders;		ULONG NumberOfProviders;

ULONG Padding; // for 8 bytes alignment		ULONG Reserved;
__field_ecount(NumberOfProviders) TRACE_PROVIDER_INFO TraceProviderInfoArray [ANYSIZE_ARRAY];		__field_ecount(NumberOfProviders) TRACE_PROVIDER_INFO TraceProviderInfoArray [ANYSIZE_ARRAY];
} PROVIDER_ENUMERATION_INFO;		} PROVIDER_ENUMERATION_INFO;
typedef PROVIDER_ENUMERATION_INFO *PPROVIDER_ENUMERATION_INFO;		typedef PROVIDER_ENUMERATION_INFO *PPROVIDER_ENUMERATION_INFO;

typedef enum _TDH_CONTEXT_TYPE {		typedef enum _TDH_CONTEXT_TYPE {
TDH_CONTEXT_WPP_TMFFILE = 0,		TDH_CONTEXT_WPP_TMFFILE = 0,
TDH_CONTEXT_WPP_TMFSEARCHPATH,		TDH_CONTEXT_WPP_TMFSEARCHPATH,
TDH_CONTEXT_WPP_GMT,		TDH_CONTEXT_WPP_GMT,
TDH_CONTEXT_POINTERSIZE,		TDH_CONTEXT_POINTERSIZE,
TDH_CONTEXT_MAXIMUM		TDH_CONTEXT_MAXIMUM
} TDH_CONTEXT_TYPE;		} TDH_CONTEXT_TYPE;


typedef TDHCACHE_ALIGN struct _TDH_CONTEXT {		typedef struct _TDH_CONTEXT {
ULONGLONG ParameterValue; // Pointer to Data		ULONGLONG ParameterValue; // Pointer to Data.
TDH_CONTEXT_TYPE ParameterType;		TDH_CONTEXT_TYPE ParameterType;
ULONG ParameterSize;		ULONG ParameterSize;
} TDH_CONTEXT;		} TDH_CONTEXT;
typedef TDH_CONTEXT *PTDH_CONTEXT;		typedef TDH_CONTEXT *PTDH_CONTEXT;

TDHAPI		TDHAPI
TdhGetEventInformation(		TdhGetEventInformation(

__in PEVENT_RECORD pEvent,		__in PEVENT_RECORD Event,
__in ULONG TdhContextCount,		__in ULONG TdhContextCount,

__in_ecount_opt(TdhContextCount) PTDH_CONTEXT pTdhContext,		__in_ecount_opt(TdhContextCount) PTDH_CONTEXT TdhContext,
__out_bcount_opt(*pBufferSize) PTRACE_EVENT_INFO pBuffer,		__out_bcount_opt(*BufferSize) PTRACE_EVENT_INFO Buffer,
__inout ULONG *pBufferSize		__inout PULONG BufferSize
);		);

TDHAPI		TDHAPI
TdhGetEventMapInformation(		TdhGetEventMapInformation(
__in PEVENT_RECORD pEvent,		__in PEVENT_RECORD pEvent,

__in LPWSTR pMapName,		__in PWSTR pMapName,
__out_bcount_opt(*pBufferSize) PEVENT_MAP_INFO pBuffer,		__out_bcount_opt(*pBufferSize) PEVENT_MAP_INFO pBuffer,
__inout ULONG *pBufferSize		__inout ULONG *pBufferSize
);		);

TDHAPI		TDHAPI
TdhGetPropertySize(		TdhGetPropertySize(
__in PEVENT_RECORD pEvent,		__in PEVENT_RECORD pEvent,
__in ULONG TdhContextCount,		__in ULONG TdhContextCount,
__in_ecount_opt(TdhContextCount) PTDH_CONTEXT pTdhContext,		__in_ecount_opt(TdhContextCount) PTDH_CONTEXT pTdhContext,
__in ULONG PropertyDataCount,		__in ULONG PropertyDataCount,

skipping to change at line 318		skipping to change at line 338
__in ULONG BufferSize,		__in ULONG BufferSize,
__out_bcount(BufferSize) PBYTE pBuffer		__out_bcount(BufferSize) PBYTE pBuffer
);		);

TDHAPI		TDHAPI
TdhEnumerateProviders(		TdhEnumerateProviders(
__out_bcount_opt(*pBufferSize) PPROVIDER_ENUMERATION_INFO pBuffer,		__out_bcount_opt(*pBufferSize) PPROVIDER_ENUMERATION_INFO pBuffer,
__inout ULONG *pBufferSize		__inout ULONG *pBufferSize
);		);


__success(return == ERROR_SUCCESS)
TDHAPI		TDHAPI
TdhQueryProviderFieldInformation(		TdhQueryProviderFieldInformation(
__in LPGUID pGuid,		__in LPGUID pGuid,
__in ULONGLONG EventFieldValue,		__in ULONGLONG EventFieldValue,
__in EVENT_FIELD_TYPE EventFieldType,		__in EVENT_FIELD_TYPE EventFieldType,
__out_bcount_opt(*pBufferSize) PPROVIDER_FIELD_INFOARRAY pBuffer,		__out_bcount_opt(*pBufferSize) PPROVIDER_FIELD_INFOARRAY pBuffer,
__inout ULONG *pBufferSize		__inout ULONG *pBufferSize
);		);

TDHAPI		TDHAPI
TdhEnumerateProviderFieldInformation(		TdhEnumerateProviderFieldInformation(
__in LPGUID pGuid,		__in LPGUID pGuid,
__in EVENT_FIELD_TYPE EventFieldType,		__in EVENT_FIELD_TYPE EventFieldType,
__out_bcount_opt(*pBufferSize) PPROVIDER_FIELD_INFOARRAY pBuffer,		__out_bcount_opt(*pBufferSize) PPROVIDER_FIELD_INFOARRAY pBuffer,
__inout ULONG *pBufferSize		__inout ULONG *pBufferSize
);		);


		#if (WINVER >= _WIN32_WINNT_WIN7)
		TDHAPI
		TdhEnumerateProviderFilters(
		__in LPGUID Guid,
		__in ULONG TdhContextCount,
		__in_ecount_opt(TdhContextCount) PTDH_CONTEXT TdhContext,
		__out ULONG *FilterCount,
		__out_bcount_opt(BufferSize) PPROVIDER_FILTER_INFO Buffer,
		__inout ULONG *BufferSize
		);
		#endif

		#if (WINVER >= _WIN32_WINNT_WIN7)
		TDHAPI
		TdhLoadManifest(
		__in PWSTR Manifest
		);
		#endif

		#if (WINVER >= _WIN32_WINNT_WIN7)
		TDHAPI
		TdhUnloadManifest(
		__in PWSTR Manifest
		);
		#endif

		#if (WINVER >= _WIN32_WINNT_WIN7)
		TDHAPI
		TdhFormatProperty(
		__in PTRACE_EVENT_INFO EventInfo,
		__in_opt PEVENT_MAP_INFO MapInfo,
		__in ULONG PointerSize,
		__in USHORT PropertyInType,
		__in USHORT PropertyOutType,
		__in USHORT PropertyLength,
		__in USHORT UserDataLength,
		__in_bcount(UserDataLength) PBYTE UserData,
		__inout PULONG BufferSize,
		__out_bcount_opt(*BufferSize) PWCHAR Buffer,
		__out PUSHORT UserDataConsumed
		);
		#endif

		//
		// Helper macros to access strings from variable length Tdh structures.
		//

		FORCEINLINE
		PWSTR
		EMI_MAP_NAME(
		__in PEVENT_MAP_INFO MapInfo
		)
		{
		return (MapInfo->NameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)MapInfo + MapInfo->NameOffset);
		}

		FORCEINLINE
		PWSTR
		EMI_MAP_FORMAT(
		__in PEVENT_MAP_INFO MapInfo
		)
		{
		if ((MapInfo->Flag & EVENTMAP_INFO_FLAG_MANIFEST_PATTERNMAP) &&
		(MapInfo->FormatStringOffset)) {
		return (PWSTR)((PBYTE)MapInfo + MapInfo->FormatStringOffset);
		} else {
		return NULL;
		}
		}

		FORCEINLINE
		PWSTR
		EMI_MAP_OUTPUT(
		__in PEVENT_MAP_INFO MapInfo,
		__in PEVENT_MAP_ENTRY Map
		)
		{
		return (Map->OutputOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)MapInfo + Map->OutputOffset);
		}

		FORCEINLINE
		PWSTR
		EMI_MAP_INPUT(
		__in PEVENT_MAP_INFO MapInfo,
		__in PEVENT_MAP_ENTRY Map
		)
		{
		if ((MapInfo->Flag & EVENTMAP_INFO_FLAG_MANIFEST_PATTERNMAP) &&
		(Map->InputOffset != 0)) {
		return (PWSTR)((PBYTE)MapInfo + Map->InputOffset);
		} else {
		return NULL;
		}
		}

		FORCEINLINE
		PWSTR
		TEI_MAP_NAME(
		__in PTRACE_EVENT_INFO EventInfo,
		__in PEVENT_PROPERTY_INFO Property
		)
		{
		return (Property->nonStructType.MapNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + Property->nonStructType.MapNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_PROPERTY_NAME(
		__in PTRACE_EVENT_INFO EventInfo,
		__in PEVENT_PROPERTY_INFO Property
		)
		{
		return (Property->NameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + Property->NameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_PROVIDER_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->ProviderNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->ProviderNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_LEVEL_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->LevelNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->LevelNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_CHANNEL_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->ChannelNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->ChannelNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_KEYWORDS_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->KeywordsNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->KeywordsNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_TASK_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->TaskNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->TaskNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_OPCODE_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->OpcodeNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->OpcodeNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_EVENT_MESSAGE(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->EventMessageOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->EventMessageOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_PROVIDER_MESSAGE(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->ProviderMessageOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->ProviderMessageOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_ACTIVITYID_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->ActivityIDNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->ActivityIDNameOffset);
		}

		FORCEINLINE
		PWSTR
		TEI_RELATEDACTIVITYID_NAME(
		__in PTRACE_EVENT_INFO EventInfo
		)
		{
		return (EventInfo->RelatedActivityIDNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)EventInfo + EventInfo->RelatedActivityIDNameOffset);
		}

		#if (WINVER >= _WIN32_WINNT_WIN7)
		FORCEINLINE
		PWSTR
		PFI_FILTER_MESSAGE(
		__in PPROVIDER_FILTER_INFO FilterInfo
		)
		{
		return (FilterInfo->MessageOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)FilterInfo + FilterInfo->MessageOffset);
		}
		#endif

		#if (WINVER >= _WIN32_WINNT_WIN7)
		FORCEINLINE
		PWSTR
		PFI_PROPERTY_NAME(
		__in PPROVIDER_FILTER_INFO FilterInfo,
		__in PEVENT_PROPERTY_INFO Property
		)
		{
		return (Property->NameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)FilterInfo + Property->NameOffset);
		}
		#endif

		FORCEINLINE
		PWSTR
		PFI_FIELD_NAME(
		__in PPROVIDER_FIELD_INFOARRAY FieldInfoArray,
		__in PPROVIDER_FIELD_INFO FieldInfo
		)
		{
		return (FieldInfo->NameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)FieldInfoArray + FieldInfo->NameOffset);
		}

		FORCEINLINE
		PWSTR
		PFI_FIELD_MESSAGE(
		__in PPROVIDER_FIELD_INFOARRAY FieldInfoArray,
		__in PPROVIDER_FIELD_INFO FieldInfo
		)
		{
		return (FieldInfo->DescriptionOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)FieldInfoArray + FieldInfo->DescriptionOffset);
		}

		FORCEINLINE
		PWSTR
		PEI_PROVIDER_NAME(
		__in PPROVIDER_ENUMERATION_INFO ProviderEnum,
		__in PTRACE_PROVIDER_INFO ProviderInfo
		)
		{
		return (ProviderInfo->ProviderNameOffset == 0) ?
		NULL :
		(PWSTR)((PBYTE)ProviderEnum + ProviderInfo->ProviderNameOffset);
		}

		#pragma warning(pop)

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // __TDH_H__		#endif // __TDH_H__

End of changes. 29 change blocks.
44 lines changed or deleted		363 lines changed or added

This html diff was produced by rfcdiff 1.41.