January 2010 - Wine-commits

Jacek Caban : mshtml: Optimize more nsAString handling.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 4b5dcc9e6b9fc7944cba1ee5cad5f30baade8a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5dcc9e6b9fc7944cba1ee5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:56:31 2010 +0100 mshtml: Optimize more nsAString handling. --- dlls/mshtml/htmlframebase.c | 4 ++-- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/script.c | 5 ++--- dlls/mshtml/txtrange.c | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 78cacc2..56c1023 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -283,10 +283,10 @@ static HRESULT WINAPI HTMLFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v) return E_INVALIDARG; if(This->nsframe) { - nsAString_Init(&nsstr, v); + nsAString_InitDepend(&nsstr, v); nsres = nsIDOMHTMLFrameElement_SetScrolling(This->nsframe, &nsstr); }else if(This->nsiframe) { - nsAString_Init(&nsstr, v); + nsAString_InitDepend(&nsstr, v); nsres = nsIDOMHTMLIFrameElement_SetScrolling(This->nsiframe, &nsstr); }else { ERR("No attached ns frame object\n"); diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 4ba6d36..aad1274 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -228,7 +228,7 @@ static HRESULT WINAPI HTMLImgElement_put_alt(IHTMLImgElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&alt_str, v); + nsAString_InitDepend(&alt_str, v); nsres = nsIDOMHTMLImageElement_SetAlt(This->nsimg, &alt_str); nsAString_Finish(&alt_str); if(NS_FAILED(nsres)) @@ -268,7 +268,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&src_str, v); + nsAString_InitDepend(&src_str, v); nsres = nsIDOMHTMLImageElement_SetSrc(This->nsimg, &src_str); nsAString_Finish(&src_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index a72a9f2..1b8d1c5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -143,7 +143,7 @@ static HRESULT WINAPI HTMLInputElement_put_value(IHTMLInputElement *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&val_str, v); + nsAString_InitDepend(&val_str, v); nsres = nsIDOMHTMLInputElement_SetValue(This->nsinput, &val_str); nsAString_Finish(&val_str); if(NS_FAILED(nsres)) @@ -512,7 +512,7 @@ static HRESULT WINAPI HTMLInputElement_put_src(IHTMLInputElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&nsstr, v); + nsAString_InitDepend(&nsstr, v); nsres = nsIDOMHTMLInputElement_SetSrc(This->nsinput, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b8cecf0..a5ea3f4 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -645,7 +645,7 @@ static HRESULT WINAPI HTMLDOMNode_put_nodeValue(IHTMLDOMNode *iface, VARIANT v) TRACE("bstr %s\n", debugstr_w(V_BSTR(&v))); - nsAString_Init(&val_str, V_BSTR(&v)); + nsAString_InitDepend(&val_str, V_BSTR(&v)); nsIDOMNode_SetNodeValue(This->nsnode, &val_str); nsAString_Finish(&val_str); diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index ea205ea..3e03762 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -117,7 +117,7 @@ static HRESULT WINAPI HTMLOptionElement_put_value(IHTMLOptionElement *iface, BST TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&value_str, v); + nsAString_InitDepend(&value_str, v); nsres = nsIDOMHTMLOptionElement_SetValue(This->nsoption, &value_str); nsAString_Finish(&value_str); if(NS_FAILED(nsres)) @@ -209,7 +209,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR } } - nsAString_Init(&text_str, v); + nsAString_InitDepend(&text_str, v); nsres = nsIDOMHTMLDocument_CreateTextNode(This->element.node.doc->nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index bb45a5e..6698606 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -253,7 +253,7 @@ static HRESULT WINAPI HTMLSelectElement_put_value(IHTMLSelectElement *iface, BST TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&value_str, v); + nsAString_InitDepend(&value_str, v); nsres = nsIDOMHTMLSelectElement_SetValue(This->nsselect, &value_str); nsAString_Finish(&value_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d6a249a..58d5f7b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -694,7 +694,7 @@ static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&name_str, v); + nsAString_InitDepend(&name_str, v); nsres = nsIDOMWindow_SetName(This->nswindow, &name_str); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 372c467..0adf87e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -168,12 +168,12 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); buf[end-ptr] = 0; - nsAString_Init(&nsstr, buf); - heap_free(buf); + nsAString_InitDepend(&nsstr, buf); /* FIXME: Find better way to insert HTML to document. */ nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); nsAString_Finish(&nsstr); + heap_free(buf); if(NS_FAILED(nsres)) { ERR("Write failed: %08x\n", nsres); return FALSE; @@ -396,7 +396,7 @@ static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface) static const PRUnichar remove_comment_magicW[] = {'#','!','w','i','n','e', 'r','e','m','o','v','e','!','#',0}; - nsAString_Init(&magic_str, remove_comment_magicW); + nsAString_InitDepend(&magic_str, remove_comment_magicW); nsres = nsIDOMComment_SetData(nscomment, &magic_str); nsAString_Finish(&magic_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0e7ea89..3415657 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -426,7 +426,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) nsAString path; nsIFile *gre_dir; - nsAString_Init(&path, gre_path); + nsAString_InitDepend(&path, gre_path); nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); nsAString_Finish(&path); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 46f057f..2dd8248 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -316,7 +316,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, nsAString type_str; nsresult nsres; - nsAString_Init(&type_str, type); + nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_AddEventListener(target, &type_str, listener, capture); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index efd2605..1d21da9 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -758,9 +758,9 @@ static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) ERR("GetType failed: %08x\n", nsres); } - nsAString_Init(&attr_str, languageW); - + nsAString_InitDepend(&attr_str, languageW); nsres = nsIDOMHTMLScriptElement_GetAttribute(nsscript, &attr_str, &val_str); + nsAString_Finish(&attr_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *language; @@ -776,7 +776,6 @@ static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) ERR("GetAttribute(language) failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); nsAString_Finish(&val_str); return ret; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 0ece6ec..9b2bb94 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1141,7 +1141,7 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) if(!This->doc) return MSHTML_E_NODOC; - nsAString_Init(&text_str, v); + nsAString_InitDepend(&text_str, v); nsres = nsIDOMHTMLDocument_CreateTextNode(This->doc->nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) {

1 0

Michael Stefaniuc : cryptnet: Don't use HIWORD() on a string pointer.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 1dcbbfe1ee083aa9599f6819512d6db226c6d124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcbbfe1ee083aa9599f68195… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 29 01:38:54 2010 +0100 cryptnet: Don't use HIWORD() on a string pointer. --- dlls/cryptnet/cryptnet_main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2306941..0b4e31d 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); +#define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -92,9 +94,7 @@ HRESULT WINAPI DllUnregisterServer(void) static const char *url_oid_to_str(LPCSTR oid) { - if (HIWORD(oid)) - return oid; - else + if (IS_INTOID(oid)) { static char buf[10]; @@ -115,6 +115,8 @@ static const char *url_oid_to_str(LPCSTR oid) return buf; } } + else + return oid; } typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD, @@ -379,7 +381,7 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved); - if (!HIWORD(pszUrlOid)) + if (IS_INTOID(pszUrlOid)) { switch (LOWORD(pszUrlOid)) { @@ -1398,7 +1400,7 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, *pFunc = NULL; *phFunc = 0; - if (!HIWORD(pszObjectOid)) + if (IS_INTOID(pszObjectOid)) { switch (LOWORD(pszObjectOid)) { @@ -1468,7 +1470,7 @@ static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid, { BOOL ret; - if (!HIWORD(pszObjectOid)) + if (IS_INTOID(pszObjectOid)) { switch (LOWORD(pszObjectOid)) {

