ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added more range tests and fixes.

This commit is contained in:
Jacek Caban 2007-10-14 01:14:08 +02:00 committed by Alexandre Julliard
parent 924b667821
commit 07dfef53bc
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mshtml/tests/dom.c
View File

@ -726,6 +726,10 @@ static void test_txtrange(IHTMLDocument2 *doc)
test_range_expand(range, wordW, VARIANT_FALSE, "123"); test_range_expand(range, wordW, VARIANT_FALSE, "123");
test_range_move(range, characterW, 2, 2); test_range_move(range, characterW, 2, 2);
test_range_expand(range, wordW, VARIANT_TRUE, "123"); test_range_expand(range, wordW, VARIANT_TRUE, "123");
test_range_moveend(range, characterW, -5, -5);
test_range_text(range, NULL);
test_range_moveend(range, characterW, 3, 3);
test_range_text(range, "c 1");
IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(range);

36
dlls/mshtml/txtrange.c
View File

@ -413,6 +413,11 @@ static inline void dompos_addref(dompos_t *pos)
fill_nodestr(pos); fill_nodestr(pos);
} }
static inline BOOL dompos_cmp(const dompos_t *pos1, const dompos_t *pos2)
{
return pos1->node == pos2->node && pos1->off == pos2->off;
}
static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf)
{ {
nsIDOMNode *iter, *tmp; nsIDOMNode *iter, *tmp;
@ -601,12 +606,16 @@ static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, dompos_t *n
return ret; return ret;
} }
static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, BOOL end, dompos_t *new_pos) static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, BOOL end,
const dompos_t *bound_pos, BOOL *bounded, dompos_t *new_pos)
{ {
dompos_t iter, tmp; dompos_t iter, tmp;
long ret = 0; long ret = 0;
WCHAR c; WCHAR c;
if(bounded)
*bounded = FALSE;
c = prev_char(This, pos, &iter); c = prev_char(This, pos, &iter);
if(c) if(c)
ret++; ret++;
@ -620,8 +629,12 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B
ret++; ret++;
break; break;
} }
ret++; ret++;
dompos_release(&tmp); dompos_release(&tmp);
if(bound_pos && dompos_cmp(&iter, bound_pos))
*bounded = TRUE;
} }
*new_pos = iter; *new_pos = iter;
@ -1114,7 +1127,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit,
IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE);
dompos_release(&new_pos); dompos_release(&new_pos);
}else { }else {
*ActualCount = -move_prev_chars(This, -Count, &cur_pos, FALSE, &new_pos); *ActualCount = -move_prev_chars(This, -Count, &cur_pos, FALSE, NULL, NULL, &new_pos);
set_range_pos(This, TRUE, &new_pos); set_range_pos(This, TRUE, &new_pos);
IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE);
dompos_release(&new_pos); dompos_release(&new_pos);
@ -1180,24 +1193,27 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit,
switch(unit) { switch(unit) {
case RU_CHAR: { case RU_CHAR: {
dompos_t cur_pos, new_pos; dompos_t start_pos, end_pos, new_pos;
PRBool collapsed; PRBool collapsed;
get_cur_pos(This, FALSE, &cur_pos); get_cur_pos(This, TRUE, &start_pos);
get_cur_pos(This, FALSE, &end_pos);
nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); nsIDOMRange_GetCollapsed(This->nsrange, &collapsed);
if(Count > 0) { if(Count > 0) {
*ActualCount = move_next_chars(Count, &cur_pos, collapsed, &new_pos); *ActualCount = move_next_chars(Count, &end_pos, collapsed, &new_pos);
set_range_pos(This, FALSE, &new_pos); set_range_pos(This, FALSE, &new_pos);
}else { }else {
*ActualCount = -move_prev_chars(This, -Count, &cur_pos, TRUE, &new_pos); BOOL bounded;
if(*ActualCount == Count)
set_range_pos(This, FALSE, &new_pos); *ActualCount = -move_prev_chars(This, -Count, &end_pos, TRUE, &start_pos, &bounded, &new_pos);
else set_range_pos(This, bounded, &new_pos);
if(bounded)
IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE);
} }
dompos_release(&cur_pos); dompos_release(&start_pos);
dompos_release(&end_pos);
dompos_release(&new_pos); dompos_release(&new_pos);
break; break;
} }