morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

types/base.h: rename FRDP_BOOL to boolean

Browse Source
This commit is contained in:
Marc-André Moreau
2011-07-04 20:10:25 -04:00
parent eed80301f4
commit 25a5bc53b1
10 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/freerdp/freerdp.h
View File

@@ -52,7 +52,7 @@
extern "C" {
#endif
FREERDP_API FRDP_BOOL
FREERDP_API boolean
freerdp_global_init(void);
FREERDP_API void
freerdp_global_finish(void);
@@ -73,7 +73,7 @@ struct rdp_inst
int (* rdp_get_fds)(rdpInst * inst, void ** read_fds, int * read_count,
void ** write_fds, int * write_count);
int (* rdp_check_fds)(rdpInst * inst);
int (* rdp_send_input_scancode)(rdpInst * inst, FRDP_BOOL up, FRDP_BOOL extended, uint8 keyCode);
int (* rdp_send_input_scancode)(rdpInst * inst, boolean up, boolean extended, uint8 keyCode);
int (* rdp_send_input_unicode)(rdpInst * inst, uint16 character);
int (* rdp_send_input_mouse)(rdpInst * inst, uint16 pointerFlags, uint16 xPos, uint16 yPos);
int (* rdp_sync_input)(rdpInst * inst, int toggle_flags);
@@ -139,10 +139,10 @@ struct rdp_inst
void (* ui_destroy_surface)(rdpInst * inst, FRDP_HBITMAP surface);
void (* ui_channel_data)(rdpInst * inst, int chan_id, char * data, int data_size,
int flags, int total_size);
FRDP_BOOL (* ui_authenticate)(rdpInst * inst);
boolean (* ui_authenticate)(rdpInst * inst);
int (* ui_decode)(rdpInst * inst, uint8 * data, int data_size);
FRDP_BOOL (* ui_check_certificate)(rdpInst * inst, const char * fingerprint,
const char * subject, const char * issuer, FRDP_BOOL verified);
boolean (* ui_check_certificate)(rdpInst * inst, const char * fingerprint,
const char * subject, const char * issuer, boolean verified);
};
FREERDP_API rdpInst *

4
include/freerdp/kbd.h
View File

@@ -37,8 +37,8 @@ freerdp_kbd_get_layouts(int types);
unsigned int
freerdp_kbd_init(void *dpy, unsigned int keyboaFRDP_layout_id);
uint8
freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended);
freerdp_kbd_get_scancode_by_keycode(uint8 keycode, boolean * extended);
uint8
freerdp_kbd_get_scancode_by_virtualkey(int vkcode, FRDP_BOOL * extended);
freerdp_kbd_get_scancode_by_virtualkey(int vkcode, boolean * extended);
#endif /* __FREERDP_KBD_H */

2
include/freerdp/types/base.h
View File

@@ -42,6 +42,6 @@ typedef signed long long sint64;
#define False (0)
#endif
typedef int FRDP_BOOL;
typedef int boolean;
#endif

8
libfreerdp-core/tcp.c
View File

