From 03d22addd12dfc752448cbae6ee738ad1576bbef Mon Sep 17 00:00:00 2001
From: Andrey Gusev <andrey.goosev@gmail.com>
Date: Wed, 25 Jan 2017 17:18:43 +0200
Subject: [PATCH] ntdll: Move UnregisterTraceGuids 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 |  2 +-
 dlls/advapi32/eventlog.c    | 14 --------------
 dlls/ntdll/misc.c           | 12 ++++++++++++
 dlls/ntdll/ntdll.spec       |  1 +
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index 8e2911c06a..3bd6382cd7 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -783,7 +783,7 @@
 # @ stub UninstallApplication
 @ stdcall UnlockServiceDatabase (ptr)
 # @ stub UnregisterIdleTask
-@ stdcall UnregisterTraceGuids(int64)
+@ stdcall UnregisterTraceGuids(int64) ntdll.EtwUnregisterTraceGuids
 @ stub UpdateTraceA
 @ stub UpdateTraceW
 # @ stub UsePinForEncryptedFilesA
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index c1dbb99276..93d814c281 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -814,20 +814,6 @@ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTra
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
-/******************************************************************************
- * UnregisterTraceGuids [ADVAPI32.@]
- *
- * See RegisterTraceGuids
- *
- * FIXME
- *  Stub.
- */
-ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
-{
-    FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle));
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
 /******************************************************************************
  * EventEnabled [ADVAPI32.@]
  *
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index ceb82f60a2..40a878539a 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -445,3 +445,15 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
           debugstr_a(MofResourceName), RegistrationHandle);
     return ERROR_SUCCESS;
 }
+
+/******************************************************************************
+ *                  EtwUnregisterTraceGuids (NTDLL.@)
+ */
+ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
+{
+    if (!RegistrationHandle)
+         return ERROR_INVALID_PARAMETER;
+
+    FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle));
+    return ERROR_SUCCESS;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index fc6074cfb0..28dc60c40a 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -46,6 +46,7 @@
 @ stdcall EtwEventUnregister(int64)
 @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
+@ stdcall EtwUnregisterTraceGuids(int64)
 # @ stub KiFastSystemCall
 # @ stub KiFastSystemCallRet
 # @ stub KiIntSystemCall