mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #370 from proski/typos

Browse Source 
Typo fixes and more
This commit is contained in:
Itamar Reis Peixoto 2016-05-06 09:05:38 -04:00
commit 0a6a55b547
37 changed files with 85 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/log.c
View File

@ -149,7 +149,7 @@ internal_log_start(struct log_config *l_cfg)
return ret; return ret;
} }
/* if progname is NULL, we ureturn error */ /* if progname is NULL, we return error */
if (0 == l_cfg->program_name) if (0 == l_cfg->program_name)
{ {
g_writeln("program_name not properly assigned"); g_writeln("program_name not properly assigned");

10
common/xrdp_constants.h
View File

@ -541,23 +541,23 @@
#define SURCMDS_FRAMEMARKER 0x00000010 #define SURCMDS_FRAMEMARKER 0x00000010
#define SURCMDS_STREAMSUFRACEBITS 0x00000040 #define SURCMDS_STREAMSUFRACEBITS 0x00000040
/* CODEC_GUID_NSCODEC 0xCA8D1BB9000F154F589FAE2D1A87E2D6 */ /* CODEC_GUID_NSCODEC CA8D1BB9-000F-154F-589FAE2D1A87E2D6 */
#define XR_CODEC_GUID_NSCODEC \ #define XR_CODEC_GUID_NSCODEC \
"\xb9\x1b\x8d\xca\x0f\x00\x4f\x15\x58\x9f\xae\x2d\x1a\x87\xe2\xd6" "\xb9\x1b\x8d\xca\x0f\x00\x4f\x15\x58\x9f\xae\x2d\x1a\x87\xe2\xd6"
/* CODEC_GUID_REMOTEFX 0x76772F12BD724463AFB3B73C9C6F7886 */ /* CODEC_GUID_REMOTEFX 76772F12-BD72-4463-AFB3B73C9C6F7886 */
#define XR_CODEC_GUID_REMOTEFX \ #define XR_CODEC_GUID_REMOTEFX \
"\x12\x2F\x77\x76\x72\xBD\x63\x44\xAF\xB3\xB7\x3C\x9C\x6F\x78\x86" "\x12\x2F\x77\x76\x72\xBD\x63\x44\xAF\xB3\xB7\x3C\x9C\x6F\x78\x86"
/* CODEC_GUID_JPEG 0x1BAF4CE6 9EED 430C 869ACB8B37B66237 */ /* CODEC_GUID_JPEG 1BAF4CE6-9EED-430C-869ACB8B37B66237 */
#define XR_CODEC_GUID_JPEG \ #define XR_CODEC_GUID_JPEG \
"\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37" "\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37"
/* CODEC_GUID_PNG 0xOE0C858D 28E0 45DB ADAA0F83E57CC560 */ /* CODEC_GUID_PNG 0E0C858D-28E0-45DB-ADAA0F83E57CC560 */
#define XR_CODEC_GUID_PNG \ #define XR_CODEC_GUID_PNG \
"\x8D\x85\x0C\x0E\xE0\x28\xDB\x45\xAD\xAA\x0F\x83\xE5\x7C\xC5\x60" "\x8D\x85\x0C\x0E\xE0\x28\xDB\x45\xAD\xAA\x0F\x83\xE5\x7C\xC5\x60"
/* MFVideoFormat_H264 ({34363248-0000-0010-8000-00AA00389B71}) */ /* MFVideoFormat_H264 0x34363248-0000-0010-800000AA00389B71 */
#define XR_CODEC_GUID_H264 \ #define XR_CODEC_GUID_H264 \
"\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71" "\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"

16
genkeymap/genkeymap.c
View File

@ -21,15 +21,15 @@
Updated Jay Sorg 2009 Updated Jay Sorg 2009
cs czech 0x405 cs Czech 0x405
de german 0x407 de German 0x407
en-us us english 0x409 en-us US English 0x409
fr french 0x40c fr French 0x40c
it italy 0x410 it Italian 0x410
br Portuguese (Brazil) 0x416 br Portuguese (Brazil) 0x416
ru russian 0x419 ru Russian 0x419
se swedish 0x41d se Swedish 0x41d
en-uk uk english 0x809 en-uk UK English 0x809
*/ */
#include <stdio.h> #include <stdio.h>

2
libxrdp/libxrdp.c
View File

@ -971,7 +971,7 @@ libxrdp_reset(struct xrdp_session *session,
} }
/* shut down the rdp client */ /* shut down the rdp client */
if (xrdp_rdp_send_deactive((struct xrdp_rdp *)session->rdp) != 0) if (xrdp_rdp_send_deactivate((struct xrdp_rdp *)session->rdp) != 0)
{ {
return 1; return 1;
} }

2
libxrdp/libxrdp.h
View File

@ -401,7 +401,7 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s);
int APP_CC int APP_CC
xrdp_rdp_disconnect(struct xrdp_rdp *self); xrdp_rdp_disconnect(struct xrdp_rdp *self);
int APP_CC int APP_CC
xrdp_rdp_send_deactive(struct xrdp_rdp *self); xrdp_rdp_send_deactivate(struct xrdp_rdp *self);
/* xrdp_orders.c */ /* xrdp_orders.c */
struct xrdp_orders * APP_CC struct xrdp_orders * APP_CC