1 0

Michael Stefaniuc : crypt32: Avoid using HIWORD() on a string pointer.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 0a866d0e4599b91cef247da883b0a93ccf7c0681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a866d0e4599b91cef247da88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 29 01:39:26 2010 +0100 crypt32: Avoid using HIWORD() on a string pointer. The stray IS_INTRESOURCE() is applied to a true resource. The other strings are OIDs and not resources. --- dlls/crypt32/chain.c | 2 +- dlls/crypt32/crypt32_private.h | 4 ++++ dlls/crypt32/decode.c | 2 +- dlls/crypt32/encode.c | 2 +- dlls/crypt32/object.c | 2 +- dlls/crypt32/oid.c | 12 ++++++------ dlls/crypt32/store.c | 2 +- dlls/crypt32/tests/chain.c | 22 ++++++++++++---------- 8 files changed, 27 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a866d0e4599b91cef247…

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMCDATASection::deleteData() with tests.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 173c4884ac84e245fe33362300506e680272999a URL: http://source.winehq.org/git/wine.git/?a=commit;h=173c4884ac84e245fe3336230… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 29 02:52:24 2010 +0300 msxml3: Implement IXMLDOMCDATASection::deleteData() with tests. --- dlls/msxml3/cdata.c | 43 +++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 04b539d..8bc1329 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -684,8 +684,47 @@ static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, LONG offset, LONG count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + LONG len = -1; + BSTR str; + + TRACE("%p %d %d\n", iface, offset, count); + + hr = IXMLDOMCDATASection_get_length(iface, &len); + if(hr != S_OK) return hr; + + if((offset < 0) || (offset > len) || (count < 0)) + return E_INVALIDARG; + + if(len == 0) return S_OK; + + /* cutting start or end */ + if((offset == 0) || ((count + offset) >= len)) + { + if(offset == 0) + IXMLDOMCDATASection_substringData(iface, count, len - count, &str); + else + IXMLDOMCDATASection_substringData(iface, 0, offset, &str); + hr = IXMLDOMCDATASection_put_data(iface, str); + } + else + /* cutting from the inside */ + { + BSTR str_end; + + IXMLDOMCDATASection_substringData(iface, 0, offset, &str); + IXMLDOMCDATASection_substringData(iface, offset + count, len - count, &str_end); + + hr = IXMLDOMCDATASection_put_data(iface, str); + if(hr == S_OK) + hr = IXMLDOMCDATASection_appendData(iface, str_end); + + SysFreeString(str_end); + } + + SysFreeString(str); + + return hr; } static HRESULT WINAPI domcdata_replaceData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 97cb772..dab220b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3340,6 +3340,77 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* delete data */ + /* invalid arguments */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, -1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, 0); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, -1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 43, "expected 43 got %d\n", len); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, len, 1); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, len+1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + /* delete from start */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, 5); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 38, "expected 38 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from end */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 35, 3); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 35, "expected 35 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from inside */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 1, 33); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 2, "expected 2 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete whole data ... */ + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + + /* ... and try again with empty string */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMText::deleteData().
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: a03bc7269092dccb97c1badc045ad7b40f3a6110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03bc7269092dccb97c1badc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 29 03:47:03 2010 +0300 msxml3: Implement IXMLDOMText::deleteData(). --- dlls/msxml3/tests/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 43 +++++++++++++++++++++++++- 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dab220b..bc052be 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -868,6 +868,77 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* delete data */ + /* invalid arguments */ + r = IXMLDOMText_deleteData(nodetext, -1, 1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, 0); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, -1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 43, "expected 43 got %d\n", nLength); + + r = IXMLDOMText_deleteData(nodetext, nLength, 1); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, nLength+1, 1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + /* delete from start */ + r = IXMLDOMText_deleteData(nodetext, 0, 5); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 38, "expected 38 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + /* whitespace preserving needs to be handled here */ + todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from end */ + r = IXMLDOMText_deleteData(nodetext, 35, 3); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 35, "expected 35 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from inside */ + r = IXMLDOMText_deleteData(nodetext, 1, 33); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 2, "expected 2 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + todo_wine ok( !lstrcmpW( str, _bstr_("") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete whole data ... */ + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, nLength); + ok(r == S_OK, "ret %08x\n", r ); + /* ... and try again with empty string */ + r = IXMLDOMText_deleteData(nodetext, 0, nLength); + ok(r == S_OK, "ret %08x\n", r ); + /* test put_data */ V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szstr1); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6380a0e..d9736b1 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -686,8 +686,47 @@ static HRESULT WINAPI domtext_deleteData( IXMLDOMText *iface, LONG offset, LONG count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + LONG len = -1; + BSTR str; + + TRACE("%p %d %d\n", iface, offset, count); + + hr = IXMLDOMText_get_length(iface, &len); + if(hr != S_OK) return hr; + + if((offset < 0) || (offset > len) || (count < 0)) + return E_INVALIDARG; + + if(len == 0) return S_OK; + + /* cutting start or end */ + if((offset == 0) || ((count + offset) >= len)) + { + if(offset == 0) + IXMLDOMText_substringData(iface, count, len - count, &str); + else + IXMLDOMText_substringData(iface, 0, offset, &str); + hr = IXMLDOMText_put_data(iface, str); + } + else + /* cutting from the inside */ + { + BSTR str_end; + + IXMLDOMText_substringData(iface, 0, offset, &str); + IXMLDOMText_substringData(iface, offset + count, len - count, &str_end); + + hr = IXMLDOMText_put_data(iface, str); + if(hr == S_OK) + hr = IXMLDOMText_appendData(iface, str_end); + + SysFreeString(str_end); + } + + SysFreeString(str); + + return hr; } static HRESULT WINAPI domtext_replaceData(

