advapi32: Move performance stubs to kernelbase.

dlls/advapi32/Makefile.in

@@ -14,7 +14,6 @@ C_SRCS = \
 	crypt_lmhash.c \
 	eventlog.c \
 	lsa.c \
-	perf.c \
 	registry.c \
 	security.c \
 	service.c \

dlls/advapi32/advapi32.spec

@@ -555,11 +555,11 @@
 # @ stub OperationStart
 # @ stub PerfAddCounters
 # @ stub PerfCloseQueryHandle
-@ stdcall PerfCreateInstance(long ptr wstr long)
+@ stdcall -import PerfCreateInstance(long ptr wstr long)
 # @ stub PerfDecrementULongCounterValue
 # @ stub PerfDecrementULongLongCounterValue
 # @ stub PerfDeleteCounters
-@ stdcall PerfDeleteInstance(long ptr)
+@ stdcall -import PerfDeleteInstance(long ptr)
 # @ stub PerfEnumerateCounterSet
 # @ stub PerfEnumerateCounterSetInstances
 # @ stub PerfIncrementULongCounterValue
@@ -575,13 +575,13 @@
 # @ stub PerfRegQueryInfoKey
 # @ stub PerfRegQueryValue
 # @ stub PerfRegSetValue
-@ stdcall PerfSetCounterRefValue(long ptr long ptr)
-@ stdcall PerfSetCounterSetInfo(long ptr long)
+@ stdcall -import PerfSetCounterRefValue(long ptr long ptr)
+@ stdcall -import PerfSetCounterSetInfo(long ptr long)
 # @ stub PerfSetULongCounterValue
 # @ stub PerfSetULongLongCounterValue
-@ stdcall PerfStartProvider(ptr ptr ptr)
-@ stdcall PerfStartProviderEx(ptr ptr ptr)
-@ stdcall PerfStopProvider(long)
+@ stdcall -import PerfStartProvider(ptr ptr ptr)
+@ stdcall -import PerfStartProviderEx(ptr ptr ptr)
+@ stdcall -import PerfStopProvider(long)
 @ stdcall -import PrivilegeCheck(ptr ptr ptr)
 @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long)
 @ stdcall -import PrivilegedServiceAuditAlarmW(wstr wstr long ptr long)

dlls/advapi32/perf.c

-/*
- * advapi32 perf functions
- *
- * Copyright 2017 Austin English
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "perflib.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(advapi);
-
-PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id)
-{
-    FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id);
-    return NULL;
-}
-
-ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block)
-{
-    FIXME("%p %p: stub\n", provider, block);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
-ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size)
-{
-    FIXME("%p %p %u: stub\n", handle, template, size);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
-ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address)
-{
-    FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
-ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider)
-{
-    FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
-ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider)
-{
-    FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
-ULONG WINAPI PerfStopProvider(HANDLE handle)
-{
-    FIXME("%p: stub\n", handle);
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}

dlls/kernelbase/kernelbase.spec

@@ -1145,20 +1145,20 @@
 @ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA
 @ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW
 @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) kernel32.PeekNamedPipe
-@ stdcall PerfCreateInstance(long ptr wstr long) advapi32.PerfCreateInstance
+@ stdcall PerfCreateInstance(long ptr wstr long)
 # @ stub PerfDecrementULongCounterValue
 # @ stub PerfDecrementULongLongCounterValue
-@ stdcall PerfDeleteInstance(long ptr) advapi32.PerfDeleteInstance
+@ stdcall PerfDeleteInstance(long ptr)
 # @ stub PerfIncrementULongCounterValue
 # @ stub PerfIncrementULongLongCounterValue
 # @ stub PerfQueryInstance
-@ stdcall PerfSetCounterRefValue(long ptr long ptr) advapi32.PerfSetCounterRefValue
-@ stdcall PerfSetCounterSetInfo(long ptr long) advapi32.PerfSetCounterSetInfo
+@ stdcall PerfSetCounterRefValue(long ptr long ptr)
+@ stdcall PerfSetCounterSetInfo(long ptr long)
 # @ stub PerfSetULongCounterValue
 # @ stub PerfSetULongLongCounterValue
-@ stdcall PerfStartProvider(ptr ptr ptr) advapi32.PerfStartProvider
-@ stdcall PerfStartProviderEx(ptr ptr ptr) advapi32.PerfStartProviderEx
-@ stdcall PerfStopProvider(long) advapi32.PerfStopProvider
+@ stdcall PerfStartProvider(ptr ptr ptr)
+@ stdcall PerfStartProviderEx(ptr ptr ptr)
+@ stdcall PerfStopProvider(long)
 # @ stub PoolPerAppKeyStateInternal
 @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus
 # @ stub PrefetchVirtualMemory

dlls/kernelbase/main.c

@@ -24,6 +24,7 @@
 #include "windows.h"
 #include "appmodel.h"
 #include "shlwapi.h"
+#include "perflib.h"
 
 #include "wine/debug.h"
 #include "wine/heap.h"
@@ -94,6 +95,71 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po
 }
 
 /***********************************************************************
+ *           PerfCreateInstance   (KERNELBASE.@)
+ */
+PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid,
+                                                    const WCHAR *name, ULONG id)
+{
+    FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id);
+    return NULL;
+}
+
+/***********************************************************************
+ *           PerfDeleteInstance   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block)
+{
+    FIXME("%p %p: stub\n", provider, block);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *           PerfSetCounterSetInfo   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size)
+{
+    FIXME("%p %p %u: stub\n", handle, template, size);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *           PerfSetCounterRefValue   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance,
+                                    ULONG counterid, void *address)
+{
+    FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *           PerfStartProvider   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider)
+{
+    FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *           PerfStartProviderEx   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider)
+{
+    FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *           PerfStopProvider   (KERNELBASE.@)
+ */
+ULONG WINAPI PerfStopProvider(HANDLE handle)
+{
+    FIXME("%p: stub\n", handle);
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
  *           QuirkIsEnabled   (KERNELBASE.@)
  */
 BOOL WINAPI QuirkIsEnabled(void *arg)