October 2007 - Wine-Commits

Francois Gouget : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 3265f2d7c48c357dbc16ec4b5e2c8d6d18e4dc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3265f2d7c48c357dbc16ec4b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:35:09 2007 +0200 crypt32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/tests/encode.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 2fbb6ed..be41587 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5541,7 +5541,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) "Unexpected value\n"); LocalFree(buf); } - excluded.Base.pwszURL = (LPWSTR)url; + U(excluded.Base).pwszURL = (LPWSTR)url; ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -5553,8 +5553,8 @@ static void test_encodeNameConstraints(DWORD dwEncoding) LocalFree(buf); } permitted.Base.dwAltNameChoice = CERT_ALT_NAME_IP_ADDRESS; - permitted.Base.IPAddress.cbData = sizeof(encodedIPAddr); - permitted.Base.IPAddress.pbData = (LPBYTE)encodedIPAddr; + U(permitted.Base).IPAddress.cbData = sizeof(encodedIPAddr); + U(permitted.Base).IPAddress.pbData = (LPBYTE)encodedIPAddr; constraints.cPermittedSubtree = 1; ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); @@ -5636,13 +5636,13 @@ static void test_decodeNameConstraints(DWORD dwEncoding) DWORD i; CERT_NAME_CONSTRAINTS_INFO *constraints; - DNSSubtree.Base.pwszURL = (LPWSTR)url; - IPAddressSubtree.Base.IPAddress.cbData = sizeof(encodedIPAddr); - IPAddressSubtree.Base.IPAddress.pbData = (LPBYTE)encodedIPAddr; - IPAddressWithMinSubtree.Base.IPAddress.cbData = sizeof(encodedIPAddr); - IPAddressWithMinSubtree.Base.IPAddress.pbData = (LPBYTE)encodedIPAddr; - IPAddressWithMinMaxSubtree.Base.IPAddress.cbData = sizeof(encodedIPAddr); - IPAddressWithMinMaxSubtree.Base.IPAddress.pbData = (LPBYTE)encodedIPAddr; + U(DNSSubtree.Base).pwszURL = (LPWSTR)url; + U(IPAddressSubtree.Base).IPAddress.cbData = sizeof(encodedIPAddr); + U(IPAddressSubtree.Base).IPAddress.pbData = (LPBYTE)encodedIPAddr; + U(IPAddressWithMinSubtree.Base).IPAddress.cbData = sizeof(encodedIPAddr); + U(IPAddressWithMinSubtree.Base).IPAddress.pbData = (LPBYTE)encodedIPAddr; + U(IPAddressWithMinMaxSubtree.Base).IPAddress.cbData = sizeof(encodedIPAddr); + U(IPAddressWithMinMaxSubtree.Base).IPAddress.pbData = (LPBYTE)encodedIPAddr; for (i = 0; i < sizeof(encodedNameConstraints) / sizeof(encodedNameConstraints[0]); i++)

1 0

Jacek Caban : mshtml: Try installing Gecko from local file in DllRegisterServer.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 71894ead1fb0eaef0edf15097f6503cbe6218dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71894ead1fb0eaef0edf15097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 01:49:19 2007 +0200 mshtml: Try installing Gecko from local file in DllRegisterServer. --- dlls/mshtml/install.c | 4 ++-- dlls/mshtml/main.c | 3 +++ dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/nsembed.c | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index db3f7f6..364884f 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -498,7 +498,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; } -BOOL install_wine_gecko(void) +BOOL install_wine_gecko(BOOL silent) { HANDLE hsem; @@ -516,7 +516,7 @@ BOOL install_wine_gecko(void) */ if(!install_from_registered_dir() && !install_from_default_dir() - && (url = get_url())) + && !silent && (url = get_url())) DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); } diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e0645f8..898ff14 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -454,6 +454,9 @@ static HRESULT register_server(BOOL do_register) if(FAILED(hres)) ERR("typelib registration failed: %08x\n", hres); + if(do_register && SUCCEEDED(hres)) + load_gecko(TRUE); + return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8ae5f1d..4c63f60 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -382,9 +382,11 @@ HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*); HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**); +BOOL load_gecko(BOOL); void close_gecko(void); void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*); void init_nsio(nsIComponentManager*,nsIComponentRegistrar*); +BOOL install_wine_gecko(BOOL); void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); @@ -448,8 +450,6 @@ void release_nodes(HTMLDocument*); IHTMLElementCollection *create_all_collection(HTMLDOMNode*); -BOOL install_wine_gecko(void); - /* commands */ typedef struct { DWORD id; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a2a1d47..8cead97 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -361,7 +361,7 @@ static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg = }; static CRITICAL_SECTION cs_load_gecko = { &cs_load_gecko_dbg, -1, 0, 0, 0, 0 }; -static BOOL load_gecko(void) +BOOL load_gecko(BOOL silent) { PRUnichar gre_path[MAX_PATH]; BOOL ret = FALSE; @@ -380,7 +380,7 @@ static BOOL load_gecko(void) loading_thread = GetCurrentThreadId(); if(load_wine_gecko(gre_path) - || (install_wine_gecko() && load_wine_gecko(gre_path))) + || (install_wine_gecko(silent) && load_wine_gecko(gre_path))) ret = init_xpcom(gre_path); else MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); @@ -1495,7 +1495,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) NSContainer *ret; nsresult nsres; - if(!load_gecko()) + if(!load_gecko(FALSE)) return NULL; ret = mshtml_alloc(sizeof(NSContainer));

