ntdll: Move EventWrite() to ntdll.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Move EventWrite() to ntdll.
77887b47 · Nikolay Sivov · Alexandre Julliard · 9f552920 · 77887b47 · 77887b47
Commit 77887b47 authored May 07, 2017 by Nikolay Sivov Committed by Alexandre Julliard May 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 11 deletions

advapi32.spec dlls/advapi32/advapi32.spec +1 -1

eventlog.c dlls/advapi32/eventlog.c +0 -10

misc.c dlls/ntdll/misc.c +10 -0

ntdll.spec dlls/ntdll/ntdll.spec +1 -0

No files found.
--- 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

--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -835,16 +835,6 @@ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid)
 }

 /******************************************************************************
- * 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.@]
 */
 ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity,

--- 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;
+}
--- 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)