uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #360 from proski/format-warnings

Browse Source 
Warning fixes
ulab-next-nosound
jsorg71 8 years ago
parent fac0907a3c 70f3d4c5e2
commit fdb146740f
21 changed files with 100 additions and 111 deletions
Show Stats Download Patch File Download Diff File

2
common/list.c
Unescape View File

@ -221,6 +221,6 @@ list_dump_items(struct list *self)
for (index = 0; index < self->count; index++) for (index = 0; index < self->count; index++)
{ {
g_writeln("%d: %s", index, list_get_item(self, index)); g_writeln("%d: 0x%lx", index, list_get_item(self, index));
} }
} }

4
common/os_calls.h
Unescape View File

@ -21,6 +21,10 @@
#if !defined(OS_CALLS_H) #if !defined(OS_CALLS_H)
#define OS_CALLS_H #define OS_CALLS_H
#if defined(HAVE_CONFIG_H)
#include "config_ac.h"
#endif
#ifndef NULL #ifndef NULL
#define NULL 0 #define NULL 0
#endif #endif

16
keygen/keygen.c
Unescape View File

@ -195,11 +195,11 @@ static tui8 g_testkey2048[376] = /* 2048 bit test key */
static int APP_CC static int APP_CC
out_params(void) out_params(void)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp rsa key gen utility examples"); g_writeln("xrdp rsa key gen utility examples");
g_writeln(" xrdp-keygen xrdp ['path and file name' | auto] [512 or 2048]"); g_writeln(" xrdp-keygen xrdp ['path and file name' | auto] [512 or 2048]");
g_writeln(" xrdp-keygen test"); g_writeln(" xrdp-keygen test");
g_writeln(""); g_writeln("%s", "");
return 0; return 0;
} }
@ -351,7 +351,7 @@ save_all(char *e_data, int e_len, char *n_data, int n_len,
} }
g_writeln("saving to %s", filename); g_writeln("saving to %s", filename);
g_writeln(""); g_writeln("%s", "");
if (g_file_exist(filename)) if (g_file_exist(filename))
{ {
@ -411,9 +411,9 @@ key_gen(const char *path_and_file_name)
d_len = n_len; d_len = n_len;
sign_len = 64; sign_len = 64;
error = 0; error = 0;
g_writeln(""); g_writeln("%s", "");
g_writeln("Generating %d bit rsa key...", g_key_size_bits); g_writeln("Generating %d bit rsa key...", g_key_size_bits);
g_writeln(""); g_writeln("%s", "");
if (error == 0) if (error == 0)
{ {
@ -428,7 +428,7 @@ key_gen(const char *path_and_file_name)
if (error == 0) if (error == 0)
{ {
g_writeln("ssl_gen_key_xrdp1 ok"); g_writeln("ssl_gen_key_xrdp1 ok");
g_writeln(""); g_writeln("%s", "");
error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len); error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
if (error != 0) if (error != 0)
@ -588,10 +588,10 @@ main(int argc, char **argv)
} }
else if (g_strcasecmp(argv[1], "test") == 0) else if (g_strcasecmp(argv[1], "test") == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("testing 512 bit key"); g_writeln("testing 512 bit key");
key_test512(); key_test512();
g_writeln(""); g_writeln("%s", "");
g_writeln("testing 2048 bit key"); g_writeln("testing 2048 bit key");
key_test2048(); key_test2048();
return 0; return 0;

12
libxrdp/xrdp_rdp.c
Unescape View File

@ -962,7 +962,6 @@ xrdp_rdp_process_data_sync(struct xrdp_rdp *self)
static int APP_CC static int APP_CC
xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s) xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s)
{ {
int op;
int left; int left;
int top; int top;
int right; int right;
@ -970,7 +969,7 @@ xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s)
int cx; int cx;
int cy; int cy;
in_uint32_le(s, op); in_uint8s(s, 4); /* op */
in_uint16_le(s, left); in_uint16_le(s, left);
in_uint16_le(s, top); in_uint16_le(s, top);
in_uint16_le(s, right); in_uint16_le(s, right);
@ -1129,16 +1128,13 @@ xrdp_rdp_process_frame_ack(struct xrdp_rdp *self, struct stream *s)
int APP_CC int APP_CC
xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s) xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s)
{ {
int len;
int data_type; int data_type;
int ctype;
int clen;
in_uint8s(s, 6); in_uint8s(s, 6);
in_uint16_le(s, len); in_uint8s(s, 2); /* len */
in_uint8(s, data_type); in_uint8(s, data_type);
in_uint8(s, ctype); in_uint8s(s, 1); /* ctype */
in_uint16_le(s, clen); in_uint8s(s, 2); /* clen */
DEBUG(("xrdp_rdp_process_data code %d", data_type)); DEBUG(("xrdp_rdp_process_data code %d", data_type));
switch (data_type) switch (data_type)

4
libxrdp/xrdp_sec.c
Unescape View File

@ -648,7 +648,6 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
int len_directory = 0; int len_directory = 0;
int len_ip = 0; int len_ip = 0;
int len_dll = 0; int len_dll = 0;
int tzone = 0;
char tmpdata[256]; char tmpdata[256];
/* initialize (zero out) local variables */ /* initialize (zero out) local variables */
@ -837,7 +836,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
{ {
return 1; return 1;
} }
in_uint32_le(s, tzone); /* len of timezone */ in_uint8s(s, 4); /* len of timezone */
in_uint8s(s, 62); /* skip */ in_uint8s(s, 62); /* skip */
in_uint8s(s, 22); /* skip misc. */ in_uint8s(s, 22); /* skip misc. */
in_uint8s(s, 62); /* skip */ in_uint8s(s, 62); /* skip */
@ -1814,7 +1813,6 @@ xrdp_sec_process_mcs_data_channels(struct xrdp_sec *self, struct stream *s)
{ {
int num_channels; int num_channels;
int index; int index;
struct mcs_channel_item *channel_item;
struct xrdp_client_info *client_info = (struct xrdp_client_info *)NULL; struct xrdp_client_info *client_info = (struct xrdp_client_info *)NULL;
client_info = &(self->rdp_layer->client_info); client_info = &(self->rdp_layer->client_info);

9
rdp/rdp_orders.c
Unescape View File

@ -225,7 +225,6 @@ rdp_orders_process_raw_bmpcache(struct rdp_orders *self, struct stream *s,
int flags) int flags)
{ {
int cache_idx = 0; int cache_idx = 0;
int bufsize = 0;
int cache_id = 0; int cache_id = 0;
int width = 0; int width = 0;
int height = 0; int height = 0;
@ -244,7 +243,7 @@ rdp_orders_process_raw_bmpcache(struct rdp_orders *self, struct stream *s,
in_uint8(s, height); in_uint8(s, height);
in_uint8(s, bpp); in_uint8(s, bpp);
Bpp = (bpp + 7) / 8; Bpp = (bpp + 7) / 8;
in_uint16_le(s, bufsize); in_uint8s(s, 2); /* bufsize */
in_uint16_le(s, cache_idx); in_uint16_le(s, cache_idx);
inverted = (char *)g_malloc(width * height * Bpp, 0); inverted = (char *)g_malloc(width * height * Bpp, 0);
@ -326,8 +325,6 @@ rdp_orders_process_bmpcache(struct rdp_orders *self, struct stream *s,
int bpp = 0; int bpp = 0;
int Bpp = 0; int Bpp = 0;
int bufsize = 0; int bufsize = 0;
int row_size = 0;
int final_size = 0;
struct rdp_bitmap *bitmap = (struct rdp_bitmap *)NULL; struct rdp_bitmap *bitmap = (struct rdp_bitmap *)NULL;
struct stream *rec_s = (struct stream *)NULL; struct stream *rec_s = (struct stream *)NULL;
@ -348,8 +345,8 @@ rdp_orders_process_bmpcache(struct rdp_orders *self, struct stream *s,
{ {
in_uint8s(s, 2); /* pad */ in_uint8s(s, 2); /* pad */
in_uint16_le(s, size); in_uint16_le(s, size);
in_uint16_le(s, row_size); in_uint8s(s, 2); /* row_size */
in_uint16_le(s, final_size); in_uint8s(s, 2); /* final_size */
} }
in_uint8p(s, data, size); in_uint8p(s, data, size);

18
rdp/rdp_rdp.c
Unescape View File

@ -506,8 +506,6 @@ static int APP_CC
rdp_rdp_process_pointer_pdu(struct rdp_rdp *self, struct stream *s) rdp_rdp_process_pointer_pdu(struct rdp_rdp *self, struct stream *s)
{ {
int message_type; int message_type;
int x;
int y;
int rv; int rv;
rv = 0; rv = 0;
@ -517,8 +515,8 @@ rdp_rdp_process_pointer_pdu(struct rdp_rdp *self, struct stream *s)
switch (message_type) switch (message_type)
{ {
case RDP_POINTER_MOVE: case RDP_POINTER_MOVE:
in_uint16_le(s, x); in_uint8s(s, 2); /* x */
in_uint16_le(s, y); in_uint8s(s, 2); /* y */
break; break;
case RDP_POINTER_COLOR: case RDP_POINTER_COLOR:
rv = rdp_rdp_process_color_pointer_pdu(self, s); rv = rdp_rdp_process_color_pointer_pdu(self, s);
@ -934,15 +932,13 @@ int APP_CC
rdp_rdp_process_data_pdu(struct rdp_rdp *self, struct stream *s) rdp_rdp_process_data_pdu(struct rdp_rdp *self, struct stream *s)
{ {
int data_pdu_type; int data_pdu_type;
int ctype;
int len;
int rv; int rv;
rv = 0; rv = 0;
in_uint8s(s, 6); /* shareid, pad, streamid */ in_uint8s(s, 6); /* shareid, pad, streamid */
in_uint16_le(s, len); in_uint8s(s, 2); /* len */
in_uint8(s, data_pdu_type); in_uint8(s, data_pdu_type);
in_uint8(s, ctype); in_uint8s(s, 1); /* ctype */
in_uint8s(s, 2); /* clen */ in_uint8s(s, 2); /* clen */
switch (data_pdu_type) switch (data_pdu_type)
@ -983,14 +979,12 @@ rdp_rdp_process_general_caps(struct rdp_rdp *self, struct stream *s)
static void APP_CC static void APP_CC
rdp_rdp_process_bitmap_caps(struct rdp_rdp *self, struct stream *s) rdp_rdp_process_bitmap_caps(struct rdp_rdp *self, struct stream *s)
{ {
int width = 0;
int height = 0;
int bpp = 0; int bpp = 0;
in_uint16_le(s, bpp); in_uint16_le(s, bpp);
in_uint8s(s, 6); in_uint8s(s, 6);
in_uint16_le(s, width); in_uint8s(s, 2); /* width */
in_uint16_le(s, height); in_uint8s(s, 2); /* height */
self->mod->rdp_bpp = bpp; self->mod->rdp_bpp = bpp;
/* todo, call reset if needed and use width and height */ /* todo, call reset if needed and use width and height */
} }

3
sesman/chansrv/chansrv.c
Unescape View File

@ -756,7 +756,6 @@ int DEFAULT_CC
my_trans_data_in(struct trans *trans) my_trans_data_in(struct trans *trans)
{ {
struct stream *s = (struct stream *)NULL; struct stream *s = (struct stream *)NULL;
int id = 0;
int size = 0; int size = 0;
int error = 0; int error = 0;
@ -772,7 +771,7 @@ my_trans_data_in(struct trans *trans)
LOGM((LOG_LEVEL_DEBUG, "my_trans_data_in:")); LOGM((LOG_LEVEL_DEBUG, "my_trans_data_in:"));
s = trans_get_in_s(trans); s = trans_get_in_s(trans);
in_uint32_le(s, id); in_uint8s(s, 4); /* id */
in_uint32_le(s, size); in_uint32_le(s, size);
error = trans_force_read(trans, size - 8); error = trans_force_read(trans, size - 8);

4
sesman/chansrv/chansrv_fuse.c
Unescape View File

@ -39,8 +39,6 @@
//#define USE_SYNC_FLAG //#define USE_SYNC_FLAG
static char g_fuse_mount_name[256] = "xrdp_client";
/* FUSE mount point */ /* FUSE mount point */
char g_fuse_root_path[256] = ""; char g_fuse_root_path[256] = "";
char g_fuse_clipboard_path[256] = ""; /* for clipboard use */ char g_fuse_clipboard_path[256] = ""; /* for clipboard use */
@ -239,6 +237,8 @@ struct opendir_req
struct fuse_file_info *fi; struct fuse_file_info *fi;
}; };
static char g_fuse_mount_name[256] = "xrdp_client";
FIFO g_fifo_opendir; FIFO g_fifo_opendir;
static struct list *g_req_list = 0; static struct list *g_req_list = 0;

28
sesman/chansrv/clipboard.c
Unescape View File

@ -1697,9 +1697,9 @@ clipboard_event_selection_owner_notify(XEvent *xevent)
XFixesSelectionNotifyEvent *lxevent; XFixesSelectionNotifyEvent *lxevent;
lxevent = (XFixesSelectionNotifyEvent *)xevent; lxevent = (XFixesSelectionNotifyEvent *)xevent;
log_debug("clipboard_event_selection_owner_notify: %p", lxevent->owner); log_debug("clipboard_event_selection_owner_notify: 0x%lx", lxevent->owner);
log_debug("clipboard_event_selection_owner_notify: " log_debug("clipboard_event_selection_owner_notify: "
"window %d subtype %d owner %d g_wnd %d", "window %ld subtype %d owner %ld g_wnd %ld",
lxevent->window, lxevent->subtype, lxevent->owner, g_wnd); lxevent->window, lxevent->subtype, lxevent->owner, g_wnd);
if (lxevent->owner == g_wnd) if (lxevent->owner == g_wnd)
@ -1735,7 +1735,7 @@ clipboard_get_window_property(Window wnd, Atom prop, Atom *type, int *fmt,
Atom ltype; Atom ltype;
log_debug("clipboard_get_window_property:"); log_debug("clipboard_get_window_property:");
log_debug(" prop %d name %s", prop, get_atom_text(prop)); log_debug(" prop %ld name %s", prop, get_atom_text(prop));
lxdata = 0; lxdata = 0;
ltype = 0; ltype = 0;
XGetWindowProperty(g_display, wnd, prop, 0, 0, 0, XGetWindowProperty(g_display, wnd, prop, 0, 0, 0,
@ -1873,7 +1873,7 @@ clipboard_event_selection_notify(XEvent *xevent)
if (rv == 0) if (rv == 0)
{ {
log_debug("clipboard_event_selection_notify: wnd %p prop %s", log_debug("clipboard_event_selection_notify: wnd 0x%lx prop %s",
lxevent->requestor, lxevent->requestor,
get_atom_text(lxevent->property)); get_atom_text(lxevent->property));
rv = clipboard_get_window_property(lxevent->requestor, lxevent->property, rv = clipboard_get_window_property(lxevent->requestor, lxevent->property,
@ -1922,7 +1922,7 @@ clipboard_event_selection_notify(XEvent *xevent)
atom = atoms[index]; atom = atoms[index];
LOGM((LOG_LEVEL_DEBUG, "clipboard_event_selection_notify: %d %s %d", LOGM((LOG_LEVEL_DEBUG, "clipboard_event_selection_notify: %d %s %d",
atom, get_atom_text(atom), XA_STRING)); atom, get_atom_text(atom), XA_STRING));
log_debug("clipboard_event_selection_notify: 0x%x %s", log_debug("clipboard_event_selection_notify: 0x%lx %s",
atom, get_atom_text(atom)); atom, get_atom_text(atom));
if (atom == g_utf8_atom) if (atom == g_utf8_atom)
{ {
@ -1943,15 +1943,15 @@ clipboard_event_selection_notify(XEvent *xevent)
} }
else else
{ {
log_error("clipboard_event_selection_notify: unknown atom 0x%x", atom); log_error("clipboard_event_selection_notify: unknown atom 0x%lx", atom);
} }
} }
} }
else else
{ {
log_error("clipboard_event_selection_notify: error, " log_error("clipboard_event_selection_notify: error, "
"target is 'TARGETS' and type[%d] or fmt[%d] not right, " "target is 'TARGETS' and type[%ld] or fmt[%d] not right, "
"should be type[%d], fmt[%d]", type, fmt, XA_ATOM, 32); "should be type[%ld], fmt[%d]", type, fmt, XA_ATOM, 32);
} }
} }
else if (lxevent->target == g_utf8_atom) else if (lxevent->target == g_utf8_atom)
@ -2138,9 +2138,9 @@ clipboard_event_selection_request(XEvent *xevent)
char *xdata; char *xdata;
lxev = (XSelectionRequestEvent *)xevent; lxev = (XSelectionRequestEvent *)xevent;
log_debug("clipboard_event_selection_request: %p", lxev->property); log_debug("clipboard_event_selection_request: 0x%lx", lxev->property);
log_debug("clipboard_event_selection_request: g_wnd %d, " log_debug("clipboard_event_selection_request: g_wnd %ld, "
".requestor %d .owner %d .selection %d '%s' .target %d .property %d", ".requestor %ld .owner %ld .selection %ld '%s' .target %ld .property %ld",
g_wnd, lxev->requestor, lxev->owner, lxev->selection, g_wnd, lxev->requestor, lxev->owner, lxev->selection,
get_atom_text(lxev->selection), get_atom_text(lxev->selection),
lxev->target, lxev->property); lxev->target, lxev->property);
@ -2326,8 +2326,8 @@ clipboard_event_property_notify(XEvent *xevent)
char *cptr; char *cptr;
log_debug("clipboard_event_property_notify:"); log_debug("clipboard_event_property_notify:");
log_debug("clipboard_event_property_notify: PropertyNotify .window %d " log_debug("clipboard_event_property_notify: PropertyNotify .window %ld "
".state %d .atom %d %s", xevent->xproperty.window, ".state %d .atom %ld %s", xevent->xproperty.window,
xevent->xproperty.state, xevent->xproperty.atom, xevent->xproperty.state, xevent->xproperty.atom,
get_atom_text(xevent->xproperty.atom)); get_atom_text(xevent->xproperty.atom));
@ -2412,7 +2412,7 @@ clipboard_event_property_notify(XEvent *xevent)
} }
else else
{ {
log_error("clipboard_event_property_notify: error unknown type %d", log_error("clipboard_event_property_notify: error unknown type %ld",
g_clip_s2c.type); g_clip_s2c.type);
clipboard_send_data_response_failed(); clipboard_send_data_response_failed();
} }

5
sesman/chansrv/clipboard_file.c
Unescape View File

@ -102,6 +102,7 @@ static int g_file_request_sent_type = 0;
#define CB_EPOCH_DIFF 11644473600LL #define CB_EPOCH_DIFF 11644473600LL
/*****************************************************************************/ /*****************************************************************************/
#if 0
static tui64 APP_CC static tui64 APP_CC
timeval2wintime(struct timeval *tv) timeval2wintime(struct timeval *tv)
{ {
@ -113,6 +114,7 @@ timeval2wintime(struct timeval *tv)
result += tv->tv_usec * 10; result += tv->tv_usec * 10;
return result; return result;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
/* this will replace %20 or any hex with the space or correct char /* this will replace %20 or any hex with the space or correct char
@ -529,7 +531,6 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
int lindex; int lindex;
int dwFlags; int dwFlags;
int nPositionLow; int nPositionLow;
int nPositionHigh;
int cbRequested; int cbRequested;
//int clipDataId; //int clipDataId;
@ -539,7 +540,7 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
in_uint32_le(s, lindex); in_uint32_le(s, lindex);
in_uint32_le(s, dwFlags); in_uint32_le(s, dwFlags);
in_uint32_le(s, nPositionLow); in_uint32_le(s, nPositionLow);
in_uint32_le(s, nPositionHigh); in_uint8s(s, 4); /* nPositionHigh */
in_uint32_le(s, cbRequested); in_uint32_le(s, cbRequested);
//in_uint32_le(s, clipDataId); /* options, used when locking */ //in_uint32_le(s, clipDataId); /* options, used when locking */
if (dwFlags & CB_FILECONTENTS_SIZE) if (dwFlags & CB_FILECONTENTS_SIZE)

8
sesman/chansrv/drdynvc.c
Unescape View File

@ -342,24 +342,24 @@ drdynvc_process_data_first(struct stream *s, unsigned char cmd)
uint32_t chan_id; uint32_t chan_id;
int bytes_in_stream; int bytes_in_stream;
int data_len;
int Len; int Len;
drdynvc_get_chan_id(s, cmd, &chan_id); drdynvc_get_chan_id(s, cmd, &chan_id);
Len = (cmd >> 2) & 0x03; Len = (cmd >> 2) & 0x03;
/* skip data_len */
if (Len == 0) if (Len == 0)
{ {
in_uint8(s, data_len); in_uint8s(s, 1);
} }
else if (Len == 1) else if (Len == 1)
{ {
in_uint16_le(s, data_len); in_uint8s(s, 2);
} }
else else
{ {
in_uint32_le(s, data_len); in_uint8s(s, 4);
} }
bytes_in_stream = stream_length_after_p(s); bytes_in_stream = stream_length_after_p(s);

36
sesman/chansrv/rail.c
Unescape View File

@ -508,7 +508,7 @@ rail_win_popdown(void)
window_attributes.map_state == IsViewable && window_attributes.map_state == IsViewable &&
list_index_of(g_window_list, children[i]) >= 0) list_index_of(g_window_list, children[i]) >= 0)
{ {
LOG(10, (" dismiss pop up 0x%8.8x", children[i])); LOG(10, (" dismiss pop up 0x%8.8lx", children[i]));
rail_send_key_esc(children[i]); rail_send_key_esc(children[i]);
rv = 1; rv = 1;
} }
@ -756,7 +756,7 @@ rail_win_set_state(Window win, unsigned long state)
int old_state; int old_state;
unsigned long data[2] = { state, None }; unsigned long data[2] = { state, None };
LOG(10, (" rail_win_set_state: %d", state)); LOG(10, (" rail_win_set_state: %ld", state));
/* check whether WM_STATE exists */ /* check whether WM_STATE exists */
old_state = rail_win_get_state(win); old_state = rail_win_get_state(win);
if (old_state == -1) if (old_state == -1)
@ -1259,7 +1259,7 @@ rail_win_send_text(Window win)
} }
if (data && len > 0) if (data && len > 0)
{ {
LOG(10, ("chansrv::rail_win_send_text: 0x%8.8x text %s length %d", LOG(10, ("chansrv::rail_win_send_text: 0x%8.8lx text %s length %d",
win, data, len)); win, data, len));
make_stream(s); make_stream(s);
init_stream(s, len + 1024); init_stream(s, len + 1024);
@ -1289,7 +1289,7 @@ rail_destroy_window(Window window_id)
{ {
struct stream *s; struct stream *s;
LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id)); LOG(10, ("chansrv::rail_destroy_window 0x%8.8lx", window_id));
make_stream(s); make_stream(s);
init_stream(s, 1024); init_stream(s, 1024);
@ -1309,7 +1309,7 @@ rail_show_window(Window window_id, int show_state)
int flags; int flags;
struct stream* s; struct stream* s;
LOG(10, ("chansrv::rail_show_window 0x%8.8x 0x%x", window_id, show_state)); LOG(10, ("chansrv::rail_show_window 0x%8.8lx 0x%x", window_id, show_state));
make_stream(s); make_stream(s);
init_stream(s, 1024); init_stream(s, 1024);
@ -1351,7 +1351,7 @@ rail_create_window(Window window_id, Window owner_id)
struct rail_window_data* rwd; struct rail_window_data* rwd;
struct stream* s; struct stream* s;
LOG(10, ("chansrv::rail_create_window 0x%8.8x", window_id)); LOG(10, ("chansrv::rail_create_window 0x%8.8lx", window_id));
rwd = rail_get_window_data_safe(window_id); rwd = rail_get_window_data_safe(window_id);
if (rwd == 0) if (rwd == 0)
@ -1507,7 +1507,7 @@ rail_configure_request_window(XConfigureRequestEvent* config)
if (mask & CWStackMode) if (mask & CWStackMode)
{ {
LOG(10, ("chansrv::rail_configure_request_window: CWStackMode " LOG(10, ("chansrv::rail_configure_request_window: CWStackMode "
"detail 0x%8.8x above 0x%8.8x", config->detail, config->above)); "detail 0x%8.8x above 0x%8.8lx", config->detail, config->above));
if (config->detail == Above) if (config->detail == Above)
{ {
LOG(10, ("chansrv::rail_configure_request_window: bring to front " LOG(10, ("chansrv::rail_configure_request_window: bring to front "
@ -1808,7 +1808,7 @@ rail_xevent(void *xevent)
{ {
case PropertyNotify: case PropertyNotify:
prop_name = XGetAtomName(g_display, lxevent->xproperty.atom); prop_name = XGetAtomName(g_display, lxevent->xproperty.atom);
LOG(10, (" got PropertyNotify window_id 0x%8.8x %s state new %d", LOG(10, (" got PropertyNotify window_id 0x%8.8lx %s state new %d",
lxevent->xproperty.window, prop_name, lxevent->xproperty.window, prop_name,
lxevent->xproperty.state == PropertyNewValue)); lxevent->xproperty.state == PropertyNewValue));
@ -1831,7 +1831,7 @@ rail_xevent(void *xevent)
break; break;
case ConfigureRequest: case ConfigureRequest:
LOG(10, (" got ConfigureRequest window_id 0x%8.8x", lxevent->xconfigurerequest.window)); LOG(10, (" got ConfigureRequest window_id 0x%8.8lx", lxevent->xconfigurerequest.window));
g_memset(&xwc, 0, sizeof(xwc)); g_memset(&xwc, 0, sizeof(xwc));
xwc.x = lxevent->xconfigurerequest.x; xwc.x = lxevent->xconfigurerequest.x;
xwc.y = lxevent->xconfigurerequest.y; xwc.y = lxevent->xconfigurerequest.y;
@ -1849,13 +1849,13 @@ rail_xevent(void *xevent)
break; break;
case CreateNotify: case CreateNotify:
LOG(10, (" got CreateNotify window 0x%8.8x parent 0x%8.8x", LOG(10, (" got CreateNotify window 0x%8.8lx parent 0x%8.8lx",
lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent)); lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent));
rail_select_input(lxevent->xcreatewindow.window); rail_select_input(lxevent->xcreatewindow.window);
break; break;
case DestroyNotify: case DestroyNotify:
LOG(10, (" got DestroyNotify window 0x%8.8x event 0x%8.8x", LOG(10, (" got DestroyNotify window 0x%8.8lx event 0x%8.8lx",
lxevent->xdestroywindow.window, lxevent->xdestroywindow.event)); lxevent->xdestroywindow.window, lxevent->xdestroywindow.event));
if (lxevent->xdestroywindow.window != lxevent->xdestroywindow.event) if (lxevent->xdestroywindow.window != lxevent->xdestroywindow.event)
{ {
@ -1871,12 +1871,12 @@ rail_xevent(void *xevent)
break; break;
case MapRequest: case MapRequest:
LOG(10, (" got MapRequest window 0x%8.8x", lxevent->xmaprequest.window)); LOG(10, (" got MapRequest window 0x%8.8lx", lxevent->xmaprequest.window));
XMapWindow(g_display, lxevent->xmaprequest.window); XMapWindow(g_display, lxevent->xmaprequest.window);
break; break;
case MapNotify: case MapNotify:
LOG(10, (" got MapNotify window 0x%8.8x event 0x%8.8x", LOG(10, (" got MapNotify window 0x%8.8lx event 0x%8.8lx",
lxevent->xmap.window, lxevent->xmap.event)); lxevent->xmap.window, lxevent->xmap.event));
if (lxevent->xmap.window != lxevent->xmap.event) if (lxevent->xmap.window != lxevent->xmap.event)
{ {
@ -1902,7 +1902,7 @@ rail_xevent(void *xevent)
break; break;
case UnmapNotify: case UnmapNotify:
LOG(10, (" got UnmapNotify 0x%8.8x", lxevent->xunmap.event)); LOG(10, (" got UnmapNotify 0x%8.8lx", lxevent->xunmap.event));
if (lxevent->xunmap.window != lxevent->xunmap.event) if (lxevent->xunmap.window != lxevent->xunmap.event)
{ {
break; break;
@ -1910,7 +1910,7 @@ rail_xevent(void *xevent)
if (is_window_valid_child_of_root(lxevent->xunmap.window)) if (is_window_valid_child_of_root(lxevent->xunmap.window))
{ {
index = list_index_of(g_window_list, lxevent->xunmap.window); index = list_index_of(g_window_list, lxevent->xunmap.window);
LOG(10, (" window 0x%8.8x is unmapped", lxevent->xunmap.window)); LOG(10, (" window 0x%8.8lx is unmapped", lxevent->xunmap.window));
if (index >= 0) if (index >= 0)
{ {
XGetWindowAttributes(g_display, lxevent->xunmap.window, &wnd_attributes); XGetWindowAttributes(g_display, lxevent->xunmap.window, &wnd_attributes);
@ -1929,7 +1929,7 @@ rail_xevent(void *xevent)
break; break;
case ConfigureNotify: case ConfigureNotify:
LOG(10, (" got ConfigureNotify 0x%8.8x event 0x%8.8x", lxevent->xconfigure.window, LOG(10, (" got ConfigureNotify 0x%8.8lx event 0x%8.8lx", lxevent->xconfigure.window,
lxevent->xconfigure.event)); lxevent->xconfigure.event));
rv = 0; rv = 0;
if (lxevent->xconfigure.event != lxevent->xconfigure.window || if (lxevent->xconfigure.event != lxevent->xconfigure.window ||
@ -1975,8 +1975,8 @@ rail_xevent(void *xevent)
break; break;
case ReparentNotify: case ReparentNotify:
LOG(10, (" got ReparentNotify window 0x%8.8x parent 0x%8.8x " LOG(10, (" got ReparentNotify window 0x%8.8lx parent 0x%8.8lx "
"event 0x%8.8x x %d y %d override redirect %d", "event 0x%8.8lx x %d y %d override redirect %d",
lxevent->xreparent.window, lxevent->xreparent.parent, lxevent->xreparent.window, lxevent->xreparent.parent,
lxevent->xreparent.event, lxevent->xreparent.x, lxevent->xreparent.event, lxevent->xreparent.x,
lxevent->xreparent.y, lxevent->xreparent.override_redirect)); lxevent->xreparent.y, lxevent->xreparent.override_redirect));

4
sesman/chansrv/smartcard.c
Unescape View File

@ -1854,8 +1854,8 @@ scard_send_Transmit(IRP *irp, char *context, int context_bytes,
} }
log_debug("send_bytes %d recv_bytes %d send dwProtocol %d cbPciLength %d " log_debug("send_bytes %d recv_bytes %d send dwProtocol %d cbPciLength %d "
"extra_bytes %d recv dwProtocol %d cbPciLength %d", send_bytes, "extra_bytes %d recv dwProtocol %d cbPciLength %d extra_bytes %d",
recv_bytes, send_ior->dwProtocol, send_ior->cbPciLength, send_bytes, recv_bytes, send_ior->dwProtocol, send_ior->cbPciLength,
send_ior->extra_bytes, recv_ior->dwProtocol, recv_ior->cbPciLength, send_ior->extra_bytes, recv_ior->dwProtocol, recv_ior->cbPciLength,
recv_ior->extra_bytes); recv_ior->extra_bytes);

2
sesman/chansrv/smartcard_pcsc.c
Unescape View File

@ -259,7 +259,7 @@ free_uds_client(struct pcsc_uds_client *uds_client)
} }
list_delete(context->cards); list_delete(context->cards);
} }
LLOGLN(10, (" left over context 0x%8.8x", context->context)); LLOGLN(10, (" left over context %p", context->context));
scard_send_cancel(0, context->context, context->context_bytes); scard_send_cancel(0, context->context, context->context_bytes);
scard_send_release_context(0, context->context, scard_send_release_context(0, context->context,
context->context_bytes); context->context_bytes);

2
sesman/chansrv/sound.c
Unescape View File

@ -103,6 +103,7 @@ static struct xr_wave_format_ex g_pcm_44100 =
g_pcm_44100_data /* data */ g_pcm_44100_data /* data */
}; };
#if defined(XRDP_OPUS)
static char g_opus_44100_data[] = { 0 }; static char g_opus_44100_data[] = { 0 };
static struct xr_wave_format_ex g_opus_44100 = static struct xr_wave_format_ex g_opus_44100 =
{ {
@ -115,6 +116,7 @@ static struct xr_wave_format_ex g_opus_44100 =
0, /* data size */ 0, /* data size */
g_opus_44100_data /* data */ g_opus_44100_data /* data */
}; };
#endif
#if defined(XRDP_OPUS) #if defined(XRDP_OPUS)

2
sesman/chansrv/xcommon.c
Unescape View File

@ -63,11 +63,13 @@ xcommon_error_handler(Display *dis, XErrorEvent *xer)
/* The X server had an internal error. This is the last function called. /* The X server had an internal error. This is the last function called.
Do any cleanup that needs to be done on exit, like removing temporary files. Do any cleanup that needs to be done on exit, like removing temporary files.
Don't worry about memory leaks */ Don't worry about memory leaks */
#if 0
static int DEFAULT_CC static int DEFAULT_CC
xcommon_fatal_handler(Display *dis) xcommon_fatal_handler(Display *dis)
{ {
return 0; return 0;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
/* returns time in milliseconds /* returns time in milliseconds

20
sesman/session.c
Unescape View File

@ -412,7 +412,7 @@ session_start_fork(int width, int height, int bpp, char *username,
int pampid = 0; int pampid = 0;
int xpid = 0; int xpid = 0;
int i = 0; int i = 0;
char **xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */ char *xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */
char geometry[32]; char geometry[32];
char depth[32]; char depth[32];
char screen[32]; /* display number */ char screen[32]; /* display number */
@ -653,9 +653,9 @@ session_start_fork(int width, int height, int bpp, char *username,
xserver_params = list_create(); xserver_params = list_create();
xserver_params->auto_free = 1; xserver_params->auto_free = 1;
/* get path of Xorg from config */ /* get path of Xorg from config */
xserver = g_strdup(list_get_item(g_cfg->xorg_params, 0)); xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0));
list_remove_item(g_cfg->xorg_params, 0); list_remove_item(g_cfg->xorg_params, 0);
/* these are the must have parameters */ /* these are the must have parameters */
list_add_item(xserver_params, (tintptr) g_strdup(xserver)); list_add_item(xserver_params, (tintptr) g_strdup(xserver));
@ -687,9 +687,9 @@ session_start_fork(int width, int height, int bpp, char *username,
xserver_params = list_create(); xserver_params = list_create();
xserver_params->auto_free = 1; xserver_params->auto_free = 1;
/* get path of Xvnc from config */ /* get path of Xvnc from config */
xserver = g_strdup(list_get_item(g_cfg->vnc_params, 0)); xserver = g_strdup((const char *)list_get_item(g_cfg->vnc_params, 0));
list_remove_item(g_cfg->vnc_params, 0); list_remove_item(g_cfg->vnc_params, 0);
/* these are the must have parameters */ /* these are the must have parameters */
list_add_item(xserver_params, (tintptr)g_strdup(xserver)); list_add_item(xserver_params, (tintptr)g_strdup(xserver));
@ -717,9 +717,9 @@ session_start_fork(int width, int height, int bpp, char *username,
xserver_params = list_create(); xserver_params = list_create();
xserver_params->auto_free = 1; xserver_params->auto_free = 1;
/* get path of X11rdp from config */ /* get path of X11rdp from config */
xserver = g_strdup(list_get_item(g_cfg->rdp_params, 0)); xserver = g_strdup((const char *)list_get_item(g_cfg->rdp_params, 0));
list_remove_item(g_cfg->rdp_params, 0); list_remove_item(g_cfg->rdp_params, 0);
/* these are the must have parameters */ /* these are the must have parameters */
list_add_item(xserver_params, (tintptr)g_strdup(xserver)); list_add_item(xserver_params, (tintptr)g_strdup(xserver));

2
tests/tcp_proxy/main.c
Unescape View File

@ -109,7 +109,7 @@ g_hexdump(char *p, int len)
g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
} }
g_writeln(""); g_writeln("%s", "");
offset += thisline; offset += thisline;
line += thisline; line += thisline;
} }

24
xrdp/xrdpwin.c
Unescape View File

@ -344,16 +344,16 @@ main(int argc, char **argv)
g_strncasecmp(argv[1], "--help", 255) == 0 || g_strncasecmp(argv[1], "--help", 255) == 0 ||
g_strncasecmp(argv[1], "-h", 255) == 0) g_strncasecmp(argv[1], "-h", 255) == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln(""); g_writeln("%s", "");
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h: show help"); g_writeln(" -h: show help");
g_writeln(" -install: install service"); g_writeln(" -install: install service");
g_writeln(" -remove: remove service"); g_writeln(" -remove: remove service");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else if (g_strncasecmp(argv[1], "-install", 255) == 0 || else if (g_strncasecmp(argv[1], "-install", 255) == 0 ||
@ -423,7 +423,7 @@ main(int argc, char **argv)
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
} }
@ -431,7 +431,7 @@ main(int argc, char **argv)
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
@ -499,34 +499,34 @@ main(int argc, char **argv)
g_strncasecmp(argv[1], "--help", 255) == 0 || g_strncasecmp(argv[1], "--help", 255) == 0 ||
g_strncasecmp(argv[1], "-h", 255) == 0) g_strncasecmp(argv[1], "-h", 255) == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln(""); g_writeln("%s", "");
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h: show help"); g_writeln(" -h: show help");
g_writeln(" -nodaemon: don't fork into background"); g_writeln(" -nodaemon: don't fork into background");
g_writeln(" -kill: shut down xrdp"); g_writeln(" -kill: shut down xrdp");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else if ((g_strncasecmp(argv[1], "-v", 255) == 0) || else if ((g_strncasecmp(argv[1], "-v", 255) == 0) ||
(g_strncasecmp(argv[1], "--version", 255) == 0)) (g_strncasecmp(argv[1], "--version", 255) == 0))
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln("Version %s", PACKAGE_VERSION); g_writeln("Version %s", PACKAGE_VERSION);
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else else
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
} }
@ -534,7 +534,7 @@ main(int argc, char **argv)
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }

6
xup/xup.c
Unescape View File

@ -212,7 +212,7 @@ lib_mod_connect(struct mod *mod)
if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0) if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0)
{ {
LLOGLN(0, ("lib_mod_connect: connected to Xserver " LLOGLN(0, ("lib_mod_connect: connected to Xserver "
"(Xorg or X11rdp) sck %d", mod->trans->sck)); "(Xorg or X11rdp) sck %ld", mod->trans->sck));
error = 0; error = 0;
} }
@ -1151,10 +1151,6 @@ process_server_paint_rect_shmem_ex(struct mod *amod, struct stream *s)
int shmem_offset; int shmem_offset;
int width; int width;
int height; int height;
int x;
int y;
int cx;
int cy;
int index; int index;
int rv; int rv;
tsi16 *ldrects; tsi16 *ldrects;

Write Preview
Loading…
Cancel
Save