1 0

Jacek Caban : mshtml: Added ref counting to node object.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: d6ccaa43a63e700637a88913a8aca10381906414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ccaa43a63e700637a88913a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 12:07:27 2007 +0200 mshtml: Added ref counting to node object. --- dlls/mshtml/htmlnode.c | 20 ++++++++++++++------ dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 82e38c4..8eb907a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -50,19 +50,26 @@ static HRESULT WINAPI HTMLDOMNode_QueryInterface(IHTMLDOMNode *iface, static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IHTMLDocument2_AddRef(HTMLDOC(This->doc)); + return ref; } static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IHTMLDocument2_Release(HTMLDOC(This->doc)); + if(!ref) { + This->vtbl->destructor(This); + mshtml_free(This); + } + + return ref; } static HRESULT WINAPI HTMLDOMNode_GetTypeInfoCount(IHTMLDOMNode *iface, UINT *pctinfo) @@ -352,6 +359,7 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) } ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; + ret->ref = 1; ret->doc = doc; nsIDOMNode_AddRef(nsnode); @@ -396,7 +404,7 @@ void release_nodes(HTMLDocument *This) for(iter = This->nodes; iter; iter = next) { next = iter->next; - iter->vtbl->destructor(iter); - mshtml_free(iter); + iter->doc = NULL; + IHTMLDOMNode_Release(HTMLDOMNODE(iter)); } } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4c63f60..a493109 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -270,6 +270,8 @@ struct HTMLDOMNode { const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; const NodeImplVtbl *vtbl; + LONG ref; + nsIDOMNode *nsnode; HTMLDocument *doc;

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::moveStart("character") implementation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 2cb3c5de90e4a7364fb5768f2a8f9482c45cd49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb3c5de90e4a7364fb5768f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 01:14:40 2007 +0200 mshtml: Added IHTMLTxtRange::moveStart("character") implementation. --- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++ dlls/mshtml/txtrange.c | 61 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 80 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 364f139..bf9f499 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -472,6 +472,18 @@ static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, l _test_range_text(line, range, NULL); } +#define test_range_movestart(r,u,c,e) _test_range_movestart(__LINE__,r,u,c,e) +static void _test_range_movestart(unsigned line, IHTMLTxtRange *range, + LPWSTR unit, long cnt, long excnt) +{ + long c = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLTxtRange_moveStart(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_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) { @@ -814,6 +826,18 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, NULL); test_range_moveend(range, characterW, 3, 3); test_range_text(range, "abc"); + test_range_movestart(range, characterW, -2, -2); + test_range_text(range, "rdabc"); + test_range_movestart(range, characterW, 3, 3); + test_range_text(range, "bc"); + test_range_movestart(range, characterW, 4, 4); + test_range_text(range, NULL); + test_range_movestart(range, characterW, -3, -3); + test_range_text(range, "c 1"); + test_range_movestart(range, characterW, -7, -6); + test_range_text(range, "wordabc 1"); + test_range_movestart(range, characterW, 100, 22); + test_range_text(range, NULL); IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 39711e8..7156d9a 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -573,12 +573,16 @@ 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) +static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, const dompos_t *bound_pos, + BOOL *bounded, dompos_t *new_pos) { dompos_t iter, tmp; long ret = 0; WCHAR c; + if(bounded) + *bounded = FALSE; + if(col) ret++; @@ -600,6 +604,10 @@ static long move_next_chars(long cnt, const dompos_t *pos, BOOL col, dompos_t *n } ret++; dompos_release(&tmp); + if(bound_pos && dompos_cmp(&tmp, bound_pos)) { + *bounded = TRUE; + ret++; + } } *new_pos = iter; @@ -1122,7 +1130,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, get_cur_pos(This, TRUE, &cur_pos); if(Count > 0) { - *ActualCount = move_next_chars(Count, &cur_pos, TRUE, &new_pos); + *ActualCount = move_next_chars(Count, &cur_pos, TRUE, NULL, NULL, &new_pos); set_range_pos(This, FALSE, &new_pos); IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); dompos_release(&new_pos); @@ -1170,8 +1178,51 @@ static HRESULT WINAPI HTMLTxtRange_moveStart(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 start_pos, end_pos, new_pos; + PRBool collapsed; + + get_cur_pos(This, TRUE, &start_pos); + get_cur_pos(This, FALSE, &end_pos); + nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + + if(Count > 0) { + BOOL bounded; + + *ActualCount = move_next_chars(Count, &start_pos, collapsed, &end_pos, &bounded, &new_pos); + set_range_pos(This, !bounded, &new_pos); + if(bounded) + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); + }else { + *ActualCount = -move_prev_chars(This, -Count, &start_pos, FALSE, NULL, NULL, &new_pos); + set_range_pos(This, TRUE, &new_pos); + } + + dompos_release(&start_pos); + dompos_release(&end_pos); + dompos_release(&new_pos); + break; + } + + default: + FIXME("unimplemented unit %s\n", debugstr_w(Unit)); + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, @@ -1201,7 +1252,7 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); if(Count > 0) { - *ActualCount = move_next_chars(Count, &end_pos, collapsed, &new_pos); + *ActualCount = move_next_chars(Count, &end_pos, collapsed, NULL, NULL, &new_pos); set_range_pos(This, FALSE, &new_pos); }else { BOOL bounded;

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement:: selectedIndex property implementation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: a468ec5747d9b6e0ef4521ade5bf9cb703f27092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a468ec5747d9b6e0ef4521ade… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:11:48 2007 +0200 mshtml: Added IHTMLSelectElement::selectedIndex property implementation. --- dlls/mshtml/htmlselect.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 00d0f6f..d1ae86d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -195,15 +195,31 @@ static HRESULT WINAPI HTMLSelectElement_get_onchange(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *iface, long v) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%ld)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetSelectedIndex(This->nsselect, v); + if(NS_FAILED(nsres)) + ERR("SetSelectedIndex failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, long *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 idx = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, &idx); + if(NS_FAILED(nsres)) + ERR("GetSelectedIndex failed: %08x\n", nsres); + + *p = idx; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_type(IHTMLSelectElement *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added more range tests and fixes.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 07dfef53bcb6475788ac5bf6578323572387ed48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07dfef53bcb6475788ac5bf65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 01:14:08 2007 +0200 mshtml: Added more range tests and fixes. --- dlls/mshtml/tests/dom.c | 4 ++++ dlls/mshtml/txtrange.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 59b77a7..364f139 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -726,6 +726,10 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_expand(range, wordW, VARIANT_FALSE, "123"); test_range_move(range, characterW, 2, 2); 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); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index faea069..39711e8 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -413,6 +413,11 @@ static inline void dompos_addref(dompos_t *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) { 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; } -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; long ret = 0; WCHAR c; + if(bounded) + *bounded = FALSE; + c = prev_char(This, pos, &iter); if(c) ret++; @@ -620,8 +629,12 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B ret++; break; } + ret++; dompos_release(&tmp); + + if(bound_pos && dompos_cmp(&iter, bound_pos)) + *bounded = TRUE; } *new_pos = iter; @@ -1114,7 +1127,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); dompos_release(&new_pos); }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); IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); dompos_release(&new_pos); @@ -1180,24 +1193,27 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, switch(unit) { case RU_CHAR: { - dompos_t cur_pos, new_pos; + dompos_t start_pos, end_pos, new_pos; 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); 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); }else { - *ActualCount = -move_prev_chars(This, -Count, &cur_pos, TRUE, &new_pos); - if(*ActualCount == Count) - set_range_pos(This, FALSE, &new_pos); - else + BOOL bounded; + + *ActualCount = -move_prev_chars(This, -Count, &end_pos, TRUE, &start_pos, &bounded, &new_pos); + set_range_pos(This, bounded, &new_pos); + if(bounded) IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); } - dompos_release(&cur_pos); + dompos_release(&start_pos); + dompos_release(&end_pos); dompos_release(&new_pos); break; }

1 0

Jacek Caban : mshtml: Added IHTMLOptionElementFactory:: create implementation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 8bfc6f75946962d8b3ad21eff93f1d8a4df1f65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc6f75946962d8b3ad21eff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:11:31 2007 +0200 mshtml: Added IHTMLOptionElementFactory::create implementation. --- dlls/mshtml/htmloption.c | 51 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 22c6023..f800fed 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -442,8 +442,55 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory IHTMLOptionElement **optelem) { HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); - FIXME("(%p)->(v v v v %p)\n", This, optelem); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMElement *nselem; + nsAString option_str; + nsresult nsres; + HRESULT hres; + + static const PRUnichar optionW[] = {'O','P','T','I','O','N',0}; + + TRACE("(%p)->(v v v v %p)\n", This, optelem); + + *optelem = NULL; + if(!This->doc->nscontainer) + return E_FAIL; + + nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&option_str, optionW); + nsres = nsIDOMDocument_CreateElement(nsdoc, &option_str, &nselem); + nsIDOMDocument_Release(nsdoc); + nsAString_Finish(&option_str); + if(NS_FAILED(nsres)) { + ERR("CreateElement failed: %08x\n", nsres); + return E_FAIL; + } + + hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(get_node(This->doc, (nsIDOMNode*)nselem)), + &IID_IHTMLOptionElement, (void**)optelem); + nsIDOMElement_Release(nselem); + + if(V_VT(&text) == VT_BSTR) + IHTMLOptionElement_put_text(*optelem, V_BSTR(&text)); + else if(V_VT(&text) != VT_EMPTY) + FIXME("Unsupported text vt=%d\n", V_VT(&text)); + + if(V_VT(&value) == VT_BSTR) + IHTMLOptionElement_put_value(*optelem, V_BSTR(&value)); + else if(V_VT(&value) != VT_EMPTY) + FIXME("Unsupported value vt=%d\n", V_VT(&value)); + + if(V_VT(&defaultselected) != VT_EMPTY) + FIXME("Unsupported defaultselected vt=%d\n", V_VT(&defaultselected)); + if(V_VT(&selected) != VT_EMPTY) + FIXME("Unsupported selected vt=%d\n", V_VT(&selected)); + + return S_OK; } #undef HTMLOPTFACTORY_THIS

