Run through codespell
This commit is contained in:
parent
380c0cd2e7
commit
964e860072
@ -346,7 +346,7 @@ file_read_sections(int fd, struct list *names)
|
|||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* return error */
|
/* return error */
|
||||||
/* this function should be prefered over file_read_sections because it can
|
/* this function should be preferred over file_read_sections because it can
|
||||||
read any file size */
|
read any file size */
|
||||||
int APP_CC
|
int APP_CC
|
||||||
file_by_name_read_sections(const char *file_name, struct list *names)
|
file_by_name_read_sections(const char *file_name, struct list *names)
|
||||||
@ -386,7 +386,7 @@ file_read_section(int fd, const char *section,
|
|||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* return error */
|
/* return error */
|
||||||
/* this function should be prefered over file_read_section because it can
|
/* this function should be preferred over file_read_section because it can
|
||||||
read any file size */
|
read any file size */
|
||||||
int APP_CC
|
int APP_CC
|
||||||
file_by_name_read_section(const char *file_name, const char *section,
|
file_by_name_read_section(const char *file_name, const char *section,
|
||||||
|
@ -1799,7 +1799,7 @@ g_file_read(int fd, char *ptr, int len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* write to file, returns the number of bytes writen or -1 on error */
|
/* write to file, returns the number of bytes written or -1 on error */
|
||||||
int APP_CC
|
int APP_CC
|
||||||
g_file_write(int fd, char *ptr, int len)
|
g_file_write(int fd, char *ptr, int len)
|
||||||
{
|
{
|
||||||
|
@ -105,7 +105,7 @@ libxrdp_get_pdu_bytes(const char *aheader)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* only used durring connection */
|
/* only used during connection */
|
||||||
struct stream * APP_CC
|
struct stream * APP_CC
|
||||||
libxrdp_force_read(struct trans* trans)
|
libxrdp_force_read(struct trans* trans)
|
||||||
{
|
{
|
||||||
@ -1074,7 +1074,7 @@ libxrdp_query_channel(struct xrdp_session *session, int index,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* returns a zero based index of the channel, -1 if error or it dosen't
|
/* returns a zero based index of the channel, -1 if error or it doesn't
|
||||||
exist */
|
exist */
|
||||||
int EXPORT_CC
|
int EXPORT_CC
|
||||||
libxrdp_get_channel_id(struct xrdp_session *session, char *name)
|
libxrdp_get_channel_id(struct xrdp_session *session, char *name)
|
||||||
|
@ -281,7 +281,7 @@ struct xrdp_mppc_enc
|
|||||||
char *outputBuffer; /* contains compressed data */
|
char *outputBuffer; /* contains compressed data */
|
||||||
char *outputBufferPlus;
|
char *outputBufferPlus;
|
||||||
int historyOffset; /* next free slot in historyBuffer */
|
int historyOffset; /* next free slot in historyBuffer */
|
||||||
int buf_len; /* length of historyBuffer, protocol dependant */
|
int buf_len; /* length of historyBuffer, protocol dependent */
|
||||||
int bytes_in_opb; /* compressed bytes available in outputBuffer */
|
int bytes_in_opb; /* compressed bytes available in outputBuffer */
|
||||||
int flags; /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */
|
int flags; /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */
|
||||||
int flagsHold;
|
int flagsHold;
|
||||||
|
@ -173,7 +173,7 @@ xrdp_channel_call_callback(struct xrdp_channel *self, struct stream *s,
|
|||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* returns error */
|
/* returns error */
|
||||||
/* This is called from the secure layer to process an incomming non global
|
/* This is called from the secure layer to process an incoming non global
|
||||||
channel packet.
|
channel packet.
|
||||||
'chanid' passed in here is the mcs channel id so it MCS_GLOBAL_CHANNEL
|
'chanid' passed in here is the mcs channel id so it MCS_GLOBAL_CHANNEL
|
||||||
plus something. */
|
plus something. */
|
||||||
|
@ -220,7 +220,7 @@ struct mydata_comp
|
|||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* called at begining */
|
/* called at beginning */
|
||||||
static void DEFAULT_CC
|
static void DEFAULT_CC
|
||||||
my_init_destination(j_compress_ptr cinfo)
|
my_init_destination(j_compress_ptr cinfo)
|
||||||
{
|
{
|
||||||
|
@ -183,7 +183,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
log_message(LOG_LEVEL_DEBUG,"Recieved an unhandled appid:%d",appid);
|
log_message(LOG_LEVEL_DEBUG,"Received an unhandled appid:%d",appid);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -286,7 +286,7 @@ xrdp_orders_last_bounds(struct xrdp_orders *self, struct xrdp_rect *rect)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* check if all coords are withing 256 bytes */
|
/* check if all coords are within 256 bytes */
|
||||||
/* returns boolean */
|
/* returns boolean */
|
||||||
static int APP_CC
|
static int APP_CC
|
||||||
xrdp_orders_send_delta(struct xrdp_orders *self, int *vals, int count)
|
xrdp_orders_send_delta(struct xrdp_orders *self, int *vals, int count)
|
||||||
@ -2719,7 +2719,7 @@ xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,
|
|||||||
out_uint8(self->out_s, RDP_ORDER_BMPCACHE3); /* type */
|
out_uint8(self->out_s, RDP_ORDER_BMPCACHE3); /* type */
|
||||||
/* cache index */
|
/* cache index */
|
||||||
out_uint16_le(self->out_s, cache_idx);
|
out_uint16_le(self->out_s, cache_idx);
|
||||||
/* persistant cache key 1/2 */
|
/* persistent cache key 1/2 */
|
||||||
out_uint32_le(self->out_s, 0);
|
out_uint32_le(self->out_s, 0);
|
||||||
out_uint32_le(self->out_s, 0);
|
out_uint32_le(self->out_s, 0);
|
||||||
/* bitmap data */
|
/* bitmap data */
|
||||||
|
@ -1435,7 +1435,7 @@ rdp_orders_process_orders(struct rdp_orders *self, struct stream *s,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* returns pointer, it might return bmpdata if the data dosen't need to
|
/* returns pointer, it might return bmpdata if the data doesn't need to
|
||||||
be converted, else it mallocs it. The calling function must free
|
be converted, else it mallocs it. The calling function must free
|
||||||
it if needed */
|
it if needed */
|
||||||
char *APP_CC
|
char *APP_CC
|
||||||
|
@ -21,7 +21,7 @@ xup is a module used to connect to an rdp specific X11 server
|
|||||||
Xserver is the files needed to build an rdp specific X11 server
|
Xserver is the files needed to build an rdp specific X11 server
|
||||||
COPYING is the licence file
|
COPYING is the licence file
|
||||||
design.txt is an attempt to expain the project design
|
design.txt is an attempt to expain the project design
|
||||||
prog_std.txt is an attemp to explain the programming standard used
|
prog_std.txt is an attempt to explain the programming standard used
|
||||||
|
|
||||||
since version 0.5.0 we switch to autotool to build xrdp
|
since version 0.5.0 we switch to autotool to build xrdp
|
||||||
|
|
||||||
|
@ -271,7 +271,7 @@ static int g_cliprdr_flags = CB_USE_LONG_FORMAT_NAMES |
|
|||||||
CB_FILECLIP_NO_FILE_PATHS;
|
CB_FILECLIP_NO_FILE_PATHS;
|
||||||
|
|
||||||
/* from client to server */
|
/* from client to server */
|
||||||
/* last recieved CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
|
/* last received CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
|
||||||
static int g_formatIds[16];
|
static int g_formatIds[16];
|
||||||
static int g_num_formatIds = 0;
|
static int g_num_formatIds = 0;
|
||||||
|
|
||||||
@ -1547,7 +1547,7 @@ clipboard_data_in(struct stream *s, int chan_id, int chan_flags, int length,
|
|||||||
{
|
{
|
||||||
log_error("aborting clipboard_data_in - clipboard has not "
|
log_error("aborting clipboard_data_in - clipboard has not "
|
||||||
"been initialized");
|
"been initialized");
|
||||||
/* we return 0 here to indicate no protocol problem occured */
|
/* we return 0 here to indicate no protocol problem occurred */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1887,7 +1887,7 @@ clipboard_event_selection_notify(XEvent *xevent)
|
|||||||
XDeleteProperty(g_display, lxevent->requestor, lxevent->property);
|
XDeleteProperty(g_display, lxevent->requestor, lxevent->property);
|
||||||
if (type == g_incr_atom)
|
if (type == g_incr_atom)
|
||||||
{
|
{
|
||||||
/* nothing more to do here, the data is comming in through
|
/* nothing more to do here, the data is coming in through
|
||||||
PropertyNotify */
|
PropertyNotify */
|
||||||
log_debug("clipboard_event_selection_notify: type is INCR "
|
log_debug("clipboard_event_selection_notify: type is INCR "
|
||||||
"data_size %d property name %s type %s", data_size,
|
"data_size %d property name %s type %s", data_size,
|
||||||
|
@ -553,7 +553,7 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* server requested info about the file and this is the responce
|
/* server requested info about the file and this is the response
|
||||||
it's either the file size or file data */
|
it's either the file size or file data */
|
||||||
int APP_CC
|
int APP_CC
|
||||||
clipboard_process_file_response(struct stream *s, int clip_msg_status,
|
clipboard_process_file_response(struct stream *s, int clip_msg_status,
|
||||||
|
@ -309,7 +309,7 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
|
|||||||
s.sun_family = AF_UNIX;
|
s.sun_family = AF_UNIX;
|
||||||
bytes = sizeof(s.sun_path) - 1;
|
bytes = sizeof(s.sun_path) - 1;
|
||||||
snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, u->display_num);
|
snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, u->display_num);
|
||||||
pa_log_debug("trying to conenct to %s", s.sun_path);
|
pa_log_debug("trying to connect to %s", s.sun_path);
|
||||||
if (connect(fd, (struct sockaddr *)&s,
|
if (connect(fd, (struct sockaddr *)&s,
|
||||||
sizeof(struct sockaddr_un)) != 0) {
|
sizeof(struct sockaddr_un)) != 0) {
|
||||||
u->failed_connect_time = pa_rtclock_now();
|
u->failed_connect_time = pa_rtclock_now();
|
||||||
|
@ -313,7 +313,7 @@ static void thread_func(void *userdata) {
|
|||||||
} else {
|
} else {
|
||||||
if (u->want_src_data)
|
if (u->want_src_data)
|
||||||
{
|
{
|
||||||
/* we dont want source data anymore */
|
/* we don't want source data anymore */
|
||||||
char buf[12];
|
char buf[12];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
|
@ -101,7 +101,7 @@ main(int argc, char **argv)
|
|||||||
wm_pid = g_atoi(argv[2]);
|
wm_pid = g_atoi(argv[2]);
|
||||||
g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)",
|
g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)",
|
||||||
x_pid, wm_pid);
|
x_pid, wm_pid);
|
||||||
/* run xrdp-chansrv as a seperate process */
|
/* run xrdp-chansrv as a separate process */
|
||||||
chansrv_pid = g_fork();
|
chansrv_pid = g_fork();
|
||||||
|
|
||||||
if (chansrv_pid == -1)
|
if (chansrv_pid == -1)
|
||||||
|
@ -611,7 +611,7 @@ static gboolean on_delete_event(GtkWidget *widget, GdkEvent *ev, gpointer data)
|
|||||||
|
|
||||||
static void on_destroy(GtkWidget *widget, gpointer data)
|
static void on_destroy(GtkWidget *widget, gpointer data)
|
||||||
{
|
{
|
||||||
/* this will destory all windows and return control to gtk_main() */
|
/* this will destroy all windows and return control to gtk_main() */
|
||||||
gtk_main_quit();
|
gtk_main_quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -673,6 +673,6 @@ static void on_clear_clicked(GtkWidget *widget, gpointer data)
|
|||||||
|
|
||||||
static void on_quit_clicked(GtkWidget *widget, gpointer data)
|
static void on_quit_clicked(GtkWidget *widget, gpointer data)
|
||||||
{
|
{
|
||||||
/* this will destory all windows and return control to gtk_main() */
|
/* this will destroy all windows and return control to gtk_main() */
|
||||||
gtk_main_quit();
|
gtk_main_quit();
|
||||||
}
|
}
|
||||||
|
@ -454,7 +454,7 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
|
|||||||
g_writeln("bind failed");
|
g_writeln("bind failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* listen for an incomming connection */
|
/* listen for an incoming connection */
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
error = g_tcp_listen(lis_sck);
|
error = g_tcp_listen(lis_sck);
|
||||||
@ -465,7 +465,7 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* accept an incomming connection */
|
/* accept an incoming connection */
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
while ((!g_terminated) && (error == 0))
|
while ((!g_terminated) && (error == 0))
|
||||||
|
@ -1041,7 +1041,7 @@ lib_mod_connect(struct vnc *v)
|
|||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
v->server_msg(v, "VNC tcp connected", 0);
|
v->server_msg(v, "VNC tcp connected", 0);
|
||||||
/* protocal version */
|
/* protocol version */
|
||||||
init_stream(s, 8192);
|
init_stream(s, 8192);
|
||||||
error = trans_force_read_s(v->trans, s, 12);
|
error = trans_force_read_s(v->trans, s, 12);
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
|
@ -188,7 +188,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
|
|||||||
pGC->alu == GXnoop ||
|
pGC->alu == GXnoop ||
|
||||||
pGC->alu == GXand ||
|
pGC->alu == GXand ||
|
||||||
pGC->alu == GXcopy /*||
|
pGC->alu == GXcopy /*||
|
||||||
pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
|
pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
|
||||||
{
|
{
|
||||||
draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
|
draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
|
||||||
pGC->alu);
|
pGC->alu);
|
||||||
@ -210,7 +210,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
|
|||||||
pGC->alu == GXnoop ||
|
pGC->alu == GXnoop ||
|
||||||
pGC->alu == GXand ||
|
pGC->alu == GXand ||
|
||||||
pGC->alu == GXcopy /*||
|
pGC->alu == GXcopy /*||
|
||||||
pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
|
pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
|
||||||
{
|
{
|
||||||
rdpup_set_fgcolor(pGC->fgPixel);
|
rdpup_set_fgcolor(pGC->fgPixel);
|
||||||
rdpup_set_opcode(pGC->alu);
|
rdpup_set_opcode(pGC->alu);
|
||||||
@ -253,7 +253,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
|
|||||||
pGC->alu == GXnoop ||
|
pGC->alu == GXnoop ||
|
||||||
pGC->alu == GXand ||
|
pGC->alu == GXand ||
|
||||||
pGC->alu == GXcopy /*||
|
pGC->alu == GXcopy /*||
|
||||||
pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
|
pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
|
||||||
{
|
{
|
||||||
LLOGLN(10, ("rdpPolyFillRect: 3"));
|
LLOGLN(10, ("rdpPolyFillRect: 3"));
|
||||||
draw_item_add_fill_region(pDirtyPriv, &clip_reg,
|
draw_item_add_fill_region(pDirtyPriv, &clip_reg,
|
||||||
@ -280,7 +280,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
|
|||||||
pGC->alu == GXnoop ||
|
pGC->alu == GXnoop ||
|
||||||
pGC->alu == GXand ||
|
pGC->alu == GXand ||
|
||||||
pGC->alu == GXcopy /*||
|
pGC->alu == GXcopy /*||
|
||||||
pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
|
pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
|
||||||
{
|
{
|
||||||
rdpup_set_fgcolor(pGC->fgPixel);
|
rdpup_set_fgcolor(pGC->fgPixel);
|
||||||
rdpup_set_opcode(pGC->alu);
|
rdpup_set_opcode(pGC->alu);
|
||||||
|
@ -182,7 +182,7 @@ rdpChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
|
|||||||
if (ctrls->enabled_ctrls & XkbRepeatKeysMask)
|
if (ctrls->enabled_ctrls & XkbRepeatKeysMask)
|
||||||
{
|
{
|
||||||
LLOGLN(10, ("rdpChangeKeyboardControl: autoRepeat on"));
|
LLOGLN(10, ("rdpChangeKeyboardControl: autoRepeat on"));
|
||||||
/* schedual to turn off the autorepeat after 100 ms so any app
|
/* schedule to turn off the autorepeat after 100 ms so any app
|
||||||
* polling it will be happy it's on */
|
* polling it will be happy it's on */
|
||||||
g_kbtimer = TimerSet(g_kbtimer, 0, 100,
|
g_kbtimer = TimerSet(g_kbtimer, 0, 100,
|
||||||
rdpInDeferredUpdateCallback, 0);
|
rdpInDeferredUpdateCallback, 0);
|
||||||
|
@ -590,7 +590,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* this is the first function called, it can be called many times
|
/* this is the first function called, it can be called many times
|
||||||
returns the number or parameters processed
|
returns the number or parameters processed
|
||||||
if it dosen't apply to the rdp part, return 0 */
|
if it doesn't apply to the rdp part, return 0 */
|
||||||
int
|
int
|
||||||
ddxProcessArgument(int argc, char **argv, int i)
|
ddxProcessArgument(int argc, char **argv, int i)
|
||||||
{
|
{
|
||||||
|
@ -1319,7 +1319,7 @@ rdpup_init(void)
|
|||||||
g_disconnect_timeout_s = 60;
|
g_disconnect_timeout_s = 60;
|
||||||
}
|
}
|
||||||
|
|
||||||
rdpLog("kill disconencted [%d] timeout [%d] sec\n", g_do_kill_disconnected,
|
rdpLog("kill disconnected [%d] timeout [%d] sec\n", g_do_kill_disconnected,
|
||||||
g_disconnect_timeout_s);
|
g_disconnect_timeout_s);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -263,7 +263,7 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
|
|||||||
if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
|
if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
|
||||||
{
|
{
|
||||||
log_message(LOG_LEVEL_WARNING,
|
log_message(LOG_LEVEL_WARNING,
|
||||||
"local keymap file for 0x%4.4x found and dosen't match "
|
"local keymap file for 0x%4.4x found and doesn't match "
|
||||||
"built in keymap, using local keymap file", keylayout);
|
"built in keymap, using local keymap file", keylayout);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -463,7 +463,7 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
if (g_file_exist(pid_file)) /* xrdp.pid */
|
if (g_file_exist(pid_file)) /* xrdp.pid */
|
||||||
{
|
{
|
||||||
g_writeln("It looks like xrdp is allready running,");
|
g_writeln("It looks like xrdp is already running,");
|
||||||
g_writeln("if not delete the xrdp.pid file and try again");
|
g_writeln("if not delete the xrdp.pid file and try again");
|
||||||
g_deinit();
|
g_deinit();
|
||||||
g_exit(0);
|
g_exit(0);
|
||||||
|
@ -165,7 +165,7 @@ xrdp_bitmap_create_with_data(int width, int height,
|
|||||||
if (((bpp >= 24) && (data_as_int & 3)) ||
|
if (((bpp >= 24) && (data_as_int & 3)) ||
|
||||||
(((bpp == 15) || (bpp == 16)) && (data_as_int & 1)))
|
(((bpp == 15) || (bpp == 16)) && (data_as_int & 1)))
|
||||||
{
|
{
|
||||||
/* got to copy data here, it's not alligned
|
/* got to copy data here, it's not aligned
|
||||||
other calls in this file assume alignment */
|
other calls in this file assume alignment */
|
||||||
Bpp = 4;
|
Bpp = 4;
|
||||||
switch (bpp)
|
switch (bpp)
|
||||||
|
@ -1983,7 +1983,7 @@ xrdp_mm_connect(struct xrdp_mm *self)
|
|||||||
if (xrdp_mm_setup_mod2(self) == 0)
|
if (xrdp_mm_setup_mod2(self) == 0)
|
||||||
{
|
{
|
||||||
xrdp_wm_set_login_mode(self->wm, 10);
|
xrdp_wm_set_login_mode(self->wm, 10);
|
||||||
rv = 0; /*sucess*/
|
rv = 0; /*success*/
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1688,7 +1688,7 @@ xrdp_wm_process_channel_data(struct xrdp_wm *self,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* this is the callbacks comming from libxrdp.so */
|
/* this is the callbacks coming from libxrdp.so */
|
||||||
int DEFAULT_CC
|
int DEFAULT_CC
|
||||||
callback(long id, int msg, long param1, long param2, long param3, long param4)
|
callback(long id, int msg, long param1, long param2, long param3, long param4)
|
||||||
{
|
{
|
||||||
@ -1760,7 +1760,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self)
|
|||||||
|
|
||||||
if (self->login_mode == 0)
|
if (self->login_mode == 0)
|
||||||
{
|
{
|
||||||
/* this is the inital state of the login window */
|
/* this is the initial state of the login window */
|
||||||
xrdp_wm_set_login_mode(self, 1); /* put the wm in login mode */
|
xrdp_wm_set_login_mode(self, 1); /* put the wm in login mode */
|
||||||
list_clear(self->log);
|
list_clear(self->log);
|
||||||
xrdp_wm_delete_all_childs(self);
|
xrdp_wm_delete_all_childs(self);
|
||||||
|
@ -369,7 +369,7 @@ main(int argc, char **argv)
|
|||||||
g_exit(0);
|
g_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if service is allready installed */
|
/* check if service is already installed */
|
||||||
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
|
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
|
||||||
|
|
||||||
if (sc_ser == 0)
|
if (sc_ser == 0)
|
||||||
@ -383,7 +383,7 @@ main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_writeln("error service is allready installed");
|
g_writeln("error service is already installed");
|
||||||
CloseServiceHandle(sc_ser);
|
CloseServiceHandle(sc_ser);
|
||||||
CloseServiceHandle(sc_man);
|
CloseServiceHandle(sc_man);
|
||||||
g_exit(0);
|
g_exit(0);
|
||||||
@ -405,7 +405,7 @@ main(int argc, char **argv)
|
|||||||
g_exit(0);
|
g_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if service is allready installed */
|
/* check if service is already installed */
|
||||||
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
|
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
|
||||||
|
|
||||||
if (sc_ser == 0)
|
if (sc_ser == 0)
|
||||||
@ -540,7 +540,7 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
if (g_file_exist(pid_file)) /* xrdp.pid */
|
if (g_file_exist(pid_file)) /* xrdp.pid */
|
||||||
{
|
{
|
||||||
g_writeln("It looks like xrdp is allready running,");
|
g_writeln("It looks like xrdp is already running,");
|
||||||
g_writeln("if not delete the xrdp.pid file and try again");
|
g_writeln("if not delete the xrdp.pid file and try again");
|
||||||
g_exit(0);
|
g_exit(0);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user