4
libxrdp/libxrdpinc.h
View File

@ -27,8 +27,8 @@
struct xrdp_brush struct xrdp_brush
{ {
int x_orgin; int x_origin;
int y_orgin; int y_origin;
int style; int style;
char pattern[8]; char pattern[8];
}; };

6
libxrdp/xrdp_caps.c
View File

@ -508,8 +508,8 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len)
/*****************************************************************************/ /*****************************************************************************/
static int APP_CC static int APP_CC
xrdp_caps_process_multifragmetupdate(struct xrdp_rdp *self, struct stream *s, xrdp_caps_process_multifragmentupdate(struct xrdp_rdp *self, struct stream *s,
int len) int len)
{ {
int MaxRequestSize; int MaxRequestSize;
@ -647,7 +647,7 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s)
xrdp_caps_process_window(self, s, len); xrdp_caps_process_window(self, s, len);
break; break;
case 0x001A: /* 26 CAPSETTYPE_MULTIFRAGMENTUPDATE */ case 0x001A: /* 26 CAPSETTYPE_MULTIFRAGMENTUPDATE */
xrdp_caps_process_multifragmetupdate(self, s, len); xrdp_caps_process_multifragmentupdate(self, s, len);
break; break;
case RDP_CAPSET_BMPCODECS: /* 0x1d(29) */ case RDP_CAPSET_BMPCODECS: /* 0x1d(29) */
xrdp_caps_process_codecs(self, s, len); xrdp_caps_process_codecs(self, s, len);

2
libxrdp/xrdp_iso.c
View File

@ -99,7 +99,7 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self)
default: default:
if (self->requestedProtocol & PROTOCOL_SSL) if (self->requestedProtocol & PROTOCOL_SSL)
{ {
/* thats a patch since we don't support CredSSP for now */ /* that's a patch since we don't support CredSSP for now */
self->selectedProtocol = PROTOCOL_SSL; self->selectedProtocol = PROTOCOL_SSL;
} }
else else

12
libxrdp/xrdp_orders.c
View File

@ -1014,18 +1014,18 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
brush = &blank_brush; brush = &blank_brush;
} }
if (brush->x_orgin != self->orders_state.pat_blt_brush.x_orgin) if (brush->x_origin != self->orders_state.pat_blt_brush.x_origin)
{ {
present |= 0x0080; present |= 0x0080;
out_uint8(self->out_s, brush->x_orgin); out_uint8(self->out_s, brush->x_origin);
self->orders_state.pat_blt_brush.x_orgin = brush->x_orgin; self->orders_state.pat_blt_brush.x_origin = brush->x_origin;
} }
if (brush->y_orgin != self->orders_state.pat_blt_brush.y_orgin) if (brush->y_origin != self->orders_state.pat_blt_brush.y_origin)
{ {
present |= 0x0100; present |= 0x0100;
out_uint8(self->out_s, brush->y_orgin); out_uint8(self->out_s, brush->y_origin);
self->orders_state.pat_blt_brush.y_orgin = brush->y_orgin; self->orders_state.pat_blt_brush.y_origin = brush->y_origin;
} }
if (brush->style != self->orders_state.pat_blt_brush.style) if (brush->style != self->orders_state.pat_blt_brush.style)

12
libxrdp/xrdp_rdp.c
View File

