wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jacek Caban : mshtml: Store information if script was already parsed in script element object.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 4503edd614da9c75644ab7c5005e0f9857aae0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503edd614da9c75644ab7c50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:45:40 2012 +0200 mshtml: Store information if script was already parsed in script element object. --- dlls/mshtml/htmlscript.c | 22 ++++++++++++++-------- dlls/mshtml/mshtml_private.h | 13 ++++++++++++- dlls/mshtml/mutation.c | 11 +++++++++-- dlls/mshtml/script.c | 36 +++++++++++++++++++----------------- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 99478ea..d6241ae 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -32,14 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { - HTMLElement element; - - IHTMLScriptElement IHTMLScriptElement_iface; - - nsIDOMHTMLScriptElement *nsscript; -} HTMLScriptElement; - static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface) { return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); @@ -327,6 +319,20 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate }; +HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + if(FAILED(hres)) + return hres; + + assert(node->vtbl == &HTMLScriptElementImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static const tid_t HTMLScriptElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLScriptElement_tid, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e26b594..9cdc410 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -741,6 +741,17 @@ void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; +typedef struct { + HTMLElement element; + + IHTMLScriptElement IHTMLScriptElement_iface; + + nsIDOMHTMLScriptElement *nsscript; + BOOL parsed; +} HTMLScriptElement; + +HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; + HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_static_data_t*) DECLSPEC_HIDDEN; @@ -904,7 +915,7 @@ HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,nsIDOMHTMLScriptElement*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 129094e..7b8bf89 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -294,8 +294,10 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *parser_iface) { nsIDOMHTMLScriptElement *nsscript; + HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); @@ -313,17 +315,22 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } } + hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->window, nsscript); + doc_insert_script(doc->window, script_elem); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); } - nsIDOMHTMLScriptElement_Release(nsscript); + IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 823c7b3..ceb88d7 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -731,34 +731,34 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) heap_free(text); } -static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) { const PRUnichar *text; nsAString text_str; nsresult nsres; nsAString_Init(&text_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetText(script_elem->nsscript, &text_str); + nsAString_GetData(&text_str, &text); - nsres = nsIDOMHTMLScriptElement_GetText(nsscript, &text_str); - - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&text_str, &text); - parse_text(script_host, text); - }else { + if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); + }else if(*text) { + script_elem->parsed = TRUE; + parse_text(script_host, text); } nsAString_Finish(&text_str); } -static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script_elem) { nsAString src_str, event_str; const PRUnichar *src; nsresult nsres; nsAString_Init(&event_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetEvent(nsscript, &event_str); + nsres = nsIDOMHTMLScriptElement_GetEvent(script_elem->nsscript, &event_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *event; @@ -774,15 +774,17 @@ static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement * nsAString_Finish(&event_str); nsAString_Init(&src_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); + nsres = nsIDOMHTMLScriptElement_GetSrc(script_elem->nsscript, &src_str); nsAString_GetData(&src_str, &src); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); - else if(*src) + }else if(*src) { + script_elem->parsed = TRUE; parse_extern_script(script_host, src); - else - parse_inline_script(script_host, nsscript); + }else { + parse_inline_script(script_host, script_elem); + } nsAString_Finish(&src_str); } @@ -887,12 +889,12 @@ static ScriptHost *get_script_host(HTMLInnerWindow *window, const GUID *guid) return create_script_host(window, guid); } -void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript) +void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; GUID guid; - if(!get_script_guid(window, nsscript, &guid)) { + if(!get_script_guid(window, script_elem->nsscript, &guid)) { WARN("Could not find script GUID\n"); return; } @@ -908,7 +910,7 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip return; if(script_host->parse) - parse_script_elem(script_host, nsscript); + parse_script_elem(script_host, script_elem); } IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)

1 0

