From 77887b474e60d21157cc1c59784b2b4c6c42dedf Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Sun, 7 May 2017 17:51:20 +0300
Subject: [PATCH] ntdll: Move EventWrite() to ntdll.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/advapi32/advapi32.spec |  2 +-
 dlls/advapi32/eventlog.c    | 10 ----------
 dlls/ntdll/misc.c           | 10 ++++++++++
 dlls/ntdll/ntdll.spec       |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index 0f9e776ba12..ff56343f237 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -293,7 +293,7 @@
 @ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister
 @ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation
 @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
-@ stdcall EventWrite(int64 ptr long ptr)
+@ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite
 # @ stub EventWriteEndScenario
 # @ stub EventWriteEx
 # @ stub EventWriteStartScenario
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 059c34d8c62..1547aa47cf5 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -834,16 +834,6 @@ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid)
     return ERROR_SUCCESS;
 }
 
-/******************************************************************************
- * EventWrite [ADVAPI32.@]
- */
-ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count,
-                         PEVENT_DATA_DESCRIPTOR data )
-{
-    FIXME("%s, %p, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
-    return ERROR_SUCCESS;
-}
-
 /******************************************************************************
  * EventWriteTransfer [ADVAPI32.@]
  */
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index bf786d62461..8f0c51cea9d 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -466,3 +466,13 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri
     FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor);
     return FALSE;
 }
+
+/******************************************************************************
+ *                  EtwEventWrite (NTDLL.@)
+ */
+ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor, ULONG count,
+    EVENT_DATA_DESCRIPTOR *data )
+{
+    FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
+    return ERROR_SUCCESS;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 4decd3a240d..9adf1edd4a5 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -45,6 +45,7 @@
 @ stdcall EtwEventRegister(ptr ptr ptr ptr)
 @ stdcall EtwEventSetInformation(int64 long ptr long)
 @ stdcall EtwEventUnregister(int64)
+@ stdcall EtwEventWrite(int64 ptr long ptr)
 @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
 @ stdcall EtwUnregisterTraceGuids(int64)