[PATCH 0/2] MR9164: advapi, ntdll: Add a couple of event tracing stubs.

[PATCH 1/2] ntdll: Add a stub for EtwEventWriteEx().

[Paul Gofman]

From: Paul Gofman

---
 dlls/advapi32/advapi32.spec     |  2 +-
 dlls/kernelbase/kernelbase.spec |  2 +-
 dlls/ntdll/misc.c               | 12 ++++++++++++
 dlls/ntdll/ntdll.spec           |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index e4b6c5a981a..f2eb44a7bb9 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -295,7 +295,7 @@
 @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
 @ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite
 # @ stub EventWriteEndScenario
-# @ stub EventWriteEx
+@ stdcall EventWriteEx(int64 ptr int64 long ptr ptr long ptr) ntdll.EtwEventWriteEx
 # @ stub EventWriteStartScenario
 @ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString
 @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 3dc846e7326..d16e2e0e2d4 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -342,7 +342,7 @@
 @ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation
 @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
 @ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite
-# @ stub EventWriteEx
+@ stdcall EventWriteEx(int64 ptr int64 long ptr ptr long ptr) ntdll.EtwEventWriteEx
 @ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString
 @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer
 @ stdcall ExitProcess(long) ntdll.RtlExitUserProcess
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index ab01c77531c..81ac7b39023 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -442,6 +442,18 @@ ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor
     return ERROR_SUCCESS;
 }

+/******************************************************************************
+ *                  EtwEventWriteEx (NTDLL.@)
+ */
+ULONG WINAPI EtwEventWriteEx( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor, ULONG64 filter,
+                            ULONG flags, const GUID *activity_id, const GUID *related_activity_id,
+                            ULONG data_count, EVENT_DATA_DESCRIPTOR *data )
+{
+    FIXME( "(%s, %p, %#I64x, %lu, %p, %p, %lu, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, filter,
+           flags, activity_id, related_activity_id, data_count, data );
+    return ERROR_SUCCESS;
+}
+
 /******************************************************************************
  *                  EtwGetTraceEnableFlags (NTDLL.@)
  */
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 64f35d0b54d..ac4dff7ff40 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -53,6 +53,7 @@
 @ stdcall EtwEventSetInformation(int64 long ptr long)
 @ stdcall EtwEventUnregister(int64)
 @ stdcall EtwEventWrite(int64 ptr long ptr)
+@ stdcall EtwEventWriteEx(int64 ptr int64 long ptr ptr long ptr)
 @ stdcall EtwEventWriteString(int64 long int64 wstr)
 @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr)
 @ stdcall EtwGetTraceEnableFlags(int64)

[PATCH 2/2] advapi32: Add a stub for EnumerateTraceGuidsEx().

[Paul Gofman]

From: Paul Gofman

---
 dlls/advapi32/advapi32.spec |  2 +-
 dlls/advapi32/eventlog.c    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index f2eb44a7bb9..4a9db829f67 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -280,7 +280,7 @@
 @ stdcall -import EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr)
 @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr)
 @ stdcall EnumerateTraceGuids(ptr long ptr)
-# @ stub EnumerateTraceGuidsEx
+@ stdcall EnumerateTraceGuidsEx(long ptr long ptr long ptr)
 @ stdcall -import EqualDomainSid(ptr ptr ptr)
 @ stdcall -import EqualPrefixSid(ptr ptr)
 @ stdcall -import EqualSid(ptr ptr)
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 58db53f5536..46300bd9e6c 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -727,3 +727,15 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray,
     FIXME("%p %ld %p: stub\n", propertiesarray, arraycount, guidcount);
     return ERROR_INVALID_PARAMETER;
 }
+
+/******************************************************************************
+ * EnumerateTraceGuidsEx [ADVAPI32.@]
+ */
+ULONG WINAPI EnumerateTraceGuidsEx(TRACE_QUERY_INFO_CLASS class, void *in, ULONG in_size, void *out, ULONG out_size,
+                                   ULONG *ret_len)
+{
+    FIXME("%d %p %ld %p %ld %p: stub\n", class, in, in_size, out, out_size, ret_len);
+
+    *ret_len = 0;
+    return ERROR_INVALID_PARAMETER;
+}

[Paul Gofman (＠gofman)]

Rec Room now depends on those after game update.