Hans Leidekker : advapi32: Add a stub implementation of EnableTraceEx2.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bacc68822aec1a025bc0e8c7aab7b75061e1c8e6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bacc68822aec1a025bc0e8c7aab7b75061e1c8e6

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Tue Oct  4 13:28:32 2016 +0200

advapi32: Add a stub implementation of EnableTraceEx2.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/advapi32/advapi32.spec                                |  2 +-
 dlls/advapi32/eventlog.c                                   | 14 ++++++++++++++
 .../api-ms-win-eventing-controller-l1-1-0.spec             |  2 +-
 include/evntrace.h                                         | 13 +++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index c2a8d01..b1a051c 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -248,7 +248,7 @@
 @ stub ElfReportEventW
 @ stdcall EnableTrace(long long long ptr int64)
 @ stdcall EnableTraceEx(ptr ptr int64 long long int64 int64 long ptr)
-# @ stub EnableTraceEx2
+@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr)
 @ stdcall EncryptFileA(str)
 @ stdcall EncryptFileW(wstr)
 # @ stub EncryptedFileKeyInfo
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index f947511..893f6e5 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -239,6 +239,20 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi
 }
 
 /******************************************************************************
+ * EnableTraceEx2 [ADVAPI32.@]
+ */
+ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, LPCGUID provider, ULONG control, UCHAR level,
+                             ULONGLONG match_any, ULONGLONG match_all, ULONG timeout,
+                             PENABLE_TRACE_PARAMETERS params )
+{
+    FIXME("(%s, %s, %u, %c, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle),
+          debugstr_guid(provider), control, level, wine_dbgstr_longlong(match_any),
+          wine_dbgstr_longlong(match_all), timeout, params);
+
+    return ERROR_SUCCESS;
+}
+
+/******************************************************************************
  * EnableTrace [ADVAPI32.@]
  */
 ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession )
diff --git a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec
index a418637..0b58510 100644
--- a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec
+++ b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec
@@ -1,5 +1,5 @@
 @ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW
-@ stub EnableTraceEx2
+@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) advapi32.EnableTraceEx2
 @ stub EnumerateTraceGuidsEx
 @ stub EventAccessControl
 @ stub EventAccessQuery
diff --git a/include/evntrace.h b/include/evntrace.h
index 191f232..6ebcfba 100644
--- a/include/evntrace.h
+++ b/include/evntrace.h
@@ -248,6 +248,18 @@ typedef struct _EVENT_TRACE_PROPERTIES
     ULONG LoggerNameOffset;
 } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;
 
+typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR;
+
+typedef struct _ENABLE_TRACE_PARAMETERS
+{
+    ULONG                    Version;
+    ULONG                    EnableProperty;
+    ULONG                    ControlFlags;
+    GUID                     SourceId;
+    PEVENT_FILTER_DESCRIPTOR EnableFilterDesc;
+    ULONG                    FilterDescCount;
+} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS;
+
 #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
 
 ULONG WINAPI CloseTrace(TRACEHANDLE);
@@ -255,6 +267,7 @@ ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG);
 ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG);
 #define      ControlTrace WINELIB_NAME_AW(ControlTrace)
 ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE);
+ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS);
 ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES);
 ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES);
 #define      FlushTrace WINELIB_NAME_AW(FlushTrace)