fixes for bell function

ulab-original
Jay Sorg 14 years ago
parent 96c1c4473a
commit 4f88bf83c1

@ -26,7 +26,7 @@
#include "os_calls.h" #include "os_calls.h"
#include "defines.h" #include "defines.h"
#define CURRENT_MOD_VER 1 #define CURRENT_MOD_VER 2
struct mod struct mod
{ {
@ -82,7 +82,8 @@ struct mod
int (*server_send_to_channel)(struct mod* v, int channel_id, int (*server_send_to_channel)(struct mod* v, int channel_id,
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); 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 */ functions above */
/* common */ /* common */
long handle; /* pointer to self as long */ long handle; /* pointer to self as long */

@ -251,7 +251,7 @@ struct rdp_orders
struct rdp_bitmap* cache_bitmap[3][600]; struct rdp_bitmap* cache_bitmap[3][600];
}; };
#define CURRENT_MOD_VER 1 #define CURRENT_MOD_VER 2
struct mod struct mod
{ {
@ -311,7 +311,8 @@ struct mod
int (*server_send_to_channel)(struct mod* v, int channel_id, int (*server_send_to_channel)(struct mod* v, int channel_id,
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); 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 */ functions above */
/* common */ /* common */
long handle; /* pointer to self as long */ long handle; /* pointer to self as long */

@ -29,12 +29,12 @@ param1=-bs
param2=-ac param2=-ac
param3=-nolisten param3=-nolisten
param4=tcp param4=tcp
param5=-localhost
param6=-dpi
param7=96
[Xvnc] [Xvnc]
param1=-bs param1=-bs
param2=-ac param2=-ac
param3=-nolisten param3=-nolisten
param4=tcp param4=tcp
param5=-localhost
param6=-dpi
param7=96

@ -27,7 +27,7 @@
#include "d3des.h" #include "d3des.h"
#include "defines.h" #include "defines.h"
#define CURRENT_MOD_VER 1 #define CURRENT_MOD_VER 2
struct vnc struct vnc
{ {
@ -50,7 +50,6 @@ struct vnc
/* 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);
int (*server_bell_trigger)(struct vnc* v);
int (*server_fill_rect)(struct vnc* v, int x, int y, int cx, int cy); 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 (*server_screen_blt)(struct vnc* v, int x, int y, int cx, int cy,
int srcx, int srcy); int srcx, int srcy);
@ -88,7 +87,8 @@ struct vnc
int (*server_send_to_channel)(struct vnc* v, int channel_id, int (*server_send_to_channel)(struct vnc* v, int channel_id,
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); 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 */ functions above */
/* common */ /* common */
long handle; /* pointer to self as long */ long handle; /* pointer to self as long */

@ -42,7 +42,6 @@ struct xrdp_mod
/* 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);
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_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 (*server_screen_blt)(struct xrdp_mod* v, int x, int y, int cx, int cy,
int srcx, int srcy); int srcx, int srcy);
@ -80,7 +79,8 @@ struct xrdp_mod
int (*server_send_to_channel)(struct xrdp_mod* v, int channel_id, int (*server_send_to_channel)(struct xrdp_mod* v, int channel_id,
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); 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 */ functions above */
/* common */ /* common */
long handle; /* pointer to self as int */ long handle; /* pointer to self as int */

@ -26,7 +26,7 @@
#include "os_calls.h" #include "os_calls.h"
#include "defines.h" #include "defines.h"
#define CURRENT_MOD_VER 1 #define CURRENT_MOD_VER 2
struct mod struct mod
{ {
@ -86,7 +86,8 @@ struct mod
int (*server_send_to_channel)(struct mod* v, int channel_id, int (*server_send_to_channel)(struct mod* v, int channel_id,
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); 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 */ functions above */
/* common */ /* common */
tbus handle; /* pointer to self as long */ tbus handle; /* pointer to self as long */

Loading…
Cancel
Save