Module: wine Branch: master Commit: 9db1bbf2516b372cdbe2a1b71d9559e950465411 URL: https://gitlab.winehq.org/wine/wine/-/commit/9db1bbf2516b372cdbe2a1b71d9559e...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Nov 3 17:09:51 2023 +0100
include: Use proper dllimports for eventlog functions.
---
dlls/advapi32/eventlog.c | 1 + dlls/sechost/trace.c | 1 + include/evntprov.h | 20 ++++++++++++-------- include/evntrace.h | 46 +++++++++++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e2e7bb238eb..58db53f5536 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -27,6 +27,7 @@ #include "winerror.h" #include "winternl.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h" #include "evntprov.h"
diff --git a/dlls/sechost/trace.c b/dlls/sechost/trace.c index 7cefcbbb55f..e9914b69d0b 100644 --- a/dlls/sechost/trace.c +++ b/dlls/sechost/trace.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h"
#include "wine/debug.h" diff --git a/include/evntprov.h b/include/evntprov.h index a89c65fd4b0..5448524f492 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -23,6 +23,10 @@ extern "C" { #endif
+#ifndef EVNTAPI +#define EVNTAPI DECLSPEC_IMPORT WINAPI +#endif + #define EVENT_LEVEL_MIN 0x00 #define EVENT_LEVEL_MAX 0xff
@@ -67,14 +71,14 @@ typedef enum _EVENT_INFO_CLASS MaxEventInfo } EVENT_INFO_CLASS;
-BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); -BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); -ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); -ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); -ULONG WINAPI EventUnregister(REGHANDLE); -ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); -ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); -ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); +BOOLEAN EVNTAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); +BOOLEAN EVNTAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); +ULONG EVNTAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG EVNTAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); +ULONG EVNTAPI EventUnregister(REGHANDLE); +ULONG EVNTAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG EVNTAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); +ULONG EVNTAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR);
#ifdef __cplusplus } diff --git a/include/evntrace.h b/include/evntrace.h index 89a6e2ebe34..4620d60b031 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -25,6 +25,14 @@ extern "C" { #endif
+#ifndef WMIAPI +#ifdef _WMI_SOURCE_ +#define WMIAPI WINAPI +#else +#define WMIAPI DECLSPEC_IMPORT WINAPI +#endif +#endif + #define EVENT_TRACE_CONTROL_QUERY 0 #define EVENT_TRACE_CONTROL_STOP 1 #define EVENT_TRACE_CONTROL_UPDATE 2 @@ -286,33 +294,33 @@ typedef enum _TRACE_QUERY_INFO_CLASS
#define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
-ULONG WINAPI CloseTrace(TRACEHANDLE); -ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); -ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI CloseTrace(TRACEHANDLE); +ULONG WMIAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) -ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); -ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); -ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WMIAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); +ULONG WMIAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) -ULONG WINAPI GetTraceEnableFlags(TRACEHANDLE); -UCHAR WINAPI GetTraceEnableLevel(TRACEHANDLE); -TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); -ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); -ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WMIAPI GetTraceEnableLevel(TRACEHANDLE); +TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); +ULONG WMIAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); #define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces) -ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); -ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids) -ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define StartTrace WINELIB_NAME_AW(StartTrace) -ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...); #ifdef __ms_va_list -ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); +ULONG WMIAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); #endif -ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); +ULONG WMIAPI UnregisterTraceGuids(TRACEHANDLE);
#ifdef __cplusplus }