@ -1155,7 +1155,7 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s)
xrdp_rdp_process_screen_update(self, s); xrdp_rdp_process_screen_update(self, s);
break; break;
case 35: /* 35(0x23) */ case 35: /* 35(0x23) */
/* 35 ?? this comes when minimuzing a full screen mstsc.exe 2600 */ /* 35 ?? this comes when minimizing a full screen mstsc.exe 2600 */
/* I think this is saying the client no longer wants screen */ /* I think this is saying the client no longer wants screen */
/* updates and it will issue a 33 above to catch up */ /* updates and it will issue a 33 above to catch up */
/* so minimized apps don't take bandwidth */ /* so minimized apps don't take bandwidth */
@ -1193,18 +1193,18 @@ xrdp_rdp_disconnect(struct xrdp_rdp *self)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_rdp_send_deactive(struct xrdp_rdp *self) xrdp_rdp_send_deactivate(struct xrdp_rdp *self)
{ {
struct stream *s; struct stream *s;
DEBUG(("in xrdp_rdp_send_deactive")); DEBUG(("in xrdp_rdp_send_deactivate"));
make_stream(s); make_stream(s);
init_stream(s, 8192); init_stream(s, 8192);
if (xrdp_rdp_init(self, s) != 0) if (xrdp_rdp_init(self, s) != 0)
{ {
free_stream(s); free_stream(s);
DEBUG(("out xrdp_rdp_send_deactive error")); DEBUG(("out xrdp_rdp_send_deactivate error"));
return 1; return 1;
} }
@ -1213,11 +1213,11 @@ xrdp_rdp_send_deactive(struct xrdp_rdp *self)
if (xrdp_rdp_send(self, s, RDP_PDU_DEACTIVATE) != 0) if (xrdp_rdp_send(self, s, RDP_PDU_DEACTIVATE) != 0)
{ {
free_stream(s); free_stream(s);
DEBUG(("out xrdp_rdp_send_deactive error")); DEBUG(("out xrdp_rdp_send_deactivate error"));
return 1; return 1;
} }
free_stream(s); free_stream(s);
DEBUG(("out xrdp_rdp_send_deactive")); DEBUG(("out xrdp_rdp_send_deactivate"));
return 0; return 0;
} }

2
mc/mc.h
View File

@ -62,7 +62,7 @@ struct mod
int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_bgcolor)(struct mod* v, int bgcolor);
int (*server_set_opcode)(struct mod* v, int opcode); int (*server_set_opcode)(struct mod* v, int opcode);
int (*server_set_mixmode)(struct mod* v, int mixmode); int (*server_set_mixmode)(struct mod* v, int mixmode);
int (*server_set_brush)(struct mod* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct mod* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);

2
neutrinordp/xrdp-neutrinordp.h
View File

@ -96,7 +96,7 @@ struct mod
int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_bgcolor)(struct mod* v, int bgcolor);
int (*server_set_opcode)(struct mod* v, int opcode); int (*server_set_opcode)(struct mod* v, int opcode);
int (*server_set_mixmode)(struct mod* v, int mixmode); int (*server_set_mixmode)(struct mod* v, int mixmode);
int (*server_set_brush)(struct mod* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct mod* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);

2
rdp/rdp.h
View File

@ -287,7 +287,7 @@ struct mod
int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_bgcolor)(struct mod* v, int bgcolor);
int (*server_set_opcode)(struct mod* v, int opcode); int (*server_set_opcode)(struct mod* v, int opcode);
int (*server_set_mixmode)(struct mod* v, int mixmode); int (*server_set_mixmode)(struct mod* v, int mixmode);
int (*server_set_brush)(struct mod* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct mod* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);

4
rdp/rdp_tcp.c
View File

@ -55,7 +55,7 @@ rdp_tcp_recv(struct rdp_tcp *self, struct stream *s, int len)
{ {
int rcvd; int rcvd;
DEBUG((" in rdp_tcp_recv gota get %d bytes on sck %d", DEBUG((" in rdp_tcp_recv will get %d bytes on sck %d",
len, self->sck)); len, self->sck));
if (self->sck_closed) if (self->sck_closed)
@ -115,7 +115,7 @@ rdp_tcp_send(struct rdp_tcp *self, struct stream *s)
} }
len = s->end - s->data; len = s->end - s->data;
DEBUG((" in rdp_tcp_send gota send %d bytes on sck %d", len, DEBUG((" in rdp_tcp_send will send %d bytes on sck %d", len,
self->sck)); self->sck));
total = 0; total = 0;

2
sesman/chansrv/clipboard.c
View File

