Skip to content

W
wine-winehq
Commit f535bcb2 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

advapi32: Move more event log stubs to ntdll.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 87897429
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 120 deletions
dlls/advapi32/advapi32.spec
View file @ f535bcb2
......@@ -287,9 +287,9 @@
# @ stub EventAccessControl
# @ stub EventAccessQuery
# @ stub EventAccessRemove
@ stdcall EventActivityIdControl(long ptr)
@ stdcall EventActivityIdControl(long ptr) ntdll.EtwEventActivityIdControl
@ stdcall EventEnabled(int64 ptr) ntdll.EtwEventEnabled
@ stdcall EventProviderEnabled(int64 long int64)
@ stdcall EventProviderEnabled(int64 long int64) ntdll.EtwEventProviderEnabled
@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister
@ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation
@ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
......@@ -298,7 +298,7 @@
# @ stub EventWriteEx
# @ stub EventWriteStartScenario
# @ stub EventWriteString
@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr)
@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer
@ stdcall FileEncryptionStatusA(str ptr)
@ stdcall FileEncryptionStatusW(wstr ptr)
@ stdcall FindFirstFreeAce(ptr ptr)
......@@ -372,9 +372,9 @@
# @ stub GetStringConditionFromBinary
# @ stub GetThreadWaitChain
@ stdcall GetTokenInformation(long long ptr long ptr)
@ stdcall GetTraceEnableFlags(int64)
@ stdcall GetTraceEnableLevel(int64)
@ stdcall -ret64 GetTraceLoggerHandle(ptr)
@ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags
@ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel
@ stdcall -ret64 GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle
@ stdcall GetTrusteeFormA(ptr)
@ stdcall GetTrusteeFormW(ptr)
@ stdcall GetTrusteeNameA(ptr)
......@@ -815,10 +815,10 @@
@ stdcall SystemFunction036(ptr long) # RtlGenRandom
@ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory
@ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory
@ stdcall TraceEvent(int64 ptr)
@ stdcall TraceEvent(int64 ptr) ntdll.EtwLogTraceEvent
@ stub TraceEventInstance
@ varargs TraceMessage(int64 long ptr long)
@ stdcall TraceMessageVa(int64 long ptr long ptr)
@ varargs TraceMessage(int64 long ptr long) ntdll.EtwTraceMessage
@ stdcall TraceMessageVa(int64 long ptr long ptr) ntdll.EtwTraceMessageVa
# @ stub TraceQueryInformation
@ stdcall TraceSetInformation(int64 long ptr long)
# @ stub TreeResetNamedSecurityInfoA
......
dlls/advapi32/eventlog.c
View file @ f535bcb2
......@@ -392,34 +392,6 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord )
}
/******************************************************************************
* GetTraceEnableFlags [ADVAPI32.@]
*/
ULONG WINAPI GetTraceEnableFlags( TRACEHANDLE handle )
{
FIXME("(%s) stub\n", wine_dbgstr_longlong(handle));
return 0;
}
/******************************************************************************
* GetTraceEnableLevel [ADVAPI32.@]
*/
UCHAR WINAPI GetTraceEnableLevel( TRACEHANDLE handle )
{
FIXME("(%s) stub\n", wine_dbgstr_longlong(handle));
return TRACE_LEVEL_VERBOSE;
}
/******************************************************************************
* GetTraceLoggerHandle [ADVAPI32.@]
*/
TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID buf )
{
FIXME("(%p) stub\n", buf);
SetLastError(ERROR_ACCESS_DENIED);
return INVALID_PROCESSTRACE_HANDLE;
}
/******************************************************************************
* NotifyChangeEventLog [ADVAPI32.@]
*
* Enables an application to receive notification when an event is written
......@@ -806,48 +778,6 @@ ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_
}
/******************************************************************************
* TraceEvent [ADVAPI32.@]
*/
ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace )
{
FIXME("%s %p\n", wine_dbgstr_longlong(SessionHandle), EventTrace);
return ERROR_CALL_NOT_IMPLEMENTED;
}
/******************************************************************************
* EventProviderEnabled [ADVAPI32.@]
*
*/
BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword )
{
FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword));
return FALSE;
}
/******************************************************************************
* EventActivityIdControl [ADVAPI32.@]
*
*/
ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid)
{
static int once;
if (!once++) FIXME("0x%x, %p: stub\n", code, guid);
return ERROR_SUCCESS;
}
/******************************************************************************
* EventWriteTransfer [ADVAPI32.@]
*/
ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity,
LPCGUID related, ULONG count, PEVENT_DATA_DESCRIPTOR data )
{
FIXME("%s, %p, %s, %s, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor,
debugstr_guid(activity), debugstr_guid(related), count, data);
return ERROR_SUCCESS;
}
/******************************************************************************
* QueryTraceW [ADVAPI32.@]
*/
ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties )
......@@ -890,30 +820,6 @@ ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETI
}
/******************************************************************************
* TraceMessage [ADVAPI32.@]
*/
ULONG WINAPIV TraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... )
{
__ms_va_list valist;
ULONG ret;
__ms_va_start( valist, number );
ret = TraceMessageVa( handle, flags, guid, number, valist );
__ms_va_end( valist );
return ret;
}
/******************************************************************************
* TraceMessageVa [ADVAPI32.@]
*/
ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number,
__ms_va_list args )
{
FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number);
return ERROR_SUCCESS;
}
/******************************************************************************
* CloseTrace [ADVAPI32.@]
*/
ULONG WINAPI CloseTrace( TRACEHANDLE handle )
......
dlls/kernelbase/kernelbase.spec
View file @ f535bcb2
......@@ -327,16 +327,16 @@
@ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid
@ stdcall EqualSid(ptr ptr) advapi32.EqualSid
@ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction
@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl
@ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled
@ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled
@ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister
@ stdcall EventSetInformation(int64 long ptr long) advapi32.EventSetInformation
@ stdcall EventUnregister(int64) advapi32.EventUnregister
@ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite
@ stdcall EventActivityIdControl(long ptr) ntdll.EtwEventActivityIdControl
@ stdcall EventEnabled(int64 ptr) ntdll.EtwEventEnabled
@ stdcall EventProviderEnabled(int64 long int64) ntdll.EtwEventProviderEnabled
@ 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) ntdll.EtwEventWrite
# @ stub EventWriteEx
# @ stub EventWriteString
@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer
@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer
@ stdcall ExitProcess(long) kernel32.ExitProcess
@ stdcall ExitThread(long) kernel32.ExitThread
@ stdcall ExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA
......@@ -734,9 +734,9 @@
@ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation
@ stdcall GetTimeZoneInformationForYear(long ptr ptr) kernel32.GetTimeZoneInformationForYear
@ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags
@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel
@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle
@ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags
@ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel
@ stdcall -ret64 GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle
@ stub GetUILanguageInfo
# @ stub GetUnicodeStringToEightBitSizeRoutine
# @ stub GetUnicodeStringToEightBitStringRoutine
......@@ -1321,7 +1321,7 @@
# @ stub RegisterGPNotificationInternal
# @ stub RegisterStateChangeNotification
# @ stub RegisterStateLock
@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW
@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW
@ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) kernel32.RegisterWaitForSingleObjectEx
@ stdcall ReleaseActCtx(ptr) kernel32.ReleaseActCtx
@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex
......@@ -1601,9 +1601,9 @@
@ stdcall TlsFree(long) kernel32.TlsFree
@ stdcall TlsGetValue(long) kernel32.TlsGetValue
@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue
@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent
@ varargs TraceMessage(int64 long ptr long) advapi32.TraceMessage
@ stdcall TraceMessageVa(int64 long ptr long ptr) advapi32.TraceMessageVa
@ stdcall TraceEvent(int64 ptr) ntdll.EtwLogTraceEvent
@ varargs TraceMessage(int64 long ptr long) ntdll.EtwTraceMessage
@ stdcall TraceMessageVa(int64 long ptr long ptr) ntdll.EtwTraceMessageVa
@ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) kernel32.TransactNamedPipe
@ stdcall TransmitCommChar(long long) kernel32.TransmitCommChar
@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive
......@@ -1621,7 +1621,7 @@
# @ stub UnregisterGPNotificationInternal
# @ stub UnregisterStateChangeNotification
# @ stub UnregisterStateLock
@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids
@ stdcall UnregisterTraceGuids(int64) ntdll.EtwUnregisterTraceGuids
@ stdcall UnregisterWaitEx(long long) kernel32.UnregisterWaitEx
# @ stub UnsubscribeEdpEnabledStateChange
# @ stub UnsubscribeStateChangeNotification
......
dlls/ntdll/misc.c
View file @ f535bcb2
......@@ -376,6 +376,26 @@ void WINAPI WinSqmSetDWORD(HANDLE session, DWORD datapoint_id, DWORD datapoint_v
}
/******************************************************************************
* EtwEventActivityIdControl (NTDLL.@)
*/
ULONG WINAPI EtwEventActivityIdControl(ULONG code, GUID *guid)
{
static int once;
if (!once++) FIXME("0x%x, %p: stub\n", code, guid);
return ERROR_SUCCESS;
}
/******************************************************************************
* EtwEventProviderEnabled (NTDLL.@)
*/
BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword )
{
FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword));
return FALSE;
}
/******************************************************************************
* EtwEventRegister (NTDLL.@)
*/
ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context,
......@@ -407,6 +427,17 @@ ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, v
}
/******************************************************************************
* EtwEventWriteTransfer (NTDLL.@)
*/
ULONG WINAPI EtwEventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity,
LPCGUID related, ULONG count, PEVENT_DATA_DESCRIPTOR data )
{
FIXME("%s, %p, %s, %s, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor,
debugstr_guid(activity), debugstr_guid(related), count, data);
return ERROR_SUCCESS;
}
/******************************************************************************
* EtwRegisterTraceGuidsW (NTDLL.@)
*
* Register an event trace provider and the event trace classes that it uses
......@@ -493,6 +524,66 @@ ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor
return ERROR_SUCCESS;
}
/******************************************************************************
* EtwGetTraceEnableFlags (NTDLL.@)
*/
ULONG WINAPI EtwGetTraceEnableFlags( TRACEHANDLE handle )
{
FIXME("(%s) stub\n", wine_dbgstr_longlong(handle));
return 0;
}
/******************************************************************************
* EtwGetTraceEnableLevel (NTDLL.@)
*/
UCHAR WINAPI EtwGetTraceEnableLevel( TRACEHANDLE handle )
{
FIXME("(%s) stub\n", wine_dbgstr_longlong(handle));
return TRACE_LEVEL_VERBOSE;
}
/******************************************************************************
* EtwGetTraceLoggerHandle (NTDLL.@)
*/
TRACEHANDLE WINAPI EtwGetTraceLoggerHandle( PVOID buf )
{
FIXME("(%p) stub\n", buf);
return INVALID_PROCESSTRACE_HANDLE;
}
/******************************************************************************
* EtwLogTraceEvent (NTDLL.@)
*/
ULONG WINAPI EtwLogTraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace )
{
FIXME("%s %p\n", wine_dbgstr_longlong(SessionHandle), EventTrace);
return ERROR_CALL_NOT_IMPLEMENTED;
}
/******************************************************************************
* EtwTraceMessageVa (NTDLL.@)
*/
ULONG WINAPI EtwTraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number,
__ms_va_list args )
{
FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number);
return ERROR_SUCCESS;
}
/******************************************************************************
* EtwTraceMessage (NTDLL.@)
*/
ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... )
{
__ms_va_list valist;
ULONG ret;
__ms_va_start( valist, number );
ret = EtwTraceMessageVa( handle, flags, guid, number, valist );
__ms_va_end( valist );
return ret;
}
/***********************************************************************
* DbgUiRemoteBreakin (NTDLL.@)
*/
......
dlls/ntdll/ntdll.spec
View file @ f535bcb2
......@@ -42,13 +42,22 @@
# @ stub DbgUiStopDebugging
@ stub DbgUiWaitStateChange
@ stdcall DbgUserBreakPoint()
@ stdcall EtwEventActivityIdControl(long ptr)
@ stdcall EtwEventEnabled(int64 ptr)
@ stdcall EtwEventProviderEnabled(int64 long int64)
@ stdcall EtwEventRegister(ptr ptr ptr ptr)
@ stdcall EtwEventSetInformation(int64 long ptr long)
@ stdcall EtwEventUnregister(int64)
@ stdcall EtwEventWrite(int64 ptr long ptr)
@ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr)
@ stdcall EtwGetTraceEnableFlags(int64)
@ stdcall EtwGetTraceEnableLevel(int64)
@ stdcall -ret64 EtwGetTraceLoggerHandle(ptr)
@ stdcall EtwLogTraceEvent(int64 ptr)
@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
@ varargs EtwTraceMessage(int64 long ptr long)
@ stdcall EtwTraceMessageVa(int64 long ptr long ptr)
@ stdcall EtwUnregisterTraceGuids(int64)
# @ stub KiFastSystemCall
# @ stub KiFastSystemCallRet
......
tools/make_specfiles
View file @ f535bcb2
......@@ -313,7 +313,6 @@ my @dll_groups =
"user32",
"shlwapi",
"version",
"kernelbase",
"api-ms-win-core-bem-l1-1-0",
],
[
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment