Module: wine Branch: master Commit: d3660e5901914daab38c95f6b2a7a43dfe6d3eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3660e5901914daab38c95f6b...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Mar 11 18:06:32 2019 +0100
ntdll: Fix event op functions declarations.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/except.c | 3 +-- dlls/ntdll/sync.c | 11 ++++------- include/winternl.h | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index c4f7faf..b8ae077 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -364,12 +364,11 @@ static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) { /* ok, our event has been set... we're the winning thread */ BOOL ret = start_debugger( epointers, hRunOnce ); - DWORD tmp;
if (!ret) { /* so that the other threads won't be stuck */ - NtSetEvent( hRunOnce, &tmp ); + NtSetEvent( hRunOnce, NULL ); } return ret; } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 94819b2..ac8c7e5 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -402,7 +402,7 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT * NtSetEvent (NTDLL.@) * ZwSetEvent (NTDLL.@) */ -NTSTATUS WINAPI NtSetEvent( HANDLE handle, PULONG NumberOfThreadsReleased ) +NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret;
@@ -421,12 +421,12 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, PULONG NumberOfThreadsReleased ) /****************************************************************************** * NtResetEvent (NTDLL.@) */ -NTSTATUS WINAPI NtResetEvent( HANDLE handle, PULONG NumberOfThreadsReleased ) +NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret;
/* resetting an event can't release any thread... */ - if (NumberOfThreadsReleased) *NumberOfThreadsReleased = 0; + if (prev_state) *prev_state = 0;
SERVER_START_REQ( event_op ) { @@ -455,13 +455,10 @@ NTSTATUS WINAPI NtClearEvent ( HANDLE handle ) * FIXME * PulseCount */ -NTSTATUS WINAPI NtPulseEvent( HANDLE handle, PULONG PulseCount ) +NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret;
- if (PulseCount) - FIXME("(%p,%d)\n", handle, *PulseCount); - SERVER_START_REQ( event_op ) { req->handle = wine_server_obj_handle( handle ); diff --git a/include/winternl.h b/include/winternl.h index 46dac7e..147cb1d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2425,7 +2425,7 @@ NTSYSAPI NTSTATUS WINAPI NtPrivilegeCheck(HANDLE,PPRIVILEGE_SET,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtPrivilegeObjectAuditAlarm(PUNICODE_STRING,HANDLE,HANDLE,ULONG,PPRIVILEGE_SET,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtPrivilegedServiceAuditAlarm(PUNICODE_STRING,PUNICODE_STRING,HANDLE,PPRIVILEGE_SET,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtProtectVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtPulseEvent(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINAPI NtPulseEvent(HANDLE,LONG*); NTSYSAPI NTSTATUS WINAPI NtQueueApcThread(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI NtQueryAttributesFile(const OBJECT_ATTRIBUTES*,FILE_BASIC_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryDefaultLocale(BOOLEAN,LCID*); @@ -2485,7 +2485,7 @@ NTSYSAPI NTSTATUS WINAPI NtReplyWaitReceivePortEx(HANDLE,PVOID*,PPORT_MESSAGE,P NTSYSAPI NTSTATUS WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtRequestPort(HANDLE,PLPC_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtResetEvent(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINAPI NtResetEvent(HANDLE,LONG*); NTSYSAPI NTSTATUS WINAPI NtResetWriteWatch(HANDLE,PVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI NtRestoreKey(HANDLE,HANDLE,ULONG); NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); @@ -2496,7 +2496,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); NTSYSAPI NTSTATUS WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,LONG*); NTSYSAPI NTSTATUS WINAPI NtSetHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowThread(VOID);