@ -1706,7 +1706,7 @@ clipboard_event_selection_owner_notify(XEvent *xevent)
{ {
log_debug("clipboard_event_selection_owner_notify: matches g_wnd"); log_debug("clipboard_event_selection_owner_notify: matches g_wnd");
log_debug("clipboard_event_selection_owner_notify: skipping, " log_debug("clipboard_event_selection_owner_notify: skipping, "
"onwer == g_wnd"); "owner == g_wnd");
g_got_selection = 1; g_got_selection = 1;
return 0; return 0;
} }

4
sesman/chansrv/pulse/module-xrdp-sink-symdef.h
View File

@ -1,5 +1,5 @@
#ifndef foomodulexrdpsinksymdeffoo #ifndef MODULE_XRDP_SINK_SYMDEF_H
#define foomodulexrdpsinksymdeffoo #define MODULE_XRDP_SINK_SYMDEF_H
#include <pulsecore/core.h> #include <pulsecore/core.h>
#include <pulsecore/module.h> #include <pulsecore/module.h>

4
sesman/chansrv/pulse/module-xrdp-source-symdef.h
View File

@ -1,5 +1,5 @@
#ifndef foomodulenullsourcesymdeffoo #ifndef MODULE_XRDP_SOURCE_SYMDEF_H
#define foomodulenullsourcesymdeffoo #define MODULE_XRDP_SOURCE_SYMDEF_H
#include <pulsecore/core.h> #include <pulsecore/core.h>
#include <pulsecore/module.h> #include <pulsecore/module.h>

2
sesman/chansrv/smartcard.c
View File

@ -1873,7 +1873,7 @@ scard_send_Transmit(IRP *irp, char *context, int context_bytes,
* u32 4 bytes dwProtocol * u32 4 bytes dwProtocol
* u32 4 bytes cbPciLength * u32 4 bytes cbPciLength
* u32 4 bytes map2 * u32 4 bytes map2
* u32 4 byts cbSendLength * u32 4 bytes cbSendLength
* u32 4 bytes map3 * u32 4 bytes map3
* u32 4 bytes map4 * u32 4 bytes map4
* u32 4 bytes map5 * u32 4 bytes map5

2
sesman/libscp/libscp_lock.c
View File

@ -29,7 +29,7 @@ pthread_mutexattr_t lock_fork_attr; /* mutex attributes */
tbus lock_fork_req; /* semaphore on which the process that are going to fork suspend on */ tbus lock_fork_req; /* semaphore on which the process that are going to fork suspend on */
tbus lock_fork_wait; /* semaphore on which the suspended process wait on */ tbus lock_fork_wait; /* semaphore on which the suspended process wait on */
int lock_fork_forkers_count; /* threads that want to fork */ int lock_fork_forkers_count; /* threads that want to fork */
int lock_fork_blockers_count; /* threads thar are blocking fork */ int lock_fork_blockers_count; /* threads that are blocking fork */
int lock_fork_waiting_count; /* threads suspended until the fork finishes */ int lock_fork_waiting_count; /* threads suspended until the fork finishes */
void DEFAULT_CC void DEFAULT_CC

2
sesman/libscp/libscp_v1s.h
View File

@ -48,7 +48,7 @@ scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SESSION** s, int skipVchk);
* *
* @brief denies connection to sesman * @brief denies connection to sesman
* @param c connection descriptor * @param c connection descriptor
* @param reason pointer to a string containinge the reason for denying connection * @param reason pointer to a string containing the reason for denying connection
* *
*/ */
/* 002 */ /* 002 */

2
sesman/libscp/libscp_v1s_mng.h
View File

@ -56,7 +56,7 @@ scp_v1s_mng_allow_connection(struct SCP_CONNECTION* c, struct SCP_SESSION* s);
* *
* @brief denies connection to sesman * @brief denies connection to sesman
* @param c connection descriptor * @param c connection descriptor
* @param reason pointer to a string containinge the reason for denying connection * @param reason pointer to a string containing the reason for denying connection
* *
*/ */
/* 003 */ /* 003 */

2
vnc/vnc.h
View File

@ -62,7 +62,7 @@ struct vnc
int (*server_set_bgcolor)(struct vnc* v, int bgcolor); int (*server_set_bgcolor)(struct vnc* v, int bgcolor);
int (*server_set_opcode)(struct vnc* v, int opcode); int (*server_set_opcode)(struct vnc* v, int opcode);
int (*server_set_mixmode)(struct vnc* v, int mixmode); int (*server_set_mixmode)(struct vnc* v, int mixmode);
int (*server_set_brush)(struct vnc* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct vnc* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct vnc* v, int style, int (*server_set_pen)(struct vnc* v, int style,
int width); int width);

