winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
7 participants
787 discussions
Start a n
N
ew thread
Jacek Caban : mshtml: Added IHTMLTxtRange::moveEnd implementation.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: d6c14fba3e5681e1fc18b1eea70c9a5055aed5f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d6c14fba3e5681e1fc18b1eea…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:36:04 2007 +0200 mshtml: Added IHTMLTxtRange::moveEnd implementation. --- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ dlls/mshtml/txtrange.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5c087f7..8bcf7b4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -155,6 +155,17 @@ static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, l _test_range_text(line, range, NULL); } +#define test_range_moveend(r,u,c,e) _test_range_moveend(__LINE__,r,u,c,e) +static void _test_range_moveend(unsigned line, IHTMLTxtRange *range, LPWSTR unit, long cnt, long excnt) +{ + long c = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLTxtRange_moveEnd(range, unit, cnt, &c); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); +} + #define test_range_inrange(r1,r2,b) _test_range_inrange(__LINE__,r1,r2,b) static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) { @@ -245,6 +256,17 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "test abc 123\r\nit's text"); test_range_move(range, characterW, 3, 3); + test_range_moveend(range, characterW, 1, 1); + test_range_text(range, "t"); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "t ab"); + test_range_moveend(range, characterW, -2, -2); + test_range_text(range, "t "); + test_range_move(range, characterW, 6, 6); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "123"); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "123\r\ni"); IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 6865efd..1a06508 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1095,8 +1095,48 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, long Count, long *ActualCount) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); - return E_NOTIMPL; + range_unit_t unit; + + TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); + + unit = string_to_unit(Unit); + if(unit == RU_UNKNOWN) + return E_INVALIDARG; + + if(!Count) { + *ActualCount = 0; + return S_OK; + } + + switch(unit) { + case RU_CHAR: { + dompos_t cur_pos, new_pos; + PRBool collapsed; + + get_cur_pos(This, FALSE, &cur_pos); + nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + + if(Count > 0) { + *ActualCount = move_next_chars(Count, &cur_pos, collapsed, &new_pos); + set_range_pos(This, FALSE, &new_pos); + }else { + *ActualCount = -move_prev_chars(This, -Count, &cur_pos, TRUE, &new_pos); + if(*ActualCount == Count) + set_range_pos(This, FALSE, &new_pos); + else + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); + } + + dompos_release(&cur_pos); + dompos_release(&new_pos); + break; + } + + default: + FIXME("unimplemented unit %s\n", debugstr_w(Unit)); + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface)
1
0
0
0
Jacek Caban : mshtml: Added IHTMLTxtRange::move("character") implementation .
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 11591e77205adfb30d9a7b94d3a08f7eabdf11ba URL:
http://source.winehq.org/git/wine.git/?a=commit;h=11591e77205adfb30d9a7b94d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:35:11 2007 +0200 mshtml: Added IHTMLTxtRange::move("character") implementation. --- dlls/mshtml/tests/dom.c | 32 ++++++++++++++ dlls/mshtml/txtrange.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f4a2f67..5c087f7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -33,6 +33,7 @@ static const char doc_str1[] = "<html><body>test</body></html>"; static const char doc_str2[] = "<html><body>test a<font size=\"2\">bc 123<br />it's </font>text<br /></body></html>"; +static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR wordW[] = {'w','o','r','d',0}; static const char *dbgstr_w(LPCWSTR str) @@ -142,6 +143,18 @@ static void _test_range_expand(unsigned line, IHTMLTxtRange *range, LPWSTR unit, _test_range_text(line, range, extext); } +#define test_range_move(r,u,c,e) _test_range_move(__LINE__,r,u,c,e) +static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, long cnt, long excnt) +{ + long c = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLTxtRange_move(range, unit, cnt, &c); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); + _test_range_text(line, range, NULL); +} + #define test_range_inrange(r1,r2,b) _test_range_inrange(__LINE__,r1,r2,b) static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) { @@ -213,6 +226,25 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_expand(range, wordW, VARIANT_TRUE, "test "); test_range_expand(range, wordW, VARIANT_FALSE, "test "); + test_range_move(range, characterW, 2, 2); + test_range_expand(range, wordW, VARIANT_TRUE, "test "); + + test_range_collapse(range, FALSE); + test_range_expand(range, wordW, VARIANT_TRUE, "abc "); + + test_range_collapse(range, FALSE); + test_range_expand(range, wordW, VARIANT_TRUE, "123"); + test_range_expand(range, wordW, VARIANT_FALSE, "123"); + test_range_move(range, characterW, 2, 2); + test_range_expand(range, wordW, VARIANT_TRUE, "123"); + + IHTMLTxtRange_Release(range); + + hres = IHTMLTxtRange_duplicate(body_range, &range); + ok(hres == S_OK, "duplicate failed: %08x\n", hres); + + test_range_text(range, "test abc 123\r\nit's text"); + test_range_move(range, characterW, 3, 3); IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 7c7dad8..6865efd 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -568,6 +568,66 @@ static WCHAR prev_char(HTMLTxtRange *This, const dompos_t *pos, dompos_t *new_po return 0; } +static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, dompos_t *new_pos) +{ + dompos_t iter, tmp; + long ret = 0; + WCHAR c; + + if(col) + ret++; + + if(ret >= cnt) { + *new_pos = *pos; + dompos_addref(new_pos); + return ret; + } + + c = next_char(pos, &iter); + ret++; + + while(ret < cnt) { + tmp = iter; + c = next_char(&tmp, &iter); + if(!c) { + iter = tmp; + break; + } + ret++; + dompos_release(&tmp); + } + + *new_pos = iter; + return ret; +} + +static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, BOOL end, dompos_t *new_pos) +{ + dompos_t iter, tmp; + long ret = 0; + WCHAR c; + + c = prev_char(This, pos, &iter); + if(c) + ret++; + + while(c && ret < cnt) { + tmp = iter; + c = prev_char(This, &tmp, &iter); + if(!c) { + iter = tmp; + if(end) + ret++; + break; + } + ret++; + dompos_release(&tmp); + } + + *new_pos = iter; + return ret; +} + static BOOL find_next_space(const dompos_t *pos, BOOL first_space, dompos_t *ret) { dompos_t iter, tmp; @@ -978,8 +1038,49 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, long Count, long *ActualCount) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); - return E_NOTIMPL; + range_unit_t unit; + + TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); + + unit = string_to_unit(Unit); + if(unit == RU_UNKNOWN) + return E_INVALIDARG; + + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); + + if(!Count) { + *ActualCount = 0; + return S_OK; + } + + switch(unit) { + case RU_CHAR: { + dompos_t cur_pos, new_pos; + + get_cur_pos(This, TRUE, &cur_pos); + + if(Count > 0) { + *ActualCount = move_next_chars(Count, &cur_pos, TRUE, &new_pos); + set_range_pos(This, FALSE, &new_pos); + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); + dompos_release(&new_pos); + }else { + *ActualCount = -move_prev_chars(This, -Count, &cur_pos, FALSE, &new_pos); + set_range_pos(This, TRUE, &new_pos); + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); + dompos_release(&new_pos); + } + + dompos_release(&cur_pos); + break; + } + + default: + FIXME("unimplemented unit %s\n", debugstr_w(Unit)); + } + + TRACE("ret %ld\n", *ActualCount); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_moveStart(IHTMLTxtRange *iface, BSTR Unit,
1
0
0
0
Jacek Caban : mshtml: Fixed ref count in parentElement.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: c1057b43a2c1704c72cfcd3c381ccefc28b709fc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1057b43a2c1704c72cfcd3c3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:33:59 2007 +0200 mshtml: Fixed ref count in parentElement. --- dlls/mshtml/txtrange.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index fdbaf9d..7c7dad8 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -818,7 +818,6 @@ static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElem HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); nsIDOMNode *nsnode, *tmp; HTMLDOMNode *node; - HRESULT hres; TRACE("(%p)->(%p)\n", This, parent); @@ -837,10 +836,7 @@ static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElem node = get_node(This->doc, nsnode); nsIDOMNode_Release(nsnode); - hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)parent); - - IHTMLDOMNode_Release(HTMLDOMNODE(node)); - return hres; + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)parent); } static HRESULT WINAPI HTMLTxtRange_duplicate(IHTMLTxtRange *iface, IHTMLTxtRange **Duplicate)
1
0
0
0
Jacek Caban : mshtml: Added IHTMLTxtRange::expand implementation.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: efe323208784d5fce3ea5194efd74804308bdb8d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=efe323208784d5fce3ea5194e…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:32:46 2007 +0200 mshtml: Added IHTMLTxtRange::expand implementation. --- dlls/mshtml/tests/dom.c | 18 +++ dlls/mshtml/txtrange.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 279 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0f883b3..f4a2f67 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -33,6 +33,8 @@ static const char doc_str1[] = "<html><body>test</body></html>"; static const char doc_str2[] = "<html><body>test a<font size=\"2\">bc 123<br />it's </font>text<br /></body></html>"; +static WCHAR wordW[] = {'w','o','r','d',0}; + static const char *dbgstr_w(LPCWSTR str) { static char buf[512]; @@ -127,6 +129,19 @@ static void _test_range_collapse(unsigned line, IHTMLTxtRange *range, BOOL b) _test_range_text(line, range, NULL); } +#define test_range_expand(r,u,b,t) _test_range_expand(__LINE__,r,u,b,t) +static void _test_range_expand(unsigned line, IHTMLTxtRange *range, LPWSTR unit, + VARIANT_BOOL exb, const char *extext) +{ + VARIANT_BOOL b = 0xe0e0; + HRESULT hres; + + hres = IHTMLTxtRange_expand(range, unit, &b); + ok_(__FILE__,line) (hres == S_OK, "expand failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "b=%x, expected %x\n", b, exb); + _test_range_text(line, range, extext); +} + #define test_range_inrange(r1,r2,b) _test_range_inrange(__LINE__,r1,r2,b) static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) { @@ -196,6 +211,9 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_inrange(range2, range, VARIANT_TRUE); IHTMLTxtRange_Release(range2); + test_range_expand(range, wordW, VARIANT_TRUE, "test "); + test_range_expand(range, wordW, VARIANT_FALSE, "test "); + IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 99248e7..fdbaf9d 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -65,6 +65,14 @@ typedef struct { const PRUnichar *p; } dompos_t; +typedef enum { + RU_UNKNOWN, + RU_CHAR, + RU_WORD, + RU_SENTENCE, + RU_TEXTEDIT +} range_unit_t; + static HTMLTxtRange *get_range_object(HTMLDocument *doc, IHTMLTxtRange *iface) { HTMLTxtRange *iter; @@ -78,6 +86,25 @@ static HTMLTxtRange *get_range_object(HTMLDocument *doc, IHTMLTxtRange *iface) return NULL; } +static range_unit_t string_to_unit(LPCWSTR str) +{ + static const WCHAR characterW[] = + {'c','h','a','r','a','c','t','e','r',0}; + static const WCHAR wordW[] = + {'w','o','r','d',0}; + static const WCHAR sentenceW[] = + {'s','e','n','t','e','n','c','e',0}; + static const WCHAR texteditW[] = + {'t','e','x','t','e','d','i','t',0}; + + if(!strcmpiW(str, characterW)) return RU_CHAR; + if(!strcmpiW(str, wordW)) return RU_WORD; + if(!strcmpiW(str, sentenceW)) return RU_SENTENCE; + if(!strcmpiW(str, texteditW)) return RU_TEXTEDIT; + + return RU_UNKNOWN; +} + static int string_to_nscmptype(LPCWSTR str) { static const WCHAR seW[] = {'S','t','a','r','t','T','o','E','n','d',0}; @@ -348,6 +375,26 @@ static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) fill_nodestr(pos); } +static void set_range_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) +{ + nsresult nsres; + + if(start) { + if(pos->type == TEXT_NODE) + nsres = nsIDOMRange_SetStart(This->nsrange, pos->node, pos->off); + else + nsres = nsIDOMRange_SetStartBefore(This->nsrange, pos->node); + }else { + if(pos->type == TEXT_NODE) + nsres = nsIDOMRange_SetEnd(This->nsrange, pos->node, pos->off+1); + else + nsres = nsIDOMRange_SetEndAfter(This->nsrange, pos->node); + } + + if(NS_FAILED(nsres)) + ERR("failed: %p %08x\n", pos->node, nsres); +} + static void inline dompos_release(dompos_t *pos) { if(pos->node) @@ -357,6 +404,15 @@ static void inline dompos_release(dompos_t *pos) nsAString_Finish(&pos->str); } +static void inline dompos_addref(dompos_t *pos) +{ + if(pos->node) + nsIDOMNode_AddRef(pos->node); + + if(pos->type == TEXT_NODE) + fill_nodestr(pos); +} + static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) { nsIDOMNode *iter, *tmp; @@ -405,6 +461,174 @@ static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) dompos_release(&end_pos); } +static WCHAR get_pos_char(const dompos_t *pos) +{ + switch(pos->type) { + case TEXT_NODE: + return pos->p[pos->off]; + case ELEMENT_NODE: + if(is_br_node(pos->node)) + return '\n'; + } + + return 0; +} + +static WCHAR next_char(const dompos_t *pos, dompos_t *new_pos) +{ + nsIDOMNode *iter, *tmp; + + if(pos->type == TEXT_NODE && pos->off != -1 && pos->p[pos->off+1]) { + *new_pos = *pos; + new_pos->off++; + dompos_addref(new_pos); + return new_pos->p[new_pos->off]; + } + + iter = next_node(pos->node); + if(!iter) + return 0; + + while(1) { + switch(get_node_type(iter)) { + case TEXT_NODE: + new_pos->node = iter; + new_pos->type = TEXT_NODE; + new_pos->off = 0; + fill_nodestr(new_pos); + return *new_pos->p; + + case ELEMENT_NODE: + if(!is_br_node(iter)) + break; + + new_pos->node = iter; + new_pos->type = ELEMENT_NODE; + new_pos->off = 0; + new_pos->p = NULL; + return '\n'; + } + + tmp = iter; + iter = next_node(iter); + nsIDOMNode_Release(tmp); + + if(!iter) + break; + } + + return 0; +} + +static WCHAR prev_char(HTMLTxtRange *This, const dompos_t *pos, dompos_t *new_pos) +{ + nsIDOMNode *iter, *tmp; + + if(pos->type == TEXT_NODE && pos->off > 0) { + *new_pos = *pos; + new_pos->off--; + dompos_addref(new_pos); + return new_pos->p[new_pos->off]; + } + + iter = prev_node(This, pos->node); + if(!iter) + return 0; + + while(1) { + switch(get_node_type(iter)) { + case TEXT_NODE: + new_pos->node = iter; + new_pos->type = TEXT_NODE; + fill_nodestr(new_pos); + new_pos->off = strlenW(new_pos->p)-1; + return new_pos->p[new_pos->off]; + + case ELEMENT_NODE: + if(!is_br_node(iter)) + break; + + new_pos->node = iter; + new_pos->type = ELEMENT_NODE; + new_pos->off = 0; + new_pos->p = NULL; + return '\n'; + } + + tmp = iter; + iter = prev_node(This, iter); + nsIDOMNode_Release(tmp); + + if(!iter) + break; + } + + *new_pos = *pos; + dompos_addref(new_pos); + return 0; +} + +static BOOL find_next_space(const dompos_t *pos, BOOL first_space, dompos_t *ret) +{ + dompos_t iter, tmp; + WCHAR c; + + if(first_space) { + c = get_pos_char(pos); + if(c && isspaceW(c)) { + *ret = *pos; + dompos_addref(ret); + return FALSE; + } + } + + c = next_char(pos, &iter); + if(!c) { + *ret = *pos; + dompos_addref(ret); + return FALSE; + } + + while(!isspaceW(c)) { + tmp = iter; + c = next_char(&tmp, &iter); + if(!c) { + iter = tmp; + break; + } + dompos_release(&tmp); + } + + *ret = iter; + return TRUE; +} + +static long find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret) +{ + dompos_t iter, tmp; + WCHAR c; + + c = prev_char(This, pos, &iter); + if(!c || (first_space && isspaceW(c))) { + *ret = *pos; + dompos_addref(ret); + return FALSE; + } + + while(1) { + tmp = iter; + c = prev_char(This, &tmp, &iter); + if(!c || isspaceW(c)) { + dompos_release(&iter); + break; + } + dompos_release(&tmp); + } + + *ret = tmp; + return TRUE; +} + #define HTMLTXTRANGE_THIS(iface) DEFINE_THIS(HTMLTxtRange, HTMLTxtRange, iface) static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) @@ -715,8 +939,43 @@ static HRESULT WINAPI HTMLTxtRange_collapse(IHTMLTxtRange *iface, VARIANT_BOOL S static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIANT_BOOL *Success) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(Unit), Success); - return E_NOTIMPL; + range_unit_t unit; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(Unit), Success); + + unit = string_to_unit(Unit); + if(unit == RU_UNKNOWN) + return E_INVALIDARG; + + switch(unit) { + case RU_WORD: { + dompos_t end_pos, start_pos, new_pos; + + *Success = VARIANT_FALSE; + + get_cur_pos(This, TRUE, &start_pos); + get_cur_pos(This, FALSE, &end_pos); + if(find_next_space(&end_pos, TRUE, &new_pos)) { + set_range_pos(This, FALSE, &new_pos); + *Success = VARIANT_TRUE; + } + dompos_release(&new_pos); + + if(find_prev_space(This, &start_pos, TRUE, &new_pos)) { + set_range_pos(This, TRUE, &new_pos); + *Success = VARIANT_TRUE; + } + + dompos_release(&new_pos); + dompos_release(&end_pos); + + break; + } + default: + FIXME("Unimplemented unit %s\n", debugstr_w(Unit)); + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit,
1
0
0
0
Jacek Caban : mshtml: Added IHTMLTxtRange tests.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 6859de16f6bb626a7afcf3fd56c3aa26b64d88f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6859de16f6bb626a7afcf3fd5…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:22:59 2007 +0200 mshtml: Added IHTMLTxtRange tests. --- dlls/mshtml/tests/dom.c | 117 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 09f905a..0f883b3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -30,10 +30,14 @@ #include "docobj.h" static const char doc_str1[] = "<html><body>test</body></html>"; +static const char doc_str2[] = + "<html><body>test a<font size=\"2\">bc 123<br />it's </font>text<br /></body></html>"; static const char *dbgstr_w(LPCWSTR str) { static char buf[512]; + if(!str) + return "(null)"; WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); return buf; } @@ -57,19 +61,20 @@ static IHTMLDocument2 *create_document(void) return doc; } -static void test_node_name(IUnknown *unk, const char *exname) +#define test_node_name(u,n) _test_node_name(__LINE__,u,n) +static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { IHTMLDOMNode *node; BSTR name; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok(hres == S_OK, "QueryInterface(IID_IHTMLNode) failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLNode) failed: %08x\n", hres); hres = IHTMLDOMNode_get_nodeName(node, &name); IHTMLDOMNode_Release(node); - ok(hres == S_OK, "get_nodeName failed: %08x\n", hres); - ok(!strcmp_wa(name, exname), "got name: %s, expected HTML\n", dbgstr_w(name)); + ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__, line) (!strcmp_wa(name, exname), "got name: %s, expected HTML\n", dbgstr_w(name)); SysFreeString(name); } @@ -92,6 +97,109 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +#define test_range_text(r,t) _test_range_text(__LINE__,r,t) +static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) +{ + BSTR text; + HRESULT hres; + + hres = IHTMLTxtRange_get_text(range, &text); + ok_(__FILE__, line) (hres == S_OK, "get_text failed: %08x\n", hres); + + if(extext) { + ok_(__FILE__, line) (text != NULL, "text == NULL\n"); + ok_(__FILE__, line) (!strcmp_wa(text, extext), "text=\"%s\", expected \"%s\"\n", dbgstr_w(text), extext); + }else { + ok_(__FILE__, line) (text == NULL, "text=\"%s\", expected NULL\n", dbgstr_w(text)); + } + + SysFreeString(text); + +} + +#define test_range_collapse(r,b) _test_range_collapse(__LINE__,r,b) +static void _test_range_collapse(unsigned line, IHTMLTxtRange *range, BOOL b) +{ + HRESULT hres; + + hres = IHTMLTxtRange_collapse(range, b); + ok_(__FILE__, line) (hres == S_OK, "collapse failed: %08x\n", hres); + _test_range_text(line, range, NULL); +} + +#define test_range_inrange(r1,r2,b) _test_range_inrange(__LINE__,r1,r2,b) +static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 0xe0e0; + hres = IHTMLTxtRange_inRange(range1, range2, &b); + ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "(1->2) b=%x, expected %x\n", b, exb); +} + +#define test_range_isequal(r1,r2,b) _test_range_isequal(__LINE__,r1,r2,b) +static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 0xe0e0; + hres = IHTMLTxtRange_isEqual(range1, range2, &b); + ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "(1->2) b=%x, expected %x\n", b, exb); + + b = 0xe0e0; + hres = IHTMLTxtRange_isEqual(range2, range1, &b); + ok_(__FILE__,line) (hres == S_OK, "(2->1) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "(2->1) b=%x, expected %x\n", b, exb); + + if(exb) { + test_range_inrange(range1, range2, VARIANT_TRUE); + test_range_inrange(range2, range1, VARIANT_TRUE); + } +} + +static void test_txtrange(IHTMLDocument2 *doc) +{ + IHTMLElement *elem; + IHTMLBodyElement *body; + IHTMLTxtRange *body_range, *range, *range2; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); + IHTMLElement_Release(elem); + + hres = IHTMLBodyElement_createTextRange(body, &body_range); + IHTMLBodyElement_Release(body); + ok(hres == S_OK, "createTextRange failed: %08x\n", hres); + + test_range_text(body_range, "test abc 123\r\nit's text"); + + hres = IHTMLTxtRange_duplicate(body_range, &range); + ok(hres == S_OK, "duplicate failed: %08x\n", hres); + + hres = IHTMLTxtRange_duplicate(body_range, &range2); + ok(hres == S_OK, "duplicate failed: %08x\n", hres); + test_range_isequal(range, range2, VARIANT_TRUE); + + test_range_text(range, "test abc 123\r\nit's text"); + test_range_text(body_range, "test abc 123\r\nit's text"); + + test_range_collapse(range, TRUE); + test_range_isequal(range, range2, VARIANT_FALSE); + test_range_inrange(range, range2, VARIANT_FALSE); + test_range_inrange(range2, range, VARIANT_TRUE); + IHTMLTxtRange_Release(range2); + + IHTMLTxtRange_Release(range); + IHTMLTxtRange_Release(body_range); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -257,6 +365,7 @@ START_TEST(dom) CoInitialize(NULL); run_domtest(doc_str1, test_doc_elem); + run_domtest(doc_str2, test_txtrange); CoUninitialize(); gecko_installer_workaround(FALSE);
1
0
0
0
Jacek Caban : mshtml: Reimplement IHTMLTxtRange::get_text.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 1a7d41b73910b17247b37c3d42c870628b5ea4b5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1a7d41b73910b17247b37c3d4…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:17:31 2007 +0200 mshtml: Reimplement IHTMLTxtRange::get_text. --- dlls/mshtml/txtrange.c | 352 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 327 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 2821e02..99248e7 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR brW[] = {'b','r',0}; + typedef struct { const IHTMLTxtRangeVtbl *lpHTMLTxtRangeVtbl; @@ -49,6 +51,20 @@ typedef struct { #define HTMLTXTRANGE(x) ((IHTMLTxtRange*) &(x)->lpHTMLTxtRangeVtbl) +typedef struct { + WCHAR *buf; + DWORD len; + DWORD size; +} wstrbuf_t; + +typedef struct { + PRUint16 type; + nsIDOMNode *node; + PRUint32 off; + nsAString str; + const PRUnichar *p; +} dompos_t; + static HTMLTxtRange *get_range_object(HTMLDocument *doc, IHTMLTxtRange *iface) { HTMLTxtRange *iter; @@ -87,6 +103,308 @@ static PRUint16 get_node_type(nsIDOMNode *node) return type; } +static BOOL is_br_node(nsIDOMNode *node) +{ + nsIDOMElement *elem; + nsAString tag_str; + const PRUnichar *tag; + BOOL ret = FALSE; + nsresult nsres; + + nsres = nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + if(NS_FAILED(nsres)) + return FALSE; + + nsAString_Init(&tag_str, NULL); + nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMElement_Release(elem); + nsAString_GetData(&tag_str, &tag, 0); + + if(!strcmpiW(tag, brW)) + ret = TRUE; + + nsAString_Finish(&tag_str); + + return ret; +} + +static void inline wstrbuf_init(wstrbuf_t *buf) +{ + buf->len = 0; + buf->size = 16; + buf->buf = mshtml_alloc(buf->size * sizeof(WCHAR)); + *buf->buf = 0; +} + +static void inline wstrbuf_finish(wstrbuf_t *buf) +{ + mshtml_free(buf->buf); +} + +static void wstrbuf_append_len(wstrbuf_t *buf, LPCWSTR str, int len) +{ + if(buf->len+len >= buf->size) { + buf->size = 2*buf->len+len; + buf->buf = mshtml_realloc(buf->buf, buf->size * sizeof(WCHAR)); + } + + memcpy(buf->buf+buf->len, str, len*sizeof(WCHAR)); + buf->len += len; + buf->buf[buf->len] = 0; +} + +static void inline wstrbuf_append(wstrbuf_t *buf, LPCWSTR str) +{ + wstrbuf_append_len(buf, str, strlenW(str)); +} + +static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) +{ + + switch(get_node_type(node)) { + case TEXT_NODE: { + nsIDOMText *nstext; + nsAString data_str; + const PRUnichar *data; + + nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); + + nsAString_Init(&data_str, NULL); + nsIDOMText_GetData(nstext, &data_str); + nsAString_GetData(&data_str, &data, NULL); + wstrbuf_append(buf, data); + nsAString_Finish(&data_str); + + nsIDOMText_Release(nstext); + + break; + } + case ELEMENT_NODE: + if(is_br_node(node)) { + static const WCHAR endlW[] = {'\r','\n'}; + wstrbuf_append_len(buf, endlW, 2); + } + } +} + +static BOOL fill_nodestr(dompos_t *pos) +{ + nsIDOMText *text; + nsresult nsres; + + if(pos->type != TEXT_NODE) + return FALSE; + + nsres = nsIDOMNode_QueryInterface(pos->node, &IID_nsIDOMText, (void**)&text); + if(NS_FAILED(nsres)) + return FALSE; + + nsAString_Init(&pos->str, NULL); + nsIDOMText_GetData(text, &pos->str); + nsIDOMText_Release(text); + nsAString_GetData(&pos->str, &pos->p, NULL); + + return TRUE; +} + +static nsIDOMNode *next_node(nsIDOMNode *iter) +{ + nsIDOMNode *ret, *tmp; + nsresult nsres; + + if(!iter) + return NULL; + + nsres = nsIDOMNode_GetFirstChild(iter, &ret); + if(NS_SUCCEEDED(nsres) && ret) + return ret; + + nsIDOMNode_AddRef(iter); + + do { + nsres = nsIDOMNode_GetNextSibling(iter, &ret); + if(NS_SUCCEEDED(nsres) && ret) { + nsIDOMNode_Release(iter); + return ret; + } + + nsres = nsIDOMNode_GetParentNode(iter, &tmp); + nsIDOMNode_Release(iter); + iter = tmp; + }while(NS_SUCCEEDED(nsres) && iter); + + return NULL; +} + +static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) +{ + nsIDOMNode *ret, *tmp; + nsresult nsres; + + if(!iter) { + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMHTMLElement *nselem; + nsIDOMDocument *nsdoc; + + nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + nsIDOMHTMLDocument_GetBody(nshtmldoc, &nselem); + nsIDOMHTMLDocument_Release(nshtmldoc); + + nsIDOMElement_GetLastChild(nselem, &tmp); + if(!tmp) + return (nsIDOMNode*)nselem; + + while(tmp) { + ret = tmp; + nsIDOMNode_GetLastChild(ret, &tmp); + } + + nsIDOMElement_Release(nselem); + + return ret; + } + + nsres = nsIDOMNode_GetLastChild(iter, &ret); + if(NS_SUCCEEDED(nsres) && ret) + return ret; + + nsIDOMNode_AddRef(iter); + + do { + nsres = nsIDOMNode_GetPreviousSibling(iter, &ret); + if(NS_SUCCEEDED(nsres) && ret) { + nsIDOMNode_Release(iter); + return ret; + } + + nsres = nsIDOMNode_GetParentNode(iter, &tmp); + nsIDOMNode_Release(iter); + iter = tmp; + }while(NS_SUCCEEDED(nsres) && iter); + + return NULL; +} + +static nsIDOMNode *get_child_node(nsIDOMNode *node, PRUint32 off) +{ + nsIDOMNodeList *node_list; + nsIDOMNode *ret = NULL; + + nsIDOMNode_GetChildNodes(node, &node_list); + nsIDOMNodeList_Item(node_list, off, &ret); + nsIDOMNodeList_Release(node_list); + + return ret; +} + +static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) +{ + nsIDOMNode *node; + PRInt32 off; + + pos->p = NULL; + + if(!start) { + PRBool collapsed; + nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + start = collapsed; + } + + if(start) { + nsIDOMRange_GetStartContainer(This->nsrange, &node); + nsIDOMRange_GetStartOffset(This->nsrange, &off); + }else { + nsIDOMRange_GetEndContainer(This->nsrange, &node); + nsIDOMRange_GetEndOffset(This->nsrange, &off); + } + + pos->type = get_node_type(node); + if(pos->type == ELEMENT_NODE) { + if(start) { + pos->node = get_child_node(node, off); + pos->off = 0; + }else { + pos->node = off ? get_child_node(node, off-1) : prev_node(This, node); + pos->off = -1; + } + + pos->type = get_node_type(pos->node); + nsIDOMNode_Release(node); + }else if(start) { + pos->node = node; + pos->off = off; + }else if(off) { + pos->node = node; + pos->off = off-1; + }else { + pos->node = prev_node(This, node); + pos->off = -1; + nsIDOMNode_Release(node); + } + + if(pos->type == TEXT_NODE) + fill_nodestr(pos); +} + +static void inline dompos_release(dompos_t *pos) +{ + if(pos->node) + nsIDOMNode_Release(pos->node); + + if(pos->p) + nsAString_Finish(&pos->str); +} + +static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) +{ + nsIDOMNode *iter, *tmp; + dompos_t start_pos, end_pos; + PRBool collapsed; + + nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + if(collapsed) { + wstrbuf_finish(buf); + buf->buf = NULL; + buf->size = 0; + return; + } + + get_cur_pos(This, FALSE, &end_pos); + get_cur_pos(This, TRUE, &start_pos); + + if(start_pos.type == TEXT_NODE) { + if(start_pos.node == end_pos.node) { + wstrbuf_append_len(buf, start_pos.p+start_pos.off, end_pos.off-start_pos.off+1); + iter = start_pos.node; + nsIDOMNode_AddRef(iter); + }else { + wstrbuf_append(buf, start_pos.p+start_pos.off); + iter = next_node(start_pos.node); + } + }else { + iter = start_pos.node; + nsIDOMNode_AddRef(iter); + } + + while(iter != end_pos.node) { + wstrbuf_append_node(buf, iter); + tmp = next_node(iter); + nsIDOMNode_Release(iter); + iter = tmp; + } + + nsIDOMNode_AddRef(end_pos.node); + + if(start_pos.node != end_pos.node && !is_br_node(end_pos.node)) + wstrbuf_append_len(buf, end_pos.p, end_pos.off+1); + + nsIDOMNode_Release(iter); + dompos_release(&start_pos); + dompos_release(&end_pos); +} + #define HTMLTXTRANGE_THIS(iface) DEFINE_THIS(HTMLTxtRange, HTMLTxtRange, iface) static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) @@ -255,35 +573,19 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); + wstrbuf_t buf; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(This->nsrange) { - nsAString text_str; - nsresult nsres; - - nsAString_Init(&text_str, NULL); - - nsres = nsIDOMRange_ToString(This->nsrange, &text_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *nstext; - - nsAString_GetData(&text_str, &nstext, NULL); - *p = SysAllocString(nstext); - }else { - ERR("ToString failed: %08x\n", nsres); - } - - nsAString_Finish(&text_str); - } - - if(!*p) { - static const WCHAR empty[] = {0}; - *p = SysAllocString(empty); - } + wstrbuf_init(&buf); + range_to_string(This, &buf); + if(buf.buf) + *p = SysAllocString(buf.buf); + else + *p = NULL; + wstrbuf_finish(&buf); + TRACE("ret %s\n", debugstr_w(*p)); return S_OK; }
1
0
0
0
Lionel Debroux : setupapi: Fix memory leak (found by Smatch).
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 85022e50c28a6843e0e62c34509831929792af10 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=85022e50c28a6843e0e62c345…
Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Fri Aug 31 14:16:56 2007 +0200 setupapi: Fix memory leak (found by Smatch). --- dlls/setupapi/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 04b9c4d..68193d7 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -241,6 +241,7 @@ BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, if (!ReturnBuffer) { + HeapFree(GetProcessHeap(), 0, filenameW); if (ReturnBufferSize) { SetLastError(ERROR_INVALID_PARAMETER); @@ -252,6 +253,7 @@ BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, if (size > ReturnBufferSize) { + HeapFree(GetProcessHeap(), 0, filenameW); SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }
1
0
0
0
Francois Gouget : crypt32: We don't consider sys/types. h to be a conditional include.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 5ac6e1f5c55a6c8a24427232dc3be9b19c154fa2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5ac6e1f5c55a6c8a24427232d…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 12 23:42:02 2007 +0200 crypt32: We don't consider sys/types.h to be a conditional include. --- dlls/crypt32/rootstore.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 7941fa2..945b9c8 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -18,9 +18,7 @@ #include "config.h" #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif
1
0
0
0
Francois Gouget : faultrep: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: 547b0f3417e8a0258040cd98fdd9e138ffa4e0d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=547b0f3417e8a0258040cd98f…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 12 23:36:42 2007 +0200 faultrep: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index d61bc74..628260e 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1342,6 +1342,20 @@ BOOL * REFCLSID REFIID +%%faultrep.dll + +%long + +BOOL + +%str + +LPCSTR + +%wstr + +LPCWSTR + %%gdi32.dll %long
1
0
0
0
Roderick Colenbrander : wined3d: Add PBO support for dynamically locked surfaces.
by Alexandre Julliard
13 Sep '07
13 Sep '07
Module: wine Branch: master Commit: ad692f2a83c11ba0c9bb1d0e21d4d95029a65942 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ad692f2a83c11ba0c9bb1d0e2…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Sep 11 10:31:54 2007 +0200 wined3d: Add PBO support for dynamically locked surfaces. --- dlls/wined3d/surface.c | 185 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/swapchain.c | 19 ++++ dlls/wined3d/wined3d_private.h | 7 ++ include/wine/wined3d_gl.h | 7 ++ 4 files changed, 202 insertions(+), 16 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad692f2a83c11ba0c9bb1…
1
0
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
79
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200