pxcloud/guacamole-server
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUACAMOLE-377: Merge corrections to RDP frame boundary logic.

Browse Source
This commit is contained in:
Mike Jumper 2023-03-22 15:37:04 -07:00 committed by GitHub
commit 77ec058eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/protocols/rdp/gdi.c
View File

@ -33,7 +33,6 @@
#include <guacamole/protocol.h>
#include <winpr/wtypes.h>
#include <stddef.h>
#include <stddef.h>
guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client,
@ -411,7 +410,7 @@ BOOL guac_rdp_gdi_frame_marker(rdpContext* context, const FRAME_MARKER_ORDER* fr
BOOL guac_rdp_gdi_surface_frame_marker(rdpContext* context, const SURFACE_FRAME_MARKER* surface_frame_marker) {
guac_rdp_gdi_mark_frame(context, surface_frame_marker->frameAction == SURFACECMD_FRAMEACTION_END);
guac_rdp_gdi_mark_frame(context, surface_frame_marker->frameAction != SURFACECMD_FRAMEACTION_END);
if (context->settings->FrameAcknowledge > 0)
IFCALL(context->update->SurfaceFrameAcknowledge, context,
@ -497,5 +496,3 @@ BOOL guac_rdp_gdi_desktop_resize(rdpContext* context) {
guac_rdp_get_height(context->instance));
}

5
src/protocols/rdp/rdp.c
View File

@ -533,8 +533,6 @@ static int guac_rdp_handle_connection(guac_client* client) {
/* Connection complete */
rdp_client->rdp_inst = rdp_inst;
guac_timestamp last_frame_end = guac_timestamp_current();
/* Signal that reconnect has been completed */
guac_rdp_disp_reconnect_complete(rdp_client->disp);
@ -586,7 +584,7 @@ static int guac_rdp_handle_connection(guac_client* client) {
- frame_end;
/* Calculate time that client needs to catch up */
int time_elapsed = frame_end - last_frame_end;
int time_elapsed = frame_end - frame_start;
int required_wait = processing_lag - time_elapsed;
/* Increase the duration of this frame if client is lagging */
@ -837,4 +835,3 @@ void* guac_rdp_client_thread(void* data) {
return NULL;
}