CVS: rdesktop bitmap.c, 1.27, 1.28 channels.c, 1.18, 1.19 cliprdr.c, 1.30, 1.31 disk.c, 1.59, 1.60 ewmhints.c, 1.12, 1.13 iso.c, 1.18, 1.19 licence.c, 1.38, 1.39 lspci.c, 1.2, 1.3 mcs.c, 1.19, 1.20 mppc.c, 1.10, 1.11 orders.c, 1.52, 1.53 printercache.c, 1.10, 1.11 proto.h, 1.106, 1.107 pstcache.c, 1.10, 1.11 rdesktop.c, 1.156, 1.157 rdp.c, 1.98, 1.99 rdpdr.c, 1.49, 1.50 rdpsnd.c, 1.38, 1.39 rdpsnd.h, 1.12, 1.13 rdpsnd_dsp.c, 1.25, 1.26 rdpsnd_dsp.h, 1.6, 1.7 rdpsnd_oss.c, 1.37, 1.38 rdpsnd_sgi.c, 1.23, 1.24 rdpsnd_sun.c, 1.30, 1.31 scard.c, 1.18, 1.19 seamless.c, 1.5, 1.6 secure.c, 1.64, 1.65 serial.c, 1.31, 1.32 tcp.c, 1.37, 1.38 types.h, 1.33, 1.34 xclip.c, 1.42, 1.43 xkeymap.c, 1.95, 1.96 xwin.c, 1.220, 1.221
Jay Sorg <[email protected]> Sun, 07 Jan 2007 20:47:10 -0800
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27230
Modified Files:
bitmap.c channels.c cliprdr.c disk.c ewmhints.c iso.c
licence.c lspci.c mcs.c mppc.c orders.c printercache.c proto.h
pstcache.c rdesktop.c rdp.c rdpdr.c rdpsnd.c rdpsnd.h
rdpsnd_dsp.c rdpsnd_dsp.h rdpsnd_oss.c rdpsnd_sgi.c
rdpsnd_sun.c scard.c seamless.c secure.c serial.c tcp.c
types.h xclip.c xkeymap.c xwin.c
Log Message:
prefix BOOL with RD_
Index: bitmap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/bitmap.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** bitmap.c 6 Jan 2007 22:21:20 -0000 1.27
--- bitmap.c 8 Jan 2007 04:47:05 -0000 1.28
***************
*** 65,69 ****
/* 1 byte bitmap decompress */
! static BOOL
bitmap_decompress1(uint8 * output, int width, int height, uint8 * input, int size)
{
--- 65,69 ----
/* 1 byte bitmap decompress */
! static RD_BOOL
bitmap_decompress1(uint8 * output, int width, int height, uint8 * input, int size)
{
***************
*** 263,267 ****
/* 2 byte bitmap decompress */
! static BOOL
bitmap_decompress2(uint8 * output, int width, int height, uint8 * input, int size)
{
--- 263,267 ----
/* 2 byte bitmap decompress */
! static RD_BOOL
bitmap_decompress2(uint8 * output, int width, int height, uint8 * input, int size)
{
***************
*** 462,466 ****
/* 3 byte bitmap decompress */
! static BOOL
bitmap_decompress3(uint8 * output, int width, int height, uint8 * input, int size)
{
--- 462,466 ----
/* 3 byte bitmap decompress */
! static RD_BOOL
bitmap_decompress3(uint8 * output, int width, int height, uint8 * input, int size)
{
***************
*** 748,755 ****
/* main decompress function */
! BOOL
bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp)
{
! BOOL rv = False;
switch (Bpp)
--- 748,755 ----
/* main decompress function */
! RD_BOOL
bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp)
{
! RD_BOOL rv = False;
switch (Bpp)
Index: channels.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/channels.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** channels.c 4 Jan 2007 05:39:38 -0000 1.18
--- channels.c 8 Jan 2007 04:47:05 -0000 1.19
***************
*** 28,33 ****
#define CHANNEL_FLAG_SHOW_PROTOCOL 0x10
! extern BOOL g_use_rdp5;
! extern BOOL g_encryption;
VCHANNEL g_channels[MAX_CHANNELS];
--- 28,33 ----
#define CHANNEL_FLAG_SHOW_PROTOCOL 0x10
! extern RD_BOOL g_use_rdp5;
! extern RD_BOOL g_encryption;
VCHANNEL g_channels[MAX_CHANNELS];
Index: cliprdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/cliprdr.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** cliprdr.c 4 Jan 2007 05:39:38 -0000 1.30
--- cliprdr.c 8 Jan 2007 04:47:05 -0000 1.31
***************
*** 176,180 ****
}
! BOOL
cliprdr_init(void)
{
--- 176,180 ----
}
! RD_BOOL
cliprdr_init(void)
{
Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** disk.c 4 Jan 2007 05:39:38 -0000 1.59
--- disk.c 8 Jan 2007 04:47:05 -0000 1.60
***************
*** 141,145 ****
FILEINFO g_fileinfo[MAX_OPEN_FILES];
! BOOL g_notify_stamp = False;
typedef struct
--- 141,145 ----
FILEINFO g_fileinfo[MAX_OPEN_FILES];
! RD_BOOL g_notify_stamp = False;
typedef struct
Index: ewmhints.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ewmhints.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ewmhints.c 9 Apr 2006 20:22:11 -0000 1.12
--- ewmhints.c 8 Jan 2007 04:47:05 -0000 1.13
***************
*** 203,207 ****
uint32 *return_words;
unsigned long item;
! BOOL maximized_vert, maximized_horz, hidden;
maximized_vert = maximized_horz = hidden = False;
--- 203,207 ----
uint32 *return_words;
unsigned long item;
! RD_BOOL maximized_vert, maximized_horz, hidden;
maximized_vert = maximized_horz = hidden = False;
Index: iso.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/iso.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** iso.c 4 Jan 2007 05:39:38 -0000 1.18
--- iso.c 8 Jan 2007 04:47:05 -0000 1.19
***************
*** 169,173 ****
/* Establish a connection up to the ISO layer */
! BOOL
iso_connect(char *server, char *username)
{
--- 169,173 ----
/* Establish a connection up to the ISO layer */
! RD_BOOL
iso_connect(char *server, char *username)
{
***************
*** 193,197 ****
/* Establish a reconnection up to the ISO layer */
! BOOL
iso_reconnect(char *server)
{
--- 193,197 ----
/* Establish a reconnection up to the ISO layer */
! RD_BOOL
iso_reconnect(char *server)
{
Index: licence.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/licence.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** licence.c 4 Jan 2007 05:39:38 -0000 1.38
--- licence.c 8 Jan 2007 04:47:05 -0000 1.39
***************
*** 28,32 ****
static uint8 g_licence_sign_key[16];
! BOOL g_licence_issued = False;
/* Generate a session key and RC4 keys, given client and server randoms */
--- 28,32 ----
static uint8 g_licence_sign_key[16];
! RD_BOOL g_licence_issued = False;
/* Generate a session key and RC4 keys, given client and server randoms */
***************
*** 202,206 ****
/* Parse an authentication request packet */
! static BOOL
licence_parse_authreq(STREAM s, uint8 ** token, uint8 ** signature)
{
--- 202,206 ----
/* Parse an authentication request packet */
! static RD_BOOL
licence_parse_authreq(STREAM s, uint8 ** token, uint8 ** signature)
{
Index: lspci.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/lspci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lspci.c 10 Mar 2006 07:14:30 -0000 1.2
--- lspci.c 8 Jan 2007 04:47:05 -0000 1.3
***************
*** 42,46 ****
/* Handle one line of output from the lspci subprocess */
! static BOOL
handle_child_line(const char *line, void *data)
{
--- 42,46 ----
/* Handle one line of output from the lspci subprocess */
! static RD_BOOL
handle_child_line(const char *line, void *data)
{
***************
*** 107,111 ****
/* Process one line of input from virtual channel */
! static BOOL
lspci_process_line(const char *line, void *data)
{
--- 107,111 ----
/* Process one line of input from virtual channel */
! static RD_BOOL
lspci_process_line(const char *line, void *data)
{
***************
*** 149,153 ****
/* Initialize this module: Register the lspci channel */
! BOOL
lspci_init(void)
{
--- 149,153 ----
/* Initialize this module: Register the lspci channel */
! RD_BOOL
lspci_init(void)
{
Index: mcs.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/mcs.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mcs.c 4 Jan 2007 05:39:38 -0000 1.19
--- mcs.c 8 Jan 2007 04:47:05 -0000 1.20
***************
*** 26,30 ****
/* Parse an ASN.1 BER header */
! static BOOL
ber_parse_header(STREAM s, int tagval, int *length)
{
--- 26,30 ----
/* Parse an ASN.1 BER header */
! static RD_BOOL
ber_parse_header(STREAM s, int tagval, int *length)
{
***************
*** 106,110 ****
/* Parse a DOMAIN_PARAMS structure (ASN.1 BER) */
! static BOOL
mcs_parse_domain_params(STREAM s)
{
--- 106,110 ----
/* Parse a DOMAIN_PARAMS structure (ASN.1 BER) */
! static RD_BOOL
mcs_parse_domain_params(STREAM s)
{
***************
*** 148,152 ****
/* Expect a MCS_CONNECT_RESPONSE message (ASN.1 BER) */
! static BOOL
mcs_recv_connect_response(STREAM mcs_data)
{
--- 148,152 ----
/* Expect a MCS_CONNECT_RESPONSE message (ASN.1 BER) */
! static RD_BOOL
mcs_recv_connect_response(STREAM mcs_data)
{
***************
*** 222,226 ****
/* Expect a AUcf message (ASN.1 PER) */
! static BOOL
mcs_recv_aucf(uint16 * mcs_userid)
{
--- 222,226 ----
/* Expect a AUcf message (ASN.1 PER) */
! static RD_BOOL
mcs_recv_aucf(uint16 * mcs_userid)
{
***************
*** 271,275 ****
/* Expect a CJcf message (ASN.1 PER) */
! static BOOL
mcs_recv_cjcf(void)
{
--- 271,275 ----
/* Expect a CJcf message (ASN.1 PER) */
! static RD_BOOL
mcs_recv_cjcf(void)
{
***************
*** 373,377 ****
/* Establish a connection up to the MCS layer */
! BOOL
mcs_connect(char *server, STREAM mcs_data, char *username)
{
--- 373,377 ----
/* Establish a connection up to the MCS layer */
! RD_BOOL
mcs_connect(char *server, STREAM mcs_data, char *username)
{
***************
*** 414,418 ****
/* Establish a connection up to the MCS layer */
! BOOL
mcs_reconnect(char *server, STREAM mcs_data)
{
--- 414,418 ----
/* Establish a connection up to the MCS layer */
! RD_BOOL
mcs_reconnect(char *server, STREAM mcs_data)
{
Index: mppc.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/mppc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mppc.c 4 Jan 2007 05:39:38 -0000 1.10
--- mppc.c 8 Jan 2007 04:47:05 -0000 1.11
***************
*** 64,68 ****
int match_len;
int old_offset, match_bits;
! BOOL big = ctype & RDP_MPPC_BIG ? True : False;
uint8 *dict = g_mppc_dict.hist;
--- 64,68 ----
int match_len;
int old_offset, match_bits;
! RD_BOOL big = ctype & RDP_MPPC_BIG ? True : False;
uint8 *dict = g_mppc_dict.hist;
Index: orders.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/orders.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** orders.c 4 Jan 2007 05:39:38 -0000 1.52
--- orders.c 8 Jan 2007 04:47:05 -0000 1.53
***************
*** 24,28 ****
extern uint8 *g_next_packet;
static RDP_ORDER_STATE g_order_state;
! extern BOOL g_use_rdp5;
/* Read field indicating which parameters are present */
--- 24,28 ----
extern uint8 *g_next_packet;
static RDP_ORDER_STATE g_order_state;
! extern RD_BOOL g_use_rdp5;
/* Read field indicating which parameters are present */
***************
*** 56,60 ****
/* Read a co-ordinate (16-bit, or 8-bit delta) */
static void
! rdp_in_coord(STREAM s, sint16 * coord, BOOL delta)
{
sint8 change;
--- 56,60 ----
/* Read a co-ordinate (16-bit, or 8-bit delta) */
static void
! rdp_in_coord(STREAM s, sint16 * coord, RD_BOOL delta)
{
sint8 change;
***************
*** 103,107 ****
/* Parse bounds information */
! static BOOL
rdp_parse_bounds(STREAM s, BOUNDS * bounds)
{
--- 103,107 ----
/* Parse bounds information */
! static RD_BOOL
rdp_parse_bounds(STREAM s, BOUNDS * bounds)
{
***************
*** 134,138 ****
/* Parse a pen */
! static BOOL
rdp_parse_pen(STREAM s, PEN * pen, uint32 present)
{
--- 134,138 ----
/* Parse a pen */
! static RD_BOOL
rdp_parse_pen(STREAM s, PEN * pen, uint32 present)
{
***************
*** 150,154 ****
/* Parse a brush */
! static BOOL
rdp_parse_brush(STREAM s, BRUSH * brush, uint32 present)
{
--- 150,154 ----
/* Parse a brush */
! static RD_BOOL
rdp_parse_brush(STREAM s, BRUSH * brush, uint32 present)
{
***************
*** 173,177 ****
/* Process a destination blt order */
static void
! process_destblt(STREAM s, DESTBLT_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x01)
--- 173,177 ----
/* Process a destination blt order */
static void
! process_destblt(STREAM s, DESTBLT_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x01)
***************
*** 198,202 ****
/* Process a pattern blt order */
static void
! process_patblt(STREAM s, PATBLT_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x0001)
--- 198,202 ----
/* Process a pattern blt order */
static void
! process_patblt(STREAM s, PATBLT_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x0001)
***************
*** 232,236 ****
/* Process a screen blt order */
static void
! process_screenblt(STREAM s, SCREENBLT_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x0001)
--- 232,236 ----
/* Process a screen blt order */
static void
! process_screenblt(STREAM s, SCREENBLT_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x0001)
***************
*** 263,267 ****
/* Process a line order */
static void
! process_line(STREAM s, LINE_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x0001)
--- 263,267 ----
/* Process a line order */
static void
! process_line(STREAM s, LINE_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x0001)
***************
*** 302,306 ****
/* Process an opaque rectangle order */
static void
! process_rect(STREAM s, RECT_ORDER * os, uint32 present, BOOL delta)
{
uint32 i;
--- 302,306 ----
/* Process an opaque rectangle order */
static void
! process_rect(STREAM s, RECT_ORDER * os, uint32 present, RD_BOOL delta)
{
uint32 i;
***************
*** 342,346 ****
/* Process a desktop save order */
static void
! process_desksave(STREAM s, DESKSAVE_ORDER * os, uint32 present, BOOL delta)
{
int width, height;
--- 342,346 ----
/* Process a desktop save order */
static void
! process_desksave(STREAM s, DESKSAVE_ORDER * os, uint32 present, RD_BOOL delta)
{
int width, height;
***************
*** 378,382 ****
/* Process a memory blt order */
static void
! process_memblt(STREAM s, MEMBLT_ORDER * os, uint32 present, BOOL delta)
{
RD_HBITMAP bitmap;
--- 378,382 ----
/* Process a memory blt order */
static void
! process_memblt(STREAM s, MEMBLT_ORDER * os, uint32 present, RD_BOOL delta)
{
RD_HBITMAP bitmap;
***************
*** 424,428 ****
/* Process a 3-way blt order */
static void
! process_triblt(STREAM s, TRIBLT_ORDER * os, uint32 present, BOOL delta)
{
RD_HBITMAP bitmap;
--- 424,428 ----
/* Process a 3-way blt order */
static void
! process_triblt(STREAM s, TRIBLT_ORDER * os, uint32 present, RD_BOOL delta)
{
RD_HBITMAP bitmap;
***************
*** 483,487 ****
/* Process a polygon order */
static void
! process_polygon(STREAM s, POLYGON_ORDER * os, uint32 present, BOOL delta)
{
int index, data, next;
--- 483,487 ----
/* Process a polygon order */
static void
! process_polygon(STREAM s, POLYGON_ORDER * os, uint32 present, RD_BOOL delta)
{
int index, data, next;
***************
*** 562,566 ****
/* Process a polygon2 order */
static void
! process_polygon2(STREAM s, POLYGON2_ORDER * os, uint32 present, BOOL delta)
{
int index, data, next;
--- 562,566 ----
/* Process a polygon2 order */
static void
! process_polygon2(STREAM s, POLYGON2_ORDER * os, uint32 present, RD_BOOL delta)
{
int index, data, next;
***************
*** 647,651 ****
/* Process a polyline order */
static void
! process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta)
{
int index, next, data;
--- 647,651 ----
/* Process a polyline order */
static void
! process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, RD_BOOL delta)
{
int index, next, data;
***************
*** 725,729 ****
/* Process an ellipse order */
static void
! process_ellipse(STREAM s, ELLIPSE_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x01)
--- 725,729 ----
/* Process an ellipse order */
static void
! process_ellipse(STREAM s, ELLIPSE_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x01)
***************
*** 757,761 ****
/* Process an ellipse2 order */
static void
! process_ellipse2(STREAM s, ELLIPSE2_ORDER * os, uint32 present, BOOL delta)
{
if (present & 0x0001)
--- 757,761 ----
/* Process an ellipse2 order */
static void
! process_ellipse2(STREAM s, ELLIPSE2_ORDER * os, uint32 present, RD_BOOL delta)
{
if (present & 0x0001)
***************
*** 795,799 ****
/* Process a text order */
static void
! process_text2(STREAM s, TEXT2_ORDER * os, uint32 present, BOOL delta)
{
int i;
--- 795,799 ----
/* Process a text order */
static void
! process_text2(STREAM s, TEXT2_ORDER * os, uint32 present, RD_BOOL delta)
{
int i;
***************
*** 962,966 ****
/* Process a bitmap cache v2 order */
static void
! process_bmpcache2(STREAM s, uint16 flags, BOOL compressed)
{
RD_HBITMAP bitmap;
--- 962,966 ----
/* Process a bitmap cache v2 order */
static void
! process_bmpcache2(STREAM s, uint16 flags, RD_BOOL compressed)
{
RD_HBITMAP bitmap;
***************
*** 1164,1168 ****
uint8 order_flags;
int size, processed = 0;
! BOOL delta;
while (processed < num_orders)
--- 1164,1168 ----
uint8 order_flags;
int size, processed = 0;
! RD_BOOL delta;
while (processed < num_orders)
Index: printercache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/printercache.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** printercache.c 4 Jan 2007 05:39:39 -0000 1.10
--- printercache.c 8 Jan 2007 04:47:05 -0000 1.11
***************
*** 37,41 ****
#include "rdesktop.h"
! static BOOL
printercache_mkdir(char *base, char *printer)
{
--- 37,41 ----
#include "rdesktop.h"
! static RD_BOOL
printercache_mkdir(char *base, char *printer)
{
***************
*** 73,77 ****
}
! static BOOL
printercache_unlink_blob(char *printer)
{
--- 73,77 ----
}
! static RD_BOOL
printercache_unlink_blob(char *printer)
{
***************
*** 110,114 ****
! static BOOL
printercache_rename_blob(char *printer, char *new_printer)
{
--- 110,114 ----
! static RD_BOOL
printercache_rename_blob(char *printer, char *new_printer)
{
Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** proto.h 4 Jan 2007 05:39:39 -0000 1.106
--- proto.h 8 Jan 2007 04:47:05 -0000 1.107
***************
*** 27,31 ****
/* *INDENT-ON* */
/* bitmap.c */
! BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp);
/* cache.c */
void cache_rebuild_bmpcache_linked_list(uint8 id, sint16 * idx, int count);
--- 27,31 ----
/* *INDENT-ON* */
/* bitmap.c */
! RD_BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp);
/* cache.c */
void cache_rebuild_bmpcache_linked_list(uint8 id, sint16 * idx, int count);
***************
*** 56,60 ****
void cliprdr_send_data(uint8 * data, uint32 length);
void cliprdr_set_mode(const char *optarg);
! BOOL cliprdr_init(void);
/* disk.c */
int disk_enum_devices(uint32 * id, char *optarg);
--- 56,60 ----
void cliprdr_send_data(uint8 * data, uint32 length);
void cliprdr_set_mode(const char *optarg);
! RD_BOOL cliprdr_init(void);
/* disk.c */
int disk_enum_devices(uint32 * id, char *optarg);
***************
*** 74,79 ****
void iso_send(STREAM s);
STREAM iso_recv(uint8 * rdpver);
! BOOL iso_connect(char *server, char *username);
! BOOL iso_reconnect(char *server);
void iso_disconnect(void);
void iso_reset_state(void);
--- 74,79 ----
void iso_send(STREAM s);
STREAM iso_recv(uint8 * rdpver);
! RD_BOOL iso_connect(char *server, char *username);
! RD_BOOL iso_reconnect(char *server);
void iso_disconnect(void);
void iso_reset_state(void);
***************
*** 85,90 ****
void mcs_send(STREAM s);
STREAM mcs_recv(uint16 * channel, uint8 * rdpver);
! BOOL mcs_connect(char *server, STREAM mcs_data, char *username);
! BOOL mcs_reconnect(char *server, STREAM mcs_data);
void mcs_disconnect(void);
void mcs_reset_state(void);
--- 85,90 ----
void mcs_send(STREAM s);
STREAM mcs_recv(uint16 * channel, uint8 * rdpver);
! RD_BOOL mcs_connect(char *server, STREAM mcs_data, char *username);
! RD_BOOL mcs_reconnect(char *server, STREAM mcs_data);
void mcs_disconnect(void);
void mcs_reset_state(void);
***************
*** 101,109 ****
/* pstcache.c */
void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
! BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height,
! uint16 length, uint8 * data);
int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
! BOOL pstcache_init(uint8 cache_id);
/* rdesktop.c */
int main(int argc, char *argv[]);
--- 101,109 ----
/* pstcache.c */
void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
! RD_BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! RD_BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height,
! uint16 length, uint8 * data);
int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
! RD_BOOL pstcache_init(uint8 cache_id);
/* rdesktop.c */
int main(int argc, char *argv[]);
***************
*** 120,130 ****
char *next_arg(char *src, char needle);
void toupper_str(char *p);
! BOOL str_startswith(const char *s, const char *prefix);
! BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data);
! BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data);
char *l_to_a(long N, int base);
int load_licence(unsigned char **data);
void save_licence(unsigned char *data, int length);
! BOOL rd_pstcache_mkdir(void);
int rd_open_file(char *filename);
void rd_close_file(int fd);
--- 120,130 ----
char *next_arg(char *src, char needle);
void toupper_str(char *p);
! RD_BOOL str_startswith(const char *s, const char *prefix);
! RD_BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data);
! RD_BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data);
char *l_to_a(long N, int base);
int load_licence(unsigned char **data);
void save_licence(unsigned char *data, int length);
! RD_BOOL rd_pstcache_mkdir(void);
int rd_open_file(char *filename);
void rd_close_file(int fd);
***************
*** 132,136 ****
int rd_write_file(int fd, void *ptr, int len);
int rd_lseek_file(int fd, int offset);
! BOOL rd_lock_file(int fd, int start, int len);
/* rdp5.c */
void rdp5_process(STREAM s);
--- 132,136 ----
int rd_write_file(int fd, void *ptr, int len);
int rd_lseek_file(int fd, int offset);
! RD_BOOL rd_lock_file(int fd, int start, int len);
/* rdp5.c */
void rdp5_process(STREAM s);
***************
*** 147,156 ****
void process_palette(STREAM s);
void process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason);
! void rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason);
! BOOL rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason);
! BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
! char *directory);
! BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command,
! char *directory, char *cookie);
void rdp_reset_state(void);
void rdp_disconnect(void);
--- 147,156 ----
void process_palette(STREAM s);
void process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason);
! void rdp_main_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason);
! RD_BOOL rdp_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason);
! RD_BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
! char *directory);
! RD_BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command,
! char *directory, char *cookie);
void rdp_reset_state(void);
void rdp_disconnect(void);
***************
*** 160,177 ****
void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer,
uint32 length);
! BOOL rdpdr_init(void);
! void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout);
struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
struct async_iorequest *iorq);
! void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out);
! BOOL rdpdr_abort_io(uint32 fd, uint32 major, RD_NTSTATUS status);
/* rdpsnd.c */
void rdpsnd_record(const void *data, unsigned int size);
! BOOL rdpsnd_init(char *optarg);
void rdpsnd_show_help(void);
void rdpsnd_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv);
void rdpsnd_check_fds(fd_set * rfds, fd_set * wfds);
struct audio_packet *rdpsnd_queue_current_packet(void);
! BOOL rdpsnd_queue_empty(void);
void rdpsnd_queue_next(unsigned long completed_in_us);
int rdpsnd_queue_next_tick(void);
--- 160,177 ----
void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer,
uint32 length);
! RD_BOOL rdpdr_init(void);
! void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, RD_BOOL * timeout);
struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
struct async_iorequest *iorq);
! void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, RD_BOOL timed_out);
! RD_BOOL rdpdr_abort_io(uint32 fd, uint32 major, RD_NTSTATUS status);
/* rdpsnd.c */
void rdpsnd_record(const void *data, unsigned int size);
! RD_BOOL rdpsnd_init(char *optarg);
void rdpsnd_show_help(void);
void rdpsnd_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv);
void rdpsnd_check_fds(fd_set * rfds, fd_set * wfds);
struct audio_packet *rdpsnd_queue_current_packet(void);
! RD_BOOL rdpsnd_queue_empty(void);
void rdpsnd_queue_next(unsigned long completed_in_us);
int rdpsnd_queue_next_tick(void);
***************
*** 188,204 ****
void sec_process_mcs_data(STREAM s);
STREAM sec_recv(uint8 * rdpver);
! BOOL sec_connect(char *server, char *username);
! BOOL sec_reconnect(char *server);
void sec_disconnect(void);
void sec_reset_state(void);
/* serial.c */
int serial_enum_devices(uint32 * id, char *optarg);
! BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result);
! BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
/* tcp.c */
STREAM tcp_init(uint32 maxlen);
void tcp_send(STREAM s);
STREAM tcp_recv(STREAM s, uint32 length);
! BOOL tcp_connect(char *server);
void tcp_disconnect(void);
char *tcp_get_address(void);
--- 188,204 ----
void sec_process_mcs_data(STREAM s);
STREAM sec_recv(uint8 * rdpver);
! RD_BOOL sec_connect(char *server, char *username);
! RD_BOOL sec_reconnect(char *server);
void sec_disconnect(void);
void sec_reset_state(void);
/* serial.c */
int serial_enum_devices(uint32 * id, char *optarg);
! RD_BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result);
! RD_BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
/* tcp.c */
STREAM tcp_init(uint32 maxlen);
void tcp_send(STREAM s);
STREAM tcp_recv(STREAM s, uint32 length);
! RD_BOOL tcp_connect(char *server);
void tcp_disconnect(void);
char *tcp_get_address(void);
***************
*** 214,224 ****
void xclip_deinit(void);
/* xkeymap.c */
! BOOL xkeymap_from_locale(const char *locale);
FILE *xkeymap_open(const char *filename);
void xkeymap_init(void);
! BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed);
key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state);
void xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
! BOOL pressed, uint8 nesting);
uint16 xkeymap_translate_button(unsigned int button);
char *get_ksname(uint32 keysym);
--- 214,224 ----
void xclip_deinit(void);
/* xkeymap.c */
! RD_BOOL xkeymap_from_locale(const char *locale);
FILE *xkeymap_open(const char *filename);
void xkeymap_init(void);
! RD_BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, RD_BOOL pressed);
key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state);
void xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
! RD_BOOL pressed, uint8 nesting);
uint16 xkeymap_translate_button(unsigned int button);
char *get_ksname(uint32 keysym);
***************
*** 231,238 ****
void rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode);
/* xwin.c */
! BOOL get_key_state(unsigned int state, uint32 keysym);
! BOOL ui_init(void);
void ui_deinit(void);
! BOOL ui_create_window(void);
void ui_resize_window(void);
void ui_destroy_window(void);
--- 231,238 ----
void rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode);
/* xwin.c */
! RD_BOOL get_key_state(unsigned int state, uint32 keysym);
! RD_BOOL ui_init(void);
void ui_deinit(void);
! RD_BOOL ui_create_window(void);
void ui_resize_window(void);
void ui_destroy_window(void);
***************
*** 279,283 ****
void ui_begin_update(void);
void ui_end_update(void);
! void ui_seamless_begin(BOOL hidden);
void ui_seamless_hide_desktop(void);
void ui_seamless_unhide_desktop(void);
--- 279,283 ----
void ui_begin_update(void);
void ui_end_update(void);
! void ui_seamless_begin(RD_BOOL hidden);
void ui_seamless_hide_desktop(void);
void ui_seamless_unhide_desktop(void);
***************
*** 295,301 ****
void ui_seamless_ack(unsigned int serial);
/* lspci.c */
! BOOL lspci_init(void);
/* seamless.c */
! BOOL seamless_init(void);
unsigned int seamless_send_sync(void);
unsigned int seamless_send_state(unsigned long id, unsigned int state, unsigned long flags);
--- 295,301 ----
void ui_seamless_ack(unsigned int serial);
/* lspci.c */
! RD_BOOL lspci_init(void);
/* seamless.c */
! RD_BOOL seamless_init(void);
unsigned int seamless_send_sync(void);
unsigned int seamless_send_state(unsigned long id, unsigned int state, unsigned long flags);
Index: pstcache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/pstcache.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pstcache.c 4 Jan 2007 05:39:39 -0000 1.10
--- pstcache.c 8 Jan 2007 04:47:05 -0000 1.11
***************
*** 26,36 ****
extern int g_server_depth;
! extern BOOL g_bitmap_cache;
! extern BOOL g_bitmap_cache_persist_enable;
! extern BOOL g_bitmap_cache_precache;
int g_pstcache_fd[8];
int g_pstcache_Bpp;
! BOOL g_pstcache_enumerated = False;
uint8 zero_key[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
--- 26,36 ----
extern int g_server_depth;
! extern RD_BOOL g_bitmap_cache;
! extern RD_BOOL g_bitmap_cache_persist_enable;
! extern RD_BOOL g_bitmap_cache_precache;
int g_pstcache_fd[8];
int g_pstcache_Bpp;
! RD_BOOL g_pstcache_enumerated = False;
uint8 zero_key[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
***************
*** 51,55 ****
/* Load a bitmap from the persistent cache */
! BOOL
pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx)
{
--- 51,55 ----
/* Load a bitmap from the persistent cache */
! RD_BOOL
pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx)
{
***************
*** 80,84 ****
/* Store a bitmap in the persistent cache */
! BOOL
pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key,
uint8 width, uint8 height, uint16 length, uint8 * data)
--- 80,84 ----
/* Store a bitmap in the persistent cache */
! RD_BOOL
pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key,
uint8 width, uint8 height, uint16 length, uint8 * data)
***************
*** 161,165 ****
/* initialise the persistent bitmap cache */
! BOOL
pstcache_init(uint8 cache_id)
{
--- 161,165 ----
/* initialise the persistent bitmap cache */
! RD_BOOL
pstcache_init(uint8 cache_id)
{
Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** rdesktop.c 4 Jan 2007 05:39:39 -0000 1.156
--- rdesktop.c 8 Jan 2007 04:47:05 -0000 1.157
***************
*** 72,100 ****
int g_server_depth = -1;
int g_win_button_size = 0; /* If zero, disable single app mode */
! BOOL g_bitmap_compression = True;
! BOOL g_sendmotion = True;
! BOOL g_bitmap_cache = True;
! BOOL g_bitmap_cache_persist_enable = False;
! BOOL g_bitmap_cache_precache = True;
! BOOL g_encryption = True;
! BOOL packet_encryption = True;
! BOOL g_desktop_save = True; /* desktop save order */
! BOOL g_polygon_ellipse_orders = True; /* polygon / ellipse orders */
! BOOL g_fullscreen = False;
! BOOL g_grab_keyboard = True;
! BOOL g_hide_decorations = False;
! BOOL g_use_rdp5 = True;
! BOOL g_rdpclip = True;
! BOOL g_console_session = False;
! BOOL g_numlock_sync = False;
! BOOL lspci_enabled = False;
! BOOL g_owncolmap = False;
! BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
! BOOL g_seamless_rdp = False;
uint32 g_embed_wnd;
uint32 g_rdp5_performanceflags =
RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
/* Session Directory redirection */
! BOOL g_redirect = False;
char g_redirect_server[64];
char g_redirect_domain[16];
--- 72,100 ----
int g_server_depth = -1;
int g_win_button_size = 0; /* If zero, disable single app mode */
! RD_BOOL g_bitmap_compression = True;
! RD_BOOL g_sendmotion = True;
! RD_BOOL g_bitmap_cache = True;
! RD_BOOL g_bitmap_cache_persist_enable = False;
! RD_BOOL g_bitmap_cache_precache = True;
! RD_BOOL g_encryption = True;
! RD_BOOL packet_encryption = True;
! RD_BOOL g_desktop_save = True; /* desktop save order */
! RD_BOOL g_polygon_ellipse_orders = True; /* polygon / ellipse orders */
! RD_BOOL g_fullscreen = False;
! RD_BOOL g_grab_keyboard = True;
! RD_BOOL g_hide_decorations = False;
! RD_BOOL g_use_rdp5 = True;
! RD_BOOL g_rdpclip = True;
! RD_BOOL g_console_session = False;
! RD_BOOL g_numlock_sync = False;
! RD_BOOL lspci_enabled = False;
! RD_BOOL g_owncolmap = False;
! RD_BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
! RD_BOOL g_seamless_rdp = False;
uint32 g_embed_wnd;
uint32 g_rdp5_performanceflags =
RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
/* Session Directory redirection */
! RD_BOOL g_redirect = False;
char g_redirect_server[64];
char g_redirect_domain[16];
***************
*** 105,109 ****
#ifdef WITH_RDPSND
! BOOL g_rdpsnd = False;
#endif
--- 105,109 ----
#ifdef WITH_RDPSND
! RD_BOOL g_rdpsnd = False;
#endif
***************
*** 320,328 ****
}
! static BOOL
read_password(char *password, int size)
{
struct termios tios;
! BOOL ret = False;
int istty = 0;
char *p;
--- 320,328 ----
}
! static RD_BOOL
read_password(char *password, int size)
{
struct termios tios;
! RD_BOOL ret = False;
int istty = 0;
char *p;
***************
*** 414,418 ****
char shell[256];
char directory[256];
! BOOL prompt_password, deactivated;
struct passwd *pw;
uint32 flags, ext_disc_reason = 0;
--- 414,418 ----
char shell[256];
char directory[256];
! RD_BOOL prompt_password, deactivated;
struct passwd *pw;
uint32 flags, ext_disc_reason = 0;
***************
*** 421,427 ****
char *locale = NULL;
int username_option = 0;
! BOOL geometry_option = False;
int run_count = 0; /* Session Directory support */
! BOOL continue_connect = True; /* Session Directory support */
#ifdef WITH_RDPSND
char *rdpsnd_optarg = NULL;
--- 421,427 ----
char *locale = NULL;
int username_option = 0;
! RD_BOOL geometry_option = False;
int run_count = 0; /* Session Directory support */
! RD_BOOL continue_connect = True; /* Session Directory support */
#ifdef WITH_RDPSND
char *rdpsnd_optarg = NULL;
***************
*** 1011,1019 ****
#ifdef EGD_SOCKET
/* Read 32 random bytes from PRNGD or EGD socket (based on OpenSSL RAND_egd) */
! static BOOL
generate_random_egd(uint8 * buf)
{
struct sockaddr_un addr;
! BOOL ret = False;
int fd;
--- 1011,1019 ----
#ifdef EGD_SOCKET
/* Read 32 random bytes from PRNGD or EGD socket (based on OpenSSL RAND_egd) */
! static RD_BOOL
generate_random_egd(uint8 * buf)
{
struct sockaddr_un addr;
! RD_BOOL ret = False;
int fd;
***************
*** 1302,1306 ****
! BOOL
str_startswith(const char *s, const char *prefix)
{
--- 1302,1306 ----
! RD_BOOL
str_startswith(const char *s, const char *prefix)
{
***************
*** 1313,1317 ****
initially point to NULL. When linehandler returns False, stop and
return False. Otherwise, return True. */
! BOOL
str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data)
{
--- 1313,1317 ----
initially point to NULL. When linehandler returns False, stop and
return False. Otherwise, return True. */
! RD_BOOL
str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data)
{
***************
*** 1321,1325 ****
size_t buflen;
size_t restlen = 0;
! BOOL ret = True;
/* Copy data to buffer */
--- 1321,1325 ----
size_t buflen;
size_t restlen = 0;
! RD_BOOL ret = True;
/* Copy data to buffer */
***************
*** 1369,1373 ****
/* Execute the program specified by argv. For each line in
stdout/stderr output, call linehandler. Returns false on failure. */
! BOOL
subprocess(char *const argv[], str_handle_lines_t linehandler, void *data)
{
--- 1369,1373 ----
/* Execute the program specified by argv. For each line in
stdout/stderr output, call linehandler. Returns false on failure. */
! RD_BOOL
subprocess(char *const argv[], str_handle_lines_t linehandler, void *data)
{
***************
*** 1535,1539 ****
/* Create the bitmap cache directory */
! BOOL
rd_pstcache_mkdir(void)
{
--- 1535,1539 ----
/* Create the bitmap cache directory */
! RD_BOOL
rd_pstcache_mkdir(void)
{
***************
*** 1612,1616 ****
/* do a write lock on a file */
! BOOL
rd_lock_file(int fd, int start, int len)
{
--- 1612,1616 ----
/* do a write lock on a file */
! RD_BOOL
rd_lock_file(int fd, int start, int len)
{
Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** rdp.c 4 Jan 2007 05:39:39 -0000 1.98
--- rdp.c 8 Jan 2007 04:47:05 -0000 1.99
***************
*** 39,48 ****
extern char g_username[64];
extern char g_codepage[16];
! extern BOOL g_bitmap_compression;
! extern BOOL g_orders;
! extern BOOL g_encryption;
! extern BOOL g_desktop_save;
! extern BOOL g_polygon_ellipse_orders;
! extern BOOL g_use_rdp5;
extern uint16 g_server_rdp_version;
extern uint32 g_rdp5_performanceflags;
--- 39,48 ----
extern char g_username[64];
extern char g_codepage[16];
! extern RD_BOOL g_bitmap_compression;
! extern RD_BOOL g_orders;
! extern RD_BOOL g_encryption;
! extern RD_BOOL g_desktop_save;
! extern RD_BOOL g_polygon_ellipse_orders;
! extern RD_BOOL g_use_rdp5;
extern uint16 g_server_rdp_version;
extern uint32 g_rdp5_performanceflags;
***************
*** 50,56 ****
extern int g_width;
extern int g_height;
! extern BOOL g_bitmap_cache;
! extern BOOL g_bitmap_cache_persist_enable;
! extern BOOL g_numlock_sync;
uint8 *g_next_packet;
--- 50,56 ----
extern int g_width;
extern int g_height;
! extern RD_BOOL g_bitmap_cache;
! extern RD_BOOL g_bitmap_cache_persist_enable;
! extern RD_BOOL g_numlock_sync;
uint8 *g_next_packet;
***************
*** 60,64 ****
/* Session Directory support */
! extern BOOL g_redirect;
extern char g_redirect_server[64];
extern char g_redirect_domain[16];
--- 60,64 ----
/* Session Directory support */
! extern RD_BOOL g_redirect;
extern char g_redirect_server[64];
extern char g_redirect_domain[16];
***************
*** 74,78 ****
#ifdef HAVE_ICONV
! static BOOL g_iconv_works = True;
#endif
--- 74,78 ----
#ifdef HAVE_ICONV
! static RD_BOOL g_iconv_works = True;
#endif
***************
*** 1226,1230 ****
/* Process data PDU */
! static BOOL
process_data_pdu(STREAM s, uint32 * ext_disc_reason)
{
--- 1226,1230 ----
/* Process data PDU */
! static RD_BOOL
process_data_pdu(STREAM s, uint32 * ext_disc_reason)
{
***************
*** 1311,1315 ****
/* Process redirect PDU from Session Directory */
! static BOOL
process_redirect_pdu(STREAM s /*, uint32 * ext_disc_reason */ )
{
--- 1311,1315 ----
/* Process redirect PDU from Session Directory */
! static RD_BOOL
process_redirect_pdu(STREAM s /*, uint32 * ext_disc_reason */ )
{
***************
*** 1361,1365 ****
/* nevers gets out of here till app is done */
void
! rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason)
{
while (rdp_loop(deactivated, ext_disc_reason))
--- 1361,1365 ----
/* nevers gets out of here till app is done */
void
! rdp_main_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason)
{
while (rdp_loop(deactivated, ext_disc_reason))
***************
*** 1368,1377 ****
/* used in uiports and rdp_main_loop, processes the rdp packets waiting */
! BOOL
! rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason)
{
uint8 type;
! BOOL disc = False; /* True when a disconnect PDU was received */
! BOOL cont = True;
STREAM s;
--- 1368,1377 ----
/* used in uiports and rdp_main_loop, processes the rdp packets waiting */
! RD_BOOL
! rdp_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason)
{
uint8 type;
! RD_BOOL disc = False; /* True when a disconnect PDU was received */
! RD_BOOL cont = True;
STREAM s;
***************
*** 1410,1414 ****
/* Establish a connection up to the RDP layer */
! BOOL
rdp_connect(char *server, uint32 flags, char *domain, char *password,
char *command, char *directory)
--- 1410,1414 ----
/* Establish a connection up to the RDP layer */
! RD_BOOL
rdp_connect(char *server, uint32 flags, char *domain, char *password,
char *command, char *directory)
***************
*** 1422,1426 ****
/* Establish a reconnection up to the RDP layer */
! BOOL
rdp_reconnect(char *server, uint32 flags, char *domain, char *password,
char *command, char *directory, char *cookie)
--- 1422,1426 ----
/* Establish a reconnection up to the RDP layer */
! RD_BOOL
rdp_reconnect(char *server, uint32 flags, char *domain, char *password,
char *command, char *directory, char *cookie)
Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** rdpdr.c 4 Jan 2007 05:39:39 -0000 1.49
--- rdpdr.c 8 Jan 2007 04:47:05 -0000 1.50
***************
*** 65,69 ****
#endif
extern FILEINFO g_fileinfo[];
! extern BOOL g_notify_stamp;
static VCHANNEL *rdpdr_channel;
--- 65,69 ----
#endif
extern FILEINFO g_fileinfo[];
! extern RD_BOOL g_notify_stamp;
static VCHANNEL *rdpdr_channel;
***************
*** 118,122 ****
}
! static BOOL
rdpdr_handle_ok(int device, int handle)
{
--- 118,122 ----
}
! static RD_BOOL
rdpdr_handle_ok(int device, int handle)
{
***************
*** 139,143 ****
/* Add a new io request to the table containing pending io requests so it won't block rdesktop */
! static BOOL
add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
DEVICE_FNS * fns, uint32 total_timeout, uint32 interval_timeout, uint8 * buffer,
--- 139,143 ----
/* Add a new io request to the table containing pending io requests so it won't block rdesktop */
! static RD_BOOL
add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
DEVICE_FNS * fns, uint32 total_timeout, uint32 interval_timeout, uint8 * buffer,
***************
*** 366,370 ****
struct stream out;
DEVICE_FNS *fns;
! BOOL rw_blocking = True;
RD_NTSTATUS status = RD_STATUS_INVALID_DEVICE_REQUEST;
--- 366,370 ----
struct stream out;
DEVICE_FNS *fns;
! RD_BOOL rw_blocking = True;
RD_NTSTATUS status = RD_STATUS_INVALID_DEVICE_REQUEST;
***************
*** 846,850 ****
}
! BOOL
rdpdr_init()
{
--- 846,850 ----
}
! RD_BOOL
rdpdr_init()
{
***************
*** 862,866 ****
/* Add file descriptors of pending io request to select() */
void
! rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout)
{
uint32 select_timeout = 0; /* Timeout value to be used for select() (in millisecons). */
--- 862,866 ----
/* Add file descriptors of pending io request to select() */
void
! rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, RD_BOOL * timeout)
{
uint32 select_timeout = 0; /* Timeout value to be used for select() (in millisecons). */
***************
*** 959,963 ****
/* Check if select() returned with one of the rdpdr file descriptors, and complete io if it did */
static void
! _rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
{
RD_NTSTATUS status;
--- 959,963 ----
/* Check if select() returned with one of the rdpdr file descriptors, and complete io if it did */
static void
! _rdpdr_check_fds(fd_set * rfds, fd_set * wfds, RD_BOOL timed_out)
{
RD_NTSTATUS status;
***************
*** 1180,1184 ****
void
! rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
{
fd_set dummy;
--- 1180,1184 ----
void
! rdpdr_check_fds(fd_set * rfds, fd_set * wfds, RD_BOOL timed_out)
{
fd_set dummy;
***************
*** 1198,1202 ****
/* Abort a pending io request for a given handle and major */
! BOOL
rdpdr_abort_io(uint32 fd, uint32 major, RD_NTSTATUS status)
{
--- 1198,1202 ----
/* Abort a pending io request for a given handle and major */
! RD_BOOL
rdpdr_abort_io(uint32 fd, uint32 major, RD_NTSTATUS status)
{
Index: rdpsnd.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** rdpsnd.c 4 Jan 2007 05:39:39 -0000 1.38
--- rdpsnd.c 8 Jan 2007 04:47:06 -0000 1.39
***************
*** 51,56 ****
struct audio_driver *current_driver = NULL;
! static BOOL device_open;
! static BOOL rec_device_open;
static RD_WAVEFORMATEX formats[MAX_FORMATS];
--- 51,56 ----
struct audio_driver *current_driver = NULL;
! static RD_BOOL device_open;
! static RD_BOOL rec_device_open;
static RD_WAVEFORMATEX formats[MAX_FORMATS];
***************
*** 179,186 ****
}
! static BOOL
rdpsnd_auto_select(void)
{
! static BOOL failed = False;
if (!failed)
--- 179,186 ----
}
! static RD_BOOL
rdpsnd_auto_select(void)
{
! static RD_BOOL failed = False;
if (!failed)
***************
*** 215,219 ****
RD_WAVEFORMATEX *format;
STREAM out;
! BOOL device_available = False;
int readcnt;
int discardcnt;
--- 215,219 ----
RD_WAVEFORMATEX *format;
STREAM out;
! RD_BOOL device_available = False;
int readcnt;
int discardcnt;
***************
*** 329,333 ****
RD_WAVEFORMATEX *format;
STREAM out;
! BOOL device_available = False;
int readcnt;
int discardcnt;
--- 329,333 ----
RD_WAVEFORMATEX *format;
STREAM out;
! RD_BOOL device_available = False;
int readcnt;
int discardcnt;
***************
*** 593,597 ****
}
! static BOOL
rdpsnddbg_line_handler(const char *line, void *data)
{
--- 593,597 ----
}
! static RD_BOOL
rdpsnddbg_line_handler(const char *line, void *data)
{
***************
*** 655,659 ****
}
! BOOL
rdpsnd_init(char *optarg)
{
--- 655,659 ----
}
! RD_BOOL
rdpsnd_init(char *optarg)
{
***************
*** 792,796 ****
}
! BOOL
rdpsnd_queue_empty(void)
{
--- 792,796 ----
}
! RD_BOOL
rdpsnd_queue_empty(void)
{
Index: rdpsnd.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rdpsnd.h 4 Jan 2007 05:39:39 -0000 1.12
--- rdpsnd.h 8 Jan 2007 04:47:06 -0000 1.13
***************
*** 34,47 ****
void (*check_fds) (fd_set * rfds, fd_set * wfds);
! BOOL(*wave_out_open) (void);
void (*wave_out_close) (void);
! BOOL(*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx);
! BOOL(*wave_out_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_out_volume) (uint16 left, uint16 right);
! BOOL(*wave_in_open) (void);
void (*wave_in_close) (void);
! BOOL(*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx);
! BOOL(*wave_in_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_in_volume) (uint16 left, uint16 right);
--- 34,47 ----
void (*check_fds) (fd_set * rfds, fd_set * wfds);
! RD_BOOL (*wave_out_open) (void);
void (*wave_out_close) (void);
! RD_BOOL (*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL (*wave_out_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_out_volume) (uint16 left, uint16 right);
! RD_BOOL (*wave_in_open) (void);
void (*wave_in_close) (void);
! RD_BOOL (*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL (*wave_in_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_in_volume) (uint16 left, uint16 right);
Index: rdpsnd_dsp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_dsp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** rdpsnd_dsp.c 4 Jan 2007 05:39:39 -0000 1.25
--- rdpsnd_dsp.c 8 Jan 2007 04:47:06 -0000 1.26
***************
*** 128,132 ****
}
! BOOL
rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample, uint16 device_channels)
{
--- 128,132 ----
}
! RD_BOOL
rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample, uint16 device_channels)
{
***************
*** 159,163 ****
}
! BOOL
rdpsnd_dsp_resample_supported(RD_WAVEFORMATEX * format)
{
--- 159,163 ----
}
! RD_BOOL
rdpsnd_dsp_resample_supported(RD_WAVEFORMATEX * format)
{
***************
*** 174,178 ****
uint32
rdpsnd_dsp_resample(unsigned char **out, unsigned char *in, unsigned int size,
! RD_WAVEFORMATEX * format, BOOL stream_be)
{
#ifdef HAVE_LIBSAMPLERATE
--- 174,178 ----
uint32
rdpsnd_dsp_resample(unsigned char **out, unsigned char *in, unsigned int size,
! RD_WAVEFORMATEX * format, RD_BOOL stream_be)
{
#ifdef HAVE_LIBSAMPLERATE
***************
*** 389,393 ****
{
static struct stream out;
! BOOL stream_be = False;
/* softvol and byteswap do not change the amount of data they
--- 389,393 ----
{
static struct stream out;
! RD_BOOL stream_be = False;
/* softvol and byteswap do not change the amount of data they
Index: rdpsnd_dsp.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_dsp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rdpsnd_dsp.h 4 Jan 2007 05:39:39 -0000 1.6
--- rdpsnd_dsp.h 8 Jan 2007 04:47:06 -0000 1.7
***************
*** 23,29 ****
/* Resample control */
! BOOL rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample,
! uint16 device_channels);
! BOOL rdpsnd_dsp_resample_supported(RD_WAVEFORMATEX * pwfx);
STREAM rdpsnd_dsp_process(unsigned char *data, unsigned int size,
--- 23,29 ----
/* Resample control */
! RD_BOOL rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample,
! uint16 device_channels);
! RD_BOOL rdpsnd_dsp_resample_supported(RD_WAVEFORMATEX * pwfx);
STREAM rdpsnd_dsp_process(unsigned char *data, unsigned int size,
Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** rdpsnd_oss.c 4 Jan 2007 05:39:39 -0000 1.37
--- rdpsnd_oss.c 8 Jan 2007 04:47:06 -0000 1.38
***************
*** 49,56 ****
static int dsp_refs;
! static BOOL dsp_configured;
! static BOOL dsp_out;
! static BOOL dsp_in;
static int stereo;
--- 49,56 ----
static int dsp_refs;
! static RD_BOOL dsp_configured;
! static RD_BOOL dsp_out;
! static RD_BOOL dsp_in;
static int stereo;
***************
*** 59,63 ****
static short samplewidth;
static char *dsp_dev;
! static BOOL in_esddsp;
/* This is a just a forward declaration */
--- 59,63 ----
static short samplewidth;
static char *dsp_dev;
! static RD_BOOL in_esddsp;
/* This is a just a forward declaration */
***************
*** 90,94 ****
}
! static BOOL
detect_esddsp(void)
{
--- 90,94 ----
}
! static RD_BOOL
detect_esddsp(void)
{
***************
*** 112,116 ****
}
! BOOL
oss_open(int fallback)
{
--- 112,116 ----
}
! RD_BOOL
oss_open(int fallback)
{
***************
*** 177,181 ****
}
! BOOL
oss_open_out(void)
{
--- 177,181 ----
}
! RD_BOOL
oss_open_out(void)
{
***************
*** 200,204 ****
}
! BOOL
oss_open_in(void)
{
--- 200,204 ----
}
! RD_BOOL
oss_open_in(void)
{
***************
*** 219,223 ****
}
! BOOL
oss_format_supported(RD_WAVEFORMATEX * pwfx)
{
--- 219,223 ----
}
! RD_BOOL
oss_format_supported(RD_WAVEFORMATEX * pwfx)
{
***************
*** 232,240 ****
}
! BOOL
oss_set_format(RD_WAVEFORMATEX * pwfx)
{
int fragments;
! static BOOL driver_broken = False;
if (dsp_configured)
--- 232,240 ----
}
! RD_BOOL
oss_set_format(RD_WAVEFORMATEX * pwfx)
{
int fragments;
! static RD_BOOL driver_broken = False;
if (dsp_configured)
Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** rdpsnd_sgi.c 4 Jan 2007 05:39:39 -0000 1.23
--- rdpsnd_sgi.c 8 Jan 2007 04:47:06 -0000 1.24
***************
*** 59,63 ****
}
! BOOL
sgi_open(void)
{
--- 59,63 ----
}
! RD_BOOL
sgi_open(void)
{
***************
*** 128,132 ****
}
! BOOL
sgi_format_supported(RD_WAVEFORMATEX * pwfx)
{
--- 128,132 ----
}
! RD_BOOL
sgi_format_supported(RD_WAVEFORMATEX * pwfx)
{
***************
*** 141,145 ****
}
! BOOL
sgi_set_format(RD_WAVEFORMATEX * pwfx)
{
--- 141,145 ----
}
! RD_BOOL
sgi_set_format(RD_WAVEFORMATEX * pwfx)
{
Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** rdpsnd_sun.c 4 Jan 2007 05:39:39 -0000 1.30
--- rdpsnd_sun.c 8 Jan 2007 04:47:06 -0000 1.31
***************
*** 36,42 ****
static int dsp_fd = -1;
! static BOOL dsp_busy;
! static BOOL g_reopened;
static short g_samplewidth;
static char *dsp_dev;
--- 36,42 ----
static int dsp_fd = -1;
! static RD_BOOL dsp_busy;
! static RD_BOOL g_reopened;
static short g_samplewidth;
static char *dsp_dev;
***************
*** 65,69 ****
}
! BOOL
sun_open(void)
{
--- 65,69 ----
}
! RD_BOOL
sun_open(void)
{
***************
*** 100,104 ****
}
! BOOL
sun_format_supported(RD_WAVEFORMATEX * pwfx)
{
--- 100,104 ----
}
! RD_BOOL
sun_format_supported(RD_WAVEFORMATEX * pwfx)
{
***************
*** 113,117 ****
}
! BOOL
sun_set_format(RD_WAVEFORMATEX * pwfx)
{
--- 113,117 ----
}
! RD_BOOL
sun_set_format(RD_WAVEFORMATEX * pwfx)
{
***************
*** 200,204 ****
unsigned int i;
STREAM out;
! static BOOL sentcompletion = True;
static uint32 samplecnt = 0;
static uint32 numsamples;
--- 200,204 ----
unsigned int i;
STREAM out;
! static RD_BOOL sentcompletion = True;
static uint32 samplecnt = 0;
static uint32 numsamples;
Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** scard.c 4 Jan 2007 23:19:54 -0000 1.18
--- scard.c 8 Jan 2007 04:47:06 -0000 1.19
***************
*** 25,31 ****
#include <sys/types.h>
#include <time.h>
- /* PCSC does not use BOOL as parameters or return values in function calls,
- so let us just ignore their own definition of BOOL */
- #define BOOL PCSC_BOOL
#ifndef MAKE_PROTO
#ifdef PCSC_OSX
--- 25,28 ----
***************
*** 38,42 ****
#include <winscard.h>
#endif /* PCSC_OSX */
- #undef BOOL
#include "rdesktop.h"
#include "scard.h"
--- 35,38 ----
***************
*** 496,500 ****
static unsigned int
! inString(PMEM_HANDLE * handle, STREAM in, char **destination, SERVER_DWORD dataLength, BOOL wide)
{
unsigned int Result = (wide) ? (2 * dataLength) : (dataLength);
--- 492,496 ----
static unsigned int
! inString(PMEM_HANDLE * handle, STREAM in, char **destination, SERVER_DWORD dataLength, RD_BOOL wide)
{
unsigned int Result = (wide) ? (2 * dataLength) : (dataLength);
***************
*** 530,534 ****
static unsigned int
! outString(STREAM out, char *source, BOOL wide)
{
PMEM_HANDLE lcHandle = NULL;
--- 526,530 ----
static unsigned int
! outString(STREAM out, char *source, RD_BOOL wide)
{
PMEM_HANDLE lcHandle = NULL;
***************
*** 564,568 ****
static void
! inReaderName(PMEM_HANDLE * handle, STREAM in, char **destination, BOOL wide)
{
SERVER_DWORD dataLength;
--- 560,564 ----
static void
! inReaderName(PMEM_HANDLE * handle, STREAM in, char **destination, RD_BOOL wide)
{
SERVER_DWORD dataLength;
***************
*** 692,696 ****
static MYPCSC_DWORD
! TS_SCardListReaders(STREAM in, STREAM out, BOOL wide)
{
#define readerArraySize 1024
--- 688,692 ----
static MYPCSC_DWORD
! TS_SCardListReaders(STREAM in, STREAM out, RD_BOOL wide)
{
#define readerArraySize 1024
***************
*** 765,769 ****
static MYPCSC_DWORD
! TS_SCardConnect(STREAM in, STREAM out, BOOL wide)
{
MYPCSC_DWORD rv;
--- 761,765 ----
static MYPCSC_DWORD
! TS_SCardConnect(STREAM in, STREAM out, RD_BOOL wide)
{
MYPCSC_DWORD rv;
***************
*** 958,962 ****
}
! static BOOL
mappedStatus(MYPCSC_DWORD code)
{
--- 954,958 ----
}
! static D_BOOL
mappedStatus(MYPCSC_DWORD code)
{
***************
*** 967,971 ****
static MYPCSC_DWORD
! incStatus(MYPCSC_DWORD code, BOOL mapped)
{
if (mapped || (code & SCARD_STATE_CHANGED))
--- 963,967 ----
static MYPCSC_DWORD
! incStatus(MYPCSC_DWORD code, RD_BOOL mapped)
{
if (mapped || (code & SCARD_STATE_CHANGED))
***************
*** 1021,1025 ****
static MYPCSC_DWORD
! TS_SCardGetStatusChange(STREAM in, STREAM out, BOOL wide)
{
MYPCSC_DWORD rv;
--- 1017,1021 ----
static MYPCSC_DWORD
! TS_SCardGetStatusChange(STREAM in, STREAM out, RD_BOOL wide)
{
MYPCSC_DWORD rv;
***************
*** 1033,1037 ****
PMEM_HANDLE lcHandle = NULL;
#if 0
! BOOL mapped = False;
#endif
--- 1029,1033 ----
PMEM_HANDLE lcHandle = NULL;
#if 0
! RD_BOOL mapped = False;
#endif
***************
*** 1223,1227 ****
static MYPCSC_DWORD
! TS_SCardLocateCardsByATR(STREAM in, STREAM out, BOOL wide)
{
int i, j, k;
--- 1219,1223 ----
static MYPCSC_DWORD
! TS_SCardLocateCardsByATR(STREAM in, STREAM out, RD_BOOL wide)
{
int i, j, k;
***************
*** 1291,1295 ****
for (j = 0, rsCur = rsArray; j < readerCount; j++, rsCur++)
{
! BOOL equal = 1;
for (k = 0; k < cur->cbAtr; k++)
{
--- 1287,1291 ----
for (j = 0, rsCur = rsArray; j < readerCount; j++, rsCur++)
{
! RD_BOOL equal = 1;
for (k = 0; k < cur->cbAtr; k++)
{
***************
*** 1632,1636 ****
static MYPCSC_DWORD
! TS_SCardStatus(STREAM in, STREAM out, BOOL wide)
{
MYPCSC_DWORD rv;
--- 1628,1632 ----
static MYPCSC_DWORD
! TS_SCardStatus(STREAM in, STREAM out, RD_BOOL wide)
{
MYPCSC_DWORD rv;
***************
*** 2226,2230 ****
case SC_LIST_READERS + 4: /* SCardListReadersW */
{
! BOOL wide = request != SC_LIST_READERS;
DEBUG_SCARD(("<---SCardListReaders---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
--- 2222,2226 ----
case SC_LIST_READERS + 4: /* SCardListReadersW */
{
! D_BOOL wide = request != SC_LIST_READERS;
DEBUG_SCARD(("<---SCardListReaders---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
***************
*** 2236,2240 ****
case SC_CONNECT + 4: /* SCardConnectW */
{
! BOOL wide = request != SC_CONNECT;
DEBUG_SCARD(("<---SCardConnect---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
--- 2232,2236 ----
case SC_CONNECT + 4: /* SCardConnectW */
{
! RD_BOOL wide = request != SC_CONNECT;
DEBUG_SCARD(("<---SCardConnect---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
***************
*** 2260,2264 ****
case SC_GET_STATUS_CHANGE + 4: /* SCardGetStatusChangeW */
{
! BOOL wide = request != SC_GET_STATUS_CHANGE;
DEBUG_SCARD(("<---SCardGetStatusChange---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
--- 2256,2260 ----
case SC_GET_STATUS_CHANGE + 4: /* SCardGetStatusChangeW */
{
! RD_BOOL wide = request != SC_GET_STATUS_CHANGE;
DEBUG_SCARD(("<---SCardGetStatusChange---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
***************
*** 2277,2281 ****
case SC_LOCATE_CARDS_BY_ATR + 4: /* SCardLocateCardsByATRW */
{
! BOOL wide = request != SC_LOCATE_CARDS_BY_ATR;
DEBUG_SCARD(("<---SCardLocateCardsByATR---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
--- 2273,2277 ----
case SC_LOCATE_CARDS_BY_ATR + 4: /* SCardLocateCardsByATRW */
{
! RD_BOOL wide = request != SC_LOCATE_CARDS_BY_ATR;
DEBUG_SCARD(("<---SCardLocateCardsByATR---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
***************
*** 2329,2333 ****
case SC_STATUS + 4: /* SCardStatusW */
{
! BOOL wide = request != SC_STATUS;
DEBUG_SCARD(("<---SCardStatus---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
--- 2325,2329 ----
case SC_STATUS + 4: /* SCardStatusW */
{
! RD_BOOL wide = request != SC_STATUS;
DEBUG_SCARD(("<---SCardStatus---> (%s)\n",
(wide) ? ("WIDE") : ("ASCII")));
***************
*** 2381,2385 ****
static STREAM
! duplicateStream(PMEM_HANDLE * handle, STREAM s, uint32 buffer_size, BOOL isInputStream)
{
STREAM d = SC_xmalloc(handle, sizeof(struct stream));
--- 2377,2381 ----
static STREAM
! duplicateStream(PMEM_HANDLE * handle, STREAM s, uint32 buffer_size, RD_BOOL isInputStream)
{
STREAM d = SC_xmalloc(handle, sizeof(struct stream));
Index: seamless.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/seamless.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** seamless.c 4 Jan 2007 05:39:39 -0000 1.5
--- seamless.c 8 Jan 2007 04:47:06 -0000 1.6
***************
*** 31,35 ****
#endif
! extern BOOL g_seamless_rdp;
static VCHANNEL *seamless_channel;
static unsigned int seamless_serial;
--- 31,35 ----
#endif
! extern RD_BOOL g_seamless_rdp;
static VCHANNEL *seamless_channel;
static unsigned int seamless_serial;
***************
*** 59,63 ****
! static BOOL
seamless_process_line(const char *line, void *data)
{
--- 59,63 ----
! static RD_BOOL
seamless_process_line(const char *line, void *data)
{
***************
*** 301,305 ****
! static BOOL
seamless_line_handler(const char *line, void *data)
{
--- 301,305 ----
! static RD_BOOL
seamless_line_handler(const char *line, void *data)
{
***************
*** 334,338 ****
! BOOL
seamless_init(void)
{
--- 334,338 ----
! RD_BOOL
seamless_init(void)
{
Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** secure.c 4 Jan 2007 05:39:39 -0000 1.64
--- secure.c 8 Jan 2007 04:47:06 -0000 1.65
***************
*** 40,47 ****
extern int g_keyboard_subtype;
extern int g_keyboard_functionkeys;
! extern BOOL g_encryption;
! extern BOOL g_licence_issued;
! extern BOOL g_use_rdp5;
! extern BOOL g_console_session;
extern int g_server_depth;
extern uint16 mcs_userid;
--- 40,47 ----
extern int g_keyboard_subtype;
extern int g_keyboard_functionkeys;
! extern RD_BOOL g_encryption;
! extern RD_BOOL g_licence_issued;
! extern RD_BOOL g_use_rdp5;
! extern RD_BOOL g_console_session;
extern int g_server_depth;
extern uint16 mcs_userid;
***************
*** 511,515 ****
/* Parse a public key structure */
! static BOOL
sec_parse_public_key(STREAM s, uint8 ** modulus, uint8 ** exponent)
{
--- 511,515 ----
/* Parse a public key structure */
! static RD_BOOL
sec_parse_public_key(STREAM s, uint8 ** modulus, uint8 ** exponent)
{
***************
*** 540,544 ****
}
! static BOOL
sec_parse_x509_key(X509 * cert)
{
--- 540,544 ----
}
! static RD_BOOL
sec_parse_x509_key(X509 * cert)
{
***************
*** 577,581 ****
/* Parse a crypto information structure */
! static BOOL
sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
uint8 ** server_random, uint8 ** modulus, uint8 ** exponent)
--- 577,581 ----
/* Parse a crypto information structure */
! static RD_BOOL
sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
uint8 ** server_random, uint8 ** modulus, uint8 ** exponent)
***************
*** 941,945 ****
/* Establish a secure connection */
! BOOL
sec_connect(char *server, char *username)
{
--- 941,945 ----
/* Establish a secure connection */
! RD_BOOL
sec_connect(char *server, char *username)
{
***************
*** 962,966 ****
/* Establish a secure connection */
! BOOL
sec_reconnect(char *server)
{
--- 962,966 ----
/* Establish a secure connection */
! RD_BOOL
sec_reconnect(char *server)
{
Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** serial.c 4 Jan 2007 05:39:39 -0000 1.31
--- serial.c 8 Jan 2007 04:47:06 -0000 1.32
***************
*** 163,167 ****
}
! static BOOL
get_termios(SERIAL_DEVICE * pser_inf, RD_NTHANDLE serial_fd)
{
--- 163,167 ----
}
! static RD_BOOL
get_termios(SERIAL_DEVICE * pser_inf, RD_NTHANDLE serial_fd)
{
***************
*** 946,950 ****
}
! BOOL
serial_get_event(RD_NTHANDLE handle, uint32 * result)
{
--- 946,950 ----
}
! RD_BOOL
serial_get_event(RD_NTHANDLE handle, uint32 * result)
{
***************
*** 952,956 ****
SERIAL_DEVICE *pser_inf;
int bytes;
! BOOL ret = False;
*result = 0;
--- 952,956 ----
SERIAL_DEVICE *pser_inf;
int bytes;
! RD_BOOL ret = False;
*result = 0;
***************
*** 1044,1048 ****
/* Read timeout for a given file descripter (device) when adding fd's to select() */
! BOOL
serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout)
{
--- 1044,1048 ----
/* Read timeout for a given file descripter (device) when adding fd's to select() */
! RD_BOOL
serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout)
{
Index: tcp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/tcp.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** tcp.c 4 Jan 2007 05:39:39 -0000 1.37
--- tcp.c 8 Jan 2007 04:47:06 -0000 1.38
***************
*** 55,59 ****
/* wait till socket is ready to write or timeout */
! static BOOL
tcp_can_send(int sck, int millis)
{
--- 55,59 ----
/* wait till socket is ready to write or timeout */
! static RD_BOOL
tcp_can_send(int sck, int millis)
{
***************
*** 200,204 ****
/* Establish a connection on the TCP layer */
! BOOL
tcp_connect(char *server)
{
--- 200,204 ----
/* Establish a connection on the TCP layer */
! RD_BOOL
tcp_connect(char *server)
{
Index: types.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/types.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** types.h 4 Jan 2007 23:19:54 -0000 1.33
--- types.h 8 Jan 2007 04:47:06 -0000 1.34
***************
*** 19,23 ****
*/
! typedef int BOOL;
#ifndef True
--- 19,23 ----
*/
! typedef int RD_BOOL;
#ifndef True
***************
*** 236,240 ****
uint32 bloblen;
uint8 *blob;
! BOOL default_printer;
}
PRINTER;
--- 236,240 ----
uint32 bloblen;
uint8 *blob;
! RD_BOOL default_printer;
}
PRINTER;
***************
*** 260,264 ****
struct dirent *pdirent;
char pattern[PATH_MAX];
! BOOL delete_on_close;
NOTIFY notify;
uint32 info_class;
--- 260,264 ----
struct dirent *pdirent;
char pattern[PATH_MAX];
! RD_BOOL delete_on_close;
NOTIFY notify;
uint32 info_class;
***************
*** 266,268 ****
FILEINFO;
! typedef BOOL(*str_handle_lines_t) (const char *line, void *data);
--- 266,268 ----
FILEINFO;
! typedef RD_BOOL(*str_handle_lines_t) (const char *line, void *data);
Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** xclip.c 4 Jan 2007 05:39:39 -0000 1.42
--- xclip.c 8 Jan 2007 04:47:06 -0000 1.43
***************
*** 54,63 ****
extern Window g_wnd;
extern Time g_last_gesturetime;
! extern BOOL g_rdpclip;
/* Mode of operation.
- Auto: Look at both PRIMARY and CLIPBOARD and use the most recent.
- Non-auto: Look at just CLIPBOARD. */
! static BOOL auto_mode = True;
/* Atoms of the two X selections we're dealing with: CLIPBOARD (explicit-copy) and PRIMARY (selection-copy) */
static Atom clipboard_atom, primary_atom;
--- 54,63 ----
extern Window g_wnd;
extern Time g_last_gesturetime;
! extern RD_BOOL g_rdpclip;
/* Mode of operation.
- Auto: Look at both PRIMARY and CLIPBOARD and use the most recent.
- Non-auto: Look at just CLIPBOARD. */
! static RD_BOOL auto_mode = True;
/* Atoms of the two X selections we're dealing with: CLIPBOARD (explicit-copy) and PRIMARY (selection-copy) */
static Atom clipboard_atom, primary_atom;
***************
*** 93,97 ****
selection owner. reprobe_selections indicate that the ownership changed in
the middle of the current probe so it should be restarted. */
! static BOOL probing_selections, reprobe_selections;
/* Atoms _RDESKTOP_PRIMARY_OWNER and _RDESKTOP_CLIPBOARD_OWNER. Used as properties
on the root window to indicate which selections that are owned by rdesktop. */
--- 93,97 ----
selection owner. reprobe_selections indicate that the ownership changed in
the middle of the current probe so it should be restarted. */
! static RD_BOOL probing_selections, reprobe_selections;
/* Atoms _RDESKTOP_PRIMARY_OWNER and _RDESKTOP_CLIPBOARD_OWNER. Used as properties
on the root window to indicate which selections that are owned by rdesktop. */
***************
*** 106,110 ****
static XSelectionRequestEvent selection_request;
/* Denotes we have a pending selection request. */
! static Bool has_selection_request;
/* Stores the clipboard format (CF_TEXT, CF_UNICODETEXT etc.) requested in the last
CLIPDR_DATA_REQUEST (= the RDP server requesting clipboard data from us).
--- 106,110 ----
static XSelectionRequestEvent selection_request;
/* Denotes we have a pending selection request. */
! static RD_BOOL has_selection_request;
/* Stores the clipboard format (CF_TEXT, CF_UNICODETEXT etc.) requested in the last
CLIPDR_DATA_REQUEST (= the RDP server requesting clipboard data from us).
***************
*** 118,122 ****
/* Denotes that an rdesktop (not this rdesktop) is owning the selection,
allowing us to interchange Windows native clipboard data directly. */
! static BOOL rdesktop_is_selection_owner = False;
/* Time when we acquired the selection. */
static Time acquire_time = 0;
--- 118,122 ----
/* Denotes that an rdesktop (not this rdesktop) is owning the selection,
allowing us to interchange Windows native clipboard data directly. */
! static RD_BOOL rdesktop_is_selection_owner = False;
/* Time when we acquired the selection. */
static Time acquire_time = 0;
***************
*** 158,162 ****
uint8 *result;
uint16 *inptr, *outptr;
! Bool swap_endianess;
/* Worst case: Every char is LF */
--- 158,162 ----
uint8 *result;
uint16 *inptr, *outptr;
! RD_BOOL swap_endianess;
/* Worst case: Every char is LF */
***************
*** 284,288 ****
to the expected RDP format as necessary. Returns true if data was sent.
*/
! static Bool
xclip_send_data_with_convert(uint8 * source, size_t source_size, Atom target)
{
--- 284,288 ----
to the expected RDP format as necessary. Returns true if data was sent.
*/
! static RD_BOOL
xclip_send_data_with_convert(uint8 * source, size_t source_size, Atom target)
{
***************
*** 959,963 ****
ui_clip_handle_data(uint8 * data, uint32 length)
{
! BOOL free_data = False;
if (length == 0)
--- 959,963 ----
ui_clip_handle_data(uint8 * data, uint32 length)
{
! RD_BOOL free_data = False;
if (length == 0)
Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** xkeymap.c 4 Jan 2007 05:39:39 -0000 1.95
--- xkeymap.c 8 Jan 2007 04:47:06 -0000 1.96
***************
*** 47,55 ****
extern int g_keyboard_functionkeys;
extern int g_win_button_size;
! extern BOOL g_enable_compose;
! extern BOOL g_use_rdp5;
! extern BOOL g_numlock_sync;
! static BOOL keymap_loaded;
static key_translation *keymap[KEYMAP_SIZE];
static int min_keycode;
--- 47,55 ----
extern int g_keyboard_functionkeys;
extern int g_win_button_size;
! extern RD_BOOL g_enable_compose;
! extern RD_BOOL g_use_rdp5;
! extern RD_BOOL g_numlock_sync;
! static RD_BOOL keymap_loaded;
static key_translation *keymap[KEYMAP_SIZE];
static int min_keycode;
***************
*** 57,61 ****
static uint16 saved_remote_modifier_state = 0;
! static void update_modifier_state(uint8 scancode, BOOL pressed);
/* Free key_translation structure, including linked list */
--- 57,61 ----
static uint16 saved_remote_modifier_state = 0;
! static void update_modifier_state(uint8 scancode, RD_BOOL pressed);
/* Free key_translation structure, including linked list */
***************
*** 160,164 ****
}
! BOOL
xkeymap_from_locale(const char *locale)
{
--- 160,164 ----
}
! RD_BOOL
xkeymap_from_locale(const char *locale)
{
***************
*** 276,280 ****
}
! static BOOL
xkeymap_read(char *mapname)
{
--- 276,280 ----
}
! static RD_BOOL
xkeymap_read(char *mapname)
{
***************
*** 456,460 ****
static void
! send_winkey(uint32 ev_time, BOOL pressed, BOOL leftkey)
{
uint8 winkey;
--- 456,460 ----
static void
! send_winkey(uint32 ev_time, RD_BOOL pressed, RD_BOOL leftkey)
{
uint8 winkey;
***************
*** 505,510 ****
/* Handle special key combinations */
! BOOL
! handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed)
{
switch (keysym)
--- 505,510 ----
/* Handle special key combinations */
! RD_BOOL
! handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, RD_BOOL pressed)
{
switch (keysym)
***************
*** 682,686 ****
void
xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
! BOOL pressed, uint8 nesting)
{
key_translation tr, *ptr;
--- 682,686 ----
void
xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
! RD_BOOL pressed, uint8 nesting)
{
key_translation tr, *ptr;
***************
*** 763,767 ****
}
! static BOOL
is_modifier(uint8 scancode)
{
--- 763,767 ----
}
! static RD_BOOL
is_modifier(uint8 scancode)
{
***************
*** 957,961 ****
static void
! update_modifier_state(uint8 scancode, BOOL pressed)
{
#ifdef WITH_DEBUG_KBD
--- 957,961 ----
static void
! update_modifier_state(uint8 scancode, RD_BOOL pressed)
{
#ifdef WITH_DEBUG_KBD
***************
*** 996,1000 ****
if (pressed && !g_numlock_sync)
{
! BOOL newNumLockState;
newNumLockState =
(MASK_HAS_BITS
--- 996,1000 ----
if (pressed && !g_numlock_sync)
{
! RD_BOOL newNumLockState;
newNumLockState =
(MASK_HAS_BITS
Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -C2 -d -r1.220 -r1.221
*** xwin.c 4 Jan 2007 23:38:35 -0000 1.220
--- xwin.c 8 Jan 2007 04:47:06 -0000 1.221
***************
*** 21,27 ****
#include <X11/Xlib.h>
#include <X11/Xutil.h>
- #define BOOL XPROTO_BOOL
#include <X11/Xproto.h>
- #undef BOOL
#include <unistd.h>
#include <sys/time.h>
--- 21,25 ----
***************
*** 37,44 ****
extern int g_ypos;
extern int g_pos;
! extern BOOL g_sendmotion;
! extern BOOL g_fullscreen;
! extern BOOL g_grab_keyboard;
! extern BOOL g_hide_decorations;
extern char g_title[];
/* Color depth of the RDP session.
--- 35,42 ----
extern int g_ypos;
extern int g_pos;
! extern RD_BOOL g_sendmotion;
! extern RD_BOOL g_fullscreen;
! extern RD_BOOL g_grab_keyboard;
! extern RD_BOOL g_hide_decorations;
extern char g_title[];
/* Color depth of the RDP session.
***************
*** 72,76 ****
struct timeval *position_timer;
! BOOL outstanding_position;
unsigned int outpos_serial;
int outpos_xoffset, outpos_yoffset;
--- 70,74 ----
struct timeval *position_timer;
! RD_BOOL outstanding_position;
unsigned int outpos_serial;
int outpos_xoffset, outpos_yoffset;
***************
*** 81,92 ****
static seamless_window *g_seamless_windows = NULL;
static unsigned long g_seamless_focused = 0;
! static BOOL g_seamless_started = False; /* Server end is up and running */
! static BOOL g_seamless_active = False; /* We are currently in seamless mode */
! static BOOL g_seamless_hidden = False; /* Desktop is hidden on server */
! extern BOOL g_seamless_rdp;
extern uint32 g_embed_wnd;
! BOOL g_enable_compose = False;
! BOOL g_Unobscured; /* used for screenblt */
static GC g_gc = NULL;
static GC g_create_bitmap_gc = NULL;
--- 79,90 ----
static seamless_window *g_seamless_windows = NULL;
static unsigned long g_seamless_focused = 0;
! static RD_BOOL g_seamless_started = False; /* Server end is up and running */
! static RD_BOOL g_seamless_active = False; /* We are currently in seamless mode */
! static RD_BOOL g_seamless_hidden = False; /* Desktop is hidden on server */
! extern RD_BOOL g_seamless_rdp;
extern uint32 g_embed_wnd;
! RD_BOOL g_enable_compose = False;
! RD_BOOL g_Unobscured; /* used for screenblt */
static GC g_gc = NULL;
static GC g_create_bitmap_gc = NULL;
***************
*** 110,115 ****
extern Atom g_net_wm_state_atom;
extern Atom g_net_wm_desktop_atom;
! static BOOL g_focused;
! static BOOL g_mouse_in_wnd;
/* Indicates that:
1) visual has 15, 16 or 24 depth and the same color channel masks
--- 108,113 ----
extern Atom g_net_wm_state_atom;
extern Atom g_net_wm_desktop_atom;
! static RD_BOOL g_focused;
! static RD_BOOL g_mouse_in_wnd;
/* Indicates that:
1) visual has 15, 16 or 24 depth and the same color channel masks
***************
*** 118,122 ****
This will trigger an optimization whose real value is questionable.
*/
! static BOOL g_compatible_arch;
/* Indicates whether RDP's bitmaps and our XImages have the same
binary format. If so, we can avoid an expensive translation.
--- 116,120 ----
This will trigger an optimization whose real value is questionable.
*/
! static RD_BOOL g_compatible_arch;
/* Indicates whether RDP's bitmaps and our XImages have the same
binary format. If so, we can avoid an expensive translation.
***************
*** 129,152 ****
so its endianess doesn't matter)
*/
! static BOOL g_no_translate_image = False;
/* endianness */
! static BOOL g_host_be;
! static BOOL g_xserver_be;
static int g_red_shift_r, g_blue_shift_r, g_green_shift_r;
static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;
/* software backing store */
! extern BOOL g_ownbackstore;
static Pixmap g_backstore = 0;
/* Moving in single app mode */
! static BOOL g_moving_wnd;
static int g_move_x_offset = 0;
static int g_move_y_offset = 0;
! static BOOL g_using_full_workarea = False;
#ifdef WITH_RDPSND
! extern BOOL g_rdpsnd;
#endif
--- 127,150 ----
so its endianess doesn't matter)
*/
! static RD_BOOL g_no_translate_image = False;
/* endianness */
! static RD_BOOL g_host_be;
! static RD_BOOL g_xserver_be;
static int g_red_shift_r, g_blue_shift_r, g_green_shift_r;
static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;
/* software backing store */
! extern RD_BOOL g_ownbackstore;
static Pixmap g_backstore = 0;
/* Moving in single app mode */
! static RD_BOOL g_moving_wnd;
static int g_move_x_offset = 0;
static int g_move_y_offset = 0;
! static RD_BOOL g_using_full_workarea = False;
#ifdef WITH_RDPSND
! extern RD_BOOL g_rdpsnd;
#endif
***************
*** 249,253 ****
/* colour maps */
! extern BOOL g_owncolmap;
static Colormap g_xcolmap;
static uint32 *g_colmap = NULL;
--- 247,251 ----
/* colour maps */
! extern RD_BOOL g_owncolmap;
static Colormap g_xcolmap;
static uint32 *g_colmap = NULL;
***************
*** 473,477 ****
static seamless_group *
! sw_find_group(unsigned long id, BOOL dont_create)
{
seamless_window *sw;
--- 471,475 ----
static seamless_group *
! sw_find_group(unsigned long id, RD_BOOL dont_create)
{
seamless_window *sw;
***************
*** 1263,1267 ****
}
! BOOL
get_key_state(unsigned int state, uint32 keysym)
{
--- 1261,1265 ----
}
! RD_BOOL
get_key_state(unsigned int state, uint32 keysym)
{
***************
*** 1311,1315 ****
}
! static BOOL
select_visual(int screen_num)
{
--- 1309,1313 ----
}
! static RD_BOOL
select_visual(int screen_num)
{
***************
*** 1350,1354 ****
{
XVisualInfo *visual_info = &vmatches[i];
! BOOL can_translate_to_bpp = False;
int j;
--- 1348,1352 ----
{
XVisualInfo *visual_info = &vmatches[i];
! RD_BOOL can_translate_to_bpp = False;
int j;
***************
*** 1522,1526 ****
}
! BOOL
ui_init(void)
{
--- 1520,1524 ----
}
! RD_BOOL
ui_init(void)
{
***************
*** 1536,1540 ****
{
uint16 endianess_test = 1;
! g_host_be = !(BOOL) (*(uint8 *) (&endianess_test));
}
--- 1534,1538 ----
{
uint16 endianess_test = 1;
! g_host_be = !(RD_BOOL) (*(uint8 *) (&endianess_test));
}
***************
*** 1688,1692 ****
}
! BOOL
ui_create_window(void)
{
--- 1686,1690 ----
}
! RD_BOOL
ui_create_window(void)
{
***************
*** 1875,1879 ****
static void
! handle_button_event(XEvent xevent, BOOL down)
{
uint16 button, flags = 0;
--- 1873,1877 ----
static void
! handle_button_event(XEvent xevent, RD_BOOL down)
{
uint16 button, flags = 0;
***************
*** 2249,2253 ****
fd_set rfds, wfds;
struct timeval tv;
! BOOL s_timeout = False;
while (True)
--- 2247,2251 ----
fd_set rfds, wfds;
struct timeval tv;
! RD_BOOL s_timeout = False;
while (True)
***************
*** 2293,2297 ****
/* Abort serial read calls */
if (s_timeout)
! rdpdr_check_fds(&rfds, &wfds, (BOOL) True);
continue;
}
--- 2291,2295 ----
/* Abort serial read calls */
if (s_timeout)
! rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) True);
continue;
}
***************
*** 2301,2305 ****
#endif
! rdpdr_check_fds(&rfds, &wfds, (BOOL) False);
if (FD_ISSET(rdp_socket, &rfds))
--- 2299,2303 ----
#endif
! rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) False);
if (FD_ISSET(rdp_socket, &rfds))
***************
*** 3254,3258 ****
void
! ui_seamless_begin(BOOL hidden)
{
if (!g_seamless_rdp)
--- 3252,3256 ----
void
! ui_seamless_begin(RD_BOOL hidden)
{
if (!g_seamless_rdp)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV