mirror of https://github.com/neutrinolabs/xrdp
got __fastcall working for borland compilers
This commit is contained in:
parent
79557c9cc6
commit
c2ff24010a
|
@ -44,7 +44,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(__BORLANDC__)
|
||||
#define APP_CC __cdecl
|
||||
#define APP_CC __fastcall
|
||||
#define DEFAULT_CC __cdecl
|
||||
#else
|
||||
#define APP_CC
|
||||
|
@ -52,7 +52,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
#define EXPORT_CC __declspec(dllexport)
|
||||
#define EXPORT_CC _export __cdecl
|
||||
#else
|
||||
#define EXPORT_CC
|
||||
#endif
|
||||
|
|
|
@ -88,60 +88,60 @@ struct xrdp_session
|
|||
int up_and_running;
|
||||
};
|
||||
|
||||
struct xrdp_session*
|
||||
struct xrdp_session* DEFAULT_CC
|
||||
libxrdp_init(long id, int sck);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_exit(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_disconnect(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_process_incomming(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_process_data(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_send_palette(struct xrdp_session* session, int* palette);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_send_bitmap(struct xrdp_session* session, int width, int height,
|
||||
int bpp, char* data, int x, int y, int cx, int cy);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_send_pointer(struct xrdp_session* session, int cache_idx,
|
||||
char* data, char* mask, int x, int y);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_set_pointer(struct xrdp_session* session, int cache_idx);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_init(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_send(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_force_send(struct xrdp_session* session);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_rect(struct xrdp_session* session, int x, int y,
|
||||
int cx, int cy, int color, struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_screen_blt(struct xrdp_session* session, int x, int y,
|
||||
int cx, int cy, int srcx, int srcy,
|
||||
int rop, struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_pat_blt(struct xrdp_session* session, int x, int y,
|
||||
int cx, int cy, int rop, int bg_color,
|
||||
int fg_color, struct xrdp_brush* brush,
|
||||
struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_dest_blt(struct xrdp_session* session, int x, int y,
|
||||
int cx, int cy, int rop,
|
||||
struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_line(struct xrdp_session* session, int mix_mode,
|
||||
int startx, int starty,
|
||||
int endx, int endy, int rop, int bg_color,
|
||||
struct xrdp_pen* pen,
|
||||
struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_mem_blt(struct xrdp_session* session, int cache_id,
|
||||
int color_table, int x, int y, int cx, int cy,
|
||||
int rop, int srcx, int srcy,
|
||||
int cache_idx, struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_text(struct xrdp_session* session,
|
||||
int font, int flags, int mixmode,
|
||||
int fg_color, int bg_color,
|
||||
|
@ -151,18 +151,18 @@ libxrdp_orders_text(struct xrdp_session* session,
|
|||
int box_right, int box_bottom,
|
||||
int x, int y, char* data, int data_len,
|
||||
struct xrdp_rect* rect);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_send_palette(struct xrdp_session* session, int* palette,
|
||||
int cache_id);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_send_raw_bitmap(struct xrdp_session* session,
|
||||
int width, int height, int bpp, char* data,
|
||||
int cache_id, int cache_idx);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_send_bitmap(struct xrdp_session* session,
|
||||
int width, int height, int bpp, char* data,
|
||||
int cache_id, int cache_idx);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
libxrdp_orders_send_font(struct xrdp_session* session,
|
||||
struct xrdp_font_char* font_char,
|
||||
int font_index, int char_index);
|
||||
|
|
18
xrdp/xrdp.h
18
xrdp/xrdp.h
|
@ -266,25 +266,25 @@ xrdp_bitmap_compress(char* in_data, int width, int height,
|
|||
int e);
|
||||
|
||||
/* xrdp_interface.c */
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_begin_update(struct xrdp_mod* mod);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_end_update(struct xrdp_mod* mod);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_fill_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
|
||||
int color);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_screen_blt(struct xrdp_mod* mod, int x, int y, int cx, int cy,
|
||||
int srcx, int srcy);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_paint_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
|
||||
char* data);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_set_pointer(struct xrdp_mod* mod, int x, int y,
|
||||
char* data, char* mask);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_palette(struct xrdp_mod* mod, int* palette);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_msg(struct xrdp_mod* mod, char* msg);
|
||||
int
|
||||
int DEFAULT_CC
|
||||
server_is_term(struct xrdp_mod* mod);
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
/*****************************************************************************/
|
||||
/* all login help screen events go here */
|
||||
int APP_CC
|
||||
static int DEFAULT_CC
|
||||
xrdp_wm_login_help_notify(struct xrdp_bitmap* wnd,
|
||||
struct xrdp_bitmap* sender,
|
||||
int msg, long param1, long param2)
|
||||
|
@ -78,17 +78,19 @@ logging on.");
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int DEFAULT_CC
|
||||
xrdp_wm_popup_notify(struct xrdp_bitmap* wnd,
|
||||
struct xrdp_bitmap* sender,
|
||||
int msg, int param1, int param2)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
static int APP_CC
|
||||
xrdp_wm_setup_mod(struct xrdp_wm* self,
|
||||
struct xrdp_mod_data* mod_data)
|
||||
{
|
||||
|
@ -134,7 +136,7 @@ xrdp_wm_setup_mod(struct xrdp_wm* self,
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_delete_all_childs(struct xrdp_wm* self)
|
||||
{
|
||||
int i;
|
||||
|
@ -150,7 +152,7 @@ xrdp_wm_delete_all_childs(struct xrdp_wm* self)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
set_mod_data_item(struct xrdp_mod_data* mod, char* name, char* value)
|
||||
{
|
||||
int index;
|
||||
|
@ -167,7 +169,7 @@ set_mod_data_item(struct xrdp_mod_data* mod, char* name, char* value)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_help_clicked(struct xrdp_bitmap* wnd)
|
||||
{
|
||||
struct xrdp_bitmap* help;
|
||||
|
@ -206,7 +208,7 @@ xrdp_wm_help_clicked(struct xrdp_bitmap* wnd)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_cancel_clicked(struct xrdp_bitmap* wnd)
|
||||
{
|
||||
if (wnd != 0)
|
||||
|
@ -223,7 +225,7 @@ xrdp_wm_cancel_clicked(struct xrdp_bitmap* wnd)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_ok_clicked(struct xrdp_bitmap* wnd)
|
||||
{
|
||||
struct xrdp_bitmap* combo;
|
||||
|
@ -325,7 +327,7 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap* wnd)
|
|||
}
|
||||
|
||||
/******************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_show_edits(struct xrdp_wm* self, struct xrdp_bitmap* combo)
|
||||
{
|
||||
int count;
|
||||
|
@ -403,7 +405,7 @@ xrdp_wm_show_edits(struct xrdp_wm* self, struct xrdp_bitmap* combo)
|
|||
|
||||
/*****************************************************************************/
|
||||
/* all login screen events go here */
|
||||
int APP_CC
|
||||
static int DEFAULT_CC
|
||||
xrdp_wm_login_notify(struct xrdp_bitmap* wnd,
|
||||
struct xrdp_bitmap* sender,
|
||||
int msg, long param1, long param2)
|
||||
|
@ -458,7 +460,7 @@ xrdp_wm_login_notify(struct xrdp_bitmap* wnd,
|
|||
}
|
||||
|
||||
/******************************************************************************/
|
||||
int APP_CC
|
||||
static int APP_CC
|
||||
xrdp_wm_login_fill_in_combo(struct xrdp_wm* self, struct xrdp_bitmap* b)
|
||||
{
|
||||
struct list* sections;
|
||||
|
|
Loading…
Reference in New Issue