Jacek Caban : mshtml: Simplify get_node_obj.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: a420b5dad863a22320c172ba89f5670b870100d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a420b5dad863a22320c172ba8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:45:15 2012 +0200 mshtml: Simplify get_node_obj. --- dlls/mshtml/htmlnode.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b0cf4c3..91ffe6d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HTMLDOMNode *get_node_obj(HTMLDocumentNode*,IUnknown*); +static HTMLDOMNode *get_node_obj(IHTMLDOMNode*); static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { @@ -503,7 +503,7 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); - new_child = get_node_obj(This->doc, (IUnknown*)newChild); + new_child = get_node_obj(newChild); if(!new_child) { ERR("invalid newChild\n"); return E_INVALIDARG; @@ -513,9 +513,17 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode case VT_NULL: break; case VT_DISPATCH: { + IHTMLDOMNode *ref_iface; + if(!V_DISPATCH(&refChild)) break; - ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&refChild), &IID_IHTMLDOMNode, (void**)&ref_iface); + if(FAILED(hres)) + break; + + ref_node = get_node_obj(ref_iface); + IHTMLDOMNode_Release(ref_iface); if(!ref_node) { ERR("unvalid node\n"); hres = E_FAIL; @@ -561,7 +569,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p)\n", This, oldChild, node); - node_obj = get_node_obj(This->doc, (IUnknown*)oldChild); + node_obj = get_node_obj(oldChild); if(!node_obj) return E_FAIL; @@ -593,11 +601,11 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - node_new = get_node_obj(This->doc, (IUnknown*)newChild); + node_new = get_node_obj(newChild); if(!node_new) return E_FAIL; - node_old = get_node_obj(This->doc, (IUnknown*)oldChild); + node_old = get_node_obj(oldChild); if(!node_old) { node_release(node_new); return E_FAIL; @@ -678,7 +686,7 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p)\n", This, newChild, node); - node_obj = get_node_obj(This->doc, (IUnknown*)newChild); + node_obj = get_node_obj(newChild); if(!node_obj) return E_FAIL; @@ -886,13 +894,16 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; -static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) +static HTMLDOMNode *get_node_obj(IHTMLDOMNode *iface) { - IHTMLDOMNode *node; - HRESULT hres; + HTMLDOMNode *ret; + + if(iface->lpVtbl != &HTMLDOMNodeVtbl) + return NULL; - hres = IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); - return hres == S_OK && node->lpVtbl == &HTMLDOMNodeVtbl ? impl_from_IHTMLDOMNode(node) : NULL; + ret = impl_from_IHTMLDOMNode(iface); + node_addref(ret); + return ret; } static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface) @@ -1192,7 +1203,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO assert(nsres == NS_OK); if(unk) { - *ret = get_node_obj(This, (IUnknown*)unk); + *ret = get_node_obj((IHTMLDOMNode*)unk); return NS_OK; }

1 0

