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

15
mc/mc.h
View File

@ -24,7 +24,7 @@
#include "os_calls.h"
#include "defines.h"
#define CURRENT_MOD_VER 2
#define CURRENT_MOD_VER 3
struct mod
{
@ -42,7 +42,7 @@ struct mod
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
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 */
/* server functions */
int (*server_begin_update)(struct mod* v);
@ -85,14 +85,15 @@ struct mod
char* data, int data_len,
int total_data_len, int flags);
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 */
/* common */
long handle; /* pointer to self as long */
long wm;
long painter;
int sck;
tintptr handle; /* pointer to self as long */
tintptr wm;
tintptr painter;
tintptr si;
/* mod data */
int sck;
int width;
int height;
int bpp;

15
neutrinordp/xrdp-neutrinordp.h
View File

@ -58,7 +58,7 @@ struct pointer_item
int bpp;
};
#define CURRENT_MOD_VER 2
#define CURRENT_MOD_VER 3
struct mod
{
@ -76,7 +76,7 @@ struct mod
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
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 */
/* server functions */
int (*server_begin_update)(struct mod* v);
@ -152,14 +152,15 @@ struct mod
int (*server_set_pointer_ex)(struct mod* mod, int x, int y, char* data,
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 */
/* common */
tbus handle; /* pointer to self as long */
tbus wm;
tbus painter;
int sck;
tintptr handle; /* pointer to self as long */
tintptr wm;
tintptr painter;
tintptr si;
/* mod data */
int sck;
int width;
int height;
int bpp;

15
vnc/vnc.h
View File

@ -25,7 +25,7 @@
#include "d3des.h"
#include "defines.h"
#define CURRENT_MOD_VER 2
#define CURRENT_MOD_VER 3
struct vnc
{
@ -43,7 +43,7 @@ struct vnc
int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
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 */
/* server functions */
int (*server_begin_update)(struct vnc* v);
@ -86,14 +86,15 @@ struct vnc
char* data, int data_len,
int total_data_len, int flags);
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 */
/* common */
long handle; /* pointer to self as long */
long wm;
long painter;
int sck;
tintptr handle; /* pointer to self as long */
tintptr wm;
tintptr painter;
tintptr si;
/* mod data */
int sck;
int server_width;
int server_height;
int server_bpp;

12
xrdp/xrdp_types.h
View File

@ -48,7 +48,7 @@ struct xrdp_mod
tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct xrdp_mod* v);
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 */
/* server functions */
int (*server_begin_update)(struct xrdp_mod* v);
@ -146,13 +146,13 @@ struct xrdp_mod
int num_crects, short *crects,
char *data, int width, int height,
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 */
/* common */
long handle; /* pointer to self as int */
long wm; /* struct xrdp_wm* */
long painter;
int sck;
tintptr handle; /* pointer to self as int */
tintptr wm; /* struct xrdp_wm* */
tintptr painter;
tintptr si;
};
/* header for bmp file */

15
xup/xup.h
View File

@ -26,7 +26,7 @@
#include "xrdp_client_info.h"
#include "xrdp_rail.h"
#define CURRENT_MOD_VER 2
#define CURRENT_MOD_VER 3
struct mod
{
@ -45,7 +45,7 @@ struct mod
tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct mod* v);
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 */
/* server functions */
int (*server_begin_update)(struct mod* v);
@ -140,13 +140,13 @@ struct mod
char *data, int width, int height,
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 */
/* common */
tbus handle; /* pointer to self as long */
tbus wm;
tbus painter;
int sck;
tintptr handle; /* pointer to self as long */
tintptr wm;
tintptr painter;
tintptr si;
/* mod data */
int width;
int height;
@ -156,7 +156,6 @@ struct mod
char password[256];
char ip[256];
char port[256];
tbus sck_obj;
int shift_state;
struct xrdp_client_info client_info;
int screen_shmem_id;