maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add SetNull and SetDefault functions to pointer managment to avoyd segfault with windows 2008r2

Browse Source 
Signed-off-by: Michael Jumper <zhangmaike@users.sourceforge.net>
This commit is contained in:
David PHAM-VAN 2012-05-23 12:11:39 +02:00 committed by Michael Jumper
parent 9549a19ab5
commit 4239a4e690
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/rdp/include/rdp_pointer.h
View File

@ -20,6 +20,7 @@
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* David PHAM-VAN <d.pham-van@ulteo.com> Ulteo SAS - http://www.ulteo.com
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -59,5 +60,7 @@ typedef struct guac_rdp_pointer {
void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer); void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer);
void guac_rdp_pointer_set(rdpContext* context, rdpPointer* pointer); void guac_rdp_pointer_set(rdpContext* context, rdpPointer* pointer);
void guac_rdp_pointer_free(rdpContext* context, rdpPointer* pointer); void guac_rdp_pointer_free(rdpContext* context, rdpPointer* pointer);
void guac_rdp_pointer_set_null(rdpContext* context);
void guac_rdp_pointer_set_default(rdpContext* context);
#endif #endif

2
protocols/rdp/src/client.c
View File

@ -151,6 +151,8 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) {
pointer->New = guac_rdp_pointer_new; pointer->New = guac_rdp_pointer_new;
pointer->Free = guac_rdp_pointer_free; pointer->Free = guac_rdp_pointer_free;
pointer->Set = guac_rdp_pointer_set; pointer->Set = guac_rdp_pointer_set;
pointer->SetNull = guac_rdp_pointer_set_null;
pointer->SetDefault = guac_rdp_pointer_set_default;
graphics_register_pointer(context->graphics, pointer); graphics_register_pointer(context->graphics, pointer);
xfree(pointer); xfree(pointer);

7
protocols/rdp/src/rdp_pointer.c
View File

@ -20,6 +20,7 @@
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* David PHAM-VAN <d.pham-van@ulteo.com> Ulteo SAS - http://www.ulteo.com
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -101,3 +102,9 @@ void guac_rdp_pointer_free(rdpContext* context, rdpPointer* pointer) {
} }
void guac_rdp_pointer_set_null(rdpContext* context) {
}
void guac_rdp_pointer_set_default(rdpContext* context) {
}