Jacek Caban : mshtml: Defer event script evaluation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 60c9069f800e16006b8a9384a91aa2ab39a6180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c9069f800e16006b8a9384a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:56 2012 +0200 mshtml: Defer event script evaluation. --- dlls/mshtml/script.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 54cee56..823c7b3 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -753,12 +753,27 @@ static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) { + nsAString src_str, event_str; const PRUnichar *src; - nsAString src_str; nsresult nsres; - nsAString_Init(&src_str, NULL); + nsAString_Init(&event_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetEvent(nsscript, &event_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *event; + nsAString_GetData(&event_str, &event); + if(*event) { + TRACE("deferring event %s script evaluation\n", debugstr_w(event)); + nsAString_Finish(&event_str); + return; + } + }else { + ERR("GetAttribute(event) failed: %08x\n", nsres); + } + nsAString_Finish(&event_str); + + nsAString_Init(&src_str, NULL); nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); nsAString_GetData(&src_str, &src);

1 0

Jacek Caban : mshtml: Moved getElementById implementation to separated function.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 3bfbd6b619a97031ec89a919f41a2b24663650d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfbd6b619a97031ec89a919f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:27 2012 +0200 mshtml: Moved getElementById implementation to separated function. --- dlls/mshtml/htmldoc3.c | 147 +++++++++++++++++++++++------------------- dlls/mshtml/htmlelem.c | 13 ++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 94 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f34f0a2..8139f7f 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -35,6 +36,79 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret) +{ + nsIDOMNodeList *nsnode_list; + nsIDOMElement *nselem; + nsIDOMNode *nsnode; + nsAString id_str; + nsresult nsres; + HRESULT hres; + + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&id_str, id); + /* get element by id attribute */ + nsres = nsIDOMHTMLDocument_GetElementById(doc->nsdoc, &id_str, &nselem); + if(FAILED(nsres)) { + ERR("GetElementById failed: %08x\n", nsres); + nsAString_Finish(&id_str); + return E_FAIL; + } + + /* get first element by name attribute */ + nsres = nsIDOMHTMLDocument_GetElementsByName(doc->nsdoc, &id_str, &nsnode_list); + nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("getElementsByName failed: %08x\n", nsres); + if(nselem) + nsIDOMElement_Release(nselem); + return E_FAIL; + } + + nsres = nsIDOMNodeList_Item(nsnode_list, 0, &nsnode); + nsIDOMNodeList_Release(nsnode_list); + assert(nsres == NS_OK); + + if(nsnode && nselem) { + PRUint16 pos; + + nsres = nsIDOMNode_CompareDocumentPosition(nsnode, (nsIDOMNode*)nselem, &pos); + if(NS_FAILED(nsres)) { + FIXME("CompareDocumentPosition failed: 0x%08x\n", nsres); + nsIDOMNode_Release(nsnode); + nsIDOMElement_Release(nselem); + return E_FAIL; + } + + TRACE("CompareDocumentPosition gave: 0x%x\n", pos); + if(!(pos & (DOCUMENT_POSITION_PRECEDING | DOCUMENT_POSITION_CONTAINS))) { + nsIDOMElement_Release(nselem); + nselem = NULL; + } + } + + if(nsnode) { + if(!nselem) { + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + assert(nsres == NS_OK); + } + nsIDOMNode_Release(nsnode); + } + + if(!nselem) { + *ret = NULL; + return S_OK; + } + + hres = get_elem(doc, nselem, ret); + nsIDOMElement_Release(nselem); + return hres; +} + static inline HTMLDocument *impl_from_IHTMLDocument3(IHTMLDocument3 *iface) { return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument3_iface); @@ -469,80 +543,19 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v IHTMLElement **pel) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - nsIDOMElement *nselem; - HTMLDOMNode *node; - nsIDOMNode *nsnode, *nsnode_by_id, *nsnode_by_name; - nsIDOMNodeList *nsnode_list; - nsAString id_str; - nsresult nsres; + HTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } - - nsAString_InitDepend(&id_str, v); - /* get element by id attribute */ - nsres = nsIDOMHTMLDocument_GetElementById(This->doc_node->nsdoc, &id_str, &nselem); - if(FAILED(nsres)) { - ERR("GetElementById failed: %08x\n", nsres); - nsAString_Finish(&id_str); - return E_FAIL; - } - nsnode_by_id = (nsIDOMNode*)nselem; - - /* get first element by name attribute */ - nsres = nsIDOMHTMLDocument_GetElementsByName(This->doc_node->nsdoc, &id_str, &nsnode_list); - nsAString_Finish(&id_str); - if(FAILED(nsres)) { - ERR("getElementsByName failed: %08x\n", nsres); - if(nsnode_by_id) - nsIDOMNode_Release(nsnode_by_id); - return E_FAIL; - } - nsIDOMNodeList_Item(nsnode_list, 0, &nsnode_by_name); - nsIDOMNodeList_Release(nsnode_list); - - - if(nsnode_by_name && nsnode_by_id) { - PRUint16 pos; - - nsres = nsIDOMNode_CompareDocumentPosition(nsnode_by_name, nsnode_by_id, &pos); - if(NS_FAILED(nsres)) { - FIXME("CompareDocumentPosition failed: 0x%08x\n", nsres); - nsIDOMNode_Release(nsnode_by_name); - nsIDOMNode_Release(nsnode_by_id); - return E_FAIL; - } - - TRACE("CompareDocumentPosition gave: 0x%x\n", pos); - if(pos & (DOCUMENT_POSITION_PRECEDING | DOCUMENT_POSITION_CONTAINS)) { - nsnode = nsnode_by_id; - nsIDOMNode_Release(nsnode_by_name); - }else { - nsnode = nsnode_by_name; - nsIDOMNode_Release(nsnode_by_id); - } - }else - nsnode = nsnode_by_name ? nsnode_by_name : nsnode_by_id; - - if(nsnode) { - hres = get_node(This->doc_node, nsnode, TRUE, &node); - nsIDOMNode_Release(nsnode); - - if(SUCCEEDED(hres)) { - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)pel); - node_release(node); - } - }else { + hres = get_doc_elem_by_id(This->doc_node, v, &elem); + if(FAILED(hres) || !elem) { *pel = NULL; - hres = S_OK; + return hres; } - return hres; + *pel = &elem->IHTMLElement_iface; + return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a12b8de..aa3b68f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1864,6 +1864,19 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g return S_OK; } +HRESULT get_elem(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); + if(FAILED(hres)) + return hres; + + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + /* interface IHTMLFiltersCollection */ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollection *iface, REFIID riid, void **ppv) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dd41224..e26b594 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -898,6 +898,7 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; +HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 359a9041b1c4747ee7bcbaae13bf9c3535553968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a9041b1c4747ee7bcbaae1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:10 2012 +0200 mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 16 ++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 8 +------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 322751a..6954d17 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2101,6 +2101,11 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { assert(!This->window); release_document_mutation(This); @@ -2126,6 +2131,8 @@ static void HTMLDocumentNode_traverse(HTMLDOMNode *iface, nsCycleCollectionTrave { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) + note_cc_edge((nsISupports*)This->nsnode_selector, "This->nsnode_selector", cb); if(This->nsdoc) note_cc_edge((nsISupports*)This->nsdoc, "This->nsdoc", cb); } @@ -2134,6 +2141,11 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { nsIDOMHTMLDocument *nsdoc = This->nsdoc; @@ -2285,6 +2297,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; + nsresult nsres; doc = alloc_doc_node(doc_obj, window); if(!doc) @@ -2298,6 +2311,9 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMNodeSelector, (void**)&doc->nsnode_selector); + assert(nsres == NS_OK); + init_document_mutation(doc); doc_init_events(doc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aec754f..dd41224 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -689,6 +689,7 @@ struct HTMLDocumentNode { HTMLInnerWindow *window; nsIDOMHTMLDocument *nsdoc; + nsIDOMNodeSelector *nsnode_selector; BOOL content_ready; event_target_t *body_event_target; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fea8b4c..bec5ed6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2004,19 +2004,13 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) */ selector = heap_alloc(sizeof(selector_formatW)+SysStringLen(frag)*sizeof(WCHAR)); if(selector) { - nsIDOMNodeSelector *node_selector; nsIDOMElement *nselem = NULL; nsAString selector_str; - nsres = nsIDOMHTMLDocument_QueryInterface(window->base.inner_window->doc->nsdoc, &IID_nsIDOMNodeSelector, - (void**)&node_selector); - assert(nsres == NS_OK); - sprintfW(selector, selector_formatW, frag); nsAString_InitDepend(&selector_str, selector); /* NOTE: Gecko doesn't set result to NULL if there is no match, so nselem must be initialized */ - nsres = nsIDOMNodeSelector_QuerySelector(node_selector, &selector_str, &nselem); - nsIDOMNodeSelector_Release(node_selector); + nsres = nsIDOMNodeSelector_QuerySelector(window->base.inner_window->doc->nsnode_selector, &selector_str, &nselem); nsAString_Finish(&selector_str); heap_free(selector); if(NS_SUCCEEDED(nsres) && nselem) {

1 0

Christian Costa : ntoskrnl.exe: Add stub for PsImpersonateClient.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: e3607c9858b4d7de6a0435a8d31c04d2cd85ac8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3607c9858b4d7de6a0435a8d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:10:38 2012 +0200 ntoskrnl.exe: Add stub for PsImpersonateClient. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ba2034d..a127551 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1660,6 +1660,18 @@ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_ST /*********************************************************************** + * PsImpersonateClient (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsImpersonateClient(PETHREAD Thread, PACCESS_TOKEN Token, BOOLEAN CopyOnOpen, + BOOLEAN EffectiveOnly, SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +{ + FIXME("(%p, %p, %u, %u, %u): stub\n", Thread, Token, CopyOnOpen, EffectiveOnly, ImpersonationLevel); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * PsSetCreateProcessNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE callback, BOOLEAN remove ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3a871de..b169815 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -885,7 +885,7 @@ @ stub PsGetThreadTeb @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) -@ stub PsImpersonateClient +@ stdcall PsImpersonateClient(ptr ptr long long long) @ stub PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread

1 0

Christian Costa : ntoskrnl.exe: Implement IoAllocateMdl.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 5c65471681cad45c21fd80b8bb243590dc032470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c65471681cad45c21fd80b8b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:09:51 2012 +0200 ntoskrnl.exe: Implement IoAllocateMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2cf7983..ba2034d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -415,13 +415,34 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { PMDL mdl; + ULONG_PTR address = (ULONG_PTR)VirtualAddress; + ULONG_PTR page_address; + SIZE_T nb_pages, mdl_size; - FIXME("partial stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + TRACE("(%p, %u, %i, %i, %p)\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); - mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MDL)); + if (Irp) + FIXME("Attaching the MDL to an IRP is not yet supported\n"); + + if (ChargeQuota) + FIXME("Charge quota is not yet supported\n"); + + /* FIXME: We suppose that page size is 4096 */ + page_address = address & ~(4096 - 1); + nb_pages = (((address + Length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; + + mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); + + mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size); if (!mdl) return NULL; + mdl->Size = mdl_size; + mdl->Process = IoGetCurrentProcess(); + mdl->StartVa = (PVOID)page_address; + mdl->ByteCount = Length; + mdl->ByteOffset = address - page_address; + return mdl; }

1 0

Christian Costa : scsiport.sys: Add stub implementation of scsiport.sys.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ce44d1e506dd647f55366932a4215d182391b96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce44d1e506dd647f55366932a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:23:49 2012 +0200 scsiport.sys: Add stub implementation of scsiport.sys. --- configure | 1 + configure.ac | 1 + dlls/scsiport.sys/Makefile.in | 8 ++++++ dlls/scsiport.sys/scsiport.c | 39 ++++++++++++++++++++++++++++ dlls/scsiport.sys/scsiport.sys.spec | 48 +++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2be377a..d18cc0e 100755 --- a/configure +++ b/configure @@ -15663,6 +15663,7 @@ wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test wine_fn_config_dll scrrun enable_scrrun wine_fn_config_test dlls/scrrun/tests scrrun_test +wine_fn_config_dll scsiport.sys enable_scsiport_sys wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index eb57696..5c7e9a2 100644 --- a/configure.ac +++ b/configure.ac @@ -2936,6 +2936,7 @@ WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) WINE_CONFIG_DLL(scrrun) WINE_CONFIG_TEST(dlls/scrrun/tests) +WINE_CONFIG_DLL(scsiport.sys) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in new file mode 100644 index 0000000..40c3b62 --- /dev/null +++ b/dlls/scsiport.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = scsiport.sys +IMPORTS = ntoskrnl.exe +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + scsiport.c + +@MAKE_DLL_RULES@ diff --git a/dlls/scsiport.sys/scsiport.c b/dlls/scsiport.sys/scsiport.c new file mode 100644 index 0000000..f689153 --- /dev/null +++ b/dlls/scsiport.sys/scsiport.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scsiport); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/scsiport.sys/scsiport.sys.spec b/dlls/scsiport.sys/scsiport.sys.spec new file mode 100644 index 0000000..55a373e --- /dev/null +++ b/dlls/scsiport.sys/scsiport.sys.spec @@ -0,0 +1,48 @@ +@ stub DllInitialize +@ stub PortNotification +@ stub ScsiDebugPrint +@ stub ScsiPortCompleteRequest +@ stub ScsiPortConvertPhysicalAddressToUlong +@ stub ScsiPortConvertUlongToPhysicalAddress +@ stub ScsiPortFlushDma +@ stub ScsiPortFreeDeviceBase +@ stub ScsiPortGetBusData +@ stub ScsiPortGetDeviceBase +@ stub ScsiPortGetLogicalUnit +@ stub ScsiPortGetPhysicalAddress +@ stub ScsiPortGetSrb +@ stub ScsiPortGetUncachedExtension +@ stub ScsiPortGetVirtualAddress +@ stub ScsiPortInitialize +@ stub ScsiPortIoMapTransfer +@ stub ScsiPortLogError +@ stub ScsiPortMoveMemory +@ stub ScsiPortNotification +@ stub ScsiPortQuerySystemTime +@ stub ScsiPortReadPortBufferUchar +@ stub ScsiPortReadPortBufferUlong +@ stub ScsiPortReadPortBufferUshort +@ stub ScsiPortReadPortUchar +@ stub ScsiPortReadPortUlong +@ stub ScsiPortReadPortUshort +@ stub ScsiPortReadRegisterBufferUchar +@ stub ScsiPortReadRegisterBufferUlong +@ stub ScsiPortReadRegisterBufferUshort +@ stub ScsiPortReadRegisterUchar +@ stub ScsiPortReadRegisterUlong +@ stub ScsiPortReadRegisterUshort +@ stub ScsiPortSetBusDataByOffset +@ stub ScsiPortStallExecution +@ stub ScsiPortValidateRange +@ stub ScsiPortWritePortBufferUchar +@ stub ScsiPortWritePortBufferUlong +@ stub ScsiPortWritePortBufferUshort +@ stub ScsiPortWritePortUchar +@ stub ScsiPortWritePortUlong +@ stub ScsiPortWritePortUshort +@ stub ScsiPortWriteRegisterBufferUchar +@ stub ScsiPortWriteRegisterBufferUlong +@ stub ScsiPortWriteRegisterBufferUshort +@ stub ScsiPortWriteRegisterUchar +@ stub ScsiPortWriteRegisterUlong +@ stub ScsiPortWriteRegisterUshort

1 0

Christian Costa : ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 84465b420b43231887bb87eafab4ec5beb4c13ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=84465b420b43231887bb87eaf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:36:52 2012 +0200 ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c66bb55..2cf7983 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -284,6 +284,24 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 561c8e1..3a871de 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -303,7 +303,7 @@ @ stub InbvSetTextColor @ stub InbvSolidColorFill @ stub InitSafeBootMode -@ stub IoAcquireCancelSpinLock +@ stdcall IoAcquireCancelSpinLock(ptr) @ stub IoAcquireRemoveLockEx @ stub IoAcquireVpbSpinLock @ stub IoAdapterObjectType @@ -432,7 +432,7 @@ @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification @ stdcall IoRegisterShutdownNotification(ptr) -@ stub IoReleaseCancelSpinLock +@ stdcall IoReleaseCancelSpinLock(ptr) @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock

1 0

Erich Hoover : ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_UNICAST_IF and SO_ATTACH_FILTER .
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 57019615b51378187b9a09be55e262dc664cfc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57019615b51378187b9a09be5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 26 16:38:29 2012 -0600 ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_UNICAST_IF and SO_ATTACH_FILTER. --- configure | 1 + configure.ac | 1 + dlls/ws2_32/socket.c | 38 ++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 54675b4..2be377a 100755 --- a/configure +++ b/configure @@ -5848,6 +5848,7 @@ for ac_header in \ link.h \ linux/cdrom.h \ linux/compiler.h \ + linux/filter.h \ linux/hdreg.h \ linux/input.h \ linux/ioctl.h \ diff --git a/configure.ac b/configure.ac index 79b1175..eb57696 100644 --- a/configure.ac +++ b/configure.ac @@ -443,6 +443,7 @@ AC_CHECK_HEADERS(\ link.h \ linux/cdrom.h \ linux/compiler.h \ + linux/filter.h \ linux/hdreg.h \ linux/input.h \ linux/ioctl.h \ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d645872..8efa1e6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -92,6 +92,9 @@ #ifdef HAVE_NET_IF_H # include <net/if.h> #endif +#ifdef HAVE_LINUX_FILTER_H +# include <linux/filter.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -167,6 +170,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +# define LINUX_BOUND_IF +struct interface_filter { + struct sock_filter iface_memaddr; + struct sock_filter iface_rule; + struct sock_filter return_keep; + struct sock_filter return_dump; +}; +# define FILTER_JUMP_DUMP(here) (u_char)(offsetof(struct interface_filter, return_dump) \ + -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ + /sizeof(struct sock_filter) +# define FILTER_JUMP_KEEP(here) (u_char)(offsetof(struct interface_filter, return_keep) \ + -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ + /sizeof(struct sock_filter) +static struct interface_filter generic_interface_filter = { + BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_AD_OFF+SKF_AD_IFINDEX), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_DUMP(iface_rule)), + BPF_STMT(BPF_RET+BPF_K, (u_int)-1), /* keep packet */ + BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ +}; +#endif /* LINUX_BOUND_IF */ /* * The actual definition of WSASendTo, wrapped in a different function name @@ -2148,6 +2172,20 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) goto cleanup; ret = TRUE; +#elif defined(LINUX_BOUND_IF) + in_addr_t ifindex = (in_addr_t) htonl(adapter->Index); + struct interface_filter specific_interface_filter; + struct sock_fprog filter_prog; + + if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) + goto cleanup; /* Failed to suggest egress interface */ + memcpy(&specific_interface_filter, &generic_interface_filter, sizeof(generic_interface_filter)); + specific_interface_filter.iface_rule.k = adapter->Index; + filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); + filter_prog.filter = (struct sock_filter *) &specific_interface_filter; + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) + goto cleanup; /* Failed to specify incoming packet filter */ + ret = TRUE; #else FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " "receiving broadcast packets will not work on socket %04lx.\n", s); diff --git a/include/config.h.in b/include/config.h.in index c1f29bc..67f4fe4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -392,6 +392,9 @@ /* Define to 1 if you have the <linux/compiler.h> header file. */ #undef HAVE_LINUX_COMPILER_H +/* Define to 1 if you have the <linux/filter.h> header file. */ +#undef HAVE_LINUX_FILTER_H + /* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ #undef HAVE_LINUX_GETHOSTBYNAME_R_6

1 0

← Newer
1
...
85
86
87
88
89
90
91
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012