From 63477f9dd4a28ef5b3e1f7931447d75a9e7c4657 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Thu, 22 May 2008 17:12:42 +0000
Subject: [PATCH] - check if PEVENT_TRACE_HEADER is already defined - define
 WMIAPI macro - add TraceEvent, GetTraceLoogerHandler prototypes -
 PEVENT_TRACE_HEADER should not be defined in the NDK

svn path=/trunk/; revision=33643
---
 reactos/include/ndk/exfuncs.h   |  3 +++
 reactos/include/psdk/evntrace.h | 29 ++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h
index d987c741a86..1221ad90271 100644
--- a/reactos/include/ndk/exfuncs.h
+++ b/reactos/include/ndk/exfuncs.h
@@ -29,7 +29,10 @@ Author:
 //
 // Don't include WMI headers just for one define
 //
+#ifndef PEVENT_TRACE_HEADER_DEFINED
+#define PEVENT_TRACE_HEADER_DEFINED
 typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER;
+#endif
 
 #ifndef NTOS_MODE_USER
 //
diff --git a/reactos/include/psdk/evntrace.h b/reactos/include/psdk/evntrace.h
index 08ce3cf00f9..b78b3f0ab25 100644
--- a/reactos/include/psdk/evntrace.h
+++ b/reactos/include/psdk/evntrace.h
@@ -1,5 +1,15 @@
-#ifndef ENVTRACE_H
-#define ENVTRACE_H
+#ifndef _EVNTRACE_
+#define _EVNTRACE_
+
+#ifndef WMIAPI
+#ifndef MIDL_PASS
+#ifdef _WMI_SOURCE_
+#define WMIAPI __stdcall
+#else
+#define WMIAPI DECLSPEC_IMPORT __stdcall
+#endif
+#endif
+#endif
 
 typedef struct _EVENT_TRACE_HEADER
 {
@@ -37,7 +47,20 @@ typedef struct _EVENT_TRACE_HEADER
     };
     ULONG64  ProcessorTime;
   };
-} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER;
+} EVENT_TRACE_HEADER;
+
+#ifndef PEVENT_TRACE_HEADER_DEFINED
+#define PEVENT_TRACE_HEADER_DEFINED
+typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER;
+#endif
+
+
+typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE;
+
+
+ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER);
+TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID);
+
 
 #endif /* ENVTRACE_H */