[ros-diffs] [janderwald] 33643: - 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

Author: janderwald
Date: Thu May 22 12:12:42 2008
New Revision: 33643

URL: http://svn.reactos.org/svn/reactos?rev=33643&view=rev
Log:
- 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

Modified:
    trunk/reactos/include/ndk/exfuncs.h
    trunk/reactos/include/psdk/evntrace.h

Modified: trunk/reactos/include/ndk/exfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Thu May 22 12:12:42 2008
@@ -29,7 +29,10 @@
 //
 // 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
 //

Modified: trunk/reactos/include/psdk/evntrace.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re…
==============================================================================
--- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Thu May 22 12:12:42 2008
@@ -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 @@
     };
     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 */