2
vrplayer/mainwindow.h
View File

@ -62,7 +62,7 @@ public:
~MainWindow(); ~MainWindow();
signals: signals:
void onGeometryChanged(int x, int y, int widht, int height); void onGeometryChanged(int x, int y, int width, int height);
public slots: public slots:
void onSliderValueChanged(int value); void onSliderValueChanged(int value);

4
xorg/X11R7.6/rdp/rdp.h
View File

@ -558,9 +558,9 @@ rdpup_set_cursor(short x, short y, char* cur_data, char* cur_mask);
int int
rdpup_set_cursor_ex(short x, short y, char *cur_data, char *cur_mask, int bpp); rdpup_set_cursor_ex(short x, short y, char *cur_data, char *cur_mask, int bpp);
int int
rdpup_create_os_surface(int rdpindexd, int width, int height); rdpup_create_os_surface(int rdpindex, int width, int height);
int int
rdpup_create_os_surface_bpp(int rdpindexd, int width, int height, int bpp); rdpup_create_os_surface_bpp(int rdpindex, int width, int height, int bpp);
int int
rdpup_switch_os_surface(int rdpindex); rdpup_switch_os_surface(int rdpindex);
int int

2
xorg/X11R7.6/rdp/rdpmain.c
View File

@ -41,7 +41,7 @@ Sets up the functions
#endif #endif
#if XRDP_DISABLE_LINUX_ABSTRACT #if XRDP_DISABLE_LINUX_ABSTRACT
/* because including <X11/Xtrans/Xtransint.h> in problematic /* because including <X11/Xtrans/Xtransint.h> is problematic
* we dup a small struct * we dup a small struct
* we need to set flags to zero to turn off abstract sockets */ * we need to set flags to zero to turn off abstract sockets */
struct _MyXtransport struct _MyXtransport

2
xorg/X11R7.6/rdp/rdpup.c
View File

@ -1127,7 +1127,7 @@ rdpup_process_msg(struct stream *s)
box.x2 = g_rdpScreen.client_info.minfo[0].right; box.x2 = g_rdpScreen.client_info.minfo[0].right;
box.y2 = g_rdpScreen.client_info.minfo[0].bottom; box.y2 = g_rdpScreen.client_info.minfo[0].bottom;
g_do_multimon = 1; g_do_multimon = 1;
/* adjust monitor info so it's not negitive */ /* adjust monitor info so it's not negative */
for (index = 1; index < g_rdpScreen.client_info.monitorCount; index++) for (index = 1; index < g_rdpScreen.client_info.monitorCount; index++)
{ {
box.x1 = min(box.x1, g_rdpScreen.client_info.minfo[index].left); box.x1 = min(box.x1, g_rdpScreen.client_info.minfo[index].left);

2
xorg/X11R7.6/rdp/rdpxv.c
View File

@ -165,7 +165,7 @@ static int
rdpXvSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute, rdpXvSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
INT32 value) INT32 value)
{ {
LLOGLN(0, ("rdpXvxSetPortAttribute:")); LLOGLN(0, ("rdpXvSetPortAttribute:"));
return Success; return Success;
} }

2
xorg/tests/xdemo/xdemo.c
View File

@ -205,7 +205,7 @@ int drawFont(int count, char *msg)
} }
else else
{ {
printf("XListFonts() reted NULL\n"); printf("XListFonts() returned NULL\n");
} }
#endif #endif

4
xrdp/xrdp.h
View File

