morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use MAXIMUM_WAIT_OBJECTS

Browse Source
This commit is contained in:
Armin Novak
2021-08-25 11:14:35 +02:00
committed by akallabeth
parent 55d2363efb
commit c073ca8ac8
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/Sample/tf_freerdp.c
View File

@@ -182,7 +182,7 @@ static DWORD WINAPI tf_client_thread_proc(LPVOID arg)
DWORD nCount;
DWORD status;
DWORD result = 0;
HANDLE handles[64];
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
BOOL rc = freerdp_connect(instance);
if (instance->settings->AuthenticationOnly)
@@ -202,7 +202,7 @@ static DWORD WINAPI tf_client_thread_proc(LPVOID arg)
while (!freerdp_shall_disconnect(instance))
{
nCount = freerdp_get_event_handles(instance->context, &handles[0], 64);
nCount = freerdp_get_event_handles(instance->context, handles, ARRAYSIZE(handles));
if (nCount == 0)
{

5
client/Wayland/wlfreerdp.c
View File

@@ -465,7 +465,7 @@ static int wlfreerdp_run(freerdp* instance)
{
wlfContext* context;
DWORD count;
HANDLE handles[64];
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD status = WAIT_ABANDONED;
if (!instance)
@@ -485,7 +485,8 @@ static int wlfreerdp_run(freerdp* instance)
while (!freerdp_shall_disconnect(instance))
{
handles[0] = context->displayHandle;
count = freerdp_get_event_handles(instance->context, &handles[1], 63) + 1;
count =
freerdp_get_event_handles(instance->context, &handles[1], ARRAYSIZE(handles) - 1) + 1;
if (count <= 1)
{

2
client/X11/xf_client.c
View File

@@ -1489,7 +1489,7 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
DWORD exit_code = 0;
DWORD nCount;
DWORD waitStatus;
HANDLE handles[64];
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
xfContext* xfc;
freerdp* instance;
rdpContext* context;

4
libfreerdp/core/gateway/tsg.c
View File

@@ -2033,7 +2033,7 @@ BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port, DWORD timeout)
{
UINT64 looptimeout = timeout * 1000ULL;
DWORD nCount;
HANDLE events[64];
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
rdpRpc* rpc = tsg->rpc;
rdpSettings* settings = rpc->settings;
rdpTransport* transport = rpc->transport;
@@ -2055,7 +2055,7 @@ BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port, DWORD timeout)
return FALSE;
}
nCount = tsg_get_event_handles(tsg, events, 64);
nCount = tsg_get_event_handles(tsg, events, ARRAYSIZE(events));
if (nCount == 0)
return FALSE;

4
libfreerdp/core/transport.c
View File

@@ -981,8 +981,8 @@ void transport_get_fds(rdpTransport* transport, void** rfds, int* rcount)
{
DWORD index;
DWORD nCount;
HANDLE events[64];
nCount = transport_get_event_handles(transport, events, 64);
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
nCount = transport_get_event_handles(transport, events, ARRAYSIZE(events));
*rcount = nCount + 1;
for (index = 0; index < nCount; index++)