From 900366fd074a4ffab4cc9b6cbc27960bec7ba251 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 27 Oct 2016 16:17:31 +0300
Subject: [PATCH] ntdll: Move EventRegister/Unregister from advapi32 to ntdll.

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/advapi32/advapi32.spec |  4 ++--
 dlls/advapi32/eventlog.c    | 20 --------------------
 dlls/ntdll/misc.c           | 22 ++++++++++++++++++++++
 dlls/ntdll/ntdll.spec       |  2 ++
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index b1a051ca66a..4868841efa4 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -272,9 +272,9 @@
 @ stdcall EventActivityIdControl(long ptr)
 @ stdcall EventEnabled(int64 ptr)
 @ stdcall EventProviderEnabled(int64 long int64)
-@ stdcall EventRegister(ptr ptr ptr ptr)
+@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister
 @ stdcall EventSetInformation(int64 long ptr long)
-@ stdcall EventUnregister(int64)
+@ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
 @ stdcall EventWrite(int64 ptr long ptr)
 # @ stub EventWriteEndScenario
 # @ stub EventWriteEx
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index e97ddc7fc3c..9bd75e8e53b 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -829,26 +829,6 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
 }
 
 /******************************************************************************
- * EventRegister [ADVAPI32.@]
- */
-ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle )
-{
-    FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle);
-
-    *handle = 0xdeadbeef;
-    return ERROR_SUCCESS;
-}
-
-/******************************************************************************
- * EventUnregister [ADVAPI32.@]
- */
-ULONG WINAPI EventUnregister( REGHANDLE handle )
-{
-    FIXME("%s: stub\n", wine_dbgstr_longlong(handle));
-    return ERROR_SUCCESS;
-}
-
-/******************************************************************************
  * EventEnabled [ADVAPI32.@]
  *
  */
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index f540c4ba2d8..687fff56cfb 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -34,6 +34,7 @@
 #include "ntdll_misc.h"
 #include "wmistr.h"
 #include "evntrace.h"
+#include "evntprov.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
@@ -359,6 +360,27 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno
 }
 
 /******************************************************************************
+ *                  EtwEventRegister (NTDLL.@)
+ */
+ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context,
+                PREGHANDLE handle )
+{
+    FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle);
+
+    *handle = 0xdeadbeef;
+    return ERROR_SUCCESS;
+}
+
+/******************************************************************************
+ *                  EtwEventUnregister (NTDLL.@)
+ */
+ULONG WINAPI EtwEventUnregister( REGHANDLE handle )
+{
+    FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle));
+    return ERROR_SUCCESS;
+}
+
+/******************************************************************************
  *                  EtwRegisterTraceGuidsW (NTDLL.@)
  *
  * Register an event trace provider and the event trace classes that it uses
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index d138ac1349e..4fd944ed113 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -41,6 +41,8 @@
 # @ stub DbgUiStopDebugging
 @ stub DbgUiWaitStateChange
 @ stdcall DbgUserBreakPoint()
+@ stdcall EtwEventRegister(ptr ptr ptr ptr)
+@ stdcall EtwEventUnregister(int64)
 @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
 # @ stub KiFastSystemCall
-- 
2.11.4.GIT