@ -136,7 +136,7 @@ xrdp_wm_pointer(struct xrdp_wm* self, char* data, char* mask, int x, int y,
int int
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);
int APP_CC int APP_CC
xrdp_wm_delete_all_childs(struct xrdp_wm* self); xrdp_wm_delete_all_children(struct xrdp_wm* self);
int APP_CC int APP_CC
xrdp_wm_show_log(struct xrdp_wm *self); xrdp_wm_show_log(struct xrdp_wm *self);
int APP_CC int APP_CC
@ -439,7 +439,7 @@ server_set_opcode(struct xrdp_mod* mod, int opcode);
int DEFAULT_CC int DEFAULT_CC
server_set_mixmode(struct xrdp_mod* mod, int mixmode); server_set_mixmode(struct xrdp_mod* mod, int mixmode);
int DEFAULT_CC int DEFAULT_CC
server_set_brush(struct xrdp_mod* mod, int x_orgin, int y_orgin, server_set_brush(struct xrdp_mod* mod, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int DEFAULT_CC int DEFAULT_CC
server_set_pen(struct xrdp_mod* mod, int style, int width); server_set_pen(struct xrdp_mod* mod, int style, int width);

4
xrdp/xrdp_bitmap.c
View File

@ -1254,8 +1254,8 @@ xrdp_bitmap_draw_focus_box(struct xrdp_bitmap *self,
painter->brush.pattern[5] = 0x55; painter->brush.pattern[5] = 0x55;
painter->brush.pattern[6] = 0xaa; painter->brush.pattern[6] = 0xaa;
painter->brush.pattern[7] = 0x55; painter->brush.pattern[7] = 0x55;
painter->brush.x_orgin = x; painter->brush.x_origin = x;
painter->brush.x_orgin = x; painter->brush.x_origin = x;
painter->brush.style = 3; painter->brush.style = 3;
painter->fg_color = self->wm->black; painter->fg_color = self->wm->black;
painter->bg_color = self->parent->bg_color; painter->bg_color = self->parent->bg_color;

23
xrdp/xrdp_login_wnd.c
View File

@ -96,7 +96,7 @@ xrdp_wm_popup_notify(struct xrdp_bitmap *wnd,
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_wm_delete_all_childs(struct xrdp_wm *self) xrdp_wm_delete_all_children(struct xrdp_wm *self)
{ {
int index; int index;
struct xrdp_bitmap *b; struct xrdp_bitmap *b;
@ -228,7 +228,7 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap *wnd)
wm->mm->login_names->auto_free = 1; wm->mm->login_names->auto_free = 1;
wm->mm->login_values = list_create(); wm->mm->login_values = list_create();
wm->mm->login_values->auto_free = 1; wm->mm->login_values->auto_free = 1;
/* gota copy these cause dialog gets freed */ /* will copy these cause dialog gets freed */
list_append_list_strdup(mod_data->names, wm->mm->login_names, 0); list_append_list_strdup(mod_data->names, wm->mm->login_names, 0);
list_append_list_strdup(mod_data->values, wm->mm->login_values, 0); list_append_list_strdup(mod_data->values, wm->mm->login_values, 0);
xrdp_wm_set_login_mode(wm, 2); xrdp_wm_set_login_mode(wm, 2);
@ -257,7 +257,7 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap *wnd)
* *
* Users can create shortcuts where this information is configured. These * Users can create shortcuts where this information is configured. These
* shortcuts simplifies login. * shortcuts simplifies login.
* @param orginalDomainInfo indata to this function * @param originalDomainInfo indata to this function
* @param comboMax the max number of combo choices * @param comboMax the max number of combo choices
* @param decode if true then we perform decoding of combo choice * @param decode if true then we perform decoding of combo choice
* @param resultBuffer must be pre allocated before calling this function. * @param resultBuffer must be pre allocated before calling this function.
@ -266,7 +266,7 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap *wnd)
* 0 if the user does not prefer any choice. * 0 if the user does not prefer any choice.
*/ */
static int APP_CC static int APP_CC
xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax, xrdp_wm_parse_domain_information(char *originalDomainInfo, int comboMax,
int decode, char *resultBuffer) int decode, char *resultBuffer)
{ {
int ret; int ret;
@ -280,7 +280,7 @@ xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax,
ret = 0; /* default return value */ ret = 0; /* default return value */
/* resultBuffer assumed to be 256 chars */ /* resultBuffer assumed to be 256 chars */
g_memset(resultBuffer, 0, 256); g_memset(resultBuffer, 0, 256);
if (orginalDomainInfo[0] == '_') if (originalDomainInfo[0] == '_')
{ {
/* we try to locate a number indicating what combobox index the user /* we try to locate a number indicating what combobox index the user
* prefer the information is loaded from domain field, from the client * prefer the information is loaded from domain field, from the client
@ -289,7 +289,7 @@ xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax,
* Underscore is a valid name in the domain. * Underscore is a valid name in the domain.
* Invalid chars are ignored in microsoft client therefore we use '_' * Invalid chars are ignored in microsoft client therefore we use '_'
* again. this sec '__' contains the split for index.*/ * again. this sec '__' contains the split for index.*/
pos = g_pos(&orginalDomainInfo[1], "__"); pos = g_pos(&originalDomainInfo[1], "__");
if (pos > 0) if (pos > 0)
{ {
/* an index is found we try to use it /* an index is found we try to use it
@ -298,7 +298,7 @@ xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax,
{ {
g_memset(index, 0, 2); g_memset(index, 0, 2);
/* we just accept values 0-9 (one figure) */ /* we just accept values 0-9 (one figure) */
g_strncpy(index, &orginalDomainInfo[pos + 3], 1); g_strncpy(index, &originalDomainInfo[pos + 3], 1);
comboxindex = g_htoi(index); comboxindex = g_htoi(index);
g_snprintf(debugstr, 255, "Value of index (as char): %s " g_snprintf(debugstr, 255, "Value of index (as char): %s "
"(converted) : %d (max) : %d", index, comboxindex, "(converted) : %d (max) : %d", index, comboxindex,
@ -314,12 +314,12 @@ xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax,
} }
} }
/* pos limit the String to only contain the IP */ /* pos limit the String to only contain the IP */
g_strncpy(resultBuffer, &orginalDomainInfo[1], pos); g_strncpy(resultBuffer, &originalDomainInfo[1], pos);
} }
else else
{ {
/* log_message(LOG_LEVEL_DEBUG, "domain does not contain _"); */ /* log_message(LOG_LEVEL_DEBUG, "domain does not contain _"); */
g_strncpy(resultBuffer, &orginalDomainInfo[1], 255); g_strncpy(resultBuffer, &originalDomainInfo[1], 255);
} }
} }
return ret; return ret;
@ -344,7 +344,7 @@ xrdp_wm_show_edits(struct xrdp_wm *self, struct xrdp_bitmap *combo)
username_set = 0; username_set = 0;
/* free labels and edits, cause we gota create them */ /* free labels and edits, cause we will create them */
/* creation or combo changed */ /* creation or combo changed */
for (index = 100; index < 200; index++) for (index = 100; index < 200; index++)
{ {
@ -791,13 +791,12 @@ load_xrdp_config(struct xrdp_config *config, int bpp)
globals = &config->cfg_globals; globals = &config->cfg_globals;
/* set default values incase we can't get them from xrdp.ini file */ /* set default values in case we can't get them from xrdp.ini file */
globals->ini_version = 1; globals->ini_version = 1;
globals->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi("009cb5")); globals->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi("009cb5"));
globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede")); globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede"));
globals->ls_width = 350; globals->ls_width = 350;
globals->ls_height = 350; globals->ls_height = 350;
globals->ls_bg_color = 0xdedede;
globals->ls_logo_x_pos = 63; globals->ls_logo_x_pos = 63;
globals->ls_logo_y_pos = 50; globals->ls_logo_y_pos = 50;
globals->ls_label_x_pos = 30; globals->ls_label_x_pos = 30;

