mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,sdl] wrap WinPR event in class

Browse Source
This commit is contained in:
Armin Novak 2023-05-30 21:04:53 +02:00 committed by Martin Fleisz
parent ccbcc4cb65
commit 68995ddffb
4 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
client/SDL/sdl_freerdp.cpp
View File

@ -278,7 +278,7 @@ static BOOL sdl_begin_paint(rdpContext* context)
WINPR_ASSERT(sdl);
HANDLE handles[] = { sdl->update_complete, freerdp_abort_event(context) };
HANDLE handles[] = { sdl->update_complete->handle(), freerdp_abort_event(context) };
const DWORD status = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (status)
{
@ -287,8 +287,7 @@ static BOOL sdl_begin_paint(rdpContext* context)
default:
return FALSE;
}
if (!ResetEvent(sdl->update_complete))
return FALSE;
sdl->update_complete->clear();
gdi = context->gdi;
WINPR_ASSERT(gdi);
@ -321,9 +320,10 @@ class SdlEventUpdateTriggerGuard
}
~SdlEventUpdateTriggerGuard()
{
SetEvent(_sdl->update_complete);
_sdl->update_complete->set();
}
};
static BOOL sdl_end_paint_process(rdpContext* context)
{
rdpGdi* gdi;
@ -483,10 +483,10 @@ static BOOL sdl_play_sound(rdpContext* context, const PLAY_SOUND_UPDATE* play_so
static BOOL sdl_wait_for_init(sdlContext* sdl)
{
WINPR_ASSERT(sdl);
if (!SetEvent(sdl->initialize))
return FALSE;
WINPR_ASSERT(sdl->initialize);
sdl->initialize->set();
HANDLE handles[] = { sdl->initialized, freerdp_abort_event(&sdl->common.context) };
HANDLE handles[] = { sdl->initialized->handle(), freerdp_abort_event(&sdl->common.context) };
const DWORD rc = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (rc)
@ -653,20 +653,18 @@ static BOOL sdl_create_windows(sdlContext* sdl)
rc = TRUE;
fail:
if (!SetEvent(sdl->windows_created))
rc = FALSE;
sdl->windows_created->set();
return rc;
}
static BOOL sdl_wait_create_windows(sdlContext* sdl)
{
std::lock_guard<CriticalSection> lock(*sdl->critical);
if (!ResetEvent(sdl->windows_created))
return FALSE;
sdl->windows_created->clear();
if (!sdl_push_user_event(SDL_USEREVENT_CREATE_WINDOWS, sdl))
return FALSE;
HANDLE handles[] = { sdl->initialized, freerdp_abort_event(&sdl->common.context) };
HANDLE handles[] = { sdl->initialized->handle(), freerdp_abort_event(&sdl->common.context) };
const DWORD rc = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (rc)
@ -683,7 +681,7 @@ static int sdl_run(sdlContext* sdl)
int rc = -1;
WINPR_ASSERT(sdl);
HANDLE handles[] = { sdl->initialize, freerdp_abort_event(&sdl->common.context) };
HANDLE handles[] = { sdl->initialize->handle(), freerdp_abort_event(&sdl->common.context) };
const DWORD status = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (status)
{
@ -694,8 +692,7 @@ static int sdl_run(sdlContext* sdl)
}
SDL_Init(SDL_INIT_VIDEO);
if (!SetEvent(sdl->initialized))
goto fail;
sdl->initialized->set();
while (!freerdp_shall_disconnect_context(&sdl->common.context))
{
@ -1176,11 +1173,11 @@ static BOOL sdl_client_new(freerdp* instance, rdpContext* context)
#endif
/* TODO: Client display set up */
sdl->critical.reset(new CriticalSection);
sdl->initialize = CreateEventA(nullptr, TRUE, FALSE, nullptr);
sdl->initialized = CreateEventA(nullptr, TRUE, FALSE, nullptr);
sdl->update_complete = CreateEventA(nullptr, TRUE, TRUE, nullptr);
sdl->windows_created = CreateEventA(nullptr, TRUE, FALSE, nullptr);
sdl->critical = std::make_unique<CriticalSection>();
sdl->initialize = std::make_unique<WinPREvent>();
sdl->initialized = std::make_unique<WinPREvent>();
sdl->update_complete = std::make_unique<WinPREvent>(true);
sdl->windows_created = std::make_unique<WinPREvent>();
return sdl->initialize && sdl->initialized && sdl->update_complete && sdl->windows_created;
}
@ -1191,16 +1188,10 @@ static void sdl_client_free(freerdp* instance, rdpContext* context)
if (!context)
return;
CloseHandle(sdl->initialize);
CloseHandle(sdl->initialized);
CloseHandle(sdl->update_complete);
CloseHandle(sdl->windows_created);
sdl->initialize = nullptr;
sdl->initialized = nullptr;
sdl->update_complete = nullptr;
sdl->windows_created = nullptr;
sdl->initialize.reset();
sdl->initialized.reset();
sdl->update_complete.reset();
sdl->windows_created.reset();
sdl->critical.reset();
}

8
client/SDL/sdl_freerdp.hpp
View File

@ -59,10 +59,10 @@ struct sdl_context
std::unique_ptr<CriticalSection> critical;
std::thread thread;
HANDLE initialize;
HANDLE initialized;
HANDLE update_complete;
HANDLE windows_created;
std::unique_ptr<WinPREvent> initialize;
std::unique_ptr<WinPREvent> initialized;
std::unique_ptr<WinPREvent> update_complete;
std::unique_ptr<WinPREvent> windows_created;
int exit_code;
SDL_Surface* primary;

30
client/SDL/sdl_utils.cpp
View File

@ -194,3 +194,33 @@ void CriticalSection::unlock()
{
LeaveCriticalSection(&_section);
}
WinPREvent::WinPREvent(bool initial)
: _handle(CreateEventA(nullptr, TRUE, initial ? TRUE : FALSE, nullptr))
{
}
WinPREvent::~WinPREvent()
{
CloseHandle(_handle);
}
void WinPREvent::set()
{
SetEvent(_handle);
}
void WinPREvent::clear()
{
ResetEvent(_handle);
}
bool WinPREvent::isSet() const
{
return WaitForSingleObject(_handle, 0) == WAIT_OBJECT_0;
}
HANDLE WinPREvent::handle() const
{
return _handle;
}

2
client/SDL/sdl_utils.hpp
View File

@ -45,7 +45,7 @@ class WinPREvent
~WinPREvent();
void set();
void reset();
void clear();
bool isSet() const;
HANDLE handle() const;