From 94020c183c5fcf141e1d6827da8917f81c9f7a53 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 16 Sep 2024 04:53:18 +0200 Subject: [PATCH] [return checks] fix use of ResetEvent --- channels/printer/client/printer_main.c | 2 +- channels/rdp2tcp/client/rdp2tcp_main.c | 2 +- channels/rdpei/client/rdpei_main.c | 2 +- channels/tsmf/client/tsmf_media.c | 2 +- .../Studio/freeRDPCore/src/main/cpp/android_cliprdr.c | 2 +- client/Mac/Clipboard.m | 2 +- client/SDL/SDL2/sdl_utils.cpp | 2 +- client/SDL/SDL3/sdl_clip.cpp | 2 +- client/SDL/SDL3/sdl_utils.cpp | 2 +- client/iOS/FreeRDP/ios_cliprdr.m | 2 +- libfreerdp/core/freerdp.c | 2 +- libfreerdp/core/gateway/rpc_client.c | 2 +- libfreerdp/core/listener.c | 2 +- libfreerdp/core/tcp.c | 4 ++-- libfreerdp/core/transport.c | 2 +- server/Windows/wf_peer.c | 6 +++--- server/shadow/Win/win_rdp.c | 2 +- server/shadow/Win/win_shadow.c | 2 +- server/shadow/shadow_mcevent.c | 6 +++--- winpr/libwinpr/pool/pool.c | 2 +- winpr/libwinpr/synch/barrier.c | 2 +- winpr/libwinpr/utils/collections/CountdownEvent.c | 2 +- winpr/libwinpr/utils/collections/MessageQueue.c | 6 +++--- winpr/libwinpr/utils/collections/Queue.c | 4 ++-- winpr/libwinpr/wtsapi/wtsapi_win32.c | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index ec32a3176..40cfeda70 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -651,7 +651,7 @@ static DWORD WINAPI printer_thread_func(LPVOID arg) else if (rc != WAIT_OBJECT_0) continue; - ResetEvent(printer_dev->event); + (void)ResetEvent(printer_dev->event); irp = (IRP*)InterlockedPopEntrySList(printer_dev->pIrpList); if (irp == NULL) diff --git a/channels/rdp2tcp/client/rdp2tcp_main.c b/channels/rdp2tcp/client/rdp2tcp_main.c index 2a7e724ed..5b3340b0b 100644 --- a/channels/rdp2tcp/client/rdp2tcp_main.c +++ b/channels/rdp2tcp/client/rdp2tcp_main.c @@ -175,7 +175,7 @@ static DWORD WINAPI copyThread(void* data) handles[1] = freerdp_abort_event(plugin->channelEntryPoints.context); status = WaitForMultipleObjects(2, handles, FALSE, INFINITE); if (status == WAIT_OBJECT_0) - ResetEvent(plugin->writeComplete); + (void)ResetEvent(plugin->writeComplete); } fail: diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index c374ce64d..8a3e06109 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -464,7 +464,7 @@ static DWORD WINAPI rdpei_periodic_update(LPVOID arg) } if (status == WAIT_OBJECT_0) - ResetEvent(rdpei->event); + (void)ResetEvent(rdpei->event); LeaveCriticalSection(&rdpei->lock); } diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 63d409fe5..81717bc66 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -1316,7 +1316,7 @@ TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stre static void tsmf_stream_resync(void* arg) { TSMF_STREAM* stream = arg; - ResetEvent(stream->ready); + (void)ResetEvent(stream->ready); } BOOL tsmf_stream_set_format(TSMF_STREAM* stream, const char* name, wStream* s) diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c index 0f777df67..b6601e95e 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c @@ -108,7 +108,7 @@ static UINT android_cliprdr_send_client_format_data_request(CliprdrClientContext formatDataRequest.common.msgFlags = 0; formatDataRequest.requestedFormatId = formatId; afc->requestedFormatId = formatId; - ResetEvent(afc->clipboardRequestEvent); + (void)ResetEvent(afc->clipboardRequestEvent); rc = cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest); fail: return rc; diff --git a/client/Mac/Clipboard.m b/client/Mac/Clipboard.m index dee7da518..02d7b39be 100644 --- a/client/Mac/Clipboard.m +++ b/client/Mac/Clipboard.m @@ -99,7 +99,7 @@ static int mac_cliprdr_send_client_format_data_request(CliprdrClientContext *cli formatDataRequest.requestedFormatId = formatId; mfc->requestedFormatId = formatId; - ResetEvent(mfc->clipboardRequestEvent); + (void)ResetEvent(mfc->clipboardRequestEvent); cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest); diff --git a/client/SDL/SDL2/sdl_utils.cpp b/client/SDL/SDL2/sdl_utils.cpp index be8c363da..a10bd1ed3 100644 --- a/client/SDL/SDL2/sdl_utils.cpp +++ b/client/SDL/SDL2/sdl_utils.cpp @@ -270,7 +270,7 @@ void WinPREvent::set() void WinPREvent::clear() { - ResetEvent(_handle); + (void)ResetEvent(_handle); } bool WinPREvent::isSet() const diff --git a/client/SDL/SDL3/sdl_clip.cpp b/client/SDL/SDL3/sdl_clip.cpp index a0f739a9e..7e19d15b2 100644 --- a/client/SDL/SDL3/sdl_clip.cpp +++ b/client/SDL/SDL3/sdl_clip.cpp @@ -681,7 +681,7 @@ const void* sdlClip::ClipDataCb(void* userdata, const char* mime_type, size_t* s std::lock_guard lock(clip->_lock); auto request = clip->_request_queue.front(); clip->_request_queue.pop(); - ResetEvent(clip->_event); + (void)ResetEvent(clip->_event); auto formatID = ClipboardRegisterFormat(clip->_system, mime_type); auto data = ClipboardGetData(clip->_system, formatID, &len); diff --git a/client/SDL/SDL3/sdl_utils.cpp b/client/SDL/SDL3/sdl_utils.cpp index f456b6258..6e59a2b73 100644 --- a/client/SDL/SDL3/sdl_utils.cpp +++ b/client/SDL/SDL3/sdl_utils.cpp @@ -316,7 +316,7 @@ void WinPREvent::set() void WinPREvent::clear() { - ResetEvent(_handle); + (void)ResetEvent(_handle); } bool WinPREvent::isSet() const diff --git a/client/iOS/FreeRDP/ios_cliprdr.m b/client/iOS/FreeRDP/ios_cliprdr.m index f79f4525c..92780129a 100644 --- a/client/iOS/FreeRDP/ios_cliprdr.m +++ b/client/iOS/FreeRDP/ios_cliprdr.m @@ -106,7 +106,7 @@ static UINT ios_cliprdr_send_client_format_data_request(CliprdrClientContext *cl formatDataRequest.common.msgFlags = 0; formatDataRequest.requestedFormatId = formatId; afc->requestedFormatId = formatId; - ResetEvent(afc->clipboardRequestEvent); + (void)ResetEvent(afc->clipboardRequestEvent); rc = cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest); fail: return rc; diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 18c58323e..140de6591 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -1292,7 +1292,7 @@ void clearChannelError(rdpContext* context) WINPR_ASSERT(context); context->channelErrorNum = 0; memset(context->errorDescription, 0, 500); - ResetEvent(context->channelErrorEvent); + (void)ResetEvent(context->channelErrorEvent); } WINPR_ATTR_FORMAT_ARG(3, 4) diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index 74ce882ec..3083d4aa2 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -165,7 +165,7 @@ int rpc_client_receive_pipe_read(RpcClient* client, BYTE* buffer, size_t length) ringbuffer_commit_read_bytes(&(client->ReceivePipe), status); if (ringbuffer_used(&(client->ReceivePipe)) < 1) - ResetEvent(client->PipeEvent); + (void)ResetEvent(client->PipeEvent); LeaveCriticalSection(&(client->PipeLock)); diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index a7592da13..4726b19b6 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -476,7 +476,7 @@ static BOOL freerdp_listener_check_fds(freerdp_listener* instance) { struct sockaddr_storage peer_addr = { 0 }; - WSAResetEvent(listener->events[i]); + (void)WSAResetEvent(listener->events[i]); int peer_addr_size = sizeof(peer_addr); int peer_sockfd = _accept(listener->sockfds[i], (struct sockaddr*)&peer_addr, &peer_addr_size); diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index beaf6c584..62240361d 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -149,7 +149,7 @@ static int transport_bio_simple_read(BIO* bio, char* buf, int size) return 0; BIO_clear_flags(bio, BIO_FLAGS_READ); - WSAResetEvent(ptr->hEvent); + (void)WSAResetEvent(ptr->hEvent); status = _recv(ptr->socket, buf, size, 0); if (status > 0) @@ -1356,7 +1356,7 @@ static int freerdp_tcp_layer_read(void* userContext, void* data, int bytes) int error = 0; int status = 0; - WSAResetEvent(tcpLayer->hEvent); + (void)WSAResetEvent(tcpLayer->hEvent); status = _recv(tcpLayer->sockfd, data, bytes, 0); if (status > 0) diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index e60b4ae6a..814f3d656 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -1427,7 +1427,7 @@ int transport_check_fds(rdpTransport* transport) if (transport->haveMoreBytesToRead) { transport->haveMoreBytesToRead = FALSE; - ResetEvent(transport->rereadEvent); + (void)ResetEvent(transport->rereadEvent); } return status; } diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index d213d23a1..bea273b8e 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -357,7 +357,7 @@ DWORD WINAPI wf_peer_main_loop(LPVOID lpParam) if (client->activated) wf_update_peer_send(wfi, context); - ResetEvent(context->updateEvent); + (void)ResetEvent(context->updateEvent); ReleaseSemaphore(wfi->updateSemaphore, 1, NULL); } @@ -369,7 +369,7 @@ DWORD WINAPI wf_peer_main_loop(LPVOID lpParam) context->socketClose = TRUE; } - ResetEvent(context->socketEvent); + (void)ResetEvent(context->socketEvent); ReleaseSemaphore(context->socketSemaphore, 1, NULL); if (context->socketClose) @@ -392,7 +392,7 @@ DWORD WINAPI wf_peer_main_loop(LPVOID lpParam) if (WaitForSingleObject(context->updateEvent, 0) == 0) { - ResetEvent(context->updateEvent); + (void)ResetEvent(context->updateEvent); ReleaseSemaphore(wfi->updateSemaphore, 1, NULL); } diff --git a/server/shadow/Win/win_rdp.c b/server/shadow/Win/win_rdp.c index a28b9bf5b..fc112ed43 100644 --- a/server/shadow/Win/win_rdp.c +++ b/server/shadow/Win/win_rdp.c @@ -81,7 +81,7 @@ static BOOL shw_end_paint(rdpContext* context) (void)SetEvent(subsystem->RdpUpdateEnterEvent); WaitForSingleObject(subsystem->RdpUpdateLeaveEvent, INFINITE); - ResetEvent(subsystem->RdpUpdateLeaveEvent); + (void)ResetEvent(subsystem->RdpUpdateLeaveEvent); return TRUE; } diff --git a/server/shadow/Win/win_shadow.c b/server/shadow/Win/win_shadow.c index b55565b38..2a6d62347 100644 --- a/server/shadow/Win/win_shadow.c +++ b/server/shadow/Win/win_shadow.c @@ -353,7 +353,7 @@ static DWORD WINAPI win_shadow_subsystem_thread(LPVOID arg) if (WaitForSingleObject(subsystem->RdpUpdateEnterEvent, 0) == WAIT_OBJECT_0) { win_shadow_surface_copy(subsystem); - ResetEvent(subsystem->RdpUpdateEnterEvent); + (void)ResetEvent(subsystem->RdpUpdateEnterEvent); (void)SetEvent(subsystem->RdpUpdateLeaveEvent); } } diff --git a/server/shadow/shadow_mcevent.c b/server/shadow/shadow_mcevent.c index f94b66845..0829f86dd 100644 --- a/server/shadow/shadow_mcevent.c +++ b/server/shadow/shadow_mcevent.c @@ -128,7 +128,7 @@ static void Publish(rdpShadowMultiClientEvent* event) { event->eventid = (event->eventid & 0xff) + 1; WLog_VRB(TAG, "Server published event %d. %d clients.\n", event->eventid, event->consuming); - ResetEvent(event->doneEvent); + (void)ResetEvent(event->doneEvent); (void)SetEvent(event->event); } } @@ -195,7 +195,7 @@ static BOOL Consume(struct rdp_shadow_multiclient_subscriber* subscriber, BOOL w if (event->consuming == 0) { /* Last client reset event before notify clients to continue */ - ResetEvent(event->event); + (void)ResetEvent(event->event); if (event->waiting > 0) { @@ -229,7 +229,7 @@ static BOOL Consume(struct rdp_shadow_multiclient_subscriber* subscriber, BOOL w * We can now discard barrierEvent and notify * server to continue. */ - ResetEvent(event->barrierEvent); + (void)ResetEvent(event->barrierEvent); (void)SetEvent(event->doneEvent); } } diff --git a/winpr/libwinpr/pool/pool.c b/winpr/libwinpr/pool/pool.c index f36dcdc47..b3d2ce7a5 100644 --- a/winpr/libwinpr/pool/pool.c +++ b/winpr/libwinpr/pool/pool.c @@ -249,7 +249,7 @@ VOID winpr_SetThreadpoolThreadMaximum(PTP_POOL ptpp, DWORD cthrdMost) { (void)SetEvent(ptpp->TerminateEvent); ArrayList_Clear(ptpp->Threads); - ResetEvent(ptpp->TerminateEvent); + (void)ResetEvent(ptpp->TerminateEvent); } ArrayList_Unlock(ptpp->Threads); winpr_SetThreadpoolThreadMinimum(ptpp, ptpp->Minimum); diff --git a/winpr/libwinpr/synch/barrier.c b/winpr/libwinpr/synch/barrier.c index 0bb07cf9a..ecee3b988 100644 --- a/winpr/libwinpr/synch/barrier.c +++ b/winpr/libwinpr/synch/barrier.c @@ -214,7 +214,7 @@ BOOL WINAPI winpr_EnterSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpBarrie } /* reset the dormant event first */ - ResetEvent(hDormantEvent); + (void)ResetEvent(hDormantEvent); /* reset the remaining counter */ lpBarrier->Reserved1 = lpBarrier->Reserved2; diff --git a/winpr/libwinpr/utils/collections/CountdownEvent.c b/winpr/libwinpr/utils/collections/CountdownEvent.c index 0bb11d7c7..bbaa0fe09 100644 --- a/winpr/libwinpr/utils/collections/CountdownEvent.c +++ b/winpr/libwinpr/utils/collections/CountdownEvent.c @@ -109,7 +109,7 @@ void CountdownEvent_AddCount(wCountdownEvent* countdown, size_t signalCount) countdown->count += signalCount; if (signalSet) - ResetEvent(countdown->event); + (void)ResetEvent(countdown->event); LeaveCriticalSection(&countdown->lock); } diff --git a/winpr/libwinpr/utils/collections/MessageQueue.c b/winpr/libwinpr/utils/collections/MessageQueue.c index 0a2e98444..0d1b6f312 100644 --- a/winpr/libwinpr/utils/collections/MessageQueue.c +++ b/winpr/libwinpr/utils/collections/MessageQueue.c @@ -192,7 +192,7 @@ int MessageQueue_Get(wMessageQueue* queue, wMessage* message) queue->size--; if (queue->size < 1) - ResetEvent(queue->event); + (void)ResetEvent(queue->event); status = (message->id != WMQ_QUIT) ? 1 : 0; } @@ -221,7 +221,7 @@ int MessageQueue_Peek(wMessageQueue* queue, wMessage* message, BOOL remove) queue->size--; if (queue->size < 1) - ResetEvent(queue->event); + (void)ResetEvent(queue->event); } } @@ -304,7 +304,7 @@ int MessageQueue_Clear(wMessageQueue* queue) queue->head = (queue->head + 1) % queue->capacity; queue->size--; } - ResetEvent(queue->event); + (void)ResetEvent(queue->event); queue->closed = FALSE; LeaveCriticalSection(&queue->lock); diff --git a/winpr/libwinpr/utils/collections/Queue.c b/winpr/libwinpr/utils/collections/Queue.c index 76cb2fbfd..925d37632 100644 --- a/winpr/libwinpr/utils/collections/Queue.c +++ b/winpr/libwinpr/utils/collections/Queue.c @@ -131,7 +131,7 @@ void Queue_Clear(wQueue* queue) queue->size = 0; queue->head = queue->tail = 0; - ResetEvent(queue->event); + (void)ResetEvent(queue->event); Queue_Unlock(queue); } @@ -247,7 +247,7 @@ void* Queue_Dequeue(wQueue* queue) } if (queue->size < 1) - ResetEvent(queue->event); + (void)ResetEvent(queue->event); Queue_Unlock(queue); diff --git a/winpr/libwinpr/wtsapi/wtsapi_win32.c b/winpr/libwinpr/wtsapi/wtsapi_win32.c index 8481d3442..b0cce7896 100644 --- a/winpr/libwinpr/wtsapi/wtsapi_win32.c +++ b/winpr/libwinpr/wtsapi/wtsapi_win32.c @@ -126,7 +126,7 @@ BOOL Win32_WTSVirtualChannelReadAsync(WTSAPI_CHANNEL* pChannel) ZeroMemory(&(pChannel->overlapped), sizeof(OVERLAPPED)); pChannel->overlapped.hEvent = pChannel->hEvent; - ResetEvent(pChannel->hEvent); + (void)ResetEvent(pChannel->hEvent); if (pChannel->showProtocol) {