From ca9cbcafc826dc4c3ff6c54fcab3d81789ae5807 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 3 May 2016 13:07:13 -0700 Subject: [PATCH 1/5] Typo fixes --- common/log.c | 2 +- libxrdp/libxrdp.c | 2 +- libxrdp/libxrdp.h | 2 +- libxrdp/libxrdpinc.h | 4 ++-- libxrdp/xrdp_caps.c | 6 +++--- libxrdp/xrdp_iso.c | 2 +- libxrdp/xrdp_orders.c | 12 ++++++------ libxrdp/xrdp_rdp.c | 12 ++++++------ mc/mc.h | 2 +- neutrinordp/xrdp-neutrinordp.h | 2 +- rdp/rdp.h | 2 +- rdp/rdp_tcp.c | 4 ++-- sesman/chansrv/clipboard.c | 2 +- sesman/chansrv/smartcard.c | 2 +- sesman/libscp/libscp_lock.c | 2 +- sesman/libscp/libscp_v1s.h | 2 +- sesman/libscp/libscp_v1s_mng.h | 2 +- vnc/vnc.h | 2 +- vrplayer/mainwindow.h | 2 +- xorg/X11R7.6/rdp/rdp.h | 4 ++-- xorg/X11R7.6/rdp/rdpmain.c | 2 +- xorg/X11R7.6/rdp/rdpup.c | 2 +- xorg/X11R7.6/rdp/rdpxv.c | 2 +- xorg/tests/xdemo/xdemo.c | 2 +- xrdp/xrdp.h | 4 ++-- xrdp/xrdp_bitmap.c | 4 ++-- xrdp/xrdp_login_wnd.c | 22 +++++++++++----------- xrdp/xrdp_mm.c | 6 +++--- xrdp/xrdp_painter.c | 2 +- xrdp/xrdp_types.h | 2 +- xrdp/xrdp_wm.c | 14 +++++++------- xrdpapi/xrdpapi.c | 2 +- xup/xup.h | 2 +- 33 files changed, 68 insertions(+), 68 deletions(-) diff --git a/common/log.c b/common/log.c index b3ae9c22..54f625d7 100644 --- a/common/log.c +++ b/common/log.c @@ -149,7 +149,7 @@ internal_log_start(struct log_config *l_cfg) return ret; } - /* if progname is NULL, we ureturn error */ + /* if progname is NULL, we return error */ if (0 == l_cfg->program_name) { g_writeln("program_name not properly assigned"); diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index 0015f26b..0b92668a 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -971,7 +971,7 @@ libxrdp_reset(struct xrdp_session *session, } /* 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; } diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h index 6058c9ac..857abc99 100644 --- a/libxrdp/libxrdp.h +++ b/libxrdp/libxrdp.h @@ -401,7 +401,7 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s); int APP_CC xrdp_rdp_disconnect(struct xrdp_rdp *self); int APP_CC -xrdp_rdp_send_deactive(struct xrdp_rdp *self); +xrdp_rdp_send_deactivate(struct xrdp_rdp *self); /* xrdp_orders.c */ struct xrdp_orders * APP_CC diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h index ffda9e81..b23fd340 100644 --- a/libxrdp/libxrdpinc.h +++ b/libxrdp/libxrdpinc.h @@ -27,8 +27,8 @@ struct xrdp_brush { - int x_orgin; - int y_orgin; + int x_origin; + int y_origin; int style; char pattern[8]; }; diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c index 8a57c003..9dfe6fef 100644 --- a/libxrdp/xrdp_caps.c +++ b/libxrdp/xrdp_caps.c @@ -508,8 +508,8 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) /*****************************************************************************/ static int APP_CC -xrdp_caps_process_multifragmetupdate(struct xrdp_rdp *self, struct stream *s, - int len) +xrdp_caps_process_multifragmentupdate(struct xrdp_rdp *self, struct stream *s, + int len) { 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); break; case 0x001A: /* 26 CAPSETTYPE_MULTIFRAGMENTUPDATE */ - xrdp_caps_process_multifragmetupdate(self, s, len); + xrdp_caps_process_multifragmentupdate(self, s, len); break; case RDP_CAPSET_BMPCODECS: /* 0x1d(29) */ xrdp_caps_process_codecs(self, s, len); diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c index ce3baf70..fa7a3f1a 100644 --- a/libxrdp/xrdp_iso.c +++ b/libxrdp/xrdp_iso.c @@ -99,7 +99,7 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self) default: 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; } else diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index d7a2d017..697d2a5a 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -1014,18 +1014,18 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y, 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; - out_uint8(self->out_s, brush->x_orgin); - self->orders_state.pat_blt_brush.x_orgin = brush->x_orgin; + out_uint8(self->out_s, brush->x_origin); + 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; - out_uint8(self->out_s, brush->y_orgin); - self->orders_state.pat_blt_brush.y_orgin = brush->y_orgin; + out_uint8(self->out_s, brush->y_origin); + self->orders_state.pat_blt_brush.y_origin = brush->y_origin; } if (brush->style != self->orders_state.pat_blt_brush.style) diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 00bda631..fb3b4b51 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -1155,7 +1155,7 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s) xrdp_rdp_process_screen_update(self, s); break; 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 */ /* updates and it will issue a 33 above to catch up */ /* so minimized apps don't take bandwidth */ @@ -1193,18 +1193,18 @@ xrdp_rdp_disconnect(struct xrdp_rdp *self) /*****************************************************************************/ int APP_CC -xrdp_rdp_send_deactive(struct xrdp_rdp *self) +xrdp_rdp_send_deactivate(struct xrdp_rdp *self) { struct stream *s; - DEBUG(("in xrdp_rdp_send_deactive")); + DEBUG(("in xrdp_rdp_send_deactivate")); make_stream(s); init_stream(s, 8192); if (xrdp_rdp_init(self, s) != 0) { free_stream(s); - DEBUG(("out xrdp_rdp_send_deactive error")); + DEBUG(("out xrdp_rdp_send_deactivate error")); return 1; } @@ -1213,11 +1213,11 @@ xrdp_rdp_send_deactive(struct xrdp_rdp *self) if (xrdp_rdp_send(self, s, RDP_PDU_DEACTIVATE) != 0) { free_stream(s); - DEBUG(("out xrdp_rdp_send_deactive error")); + DEBUG(("out xrdp_rdp_send_deactivate error")); return 1; } free_stream(s); - DEBUG(("out xrdp_rdp_send_deactive")); + DEBUG(("out xrdp_rdp_send_deactivate")); return 0; } diff --git a/mc/mc.h b/mc/mc.h index 4af932f0..a28ade47 100644 --- a/mc/mc.h +++ b/mc/mc.h @@ -62,7 +62,7 @@ struct mod int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_opcode)(struct mod* v, int opcode); 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 (*server_set_pen)(struct mod* v, int style, int width); diff --git a/neutrinordp/xrdp-neutrinordp.h b/neutrinordp/xrdp-neutrinordp.h index 8606efe2..feddda4b 100644 --- a/neutrinordp/xrdp-neutrinordp.h +++ b/neutrinordp/xrdp-neutrinordp.h @@ -96,7 +96,7 @@ struct mod int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_opcode)(struct mod* v, int opcode); 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 (*server_set_pen)(struct mod* v, int style, int width); diff --git a/rdp/rdp.h b/rdp/rdp.h index 36a20f57..da8c1321 100644 --- a/rdp/rdp.h +++ b/rdp/rdp.h @@ -287,7 +287,7 @@ struct mod int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_opcode)(struct mod* v, int opcode); 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 (*server_set_pen)(struct mod* v, int style, int width); diff --git a/rdp/rdp_tcp.c b/rdp/rdp_tcp.c index 0200e777..60807806 100644 --- a/rdp/rdp_tcp.c +++ b/rdp/rdp_tcp.c @@ -55,7 +55,7 @@ rdp_tcp_recv(struct rdp_tcp *self, struct stream *s, int len) { 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)); if (self->sck_closed) @@ -115,7 +115,7 @@ rdp_tcp_send(struct rdp_tcp *self, struct stream *s) } 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)); total = 0; diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index a170dd23..80db95d1 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -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: skipping, " - "onwer == g_wnd"); + "owner == g_wnd"); g_got_selection = 1; return 0; } diff --git a/sesman/chansrv/smartcard.c b/sesman/chansrv/smartcard.c index 02a30d1a..38d80c8b 100644 --- a/sesman/chansrv/smartcard.c +++ b/sesman/chansrv/smartcard.c @@ -1873,7 +1873,7 @@ scard_send_Transmit(IRP *irp, char *context, int context_bytes, * u32 4 bytes dwProtocol * u32 4 bytes cbPciLength * u32 4 bytes map2 - * u32 4 byts cbSendLength + * u32 4 bytes cbSendLength * u32 4 bytes map3 * u32 4 bytes map4 * u32 4 bytes map5 diff --git a/sesman/libscp/libscp_lock.c b/sesman/libscp/libscp_lock.c index 848c1966..be0619cb 100644 --- a/sesman/libscp/libscp_lock.c +++ b/sesman/libscp/libscp_lock.c @@ -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_wait; /* semaphore on which the suspended process wait on */ 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 */ void DEFAULT_CC diff --git a/sesman/libscp/libscp_v1s.h b/sesman/libscp/libscp_v1s.h index 322edb28..cc29d70d 100644 --- a/sesman/libscp/libscp_v1s.h +++ b/sesman/libscp/libscp_v1s.h @@ -48,7 +48,7 @@ scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SESSION** s, int skipVchk); * * @brief denies connection to sesman * @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 */ diff --git a/sesman/libscp/libscp_v1s_mng.h b/sesman/libscp/libscp_v1s_mng.h index 83dee35b..867931a5 100644 --- a/sesman/libscp/libscp_v1s_mng.h +++ b/sesman/libscp/libscp_v1s_mng.h @@ -56,7 +56,7 @@ scp_v1s_mng_allow_connection(struct SCP_CONNECTION* c, struct SCP_SESSION* s); * * @brief denies connection to sesman * @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 */ diff --git a/vnc/vnc.h b/vnc/vnc.h index af5e86e6..6d1ddb8f 100644 --- a/vnc/vnc.h +++ b/vnc/vnc.h @@ -62,7 +62,7 @@ struct vnc int (*server_set_bgcolor)(struct vnc* v, int bgcolor); int (*server_set_opcode)(struct vnc* v, int opcode); 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 (*server_set_pen)(struct vnc* v, int style, int width); diff --git a/vrplayer/mainwindow.h b/vrplayer/mainwindow.h index f0383098..58bcb31c 100644 --- a/vrplayer/mainwindow.h +++ b/vrplayer/mainwindow.h @@ -62,7 +62,7 @@ public: ~MainWindow(); signals: - void onGeometryChanged(int x, int y, int widht, int height); + void onGeometryChanged(int x, int y, int width, int height); public slots: void onSliderValueChanged(int value); diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h index 901e292b..bc34778b 100644 --- a/xorg/X11R7.6/rdp/rdp.h +++ b/xorg/X11R7.6/rdp/rdp.h @@ -558,9 +558,9 @@ rdpup_set_cursor(short x, short y, char* cur_data, char* cur_mask); int rdpup_set_cursor_ex(short x, short y, char *cur_data, char *cur_mask, int bpp); int -rdpup_create_os_surface(int rdpindexd, int width, int height); +rdpup_create_os_surface(int rdpindex, int width, int height); 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 rdpup_switch_os_surface(int rdpindex); int diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c index c08b15cd..7540e12e 100644 --- a/xorg/X11R7.6/rdp/rdpmain.c +++ b/xorg/X11R7.6/rdp/rdpmain.c @@ -41,7 +41,7 @@ Sets up the functions #endif #if XRDP_DISABLE_LINUX_ABSTRACT -/* because including in problematic +/* because including is problematic * we dup a small struct * we need to set flags to zero to turn off abstract sockets */ struct _MyXtransport diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index c9091a7d..54eb779d 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -1127,7 +1127,7 @@ rdpup_process_msg(struct stream *s) box.x2 = g_rdpScreen.client_info.minfo[0].right; box.y2 = g_rdpScreen.client_info.minfo[0].bottom; 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++) { box.x1 = min(box.x1, g_rdpScreen.client_info.minfo[index].left); diff --git a/xorg/X11R7.6/rdp/rdpxv.c b/xorg/X11R7.6/rdp/rdpxv.c index d0ce8345..99fbd993 100644 --- a/xorg/X11R7.6/rdp/rdpxv.c +++ b/xorg/X11R7.6/rdp/rdpxv.c @@ -165,7 +165,7 @@ static int rdpXvSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute, INT32 value) { - LLOGLN(0, ("rdpXvxSetPortAttribute:")); + LLOGLN(0, ("rdpXvSetPortAttribute:")); return Success; } diff --git a/xorg/tests/xdemo/xdemo.c b/xorg/tests/xdemo/xdemo.c index f7e6b0ef..cef93274 100644 --- a/xorg/tests/xdemo/xdemo.c +++ b/xorg/tests/xdemo/xdemo.c @@ -205,7 +205,7 @@ int drawFont(int count, char *msg) } else { - printf("XListFonts() reted NULL\n"); + printf("XListFonts() returned NULL\n"); } #endif diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h index 1199d01a..e9bf69ef 100644 --- a/xrdp/xrdp.h +++ b/xrdp/xrdp.h @@ -136,7 +136,7 @@ xrdp_wm_pointer(struct xrdp_wm* self, char* data, char* mask, int x, int y, int callback(long id, int msg, long param1, long param2, long param3, long param4); int APP_CC -xrdp_wm_delete_all_childs(struct xrdp_wm* self); +xrdp_wm_delete_all_children(struct xrdp_wm* self); int APP_CC xrdp_wm_show_log(struct xrdp_wm *self); int APP_CC @@ -439,7 +439,7 @@ server_set_opcode(struct xrdp_mod* mod, int opcode); int DEFAULT_CC server_set_mixmode(struct xrdp_mod* mod, int mixmode); 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 DEFAULT_CC server_set_pen(struct xrdp_mod* mod, int style, int width); diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c index 3fd0fbb7..6a062d51 100644 --- a/xrdp/xrdp_bitmap.c +++ b/xrdp/xrdp_bitmap.c @@ -1254,8 +1254,8 @@ xrdp_bitmap_draw_focus_box(struct xrdp_bitmap *self, painter->brush.pattern[5] = 0x55; painter->brush.pattern[6] = 0xaa; painter->brush.pattern[7] = 0x55; - painter->brush.x_orgin = x; - painter->brush.x_orgin = x; + painter->brush.x_origin = x; + painter->brush.x_origin = x; painter->brush.style = 3; painter->fg_color = self->wm->black; painter->bg_color = self->parent->bg_color; diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index 357b4e2a..23195d49 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -96,7 +96,7 @@ xrdp_wm_popup_notify(struct xrdp_bitmap *wnd, /*****************************************************************************/ int APP_CC -xrdp_wm_delete_all_childs(struct xrdp_wm *self) +xrdp_wm_delete_all_children(struct xrdp_wm *self) { int index; 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_values = list_create(); 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->values, wm->mm->login_values, 0); 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 * shortcuts simplifies login. -* @param orginalDomainInfo indata to this function +* @param originalDomainInfo indata to this function * @param comboMax the max number of combo choices * @param decode if true then we perform decoding of combo choice * @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. */ 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 ret; @@ -280,7 +280,7 @@ xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax, ret = 0; /* default return value */ /* resultBuffer assumed to be 256 chars */ g_memset(resultBuffer, 0, 256); - if (orginalDomainInfo[0] == '_') + if (originalDomainInfo[0] == '_') { /* we try to locate a number indicating what combobox index the user * 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. * Invalid chars are ignored in microsoft client therefore we use '_' * again. this sec '__' contains the split for index.*/ - pos = g_pos(&orginalDomainInfo[1], "__"); + pos = g_pos(&originalDomainInfo[1], "__"); if (pos > 0) { /* 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); /* 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); g_snprintf(debugstr, 255, "Value of index (as char): %s " "(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 */ - g_strncpy(resultBuffer, &orginalDomainInfo[1], pos); + g_strncpy(resultBuffer, &originalDomainInfo[1], pos); } else { /* log_message(LOG_LEVEL_DEBUG, "domain does not contain _"); */ - g_strncpy(resultBuffer, &orginalDomainInfo[1], 255); + g_strncpy(resultBuffer, &originalDomainInfo[1], 255); } } return ret; @@ -344,7 +344,7 @@ xrdp_wm_show_edits(struct xrdp_wm *self, struct xrdp_bitmap *combo) 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 */ for (index = 100; index < 200; index++) { @@ -791,7 +791,7 @@ load_xrdp_config(struct xrdp_config *config, int bpp) 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->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi("009cb5")); globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede")); diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 1ee0b3bc..94be7e4f 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -2777,7 +2777,7 @@ server_set_mixmode(struct xrdp_mod *mod, int mixmode) /*****************************************************************************/ 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) { struct xrdp_painter *p; @@ -2789,8 +2789,8 @@ server_set_brush(struct xrdp_mod *mod, int x_orgin, int y_orgin, return 0; } - p->brush.x_orgin = x_orgin; - p->brush.y_orgin = y_orgin; + p->brush.x_origin = x_origin; + p->brush.y_origin = y_origin; p->brush.style = style; g_memcpy(p->brush.pattern, pattern, 8); return 0; diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c index 522c83d5..4b36b1ea 100644 --- a/xrdp/xrdp_painter.c +++ b/xrdp/xrdp_painter.c @@ -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->wm = wm; self->session = session; - self->rop = 0xcc; /* copy gota use 0xcc*/ + self->rop = 0xcc; /* copy will use 0xcc*/ self->clip_children = 1; return self; } diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 6230d678..4590d7a8 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -70,7 +70,7 @@ struct xrdp_mod int (*server_set_bgcolor)(struct xrdp_mod* v, int bgcolor); int (*server_set_opcode)(struct xrdp_mod* v, int opcode); 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 (*server_set_pen)(struct xrdp_mod* v, int style, int width); diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c index ddadbe5a..4e545b26 100644 --- a/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c @@ -594,9 +594,9 @@ xrdp_wm_init(struct xrdp_wm *self) { /* if no domain is passed, and no autorun in xrdp.ini, use the first item in the xrdp.ini - file thats not named + file that's not named 'globals' or 'Logging' or 'channels' */ - /* TODO: change this and have a 'autologin' + /* TODO: change this and have an 'autologin' line in globals section */ file_read_sections(fd, names); 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[6] = 0xaa; self->painter->brush.pattern[7] = 0x55; - self->painter->brush.x_orgin = 0; - self->painter->brush.x_orgin = 0; + self->painter->brush.x_origin = 0; + self->painter->brush.x_origin = 0; self->painter->brush.style = 3; self->painter->bg_color = self->black; 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 */ xrdp_wm_set_login_mode(self, 1); /* put the wm in login mode */ list_clear(self->log); - xrdp_wm_delete_all_childs(self); + xrdp_wm_delete_all_children(self); self->dragging = 0; xrdp_wm_init(self); } @@ -1772,7 +1772,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self) if (xrdp_mm_connect(self->mm) == 0) { 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; } else @@ -1782,7 +1782,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self) } else if (self->login_mode == 10) { - xrdp_wm_delete_all_childs(self); + xrdp_wm_delete_all_children(self); self->dragging = 0; xrdp_wm_set_login_mode(self, 11); } diff --git a/xrdpapi/xrdpapi.c b/xrdpapi/xrdpapi.c index 13f8e584..7d5c65f0 100644 --- a/xrdpapi/xrdpapi.c +++ b/xrdpapi/xrdpapi.c @@ -247,7 +247,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, return -1; } - LLOGLN(10, ("WTSVirtualChannelWrite: mysend() reted %d", rv)); + LLOGLN(10, ("WTSVirtualChannelWrite: mysend() returned %d", rv)); if (rv >= 0) { diff --git a/xup/xup.h b/xup/xup.h index 70cdcf27..85aff9fe 100644 --- a/xup/xup.h +++ b/xup/xup.h @@ -66,7 +66,7 @@ struct mod int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_opcode)(struct mod* v, int opcode); 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 (*server_set_pen)(struct mod* v, int style, int width); From d33bc070054ea11f7d31f0da4fa057f4ad79dda7 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 5 May 2016 00:05:23 -0700 Subject: [PATCH 2/5] Capitalize language and country names --- genkeymap/genkeymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c index 088af748..a92d45f9 100644 --- a/genkeymap/genkeymap.c +++ b/genkeymap/genkeymap.c @@ -21,15 +21,15 @@ Updated Jay Sorg 2009 - cs czech 0x405 - de german 0x407 - en-us us english 0x409 - fr french 0x40c - it italy 0x410 + cs Czech 0x405 + de German 0x407 + en-us US English 0x409 + fr French 0x40c + it Italian 0x410 br Portuguese (Brazil) 0x416 - ru russian 0x419 - se swedish 0x41d - en-uk uk english 0x809 + ru Russian 0x419 + se Swedish 0x41d + en-uk UK English 0x809 */ #include From c3f6e1f58afb6f6407b1a7c772b015ee84a14896 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 4 May 2016 23:36:11 -0700 Subject: [PATCH 3/5] Use uniform comments for GUIDs --- common/xrdp_constants.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 94f4305c..f034a293 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -541,23 +541,23 @@ #define SURCMDS_FRAMEMARKER 0x00000010 #define SURCMDS_STREAMSUFRACEBITS 0x00000040 -/* CODEC_GUID_NSCODEC 0xCA8D1BB9000F154F589FAE2D1A87E2D6 */ +/* CODEC_GUID_NSCODEC CA8D1BB9-000F-154F-589FAE2D1A87E2D6 */ #define XR_CODEC_GUID_NSCODEC \ "\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 \ "\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 \ "\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 \ "\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 \ "\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71" From 72019d3611c375d88029448820e84bb3d62d4033 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 4 May 2016 22:57:12 -0700 Subject: [PATCH 4/5] Use better symbols to protect include files --- sesman/chansrv/pulse/module-xrdp-sink-symdef.h | 4 ++-- sesman/chansrv/pulse/module-xrdp-source-symdef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sesman/chansrv/pulse/module-xrdp-sink-symdef.h b/sesman/chansrv/pulse/module-xrdp-sink-symdef.h index 14443d31..7001ba51 100644 --- a/sesman/chansrv/pulse/module-xrdp-sink-symdef.h +++ b/sesman/chansrv/pulse/module-xrdp-sink-symdef.h @@ -1,5 +1,5 @@ -#ifndef foomodulexrdpsinksymdeffoo -#define foomodulexrdpsinksymdeffoo +#ifndef MODULE_XRDP_SINK_SYMDEF_H +#define MODULE_XRDP_SINK_SYMDEF_H #include #include diff --git a/sesman/chansrv/pulse/module-xrdp-source-symdef.h b/sesman/chansrv/pulse/module-xrdp-source-symdef.h index e0467648..41e364ce 100644 --- a/sesman/chansrv/pulse/module-xrdp-source-symdef.h +++ b/sesman/chansrv/pulse/module-xrdp-source-symdef.h @@ -1,5 +1,5 @@ -#ifndef foomodulenullsourcesymdeffoo -#define foomodulenullsourcesymdeffoo +#ifndef MODULE_XRDP_SOURCE_SYMDEF_H +#define MODULE_XRDP_SOURCE_SYMDEF_H #include #include From b95dc9e12f570c6612c74f2b9b409946ad5ecdcb Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 5 May 2016 00:11:36 -0700 Subject: [PATCH 5/5] Remove extraneous color initialization --- xrdp/xrdp_login_wnd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index 23195d49..c0bd0c6f 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -797,7 +797,6 @@ load_xrdp_config(struct xrdp_config *config, int bpp) globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede")); globals->ls_width = 350; globals->ls_height = 350; - globals->ls_bg_color = 0xdedede; globals->ls_logo_x_pos = 63; globals->ls_logo_y_pos = 50; globals->ls_label_x_pos = 30;