diff options
| -rw-r--r-- | mc/mc.h | 5 | ||||
| -rw-r--r-- | rdp/rdp.h | 5 | ||||
| -rw-r--r-- | sesman/sesman.ini | 6 | ||||
| -rw-r--r-- | sesman/session.c | 2 | ||||
| -rw-r--r-- | vnc/vnc.h | 6 | ||||
| -rw-r--r-- | xrdp/xrdp_types.h | 4 | ||||
| -rw-r--r-- | xup/xup.h | 5 |
7 files changed, 18 insertions, 15 deletions
@@ -26,7 +26,7 @@ #include "os_calls.h" #include "defines.h" -#define CURRENT_MOD_VER 1 +#define CURRENT_MOD_VER 2 struct mod { @@ -82,7 +82,8 @@ struct mod int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - long server_dumby[100 - 24]; /* align, 100 minus the number of server + int (*server_bell_trigger)(struct vnc* v); + long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ long handle; /* pointer to self as long */ @@ -251,7 +251,7 @@ struct rdp_orders struct rdp_bitmap* cache_bitmap[3][600]; }; -#define CURRENT_MOD_VER 1 +#define CURRENT_MOD_VER 2 struct mod { @@ -311,7 +311,8 @@ struct mod int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - long server_dumby[100 - 24]; /* align, 100 minus the number of server + int (*server_bell_trigger)(struct vnc* v); + long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ long handle; /* pointer to self as long */ diff --git a/sesman/sesman.ini b/sesman/sesman.ini index 8742d5d5..640c898d 100644 --- a/sesman/sesman.ini +++ b/sesman/sesman.ini @@ -29,12 +29,12 @@ param1=-bs param2=-ac param3=-nolisten param4=tcp -param5=-localhost -param6=-dpi -param7=96 [Xvnc] param1=-bs param2=-ac param3=-nolisten param4=tcp +param5=-localhost +param6=-dpi +param7=96 diff --git a/sesman/session.c b/sesman/session.c index a9cbc909..36262ad6 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -504,7 +504,7 @@ session_start_fork(int width, int height, int bpp, char* username, /* additional parameters from sesman.ini file */ //config_read_xserver_params(SESMAN_SESSION_TYPE_XRDP, // xserver_params); - list_append_list_strdup(g_cfg->rdp_params, xserver_params, 0); + list_append_list_strdup(g_cfg->rdp_params, xserver_params, 0); /* make sure it ends with a zero */ list_add_item(xserver_params, 0); @@ -27,7 +27,7 @@ #include "d3des.h" #include "defines.h" -#define CURRENT_MOD_VER 1 +#define CURRENT_MOD_VER 2 struct vnc { @@ -50,7 +50,6 @@ struct vnc /* server functions */ int (*server_begin_update)(struct vnc* v); int (*server_end_update)(struct vnc* v); - int (*server_bell_trigger)(struct vnc* v); int (*server_fill_rect)(struct vnc* v, int x, int y, int cx, int cy); int (*server_screen_blt)(struct vnc* v, int x, int y, int cx, int cy, int srcx, int srcy); @@ -88,7 +87,8 @@ struct vnc int (*server_send_to_channel)(struct vnc* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - long server_dumby[100 - 24]; /* align, 100 minus the number of server + int (*server_bell_trigger)(struct vnc* v); + long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ long handle; /* pointer to self as long */ diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 74041608..7d470e08 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -42,7 +42,6 @@ struct xrdp_mod /* server functions */ int (*server_begin_update)(struct xrdp_mod* v); int (*server_end_update)(struct xrdp_mod* v); - int (*server_bell_trigger)(struct xrdp_mod* v); int (*server_fill_rect)(struct xrdp_mod* v, int x, int y, int cx, int cy); int (*server_screen_blt)(struct xrdp_mod* v, int x, int y, int cx, int cy, int srcx, int srcy); @@ -80,7 +79,8 @@ struct xrdp_mod int (*server_send_to_channel)(struct xrdp_mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - long server_dumby[100 - 24]; /* align, 100 minus the number of server + int (*server_bell_trigger)(struct xrdp_mod* v); + long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ long handle; /* pointer to self as int */ @@ -26,7 +26,7 @@ #include "os_calls.h" #include "defines.h" -#define CURRENT_MOD_VER 1 +#define CURRENT_MOD_VER 2 struct mod { @@ -86,7 +86,8 @@ struct mod int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - tbus server_dumby[100 - 24]; /* align, 100 minus the number of server + int (*server_bell_trigger)(struct vnc* v); + tbus server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ tbus handle; /* pointer to self as long */ |