Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-19 00:54:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[User32]

Browse source 
- Aric Stewart : While calculating lines, discard uniscribe data for non-visible lines.
- Nikolay Sivov : Release uniscribe data on Edit control destruction (valgrind).
- Sync Port wine.
- Someone needs to post a wine bug report due to the lack of support for Ctrl+Backspace. Debug fixme was added. See bug 1419.

svn path=/trunk/; revision=57291
This commit is contained in:
James Tabor 2012-09-13 20:44:04 +00:00
parent eb33840de6
commit 134c7287e0
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/win32ss/user/user32/controls/edit.c
View file

@ -411,6 +411,12 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
return line_def->ssa; return line_def->ssa;
} }
static inline INT get_vertical_line_count(EDITSTATE *es)
{
INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
return max(1,vlc);
}
static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, INT line) static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, INT line)
{ {
LINEDEF *line_def; LINEDEF *line_def;
@ -473,6 +479,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
INT line_count = es->line_count; INT line_count = es->line_count;
INT orig_net_length; INT orig_net_length;
RECT rc; RECT rc;
INT vlc;
if (istart == iend && delta == 0) if (istart == iend && delta == 0)
return; return;
@ -513,6 +520,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
fw = es->format_rect.right - es->format_rect.left; fw = es->format_rect.right - es->format_rect.left;
current_position = es->text + current_line->index; current_position = es->text + current_line->index;
vlc = get_vertical_line_count(es);
do { do {
if (current_line != start_line) if (current_line != start_line)
{ {
@ -696,6 +704,11 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
es->text_width = max(es->text_width, current_line->width); es->text_width = max(es->text_width, current_line->width);
current_position += current_line->length; current_position += current_line->length;
previous_line = current_line; previous_line = current_line;
/* Discard data for non-visible lines. It will be calculated as needed */
if ((line_index < es->y_offset) || (line_index > es->y_offset + vlc))
EDIT_InvalidateUniscribeData_linedef(current_line);
current_line = current_line->next; current_line = current_line->next;
line_index++; line_index++;
} while (previous_line->ending != END_0); } while (previous_line->ending != END_0);
@ -1444,13 +1457,6 @@ static void EDIT_SL_InvalidateText(EDITSTATE *es, INT start, INT end)
EDIT_UpdateText(es, &rc, TRUE); EDIT_UpdateText(es, &rc, TRUE);
} }
static inline INT get_vertical_line_count(EDITSTATE *es)
{
INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
return max(1,vlc);
}
/********************************************************************* /*********************************************************************
* *
* EDIT_ML_InvalidateText * EDIT_ML_InvalidateText
@ -3544,6 +3550,12 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key)
if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es))
SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0);
break; break;
case VK_BACK:
if (control)
{
FIXME("Ctrl+Backspace\n"); // See bug 1419.
}
break;
} }
return TRUE; return TRUE;
} }
@ -4618,6 +4630,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es)
pc = pp; pc = pp;
} }
EDIT_InvalidateUniscribeData(es);
SetWindowLongPtrW( es->hwndSelf, 0, 0 ); SetWindowLongPtrW( es->hwndSelf, 0, 0 );
HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es->undo_text);
HeapFree(GetProcessHeap(), 0, es); HeapFree(GetProcessHeap(), 0, es);