1 0

Jacek Caban : mshtml: Added more DOM tests.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 924b6678217e7f7a2243528d109414ea1a4081be URL: http://source.winehq.org/git/wine.git/?a=commit;h=924b6678217e7f7a2243528d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:12:12 2007 +0200 mshtml: Added more DOM tests. --- dlls/mshtml/tests/dom.c | 522 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 522 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=924b6678217e7f7a22435…

1 0

Jacek Caban : mshtml: Added IHTMLOptionElement::get_text implementation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 0466542a7e76053ae99969aa30ecd7d89eed74ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0466542a7e76053ae99969aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:11:06 2007 +0200 mshtml: Added IHTMLOptionElement::get_text implementation. --- dlls/mshtml/htmloption.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 5c48c23..22c6023 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -241,8 +241,24 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR static HRESULT WINAPI HTMLOptionElement_get_text(IHTMLOptionElement *iface, BSTR *p) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text_str; + const PRUnichar *text; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&text_str, NULL); + nsres = nsIDOMHTMLOptionElement_GetText(This->nsoption, &text_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&text_str, &text, NULL); + *p = SysAllocString(text); + }else { + ERR("GetText failed: %08x\n", nsres); + *p = NULL; + } + nsAString_Finish(&text_str); + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_get_form(IHTMLOptionElement *iface, IHTMLFormElement **p)

