diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/RDP | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/RDP')
| -rw-r--r-- | src/VBox/RDP/client/rdp.c | 10 | ||||
| -rw-r--r-- | src/VBox/RDP/client/vrdp/rdpusb.c | 2 | ||||
| -rw-r--r-- | src/VBox/RDP/client/vrdp/vrdpusb.h | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/VBox/RDP/client/rdp.c b/src/VBox/RDP/client/rdp.c index 74bcade8..9d0a1011 100644 --- a/src/VBox/RDP/client/rdp.c +++ b/src/VBox/RDP/client/rdp.c @@ -827,6 +827,7 @@ rdp_out_pointer_caps(STREAM s) out_uint16_le(s, 20); /* Cache size */ } +#ifndef VBOX /* Output new pointer capability set */ static void rdp_out_newpointer_caps(STREAM s) @@ -838,6 +839,7 @@ rdp_out_newpointer_caps(STREAM s) out_uint16_le(s, 20); /* Cache size */ out_uint16_le(s, 20); /* Cache size for new pointers */ } +#endif /* Output share capability set */ static void @@ -925,7 +927,11 @@ rdp_send_confirm_active(void) if (g_use_rdp5) { caplen += RDP_CAPLEN_BMPCACHE2; +#ifdef VBOX + caplen += RDP_CAPLEN_POINTER; +#else caplen += RDP_CAPLEN_NEWPOINTER; +#endif } else { @@ -954,7 +960,11 @@ rdp_send_confirm_active(void) if (g_use_rdp5) { rdp_out_bmpcache2_caps(s); +#ifdef VBOX + rdp_out_pointer_caps(s); +#else rdp_out_newpointer_caps(s); +#endif } else { diff --git a/src/VBox/RDP/client/vrdp/rdpusb.c b/src/VBox/RDP/client/vrdp/rdpusb.c index 028af77d..013a579b 100644 --- a/src/VBox/RDP/client/vrdp/rdpusb.c +++ b/src/VBox/RDP/client/vrdp/rdpusb.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/RDP/client/vrdp/vrdpusb.h b/src/VBox/RDP/client/vrdp/vrdpusb.h index c1a9ba04..f8469706 100644 --- a/src/VBox/RDP/client/vrdp/vrdpusb.h +++ b/src/VBox/RDP/client/vrdp/vrdpusb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; |