diff options
| author | jsorg71 <jsorg71> | 2005-09-25 04:52:34 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2005-09-25 04:52:34 +0000 |
| commit | 2380919d0bd9d2ec6b7e88c63ead3adeb23d42cf (patch) | |
| tree | 3201b0432d9e8ce2c8f7668ecc78c77c376cbe88 /xrdp | |
| parent | 5d1c7fb6b5428d7c982fddf2826e5614e31b88a8 (diff) | |
| download | xrdp-proprietary-2380919d0bd9d2ec6b7e88c63ead3adeb23d42cf.tar.gz xrdp-proprietary-2380919d0bd9d2ec6b7e88c63ead3adeb23d42cf.zip | |
remove g_strcmp and clip fix
Diffstat (limited to 'xrdp')
| -rw-r--r-- | xrdp/xrdp_login_wnd.c | 10 | ||||
| -rw-r--r-- | xrdp/xrdp_painter.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index 723cfd2f..148d4ccd 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -209,7 +209,7 @@ set_mod_data_item(struct xrdp_mod_data* mod, char* name, char* value) for (index = 0; index < mod->names->count; index++) { - if (g_strcmp(name, (char*)list_get_item(mod->names, index)) == 0) + if (g_strncmp(name, (char*)list_get_item(mod->names, index), 255) == 0) { list_remove_item(mod->values, index); list_insert_item(mod->values, index, (long)g_strdup(value)); @@ -449,7 +449,7 @@ xrdp_wm_show_edits(struct xrdp_wm* self, struct xrdp_bitmap* combo) { self->login_window->focused_control = b; } - if (g_strcmp(name, "password") == 0) + if (g_strncmp(name, "password", 255) == 0) { b->password_char = '*'; } @@ -543,7 +543,7 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm* self, struct xrdp_bitmap* b) { p = (char*)list_get_item(sections, i); file_read_section(fd, p, section_names, section_values); - if (g_strcmp(p, "globals") == 0) + if (g_strncmp(p, "globals", 255) == 0) { } else @@ -559,11 +559,11 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm* self, struct xrdp_bitmap* b) { q = (char*)list_get_item(section_names, j); r = (char*)list_get_item(section_values, j); - if (g_strcmp("name", q) == 0) + if (g_strncmp("name", q, 255) == 0) { g_strcpy(mod_data->name, r); } - else if (g_strcmp("lib", q) == 0) + else if (g_strncmp("lib", q, 255) == 0) { g_strcpy(mod_data->lib, r); } diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c index a8d48572..c50a7493 100644 --- a/xrdp/xrdp_painter.c +++ b/xrdp/xrdp_painter.c @@ -376,8 +376,6 @@ xrdp_painter_draw_text(struct xrdp_painter* self, { x1 = x; y1 = y + total_height; - draw_rect.right--; - draw_rect.bottom--; flags = 0x03; /* 0x03 0x73; TEXT2_IMPLICIT_X and something else */ libxrdp_orders_text(self->session, f, flags, 0, font->color, 0, |