ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Add missing spec file entry for EtwEventWriteString. 

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2019-10-31 08:58:13 -05:00 committed by Alexandre Julliard
parent 364d654ba3
commit 9e817f8f8b
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/advapi32/tests/eventlog.c
View File

@ -37,6 +37,7 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*);
static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *);
static ULONG (WINAPI *pEventUnregister)(REGHANDLE); static ULONG (WINAPI *pEventUnregister)(REGHANDLE);
static ULONG (WINAPI *pEventWriteString)(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *);
static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD);
static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *);
@ -49,6 +50,7 @@ static void init_function_pointers(void)
pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid");
pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation");
pEventWriteString = (void*)GetProcAddress(hadvapi32, "EventWriteString");
pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister");
pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister");
@ -1153,6 +1155,7 @@ static void cleanup_eventlog(void)
static void test_trace_event_params(void) static void test_trace_event_params(void)
{ {
static const WCHAR emptyW[] = {0};
static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}};
REGHANDLE reg_handle; REGHANDLE reg_handle;
@ -1173,6 +1176,12 @@ static void test_trace_event_params(void)
uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle);
ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret);
uret = pEventWriteString(0, 0, 0, emptyW);
todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventWriteString gave wrong error: %#x\n", uret);
uret = pEventWriteString(reg_handle, 0, 0, NULL);
todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventWriteString gave wrong error: %#x\n", uret);
uret = pEventUnregister(0); uret = pEventUnregister(0);
todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret);

1
dlls/ntdll/ntdll.spec
View File

@ -52,6 +52,7 @@
@ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventSetInformation(int64 long ptr long)
@ stdcall EtwEventUnregister(int64) @ stdcall EtwEventUnregister(int64)
@ stdcall EtwEventWrite(int64 ptr long ptr) @ stdcall EtwEventWrite(int64 ptr long ptr)
@ stdcall EtwEventWriteString(int64 long int64 ptr)
@ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr)
@ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableFlags(int64)
@ stdcall EtwGetTraceEnableLevel(int64) @ stdcall EtwGetTraceEnableLevel(int64)

1
include/evntprov.h
View File

@ -73,6 +73,7 @@ ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE);
ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG);
ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventUnregister(REGHANDLE);
ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); 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); ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR);
#ifdef __cplusplus #ifdef __cplusplus