6
xrdp/xrdp_mm.c
View File

@ -2777,7 +2777,7 @@ server_set_mixmode(struct xrdp_mod *mod, int mixmode)
/*****************************************************************************/ /*****************************************************************************/
int DEFAULT_CC int DEFAULT_CC
server_set_brush(struct xrdp_mod *mod, int x_orgin, int y_orgin, server_set_brush(struct xrdp_mod *mod, int x_origin, int y_origin,
int style, char *pattern) int style, char *pattern)
{ {
struct xrdp_painter *p; struct xrdp_painter *p;
@ -2789,8 +2789,8 @@ server_set_brush(struct xrdp_mod *mod, int x_orgin, int y_orgin,
return 0; return 0;
} }
p->brush.x_orgin = x_orgin; p->brush.x_origin = x_origin;
p->brush.y_orgin = y_orgin; p->brush.y_origin = y_origin;
p->brush.style = style; p->brush.style = style;
g_memcpy(p->brush.pattern, pattern, 8); g_memcpy(p->brush.pattern, pattern, 8);
return 0; return 0;

2
xrdp/xrdp_painter.c
View File

@ -29,7 +29,7 @@ xrdp_painter_create(struct xrdp_wm *wm, struct xrdp_session *session)
self = (struct xrdp_painter *)g_malloc(sizeof(struct xrdp_painter), 1); self = (struct xrdp_painter *)g_malloc(sizeof(struct xrdp_painter), 1);
self->wm = wm; self->wm = wm;
self->session = session; self->session = session;
self->rop = 0xcc; /* copy gota use 0xcc*/ self->rop = 0xcc; /* copy will use 0xcc*/
self->clip_children = 1; self->clip_children = 1;
return self; return self;
} }

