remove g_strcmp and clip fix

This commit is contained in:
jsorg71 2005-09-25 04:52:34 +00:00
parent 5d1c7fb6b5
commit 2380919d0b
2 changed files with 5 additions and 7 deletions

View File

@ -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++) 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_remove_item(mod->values, index);
list_insert_item(mod->values, index, (long)g_strdup(value)); 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; self->login_window->focused_control = b;
} }
if (g_strcmp(name, "password") == 0) if (g_strncmp(name, "password", 255) == 0)
{ {
b->password_char = '*'; 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); p = (char*)list_get_item(sections, i);
file_read_section(fd, p, section_names, section_values); file_read_section(fd, p, section_names, section_values);
if (g_strcmp(p, "globals") == 0) if (g_strncmp(p, "globals", 255) == 0)
{ {
} }
else 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); q = (char*)list_get_item(section_names, j);
r = (char*)list_get_item(section_values, 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); 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); g_strcpy(mod_data->lib, r);
} }

View File

@ -376,8 +376,6 @@ xrdp_painter_draw_text(struct xrdp_painter* self,
{ {
x1 = x; x1 = x;
y1 = y + total_height; y1 = y + total_height;
draw_rect.right--;
draw_rect.bottom--;
flags = 0x03; /* 0x03 0x73; TEXT2_IMPLICIT_X and something else */ flags = 0x03; /* 0x03 0x73; TEXT2_IMPLICIT_X and something else */
libxrdp_orders_text(self->session, f, flags, 0, libxrdp_orders_text(self->session, f, flags, 0,
font->color, 0, font->color, 0,