From b5314f50ed3ac7ce1b5de5492c9d428503246b9e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 27 Jan 2012 11:10:21 +0100
Subject: [PATCH] advapi32: Fix the TraceMessage prototypes.

---
 dlls/advapi32/eventlog.c | 26 +++++++++++++++++---------
 include/evntrace.h       |  2 ++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index cfad001808a..0b6634bfa1b 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -885,18 +885,26 @@ ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETI
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
-ULONG TraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid,
-                    USHORT MessageNumber, ...)
+/******************************************************************************
+ * TraceMessage [ADVAPI32.@]
+ */
+ULONG WINAPIV TraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... )
 {
-    FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags,
-                    debugstr_guid(MessageGuid), MessageNumber);
-    return ERROR_SUCCESS;
+    __ms_va_list valist;
+    ULONG ret;
+
+    __ms_va_start( valist, number );
+    ret = TraceMessageVa( handle, flags, guid, number, valist );
+    __ms_va_end( valist );
+    return ret;
 }
 
-ULONG TraceMessageVa( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid,
-                    USHORT MessageNumber, __ms_va_list args)
+/******************************************************************************
+ * TraceMessageVa [ADVAPI32.@]
+ */
+ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number,
+                            __ms_va_list args )
 {
-    FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags,
-                    debugstr_guid(MessageGuid), MessageNumber);
+    FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number);
     return ERROR_SUCCESS;
 }
diff --git a/include/evntrace.h b/include/evntrace.h
index 4cacc840cb4..e0c3f211db2 100644
--- a/include/evntrace.h
+++ b/include/evntrace.h
@@ -222,6 +222,8 @@ ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES);
 ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES);
 #define      StartTrace WINELIB_NAME_AW(StartTrace)
 ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER);
+ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...);
+ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list);
 ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE);
 
 #ifdef __cplusplus