From bbc71faf95a515f6e66ac12ed654d51a4d488782 Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 12 Aug 2016 09:25:18 -0400 Subject: sync block: remove validate/invalidate api, fix lock_tries logic, tidy up. --- include/ntapi/nt_sync.h | 24 ++++++++---------------- include/ntapi/ntapi.h | 5 ++--- 2 files changed, 10 insertions(+), 19 deletions(-) (limited to 'include/ntapi') diff --git a/include/ntapi/nt_sync.h b/include/ntapi/nt_sync.h index 99508dd..38d304b 100644 --- a/include/ntapi/nt_sync.h +++ b/include/ntapi/nt_sync.h @@ -393,14 +393,11 @@ typedef void __stdcall ntapi_tt_sync_block_init( __in void * hsignal __optional); -typedef int32_t __stdcall ntapi_tt_sync_block_lock( - __in nt_sync_block * sync_block, - __in int32_t lock_tries __optional, - __in int64_t lock_wait __optional, - __in uint32_t * sig_flag __optional); +typedef int32_t __stdcall ntapi_tt_sync_block_discard( + __in nt_sync_block * sync_block); -typedef int32_t __stdcall ntapi_tt_sync_block_server_lock( +typedef int32_t __stdcall ntapi_tt_sync_block_lock( __in nt_sync_block * sync_block, __in int32_t lock_tries __optional, __in int64_t lock_wait __optional, @@ -411,16 +408,11 @@ typedef int32_t __stdcall ntapi_tt_sync_block_unlock( __in nt_sync_block * sync_block); -typedef void __stdcall ntapi_tt_sync_block_validate( - __in nt_sync_block * sync_block); - - -typedef int32_t __stdcall ntapi_tt_sync_block_invalidate( - __in nt_sync_block * sync_block); - - -typedef int32_t __stdcall ntapi_tt_sync_block_discard( - __in nt_sync_block * sync_block); +typedef int32_t __stdcall ntapi_tt_sync_block_server_lock( + __in nt_sync_block * sync_block, + __in int32_t lock_tries __optional, + __in int64_t lock_wait __optional, + __in uint32_t * sig_flag __optional); typedef int32_t __stdcall ntapi_tt_wait_for_dummy_event(void); diff --git a/include/ntapi/ntapi.h b/include/ntapi/ntapi.h index f330283..0af598a 100644 --- a/include/ntapi/ntapi.h +++ b/include/ntapi/ntapi.h @@ -466,11 +466,10 @@ typedef struct _ntapi_vtbl { ntapi_tt_create_inheritable_event * tt_create_inheritable_event; ntapi_tt_create_private_event * tt_create_private_event; ntapi_tt_sync_block_init * tt_sync_block_init; + ntapi_tt_sync_block_discard * tt_sync_block_discard; ntapi_tt_sync_block_lock * tt_sync_block_lock; - ntapi_tt_sync_block_server_lock * tt_sync_block_server_lock; ntapi_tt_sync_block_unlock * tt_sync_block_unlock; - ntapi_tt_sync_block_invalidate * tt_sync_block_invalidate; - ntapi_tt_sync_block_discard * tt_sync_block_discard; + ntapi_tt_sync_block_server_lock * tt_sync_block_server_lock; ntapi_tt_wait_for_dummy_event * tt_wait_for_dummy_event; /* nt_port.h */ -- cgit v1.2.3