1 0

Jacek Caban : mshtml: Pass dispex info to HTMLElement_Init in HTMLElement_Create.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 4a400e154baf9ed25a6c3c68db29d76a9742b6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a400e154baf9ed25a6c3c68d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:54:10 2010 +0100 mshtml: Pass dispex info to HTMLElement_Init in HTMLElement_Create. --- dlls/mshtml/htmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e98243d..72921ae 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1671,7 +1671,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL if(!ret) { ret = heap_alloc_zero(sizeof(HTMLElement)); - HTMLElement_Init(ret, doc, nselem, NULL); + HTMLElement_Init(ret, doc, nselem, &HTMLElement_dispex); ret->node.vtbl = &HTMLElementImplVtbl; }

1 0

Jacek Caban : mshtml: Use NS_StringContainerInit2 instead of NS_StringContainerInit.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 22d493763b77cb21465250d28eec188e951f26df URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d493763b77cb21465250d28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:54:38 2010 +0100 mshtml: Use NS_StringContainerInit2 instead of NS_StringContainerInit. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 054aeab..a8cd32f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -711,7 +711,7 @@ void nsfree(void*); void nsACString_SetData(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**); -void nsAString_Init(nsAString*,const PRUnichar*); +BOOL nsAString_Init(nsAString*,const PRUnichar*); void nsAString_SetData(nsAString*,const PRUnichar*); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**); void nsAString_Finish(nsAString*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6858897..0e0d4b5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -52,13 +52,13 @@ struct nsCStringContainer { void *v; void *d1; PRUint32 d2; - void *d3; + PRUint32 d3; }; static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); -static nsresult (*NS_StringContainerInit)(nsStringContainer*); +static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); static nsresult (*NS_CStringContainerInit)(nsCStringContainer*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); @@ -194,7 +194,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path) NS_DLSYM(NS_InitXPCOM2); NS_DLSYM(NS_ShutdownXPCOM); NS_DLSYM(NS_GetComponentRegistrar); - NS_DLSYM(NS_StringContainerInit); + NS_DLSYM(NS_StringContainerInit2); NS_DLSYM(NS_CStringContainerInit); NS_DLSYM(NS_StringContainerFinish); NS_DLSYM(NS_CStringContainerFinish); @@ -555,11 +555,9 @@ static void nsACString_Finish(nsACString *str) NS_CStringContainerFinish(str); } -void nsAString_Init(nsAString *str, const PRUnichar *data) +BOOL nsAString_Init(nsAString *str, const PRUnichar *data) { - NS_StringContainerInit(str); - if(data) - nsAString_SetData(str, data); + return NS_SUCCEEDED(NS_StringContainerInit2(str, data, PR_UINT32_MAX, 0)); } void nsAString_SetData(nsAString *str, const PRUnichar *data)