1 0

Jacek Caban : mshtml: Added IHTMLOptionElement::put_text implementation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: fa2f0665b5f8d60e609669f3b0431607327738a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2f0665b5f8d60e609669f3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:10:43 2007 +0200 mshtml: Added IHTMLOptionElement::put_text implementation. --- dlls/mshtml/htmloption.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index c21a4bb..5c48c23 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -189,8 +189,53 @@ static HRESULT WINAPI HTMLOptionElement_get_index(IHTMLOptionElement *iface, LON static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR v) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMText *text_node; + nsAString text_str; + nsIDOMNode *tmp; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + while(1) { + nsIDOMNode *child; + + nsres = nsIDOMHTMLOptionElement_GetFirstChild(This->nsoption, &child); + if(NS_FAILED(nsres) || !child) + break; + + nsres = nsIDOMHTMLOptionElement_RemoveChild(This->nsoption, child, &tmp); + nsIDOMNode_Release(child); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNode_Release(tmp); + }else { + ERR("RemoveChild failed: %08x\n", nsres); + break; + } + } + + nsres = nsIWebNavigation_GetDocument(This->element.node.doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return S_OK; + } + + nsAString_Init(&text_str, v); + nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &text_node); + nsIDOMDocument_Release(nsdoc); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + ERR("CreateTextNode failed: %08x\n", nsres); + return S_OK; + } + + nsres = nsIDOMHTMLOptionElement_AppendChild(This->nsoption, (nsIDOMNode*)text_node, &tmp); + if(NS_SUCCEEDED(nsres)) + nsIDOMNode_Release(tmp); + else + ERR("AppendChild failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_get_text(IHTMLOptionElement *iface, BSTR *p)

1 0