jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update the module API

Browse Source
This commit is contained in:
Jay Sorg 2015-07-10 21:57:04 -07:00
parent 65de5e971b
commit 4a553e07af
5 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mc/mc.h
View File

@ -24,7 +24,7 @@
#include "os_calls.h" #include "os_calls.h"
#include "defines.h" #include "defines.h"
#define CURRENT_MOD_VER 2 #define CURRENT_MOD_VER 3
struct mod struct mod
{ {
@ -42,8 +42,8 @@ struct mod
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout); tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct mod* v); int (*mod_check_wait_objs)(struct mod* v);
long mod_dumby[100 - 9]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct mod* v); int (*server_begin_update)(struct mod* v);
int (*server_end_update)(struct mod* v); int (*server_end_update)(struct mod* v);
@ -85,14 +85,15 @@ struct mod
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); int total_data_len, int flags);
int (*server_bell_trigger)(struct mod* v); int (*server_bell_trigger)(struct mod* v);
long server_dumby[100 - 25]; /* align, 100 minus the number of server tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
long handle; /* pointer to self as long */ tintptr handle; /* pointer to self as long */
long wm; tintptr wm;
long painter; tintptr painter;
int sck; tintptr si;
/* mod data */ /* mod data */
int sck;
int width; int width;
int height; int height;
int bpp; int bpp;

19
neutrinordp/xrdp-neutrinordp.h
View File

@ -58,7 +58,7 @@ struct pointer_item
int bpp; int bpp;
}; };
#define CURRENT_MOD_VER 2 #define CURRENT_MOD_VER 3
struct mod struct mod
{ {
@ -76,8 +76,8 @@ struct mod
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout); tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct mod* v); int (*mod_check_wait_objs)(struct mod* v);
long mod_dumby[100 - 9]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct mod* v); int (*server_begin_update)(struct mod* v);
int (*server_end_update)(struct mod* v); int (*server_end_update)(struct mod* v);
@ -152,14 +152,15 @@ struct mod
int (*server_set_pointer_ex)(struct mod* mod, int x, int y, char* data, int (*server_set_pointer_ex)(struct mod* mod, int x, int y, char* data,
char* mask, int bpp); char* mask, int bpp);
long server_dumby[100 - 37]; /* align, 100 minus the number of server tintptr server_dumby[100 - 37]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
tbus handle; /* pointer to self as long */ tintptr handle; /* pointer to self as long */
tbus wm; tintptr wm;
tbus painter; tintptr painter;
int sck; tintptr si;
/* mod data */ /* mod data */
int sck;
int width; int width;
int height; int height;
int bpp; int bpp;

19
vnc/vnc.h
View File

@ -25,7 +25,7 @@
#include "d3des.h" #include "d3des.h"
#include "defines.h" #include "defines.h"
#define CURRENT_MOD_VER 2 #define CURRENT_MOD_VER 3
struct vnc struct vnc
{ {
@ -43,8 +43,8 @@ struct vnc
int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount, int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout); tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct vnc* v); int (*mod_check_wait_objs)(struct vnc* v);
long mod_dumby[100 - 9]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct vnc* v); int (*server_begin_update)(struct vnc* v);
int (*server_end_update)(struct vnc* v); int (*server_end_update)(struct vnc* v);
@ -86,14 +86,15 @@ struct vnc
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); int total_data_len, int flags);
int (*server_bell_trigger)(struct vnc* v); int (*server_bell_trigger)(struct vnc* v);
long server_dumby[100 - 25]; /* align, 100 minus the number of server tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
long handle; /* pointer to self as long */ tintptr handle; /* pointer to self as long */
long wm; tintptr wm;
long painter; tintptr painter;
int sck; tintptr si;
/* mod data */ /* mod data */
int sck;
int server_width; int server_width;
int server_height; int server_height;
int server_bpp; int server_bpp;

16
xrdp/xrdp_types.h
View File

@ -48,8 +48,8 @@ struct xrdp_mod
tbus* write_objs, int* wcount, int* timeout); tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct xrdp_mod* v); int (*mod_check_wait_objs)(struct xrdp_mod* v);
int (*mod_frame_ack)(struct xrdp_mod* v, int flags, int frame_id); int (*mod_frame_ack)(struct xrdp_mod* v, int flags, int frame_id);
long mod_dumby[100 - 10]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 10]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct xrdp_mod* v); int (*server_begin_update)(struct xrdp_mod* v);
int (*server_end_update)(struct xrdp_mod* v); int (*server_end_update)(struct xrdp_mod* v);
@ -146,13 +146,13 @@ struct xrdp_mod
int num_crects, short *crects, int num_crects, short *crects,
char *data, int width, int height, char *data, int width, int height,
int flags, int frame_id); int flags, int frame_id);
long server_dumby[100 - 43]; /* align, 100 minus the number of server tintptr server_dumby[100 - 43]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
long handle; /* pointer to self as int */ tintptr handle; /* pointer to self as int */
long wm; /* struct xrdp_wm* */ tintptr wm; /* struct xrdp_wm* */
long painter; tintptr painter;
int sck; tintptr si;
}; };
/* header for bmp file */ /* header for bmp file */

19
xup/xup.h
View File

@ -26,7 +26,7 @@
#include "xrdp_client_info.h" #include "xrdp_client_info.h"
#include "xrdp_rail.h" #include "xrdp_rail.h"
#define CURRENT_MOD_VER 2 #define CURRENT_MOD_VER 3
struct mod struct mod
{ {
@ -45,8 +45,8 @@ struct mod
tbus* write_objs, int* wcount, int* timeout); tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct mod* v); int (*mod_check_wait_objs)(struct mod* v);
int (*mod_frame_ack)(struct mod* v, int flags, int frame_id); int (*mod_frame_ack)(struct mod* v, int flags, int frame_id);
tbus mod_dumby[100 - 10]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 10]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct mod* v); int (*server_begin_update)(struct mod* v);
int (*server_end_update)(struct mod* v); int (*server_end_update)(struct mod* v);
@ -140,13 +140,13 @@ struct mod
char *data, int width, int height, char *data, int width, int height,
int flags, int frame_id); int flags, int frame_id);
tbus server_dumby[100 - 43]; /* align, 100 minus the number of server tintptr server_dumby[100 - 43]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
tbus handle; /* pointer to self as long */ tintptr handle; /* pointer to self as long */
tbus wm; tintptr wm;
tbus painter; tintptr painter;
int sck; tintptr si;
/* mod data */ /* mod data */
int width; int width;
int height; int height;
@ -156,7 +156,6 @@ struct mod
char password[256]; char password[256];
char ip[256]; char ip[256];
char port[256]; char port[256];
tbus sck_obj;
int shift_state; int shift_state;
struct xrdp_client_info client_info; struct xrdp_client_info client_info;
int screen_shmem_id; int screen_shmem_id;