@@ -32,7 +32,7 @@
#include "tcp.h"
FRDP_BOOL
boolean
tcp_connect(rdpTcp * tcp, const char * hostname, int port)
{
int status;
@@ -81,7 +81,7 @@ tcp_connect(rdpTcp * tcp, const char * hostname, int port)
return True;
}
FRDP_BOOL
boolean
tcp_disconnect(rdpTcp * tcp)
{
if (tcp->sockfd != -1)
@@ -93,8 +93,8 @@ tcp_disconnect(rdpTcp * tcp)
return True;
}
FRDP_BOOL
tcp_set_blocking_mode(rdpTcp * tcp, FRDP_BOOL blocking)
boolean
tcp_set_blocking_mode(rdpTcp * tcp, boolean blocking)
{
int flags;
flags = fcntl(tcp->sockfd, F_GETFL);

14
libfreerdp-core/tcp.h
View File

@@ -25,9 +25,9 @@
#include <freerdp/utils/stream.h>
typedef struct rdp_tcp rdpTcp;
typedef FRDP_BOOL (*TcpConnect) (rdpTcp * tcp, const char * hostname, int port);
typedef FRDP_BOOL (*TcpDisconnect) (rdpTcp * tcp);
typedef FRDP_BOOL (*TcpSetBlockingMode) (rdpTcp * tcp, FRDP_BOOL blocking);
typedef boolean (*TcpConnect) (rdpTcp * tcp, const char * hostname, int port);
typedef boolean (*TcpDisconnect) (rdpTcp * tcp);
typedef boolean (*TcpSetBlockingMode) (rdpTcp * tcp, boolean blocking);
struct rdp_tcp
{
@@ -37,12 +37,12 @@ struct rdp_tcp
TcpSetBlockingMode set_blocking_mode;
};
FRDP_BOOL
boolean
tcp_connect(rdpTcp * tcp, const char * hostname, int port);
FRDP_BOOL
boolean
tcp_disconnect(rdpTcp * tcp);
FRDP_BOOL
tcp_set_blocking_mode(rdpTcp * tcp, FRDP_BOOL blocking);
boolean
tcp_set_blocking_mode(rdpTcp * tcp, boolean blocking);
rdpTcp*
tcp_new();

6
libfreerdp-core/tls.c
View File

@@ -22,7 +22,7 @@
#include "tls.h"
FRDP_BOOL
boolean
tls_connect(rdpTls * tls)
{
int connection_status;
@@ -59,7 +59,7 @@ tls_connect(rdpTls * tls)
return True;
}
FRDP_BOOL
boolean
tls_disconnect(rdpTls * tls)
{
return True;
@@ -123,7 +123,7 @@ tls_write(rdpTls * tls, char* data, int length)
return bytes;
}
FRDP_BOOL
boolean
tls_print_error(char *func, SSL *connection, int value)
{
switch (SSL_get_error(connection, value))

10
libfreerdp-core/tls.h
View File

@@ -28,8 +28,8 @@
#include <freerdp/utils/stream.h>
typedef struct rdp_tls rdpTls;
typedef FRDP_BOOL (*TlsConnect) (rdpTls * tls);
typedef FRDP_BOOL (*TlsDisconnect) (rdpTls * tls);
typedef boolean (*TlsConnect) (rdpTls * tls);
typedef boolean (*TlsDisconnect) (rdpTls * tls);
struct rdp_tls
{
@@ -41,15 +41,15 @@ struct rdp_tls
TlsDisconnect disconnect;
};
FRDP_BOOL
boolean
tls_connect(rdpTls * tls);
FRDP_BOOL
boolean
tls_disconnect(rdpTls * tls);
int
tls_read(rdpTls * tls, char* data, int length);
int
tls_write(rdpTls * tls, char* data, int length);
FRDP_BOOL
boolean
tls_print_error(char *func, SSL *connection, int value);
rdpTls*

10
libfreerdp-core/transport.c
View File

@@ -34,19 +34,19 @@
#define BUFFER_SIZE 16384
FRDP_BOOL
boolean
transport_connect(rdpTransport * transport, const char * server, int port)
{
return transport->tcp->connect(transport->tcp, server, port);
}
FRDP_BOOL
boolean
transport_disconnect(rdpTransport * transport)
{
return transport->tcp->disconnect(transport->tcp);
}
FRDP_BOOL
boolean
transport_connect_rdp(rdpTransport * transport)
{
transport->state = TRANSPORT_STATE_RDP;
@@ -56,7 +56,7 @@ transport_connect_rdp(rdpTransport * transport)
return True;
}
FRDP_BOOL
boolean
transport_connect_tls(rdpTransport * transport)
{
if (transport->tls == NULL)
@@ -72,7 +72,7 @@ transport_connect_tls(rdpTransport * transport)
return True;
}
FRDP_BOOL
boolean
transport_connect_nla(rdpTransport * transport)
{
if (transport->tls == NULL)

10
libfreerdp-core/transport.h
View File

@@ -56,15 +56,15 @@ rdpTransport *
transport_new(void);
void
transport_free(rdpTransport * transport);
FRDP_BOOL
boolean
transport_connect(rdpTransport * transport, const char * server, int port);
FRDP_BOOL
boolean
transport_disconnect(rdpTransport * transport);
FRDP_BOOL
boolean
transport_connect_rdp(rdpTransport * transport);
FRDP_BOOL
boolean
transport_connect_tls(rdpTransport * transport);
FRDP_BOOL
boolean
transport_connect_nla(rdpTransport * transport);
int
transport_send(rdpTransport * transport, STREAM * stream);

4
libfreerdp-kbd/libkbd.c
View File

@@ -136,7 +136,7 @@ freerdp_kbd_get_layouts(int types)
}
uint8
freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended)
freerdp_kbd_get_scancode_by_keycode(uint8 keycode, boolean * extended)
{
DEBUG_KBD("%2x %4s -> %d/%d", keycode, x_keycode_to_rdp_keycode[keycode].keyname,
x_keycode_to_rdp_keycode[keycode].extended, x_keycode_to_rdp_keycode[keycode].keycode);
@@ -145,7 +145,7 @@ freerdp_kbd_get_scancode_by_keycode(uint8 keycode, FRDP_BOOL * extended)
}
uint8
freerdp_kbd_get_scancode_by_virtualkey(int vkcode, FRDP_BOOL * extended)
freerdp_kbd_get_scancode_by_virtualkey(int vkcode, boolean * extended)
{
*extended = virtualKeyboard[vkcode].extended;
return virtualKeyboard[vkcode].scancode;