2
xrdp/xrdp_types.h
View File

@ -70,7 +70,7 @@ struct xrdp_mod
int (*server_set_bgcolor)(struct xrdp_mod* v, int bgcolor); int (*server_set_bgcolor)(struct xrdp_mod* v, int bgcolor);
int (*server_set_opcode)(struct xrdp_mod* v, int opcode); int (*server_set_opcode)(struct xrdp_mod* v, int opcode);
int (*server_set_mixmode)(struct xrdp_mod* v, int mixmode); int (*server_set_mixmode)(struct xrdp_mod* v, int mixmode);
int (*server_set_brush)(struct xrdp_mod* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct xrdp_mod* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct xrdp_mod* v, int style, int (*server_set_pen)(struct xrdp_mod* v, int style,
int width); int width);

14
xrdp/xrdp_wm.c
View File

@ -594,9 +594,9 @@ xrdp_wm_init(struct xrdp_wm *self)
{ {
/* if no domain is passed, and no autorun in xrdp.ini, /* if no domain is passed, and no autorun in xrdp.ini,
use the first item in the xrdp.ini use the first item in the xrdp.ini
file thats not named file that's not named
'globals' or 'Logging' or 'channels' */ 'globals' or 'Logging' or 'channels' */
/* TODO: change this and have a 'autologin' /* TODO: change this and have an 'autologin'
line in globals section */ line in globals section */
file_read_sections(fd, names); file_read_sections(fd, names);
for (index = 0; index < names->count; index++) for (index = 0; index < names->count; index++)
@ -810,8 +810,8 @@ xrdp_wm_xor_pat(struct xrdp_wm *self, int x, int y, int cx, int cy)
self->painter->brush.pattern[5] = 0x55; self->painter->brush.pattern[5] = 0x55;
self->painter->brush.pattern[6] = 0xaa; self->painter->brush.pattern[6] = 0xaa;
self->painter->brush.pattern[7] = 0x55; self->painter->brush.pattern[7] = 0x55;
self->painter->brush.x_orgin = 0; self->painter->brush.x_origin = 0;
self->painter->brush.x_orgin = 0; self->painter->brush.x_origin = 0;
self->painter->brush.style = 3; self->painter->brush.style = 3;
self->painter->bg_color = self->black; self->painter->bg_color = self->black;
self->painter->fg_color = self->white; self->painter->fg_color = self->white;
@ -1763,7 +1763,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self)
/* this is the initial 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_children(self);
self->dragging = 0; self->dragging = 0;
xrdp_wm_init(self); xrdp_wm_init(self);
} }
@ -1772,7 +1772,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self)
if (xrdp_mm_connect(self->mm) == 0) if (xrdp_mm_connect(self->mm) == 0)
{ {
xrdp_wm_set_login_mode(self, 3); /* put the wm in connected mode */ xrdp_wm_set_login_mode(self, 3); /* put the wm in connected mode */
xrdp_wm_delete_all_childs(self); xrdp_wm_delete_all_children(self);
self->dragging = 0; self->dragging = 0;
} }
else else
@ -1782,7 +1782,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self)
} }
else if (self->login_mode == 10) else if (self->login_mode == 10)
{ {
xrdp_wm_delete_all_childs(self); xrdp_wm_delete_all_children(self);
self->dragging = 0; self->dragging = 0;
xrdp_wm_set_login_mode(self, 11); xrdp_wm_set_login_mode(self, 11);
} }

2
xrdpapi/xrdpapi.c
View File

@ -247,7 +247,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer,
return -1; return -1;
} }
LLOGLN(10, ("WTSVirtualChannelWrite: mysend() reted %d", rv)); LLOGLN(10, ("WTSVirtualChannelWrite: mysend() returned %d", rv));
if (rv >= 0) if (rv >= 0)
{ {

2
xup/xup.h
View File

@ -66,7 +66,7 @@ struct mod
int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_bgcolor)(struct mod* v, int bgcolor);
int (*server_set_opcode)(struct mod* v, int opcode); int (*server_set_opcode)(struct mod* v, int opcode);
int (*server_set_mixmode)(struct mod* v, int mixmode); int (*server_set_mixmode)(struct mod* v, int mixmode);
int (*server_set_brush)(struct mod* v, int x_orgin, int y_orgin, int (*server_set_brush)(struct mod* v, int x_origin, int y_origin,
int style, char* pattern); int style, char* pattern);
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);