1 0

Jacek Caban : mshtml: Optimize nsAString handling.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: c3ae1356d6d283b870c09a83572dd72095af4dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ae1356d6d283b870c09a835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:55:06 2010 +0100 mshtml: Optimize nsAString handling. --- dlls/mshtml/htmlstyle.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 467464a..04ba1d6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -315,9 +315,9 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCW if(flags & ATTR_FIX_URL) val = fix_url_value(value); - nsAString_Init(&str_name, style_tbl[sid].name); - nsAString_Init(&str_value, val ? val : value); - nsAString_Init(&str_empty, wszEmpty); + nsAString_InitDepend(&str_name, style_tbl[sid].name); + nsAString_InitDepend(&str_value, val ? val : value); + nsAString_InitDepend(&str_empty, wszEmpty); heap_free(val); nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); @@ -369,7 +369,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString str_name; nsresult nsres; - nsAString_Init(&str_name, style_tbl[sid].name); + nsAString_InitDepend(&str_name, style_tbl[sid].name); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); if(NS_FAILED(nsres)) { @@ -2129,7 +2129,7 @@ static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&text_str, v); + nsAString_InitDepend(&text_str, v); nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a8cd32f..2fafdf0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -712,6 +712,7 @@ void nsACString_SetData(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**); BOOL nsAString_Init(nsAString*,const PRUnichar*); +void nsAString_InitDepend(nsAString*,const PRUnichar*); void nsAString_SetData(nsAString*,const PRUnichar*); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**); void nsAString_Finish(nsAString*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0e0d4b5..0e7ea89 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -55,6 +55,8 @@ struct nsCStringContainer { PRUint32 d3; }; +#define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 + static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); @@ -560,6 +562,15 @@ BOOL nsAString_Init(nsAString *str, const PRUnichar *data) return NS_SUCCEEDED(NS_StringContainerInit2(str, data, PR_UINT32_MAX, 0)); } +/* + * Initializes nsAString with data owned by caller. + * Caller must ensure that data is valid during lifetime of string object. + */ +void nsAString_InitDepend(nsAString *str, const PRUnichar *data) +{ + NS_StringContainerInit2(str, data, PR_UINT32_MAX, NS_STRING_CONTAINER_INIT_DEPEND); +} + void nsAString_SetData(nsAString *str, const PRUnichar *data) { NS_StringSetData(str, data, PR_UINT32_MAX);

1 0

Jacek Caban : mshtml: Optimize nsAString handling in htmlelem*.c.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 673c90382d568a5eb354d6a3c5bbb4624c4d2fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673c90382d568a5eb354d6a3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:55:31 2010 +0100 mshtml: Optimize nsAString handling in htmlelem*.c. --- dlls/mshtml/htmlelem.c | 18 +++++++++--------- dlls/mshtml/htmlelem2.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 72921ae..73c623a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -65,7 +65,7 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement return E_UNEXPECTED; } - nsAString_Init(&tag_str, tag); + nsAString_InitDepend(&tag_str, tag); nsres = nsIDOMDocument_CreateElement(doc->nsdoc, &tag_str, &nselem); nsAString_Finish(&tag_str); if(NS_FAILED(nsres)) { @@ -215,7 +215,7 @@ static HRESULT WINAPI HTMLElement_put_className(IHTMLElement *iface, BSTR v) return E_NOTIMPL; } - nsAString_Init(&classname_str, v); + nsAString_InitDepend(&classname_str, v); nsres = nsIDOMHTMLElement_SetClassName(This->nselem, &classname_str); nsAString_Finish(&classname_str); if(NS_FAILED(nsres)) @@ -269,7 +269,7 @@ static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) return S_OK; } - nsAString_Init(&id_str, v); + nsAString_InitDepend(&id_str, v); nsres = nsIDOMHTMLElement_SetId(This->nselem, &id_str); nsAString_Finish(&id_str); if(NS_FAILED(nsres)) @@ -601,7 +601,7 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&title_str, v); + nsAString_InitDepend(&title_str, v); nsres = nsIDOMHTMLElement_SetTitle(This->nselem, &title_str); nsAString_Finish(&title_str); if(NS_FAILED(nsres)) @@ -820,7 +820,7 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) return E_FAIL; } - nsAString_Init(&html_str, v); + nsAString_InitDepend(&html_str, v); nsres = nsIDOMNSHTMLElement_SetInnerHTML(nselem, &html_str); nsAString_Finish(&html_str); @@ -896,7 +896,7 @@ static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) nsIDOMNode_Release(tmp); } - nsAString_Init(&text_str, v); + nsAString_InitDepend(&text_str, v); nsres = nsIDOMHTMLDocument_CreateTextNode(This->node.doc->nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { @@ -955,7 +955,7 @@ static HRESULT WINAPI HTMLElement_put_outerHTML(IHTMLElement *iface, BSTR v) return E_FAIL; } - nsAString_Init(&html_str, v); + nsAString_InitDepend(&html_str, v); nsIDOMNSRange_CreateContextualFragment(nsrange, &html_str, &nsfragment); nsIDOMNSRange_Release(nsrange); nsAString_Finish(&html_str); @@ -1131,7 +1131,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - nsAString_Init(&ns_html, html); + nsAString_InitDepend(&ns_html, html); nsres = nsIDOMNSRange_CreateContextualFragment(nsrange, &ns_html, (nsIDOMDocumentFragment **)&nsnode); nsIDOMNSRange_Release(nsrange); @@ -1166,7 +1166,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w } - nsAString_Init(&ns_text, text); + nsAString_InitDepend(&ns_text, text); nsres = nsIDOMDocument_CreateTextNode(This->node.doc->nsdoc, &ns_text, (nsIDOMText **)&nsnode); nsAString_Finish(&ns_text); diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index cd9b676..356ce46 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1087,7 +1087,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - nsAString_Init(&tag_str, v); + nsAString_InitDepend(&tag_str, v); nsres = nsIDOMHTMLElement_GetElementsByTagName(This->nselem, &tag_str, &nslist); nsAString_Finish(&tag_str); if(NS_FAILED(nsres)) {

1 0

Henri Verbeet : wined3d: Add some basic state table validation.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 19516bf69f905c6d63f49744117edc240d357f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19516bf69f905c6d63f497441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:24 2010 +0100 wined3d: Add some basic state table validation. --- dlls/wined3d/state.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 35482ee..17a6704 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5685,6 +5685,22 @@ static void multistate_apply_3(DWORD state, IWineD3DStateBlockImpl *stateblock, stateblock->device->multistate_funcs[state][2](state, stateblock, context); } +static void validate_state_table(struct StateEntry *state_table) +{ + unsigned int i; + + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + DWORD rep = state_table[i].representative; + if (rep && !state_table[rep].representative) + { + ERR("State %s (%#x) has invalid representative %s (%#x).\n", + debug_d3dstate(i), i, debug_d3dstate(rep), rep); + state_table[i].representative = 0; + } + } +} + HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_gl_info *gl_info, const struct StateEntryTemplate *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) @@ -5784,6 +5800,8 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ } } + validate_state_table(StateTable); + return WINED3D_OK; out_of_mem:

1 0