mirror of https://github.com/FreeRDP/FreeRDP
MacFreeRDP: async rdpStart.
Merge branch 'master' of git://github.com/awakecoding/FreeRDP # By Marc-André Moreau # Via Marc-André Moreau * 'master' of git://github.com/awakecoding/FreeRDP: libfreerdp-core: initialize queue objects earlier mfreerdp: fix cursor rendering Conflicts: client/Mac/MRDPView.m
This commit is contained in:
commit
a2293857a4
|
@ -495,6 +495,8 @@ rdpInput* input_new(rdpRdp* rdp)
|
||||||
if (input != NULL)
|
if (input != NULL)
|
||||||
{
|
{
|
||||||
ZeroMemory(input, sizeof(rdpInput));
|
ZeroMemory(input, sizeof(rdpInput));
|
||||||
|
|
||||||
|
input->queue = MessageQueue_New();
|
||||||
}
|
}
|
||||||
|
|
||||||
return input;
|
return input;
|
||||||
|
@ -507,6 +509,8 @@ void input_free(rdpInput* input)
|
||||||
if (input->asynchronous)
|
if (input->asynchronous)
|
||||||
input_message_proxy_free(input->proxy);
|
input_message_proxy_free(input->proxy);
|
||||||
|
|
||||||
|
MessageQueue_Free(input->queue);
|
||||||
|
|
||||||
free(input);
|
free(input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1741,7 +1741,6 @@ rdpUpdateProxy* update_message_proxy_new(rdpUpdate* update)
|
||||||
ZeroMemory(message, sizeof(rdpUpdateProxy));
|
ZeroMemory(message, sizeof(rdpUpdateProxy));
|
||||||
|
|
||||||
message->update = update;
|
message->update = update;
|
||||||
update->queue = MessageQueue_New();
|
|
||||||
update_message_register_interface(message, update);
|
update_message_register_interface(message, update);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1752,7 +1751,6 @@ void update_message_proxy_free(rdpUpdateProxy* message)
|
||||||
{
|
{
|
||||||
if (message)
|
if (message)
|
||||||
{
|
{
|
||||||
MessageQueue_Free(message->update->queue);
|
|
||||||
free(message);
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1940,7 +1938,6 @@ rdpInputProxy* input_message_proxy_new(rdpInput* input)
|
||||||
ZeroMemory(proxy, sizeof(rdpInputProxy));
|
ZeroMemory(proxy, sizeof(rdpInputProxy));
|
||||||
|
|
||||||
proxy->input = input;
|
proxy->input = input;
|
||||||
input->queue = MessageQueue_New();
|
|
||||||
input_message_proxy_register(proxy, input);
|
input_message_proxy_register(proxy, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1951,7 +1948,6 @@ void input_message_proxy_free(rdpInputProxy* proxy)
|
||||||
{
|
{
|
||||||
if (proxy)
|
if (proxy)
|
||||||
{
|
{
|
||||||
MessageQueue_Free(proxy->input->queue);
|
|
||||||
free(proxy);
|
free(proxy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1512,6 +1512,8 @@ rdpUpdate* update_new(rdpRdp* rdp)
|
||||||
update->SuppressOutput = update_send_suppress_output;
|
update->SuppressOutput = update_send_suppress_output;
|
||||||
|
|
||||||
update->initialState = TRUE;
|
update->initialState = TRUE;
|
||||||
|
|
||||||
|
update->queue = MessageQueue_New();
|
||||||
}
|
}
|
||||||
|
|
||||||
return update;
|
return update;
|
||||||
|
@ -1545,6 +1547,8 @@ void update_free(rdpUpdate* update)
|
||||||
if (update->asynchronous)
|
if (update->asynchronous)
|
||||||
update_message_proxy_free(update->proxy);
|
update_message_proxy_free(update->proxy);
|
||||||
|
|
||||||
|
MessageQueue_Free(update->queue);
|
||||||
|
|
||||||
free(update);
|
free(update);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue