November 2010 - Wine-commits

Cheer Xiao : oleview: Update Simplified Chinese translation.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: c0aecb8062b629f8286bbc1964acca377d813cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0aecb8062b629f8286bbc196… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:18:53 2010 +0800 oleview: Update Simplified Chinese translation. --- programs/oleview/Zh.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 5b6e108..aef68c3 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -171,7 +171,7 @@ FONT 9, "MS Shell Dlg" LTEXT "系统设置", -1, 5, 6, 160, 8 CHECKBOX "启用分布式CO&M", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "启用远程连接(限&Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX - LTEXT "这些设置只改变寄存器值(register values)。\n它对Wine的性能没有影响。", -1, 5, 50, 160, 40 + LTEXT "这些设置只改变寄存器值(register values)。\n它对Wine的性能没有影响。", -1, 5, 50, 160, 40 /* 译文待议 */ DEFPUSHBUTTON "确定(&O)", IDOK, 70, 80, 45, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 120, 80, 45, 14 }

1 0

Jacek Caban : mshtml: Use custom get_readyState implementations for object and frame elements.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: cb99f716a7635fc8ef20d092b2326b72669d1a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb99f716a7635fc8ef20d092b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:42:00 2010 +0100 mshtml: Use custom get_readyState implementations for object and frame elements. --- dlls/mshtml/htmlframe.c | 9 ++++++++- dlls/mshtml/htmlobject.c | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index ece349d..6683462 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -211,6 +211,13 @@ static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; } +static HRESULT HTMLFrameElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + return IHTMLFrameBase2_get_readyState(HTMLFRAMEBASE2(&This->framebase), p); +} + static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *pid) { @@ -264,7 +271,7 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { NULL, NULL, HTMLFrameElement_get_document, - NULL, + HTMLFrameElement_get_readystate, HTMLFrameElement_get_dispid, HTMLFrameElement_invoke, HTMLFrameElement_bind_to_tree diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index f7f6d45..66f9a5d 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -40,7 +40,7 @@ typedef struct { nsIDOMHTMLObjectElement *nsobject; } HTMLObjectElement; -#define HTMLOBJECT(x) (&(x)->lpIHTMLObjectElementVtbl) +#define HTMLOBJECT(x) ((IHTMLObjectElement*) &(x)->lpIHTMLObjectElementVtbl) #define HTMLOBJECT_THIS(iface) DEFINE_THIS(HTMLObjectElement, IHTMLObjectElement, iface) @@ -424,12 +424,25 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLObjectElement *This = HTMLOBJECT_NODE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + #undef HTMLOBJECT_NODE_THIS static const NodeImplVtbl HTMLObjectElementImplVtbl = { HTMLObjectElement_QI, HTMLObjectElement_destructor, - HTMLElement_clone + HTMLElement_clone, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLObjectElement_get_readystate }; static const tid_t HTMLObjectElement_iface_tids[] = {

1 0

Jacek Caban : mshtml: Added IHTMLDocument3:: createDocumentFragment implementation.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: d9aacfd989199fee4a69c4c08564993ee52bfc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9aacfd989199fee4a69c4c08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:42:20 2010 +0100 mshtml: Added IHTMLDocument3::createDocumentFragment implementation. --- dlls/mshtml/htmldoc.c | 49 +++++++++++++++++++++++++++++++++-------- dlls/mshtml/htmldoc3.c | 27 +++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dfa2a8b..9299170 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1930,35 +1930,47 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HTMLDocumentNode_iface_tids }; -HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) +static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *window) { HTMLDocumentNode *doc; - HRESULT hres; doc = heap_alloc_zero(sizeof(HTMLDocumentNode)); if(!doc) - return E_OUTOFMEMORY; + return NULL; + doc->ref = 1; doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; + doc->basedoc.window = window; init_dispex(&doc->node.dispex, (IUnknown*)HTMLDOMNODE(&doc->node), &HTMLDocumentNode_dispex); init_doc(&doc->basedoc, (IUnknown*)HTMLDOMNODE(&doc->node), DISPATCHEX(&doc->node.dispex)); HTMLDocumentNode_SecMgr_Init(doc); - doc->ref = 1; - doc->basedoc.window = window; + init_nsevents(doc); + + list_init(&doc->bindings); + list_init(&doc->selection_list); + list_init(&doc->range_list); + + return doc; +} + +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) +{ + HTMLDocumentNode *doc; + HRESULT hres; + + doc = alloc_doc_node(doc_obj, window); + if(!doc) + return E_OUTOFMEMORY; + if(window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; init_mutation(doc); - init_nsevents(doc); - - list_init(&doc->bindings); - list_init(&doc->selection_list); - list_init(&doc->range_list); HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; @@ -1974,6 +1986,23 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob return S_OK; } +HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret) +{ + HTMLDocumentNode *doc_frag; + + doc_frag = alloc_doc_node(doc_node->basedoc.doc_obj, doc_node->basedoc.window); + if(!doc_frag) + return E_OUTOFMEMORY; + + HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode); + doc_frag->node.vtbl = &HTMLDocumentNodeImplVtbl; + doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; + + htmldoc_addref(&doc_frag->basedoc); + *ret = doc_frag; + return S_OK; +} + /********************************************************** * ICustomDoc implementation */ diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 8d135ff..550cf5d 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -343,8 +343,31 @@ static HRESULT WINAPI HTMLDocument3_createDocumentFragment(IHTMLDocument3 *iface IHTMLDocument2 **ppNewDoc) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppNewDoc); - return E_NOTIMPL; + nsIDOMDocumentFragment *doc_frag; + HTMLDocumentNode *docnode; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, ppNewDoc); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLDocument_CreateDocumentFragment(This->doc_node->nsdoc, &doc_frag); + if(NS_FAILED(nsres)) { + ERR("CreateDocumentFragment failed: %08x\n", nsres); + return E_FAIL; + } + + hres = create_document_fragment((nsIDOMNode*)doc_frag, This->doc_node, &docnode); + nsIDOMDocumentFragment_Release(doc_frag); + if(FAILED(hres)) + return hres; + + *ppNewDoc = HTMLDOC(&docnode->basedoc); + return S_OK; } static HRESULT WINAPI HTMLDocument3_get_parentDocument(IHTMLDocument3 *iface, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e99ecfd..5af4247 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -701,6 +701,7 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLWindow*,HTMLDocumentNode**); +HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode**); HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow*,HTMLWindow**); void update_window_doc(HTMLWindow*);

1 0

Jacek Caban : mshtml: Added createDocumentFragment tests.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 04ad73211475d82f36482052eea613731ce5e20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad73211475d82f36482052e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:42:33 2010 +0100 mshtml: Added createDocumentFragment tests. --- dlls/mshtml/tests/dom.c | 89 ++++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/jstest.html | 9 ++++ 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a8212e4..d075e59 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -69,6 +69,9 @@ static const char frameset_str[] = "<frame src=\"about:blank\" name=\"nm1\" id=\"fr1\"><frame src=\"about:blank\" name=\"nm2\" id=\"fr2\">" "<frame src=\"about:blank\" id=\"fr3\">" "</frameset></html>"; +static const char emptydiv_str[] = + "<html><head><title>emptydiv test</title></head>" + "<body><div id=\"divid\"></div></body></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; @@ -102,7 +105,8 @@ typedef enum { ET_FORM, ET_FRAME, ET_OBJECT, - ET_EMBED + ET_EMBED, + ET_DIV } elem_type_t; static const IID * const none_iids[] = { @@ -461,7 +465,8 @@ static const elem_type_info_t elem_type_infos[] = { {"FORM", form_iids, &DIID_DispHTMLFormElement}, {"FRAME", frame_iids, &DIID_DispHTMLFrameElement}, {"OBJECT", object_iids, &DIID_DispHTMLObjectElement}, - {"EMBED", embed_iids, &DIID_DispHTMLEmbed} + {"EMBED", embed_iids, &DIID_DispHTMLEmbed}, + {"DIV", elem_iids, NULL} }; static const char *dbgstr_guid(REFIID riid) @@ -2795,6 +2800,19 @@ static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) return doc; } +#define doc_get_body(d) _doc_get_body(__LINE__,d) +static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) +{ + IHTMLElement *elem; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok_(__FILE__,line)(hres == S_OK, "get_body failed: %08x\n", hres); + ok_(__FILE__,line)(elem != NULL, "body == NULL\n"); + + return elem; +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -3334,9 +3352,7 @@ static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) IHTMLElement *elem; HRESULT hres; - hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); - + elem = doc_get_body(doc); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); IHTMLElement_Release(elem); @@ -5581,8 +5597,7 @@ static void test_defaults(IHTMLDocument2 *doc) HRESULT hres; IHTMLElementCollection *collection; - hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + elem = doc_get_body(doc); hres = IHTMLDocument2_get_images(doc, NULL); ok(hres == E_INVALIDARG, "hres %08x\n", hres); @@ -6274,8 +6289,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + elem = doc_get_body(doc); node = get_first_child((IUnknown*)elem); ok(node != NULL, "node == NULL\n"); @@ -6524,8 +6538,7 @@ static void test_create_elems(IHTMLDocument2 *doc) test_ifaces((IUnknown*)elem, elem_iids); test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement, "[object]"); - hres = IHTMLDocument2_get_body(doc, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + body = doc_get_body(doc); test_node_has_child((IUnknown*)body, VARIANT_FALSE); node = test_node_append_child((IUnknown*)body, (IUnknown*)elem); @@ -6940,6 +6953,59 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc) +{ + IHTMLDocument2 *frag; + IHTMLDocument3 *doc3; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Coult not get IHTMLDocument3 iface: %08x\n", hres); + + hres = IHTMLDocument3_createDocumentFragment(doc3, &frag); + IHTMLDocument3_Release(doc3); + ok(hres == S_OK, "createDocumentFragment failed: %08x\n", hres); + ok(frag != NULL, "frag == NULL\n"); + + return frag; +} + +static void test_docfrag(IHTMLDocument2 *doc) +{ + IHTMLElement *div, *br; + IHTMLElementCollection *col; + IHTMLDocument2 *frag; + HRESULT hres; + + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_DIV, + ET_BR + }; + + frag = create_docfrag(doc); + + test_disp((IUnknown*)frag, &DIID_DispHTMLDocument, "[object]"); + + br = test_create_elem(doc, "BR"); + test_node_append_child((IUnknown*)frag, (IUnknown*)br); + IHTMLElement_Release(br); + + div = get_elem_by_id(doc, "divid", TRUE); + test_node_append_child((IUnknown*)div, (IUnknown*)frag); + IHTMLElement_Release(div); + + hres = IHTMLDocument2_get_all(doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + IHTMLElementCollection_Release(col); + + IHTMLDocument2_Release(frag); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -7091,6 +7157,7 @@ START_TEST(dom) run_domtest(indent_test_str, test_indent); run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset); + run_domtest(emptydiv_str, test_docfrag); CoUninitialize(); } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index b977ad3..b5e19ab 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -31,6 +31,14 @@ function test_select_index() { ok(s[2] === null, "s[2] = " + s[2]); } +function test_createDocumentFragment() { + var fragment = document.createDocumentFragment(); + + ok(typeof(fragment) === "object", "typeof(fragmend) = " + typeof(fragment)); + ok(fragment.parentWindow === window, "fragment.parentWindow != window"); + ok(fragment.nodeName === "#document-fragment", "fragment.nodeName = " + fragment.nodeName); +} + var globalVar = false; function runTest() { @@ -42,6 +50,7 @@ function runTest() { test_removeAttribute(document.getElementById("divid")); test_removeAttribute(document.body); test_select_index(); + test_createDocumentFragment(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Correctly handle DOCUMENT_FRAGMENT_NODE in IHTMLDOMNode::get_nodeType.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 22ba44b40195f586583700d93fa623eb02c99927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ba44b40195f586583700d93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:42:43 2010 +0100 mshtml: Correctly handle DOCUMENT_FRAGMENT_NODE in IHTMLDOMNode::get_nodeType. --- dlls/mshtml/htmlnode.c | 3 +++ dlls/mshtml/tests/jstest.html | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 932577e..8f61320 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -368,6 +368,9 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p) case DOCUMENT_NODE: *p = 9; break; + case DOCUMENT_FRAGMENT_NODE: + *p = 11; + break; default: /* * FIXME: diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index b5e19ab..ae224cc 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -36,6 +36,7 @@ function test_createDocumentFragment() { ok(typeof(fragment) === "object", "typeof(fragmend) = " + typeof(fragment)); ok(fragment.parentWindow === window, "fragment.parentWindow != window"); + ok(fragment.nodeType === 11, "fragment.nodeType = " + fragment.nodeType); ok(fragment.nodeName === "#document-fragment", "fragment.nodeName = " + fragment.nodeName); }

1 0

Jacek Caban : mshtml: Correctly handle NULL nsdoc in IHTMLDocument2:: get_body.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: c481fb4bb8a8b71265d83b6a4b25454fac50aab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c481fb4bb8a8b71265d83b6a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:42:55 2010 +0100 mshtml: Correctly handle NULL nsdoc in IHTMLDocument2::get_body. --- dlls/mshtml/htmldoc.c | 16 +++++++--------- dlls/mshtml/tests/dom.c | 7 ++++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9299170..50a9f67 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -140,19 +140,17 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement HTMLDocument *This = HTMLDOC_THIS(iface); nsIDOMHTMLElement *nsbody = NULL; HTMLDOMNode *node; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + if(This->doc_node->nsdoc) { + nsresult nsres; - nsres = nsIDOMHTMLDocument_GetBody(This->doc_node->nsdoc, &nsbody); - if(NS_FAILED(nsres)) { - TRACE("Could not get body: %08x\n", nsres); - return E_UNEXPECTED; + nsres = nsIDOMHTMLDocument_GetBody(This->doc_node->nsdoc, &nsbody); + if(NS_FAILED(nsres)) { + TRACE("Could not get body: %08x\n", nsres); + return E_UNEXPECTED; + } } if(nsbody) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d075e59..ea010c9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6972,7 +6972,7 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc) static void test_docfrag(IHTMLDocument2 *doc) { - IHTMLElement *div, *br; + IHTMLElement *div, *body, *br; IHTMLElementCollection *col; IHTMLDocument2 *frag; HRESULT hres; @@ -6990,6 +6990,11 @@ static void test_docfrag(IHTMLDocument2 *doc) test_disp((IUnknown*)frag, &DIID_DispHTMLDocument, "[object]"); + body = (void*)0xdeadbeef; + hres = IHTMLDocument2_get_body(frag, &body); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(!body, "body != NULL\n"); + br = test_create_elem(doc, "BR"); test_node_append_child((IUnknown*)frag, (IUnknown*)br); IHTMLElement_Release(br);

1 0

Jacek Caban : mshtml: Correctly handle NULL nsdoc in IHTMLDocument2:: get_location.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 5caf8c3187c1769bf5381a8093c4f92538e25dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caf8c3187c1769bf5381a809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:43:06 2010 +0100 mshtml: Correctly handle NULL nsdoc in IHTMLDocument2::get_location. --- dlls/mshtml/htmldoc.c | 5 +++++ dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 50a9f67..28059cc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -565,6 +565,11 @@ static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLoca TRACE("(%p)->(%p)\n", This, p); + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + return IHTMLWindow2_get_location(HTMLWINDOW2(This->window), p); } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea010c9..8cf678a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6974,6 +6974,7 @@ static void test_docfrag(IHTMLDocument2 *doc) { IHTMLElement *div, *body, *br; IHTMLElementCollection *col; + IHTMLLocation *location; IHTMLDocument2 *frag; HRESULT hres; @@ -6995,6 +6996,11 @@ static void test_docfrag(IHTMLDocument2 *doc) ok(hres == S_OK, "get_body failed: %08x\n", hres); ok(!body, "body != NULL\n"); + location = (void*)0xdeadbeef; + hres = IHTMLDocument2_get_location(frag, &location); + ok(hres == E_UNEXPECTED, "get_location failed: %08x\n", hres); + ok(location == (void*)0xdeadbeef, "location changed\n"); + br = test_create_elem(doc, "BR"); test_node_append_child((IUnknown*)frag, (IUnknown*)br); IHTMLElement_Release(br);

1 0

Jacek Caban : mshtml: Added document fragment cloneNode implementation.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: a215ab64ff1abfe2f341f901eb9105e58f9541fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a215ab64ff1abfe2f341f901e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:43:18 2010 +0100 mshtml: Added document fragment cloneNode implementation. --- dlls/mshtml/htmldoc.c | 26 +++++++++++++++++++++++--- dlls/mshtml/tests/jstest.html | 5 +++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 28059cc..f0b7056 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1908,14 +1908,34 @@ static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HT return E_NOTIMPL; } -#undef HTMLDOCNODE_NODE_THIS - static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, HTMLDocumentNode_clone }; +static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + HTMLDocumentNode *new_node; + HRESULT hres; + + hres = create_document_fragment(nsnode, This->node.doc, &new_node); + if(FAILED(hres)) + return hres; + + *ret = &new_node->node; + return S_OK; +} + +#undef HTMLDOCNODE_NODE_THIS + +static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { + HTMLDocumentNode_QI, + HTMLDocumentNode_destructor, + HTMLDocumentFragment_clone +}; + static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDOMNode_tid, IHTMLDOMNode2_tid, @@ -1998,7 +2018,7 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, return E_OUTOFMEMORY; HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode); - doc_frag->node.vtbl = &HTMLDocumentNodeImplVtbl; + doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; htmldoc_addref(&doc_frag->basedoc); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index ae224cc..39f2620 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -38,6 +38,11 @@ function test_createDocumentFragment() { ok(fragment.parentWindow === window, "fragment.parentWindow != window"); ok(fragment.nodeType === 11, "fragment.nodeType = " + fragment.nodeType); ok(fragment.nodeName === "#document-fragment", "fragment.nodeName = " + fragment.nodeName); + + var cloned = fragment.cloneNode(true); + ok(cloned.parentWindow === window, "cloned.parentWindow != window"); + ok(cloned.nodeType === 11, "cloned.nodeType = " + cloned.nodeType); + ok(cloned.nodeName === "#document-fragment", "cloned.nodeName = " + cloned.nodeName); } var globalVar = false;

1 0

Marcus Meissner : ntdll: Fixed file view mapping in regards to no-exec.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: da8c179d61f0ccc679b68b1ecca9f10b4334ae99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8c179d61f0ccc679b68b1ec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 14 12:52:01 2010 +0100 ntdll: Fixed file view mapping in regards to no-exec. --- dlls/ntdll/tests/info.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 7 ++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6345e08..beffca8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -29,6 +29,10 @@ static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PV static NTSTATUS (WINAPI * pNtSetInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI * pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS , PVOID , SIZE_T , SIZE_T *); +static NTSTATUS (WINAPI * pNtCreateSection)(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); +static NTSTATUS (WINAPI * pNtMapViewOfSection)(HANDLE,HANDLE,PVOID*,ULONG,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); +static NTSTATUS (WINAPI * pNtClose)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL is_wow64; @@ -63,6 +67,10 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationThread); NTDLL_GET_PROC(NtReadVirtualMemory); NTDLL_GET_PROC(NtQueryVirtualMemory); + NTDLL_GET_PROC(NtClose); + NTDLL_GET_PROC(NtCreateSection); + NTDLL_GET_PROC(NtMapViewOfSection); + NTDLL_GET_PROC(NtUnmapViewOfSection); pIsWow64Process = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -1068,6 +1076,67 @@ static void test_readvirtualmemory(void) CloseHandle(process); } +static void test_mapprotection(void) +{ + HANDLE h; + void* addr; + MEMORY_BASIC_INFORMATION info; + ULONG oldflags, flagsize, flags = MEM_EXECUTE_OPTION_ENABLE; + LARGE_INTEGER size, offset; + NTSTATUS status; + SIZE_T retlen, count; + void (*f)(void); + + if (!pNtClose) { + skip("No NtClose ... Win98\n"); + return; + } + /* Switch to being a noexec unaware process */ + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize); + if (status == STATUS_INVALID_PARAMETER) { + skip("Invalid Parameter on ProcessExecuteFlags query?\n"); + return; + } + ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + + size.u.LowPart = 0x1000; + size.u.HighPart = 0; + status = pNtCreateSection ( &h, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, + NULL, + &size, + PAGE_READWRITE, + SEC_COMMIT | SEC_NOCACHE, + 0 + ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + count = 0x1000; + addr = NULL; + status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + memset (addr, 0xc3, 1); /* lret ... in both i386 and x86_64 */ + trace("trying to execute code in the readwrite only mapped anon file...\n"); + f = addr;f(); + trace("...done.\n"); + + status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); + ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); + + status = pNtUnmapViewOfSection (GetCurrentProcess(), addr); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + pNtClose (h); + + /* Switch back */ + pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); +} + static void test_queryvirtualmemory(void) { NTSTATUS status; @@ -1340,9 +1409,13 @@ START_TEST(info) /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); + trace("Starting test_queryvirtualmemory()\n"); test_queryvirtualmemory(); + trace("Starting test_mapprotection()\n"); + test_mapprotection(); + trace("Starting test_affinity()\n"); test_affinity(); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7dff79f..548c0fd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -862,6 +862,13 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start assert( start < view->size ); assert( start + size <= view->size ); + if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (vprot & VPROT_READ)) + { + TRACE( "forcing exec permission on mapping %p-%p\n", + (char *)view->base + start, (char *)view->base + start + size - 1 ); + prot |= PROT_EXEC; + } + /* only try mmap if media is not removable (or if we require write access) */ if (!removable || shared_write) {

1 0

Matteo Bruni : d3dx9: Add color key support to D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 0b4969f841abc269bc6cfcf68285857891fd4beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4969f841abc269bc6cfcf68… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 11 22:13:06 2010 +0100 d3dx9: Add color key support to D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/surface.c | 60 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index e9af051..48cd2c2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -642,11 +642,14 @@ static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD * Pixels outsize the source rect are blacked out. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) +static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, + CONST PixelFormatDesc *srcformat, + BYTE *dest, UINT destpitch, POINT destsize, + CONST PixelFormatDesc *destformat, + D3DCOLOR colorkey) { - struct argb_conversion_info conv_info; - DWORD channels[4]; + struct argb_conversion_info conv_info, ck_conv_info; + DWORD channels[4], pixel; UINT minwidth, minheight; UINT x, y; @@ -656,6 +659,14 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; + if(colorkey) { + /* color keys are always represented in D3DFMT_A8R8G8B8 format */ + const PixelFormatDesc *ckformatdesc; + + ckformatdesc = get_format_info(D3DFMT_A8R8G8B8); + init_argb_conversion_info(srcformat, ckformatdesc, &ck_conv_info); + } + for(y = 0;y < minheight;y++) { const BYTE *srcptr = src + y * srcpitch; BYTE *destptr = dest + y * destpitch; @@ -666,6 +677,14 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + if(colorkey) { + get_relevant_argb_components(&ck_conv_info, *(const DWORD*)srcptr, channels); + make_argb_color(&ck_conv_info, channels, &pixel); + if(pixel == colorkey) + /* make this pixel transparent */ + *(DWORD *)destptr &= ~conv_info.destmask[0]; + } + srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } @@ -685,17 +704,28 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C * using a point filter. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) +static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, + CONST PixelFormatDesc *srcformat, + BYTE *dest, UINT destpitch, POINT destsize, + CONST PixelFormatDesc *destformat, + D3DCOLOR colorkey) { - struct argb_conversion_info conv_info; - DWORD channels[4]; + struct argb_conversion_info conv_info, ck_conv_info; + DWORD channels[4], pixel; UINT x, y; ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(srcformat, destformat, &conv_info); + if(colorkey) { + /* color keys are always represented in D3DFMT_A8R8G8B8 format */ + const PixelFormatDesc *ckformatdesc; + + ckformatdesc = get_format_info(D3DFMT_A8R8G8B8); + init_argb_conversion_info(srcformat, ckformatdesc, &ck_conv_info); + } + for(y = 0;y < destsize.y;y++) { BYTE *destptr = dest + y * destpitch; const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); @@ -709,6 +739,14 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + if(colorkey) { + get_relevant_argb_components(&ck_conv_info, *(const DWORD*)srcptr, channels); + make_argb_color(&ck_conv_info, channels, &pixel); + if(pixel == colorkey) + /* make this pixel transparent */ + *(DWORD *)destptr &= ~conv_info.destmask[0]; + } + destptr += destformat->bytes_per_pixel; } } @@ -797,11 +835,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if((dwFilter & 0xF) == D3DX_FILTER_NONE) { copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + Colorkey); } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + Colorkey); } IDirect3DSurface9_UnlockRect(pDestSurface);

1 0