wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : usp10: Use usp10_array_reserve() in computeBracketPairs().
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: d48dd7efbf5e7e78e5b42c893341256b5054b4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48dd7efbf5e7e78e5b42c89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:00 2018 +0330 usp10: Use usp10_array_reserve() in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 71 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2277190..b0df781 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -694,6 +694,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) int stack_top = iso_run->length; unsigned int pair_count = 0; BracketPair *out = NULL; + SIZE_T out_size = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -702,42 +703,43 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry(bidi_bracket_table, iso_run->item[i].ch); - if (ubv) + + if (!ubv) + continue; + + if ((ubv >> 8) == 0) { - if (!out) - { - out = heap_alloc(sizeof(*out)); - out[0].start = -1; - } + --stack_top; + open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); + /* Deal with canonical equivalent U+2329/232A and U+3008/3009. */ + if (open_stack[stack_top] == 0x232a) + open_stack[stack_top] = 0x3009; + stack_index[stack_top] = i; + } + else if ((ubv >> 8) == 1) + { + unsigned int j; - if ((ubv >> 8) == 0) - { - stack_top --; - open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); - /* deal with canonical equivalent U+2329/232A and U+3008/3009 */ - if (open_stack[stack_top] == 0x232A) - open_stack[stack_top] = 0x3009; - stack_index[stack_top] = i; - } - else if ((ubv >> 8) == 1) + for (j = stack_top; j < iso_run->length; ++j) { - int j; - if (stack_top == iso_run->length) continue; - for (j = stack_top; j < iso_run->length; j++) - { - WCHAR c = iso_run->item[i].ch; - if (c == 0x232A) c = 0x3009; - if (c == open_stack[j]) - { - out[pair_count].start = stack_index[j]; - out[pair_count].end = i; - pair_count++; - out = HeapReAlloc(GetProcessHeap(), 0, out, sizeof(BracketPair) * (pair_count+1)); - out[pair_count].start = -1; - stack_top = j+1; - break; - } - } + WCHAR c = iso_run->item[i].ch; + + if (c == 0x232a) + c = 0x3009; + + if (c != open_stack[j]) + continue; + + if (!(usp10_array_reserve((void **)&out, &out_size, pair_count + 2, sizeof(*out)))) + ERR("Failed to grow output array.\n"); + + out[pair_count].start = stack_index[j]; + out[pair_count].end = i; + ++pair_count; + + out[pair_count].start = -1; + stack_top = j + 1; + break; } } } @@ -746,10 +748,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(stack_index); if (!pair_count) - { - heap_free(out); return NULL; - } qsort(out, pair_count, sizeof(*out), compr);

1 0

Henri Verbeet : usp10: Make "pair_count" unsigned in computeBracketPairs() .
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 24f64acc357a4682b3caa6e6a97db2ba9875dfad URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f64acc357a4682b3caa6e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:21:59 2018 +0330 usp10: Make "pair_count" unsigned in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 8f94ede..2277190 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -692,8 +692,8 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; + unsigned int pair_count = 0; BracketPair *out = NULL; - int pair_count = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -745,13 +745,13 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(open_stack); heap_free(stack_index); - if (pair_count == 0) + if (!pair_count) { heap_free(out); - out = NULL; + return NULL; } - else if (pair_count > 1) - qsort(out, pair_count, sizeof(BracketPair), compr); + + qsort(out, pair_count, sizeof(*out), compr); return out; }

1 0

Nikolay Sivov : ntdll: Allow closing tags for 'supportedOS' elements.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: f8cca445fb103812ff77bf47d6d46c454786e007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8cca445fb103812ff77bf47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 15:57:47 2018 +0300 ntdll: Allow closing tags for 'supportedOS' elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 4 +-- dlls/ntdll/actctx.c | 70 ++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index cef11a5..263fe39 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -426,9 +426,9 @@ static const char compat_manifest_vista_7_8_10_81[] = " <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" " <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" " <application>" -" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" />" /* Windows Vista */ +" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" ></supportedOS>" /* Windows Vista */ " <supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" />" /* Windows 7 */ -" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" />" /* Windows 8 */ +" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" ></supportedOS>" /* Windows 8 */ " <supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" />" /* Windows 10 */ " <supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" />" /* Windows 8.1 */ " </application>" diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4a33700..27d6ad8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2245,11 +2245,50 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + COMPATIBILITY_CONTEXT_ELEMENT *compat; + UNICODE_STRING str; + GUID compat_id; + + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); + } + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + } + } + + if (error) return FALSE; + if (end) return TRUE; + + return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); +} + static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + BOOL ret = TRUE; + xmlstr_t elem; while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -2260,32 +2299,7 @@ static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assemb } else if (xmlstr_cmp(&elem, supportedOSW)) { - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - if (xmlstr_cmp(&attr_name, IdW)) - { - UNICODE_STRING str; - COMPATIBILITY_CONTEXT_ELEMENT* compat; - GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); - if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) - { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; - compat->Id = compat_id; - } - else - { - WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); - } - } - else - { - WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), - debugstr_xmlstr(&attr_value)); - } - } + ret = parse_supportedos_elem(xmlbuf, assembly, acl); } else {

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent::relatedTarget implementation.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 832b90d4a50df10e2d1ef86d6d67f1a0d938de92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832b90d4a50df10e2d1ef86d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:48:44 2018 +0100 mshtml: Added IDOMMouseEvent::relatedTarget implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 ++++ dlls/mshtml/htmlelem.c | 7 ++++ dlls/mshtml/htmlevent.c | 90 +++++++++++++++++++++++++++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 7 ++++ dlls/mshtml/tests/events.js | 5 ++- dlls/mshtml/xmlhttprequest.c | 7 ++++ 7 files changed, 109 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=832b90d4a50df10e2d1e…

1 0

Jacek Caban : mshtml: Share more code between get_form implementations.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: ad1599f276e1b396bdbb8bdd93917bd1e04302bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad1599f276e1b396bdbb8bdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:25:44 2018 +0100 mshtml: Share more code between get_form implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/htmlinput.c | 40 ++-------------------------------------- dlls/mshtml/htmloption.c | 28 +--------------------------- dlls/mshtml/htmlselect.c | 28 +--------------------------- dlls/mshtml/htmltextarea.c | 23 +---------------------- dlls/mshtml/mshtml_private.h | 1 + 6 files changed, 38 insertions(+), 114 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 27a82fa..c22fa9e 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -42,6 +42,38 @@ struct HTMLFormElement { nsIDOMHTMLFormElement *nsform; }; +HRESULT return_nsform(nsresult nsres, nsIDOMHTMLFormElement *form, IHTMLFormElement **p) +{ + nsIDOMNode *form_node; + HTMLDOMNode *node; + HRESULT hres; + + if (NS_FAILED(nsres)) { + ERR("GetForm failed: %08x\n", nsres); + return E_FAIL; + } + + if(!form) { + *p = NULL; + TRACE("NULL\n"); + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(form, &IID_nsIDOMNode, (void**)&form_node); + nsIDOMHTMLFormElement_Release(form); + assert(nsres == NS_OK); + + hres = get_node(form_node, TRUE, &node); + nsIDOMNode_Release(form_node); + if (FAILED(hres)) + return hres; + + TRACE("node %p\n", node); + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLFormElement, (void**)p); + node_release(node); + return hres; +} + static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret) { nsIDOMHTMLCollection *elements; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 9c44864..1ae1f8a 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -46,32 +46,6 @@ struct HTMLInputElement { static const WCHAR forW[] = {'f','o','r',0}; -static HRESULT return_nsform(HTMLElement *elem, nsIDOMHTMLFormElement *nsform, IHTMLFormElement **p) -{ - nsIDOMNode *form_node; - HTMLDOMNode *node; - nsresult nsres; - HRESULT hres; - - if(!nsform) { - *p = NULL; - return S_OK; - } - - nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); - nsIDOMHTMLFormElement_Release(nsform); - assert(nsres == NS_OK); - - hres = get_node(form_node, TRUE, &node); - nsIDOMNode_Release(form_node); - if (FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); - return hres; -} - static inline HTMLInputElement *impl_from_IHTMLInputElement(IHTMLInputElement *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputElement_iface); @@ -288,12 +262,7 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF TRACE("(%p)->(%p)\n", This, p); nsres = nsIDOMHTMLInputElement_GetForm(This->nsinput, &nsform); - if (NS_FAILED(nsres)) { - ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); - return E_FAIL; - } - - return return_nsform(&This->element, nsform, p); + return return_nsform(nsres, nsform, p); } static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, LONG v) @@ -1905,12 +1874,7 @@ static HRESULT WINAPI HTMLButtonElement_get_form(IHTMLButtonElement *iface, IHTM TRACE("(%p)->(%p)\n", This, p); nsres = nsIDOMHTMLButtonElement_GetForm(This->nsbutton, &nsform); - if (NS_FAILED(nsres)) { - ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); - return E_FAIL; - } - - return return_nsform(&This->element, nsform, p); + return return_nsform(nsres, nsform, p); } static HRESULT WINAPI HTMLButtonElement_createTextRange(IHTMLButtonElement *iface, IHTMLTxtRange **range) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a2bf073..e337be9 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -308,9 +308,6 @@ static HRESULT WINAPI HTMLOptionElement_get_form(IHTMLOptionElement *iface, IHTM { HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); nsIDOMHTMLFormElement *nsform; - nsIDOMNode *form_node; - HTMLDOMNode *node; - HRESULT hres; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -319,30 +316,7 @@ static HRESULT WINAPI HTMLOptionElement_get_form(IHTMLOptionElement *iface, IHTM return E_POINTER; nsres = nsIDOMHTMLOptionElement_GetForm(This->nsoption, &nsform); - if (NS_FAILED(nsres)) { - ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); - *p = NULL; - return E_FAIL; - } - if (nsform == NULL) { - TRACE("nsform not found\n"); - *p = NULL; - return S_OK; - } - - nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); - nsIDOMHTMLFormElement_Release(nsform); - assert(nsres == NS_OK); - - hres = get_node(form_node, TRUE, &node); - nsIDOMNode_Release(form_node); - if (FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - - node_release(node); - return hres; + return return_nsform(nsres, nsform, p); } static const IHTMLOptionElementVtbl HTMLOptionElementVtbl = { diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 320cf5f..a1d9b05 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -372,9 +372,6 @@ static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTM { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsIDOMHTMLFormElement *nsform; - nsIDOMNode *form_node; - HTMLDOMNode *node; - HRESULT hres; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -383,30 +380,7 @@ static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTM return E_POINTER; nsres = nsIDOMHTMLSelectElement_GetForm(This->nsselect, &nsform); - if (NS_FAILED(nsres)) { - ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); - *p = NULL; - return E_FAIL; - } - if (nsform == NULL) { - TRACE("nsform not found\n"); - *p = NULL; - return S_OK; - } - - nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); - nsIDOMHTMLFormElement_Release(nsform); - assert(nsres == NS_OK); - - hres = get_node(form_node, TRUE, &node); - nsIDOMNode_Release(form_node); - if (FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - - node_release(node); - return hres; + return return_nsform(nsres, nsform, p); } static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElement *element, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 599c029..caf5d85 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -197,33 +197,12 @@ static HRESULT WINAPI HTMLTextAreaElement_get_form(IHTMLTextAreaElement *iface, { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); nsIDOMHTMLFormElement *nsform; - nsIDOMNode *nsnode; - HTMLDOMNode *node; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); nsres = nsIDOMHTMLTextAreaElement_GetForm(This->nstextarea, &nsform); - assert(nsres == NS_OK); - - if(!nsform) { - *p = NULL; - return S_OK; - } - - nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&nsnode); - nsIDOMHTMLFormElement_Release(nsform); - assert(nsres == NS_OK); - - hres = get_node(nsnode, TRUE, &node); - nsIDOMNode_Release(nsnode); - if(FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLFormElement, (void**)p); - IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); - return hres; + return return_nsform(nsres, nsform, p); } static HRESULT WINAPI HTMLTextAreaElement_put_defaultValue(IHTMLTextAreaElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c720ef4..551ee12 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -948,6 +948,7 @@ void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; +HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLDocument3:: get_documentElement implementation.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: cff4612646fb1e71695e22ce8059c29838c76ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff4612646fb1e71695e22ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:25:22 2018 +0100 mshtml: Use get_element helper in IHTMLDocument3::get_documentElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3bf3419..25459bc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1993,7 +1993,7 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I { HTMLDocument *This = impl_from_IHTMLDocument3(iface); nsIDOMElement *nselem = NULL; - HTMLDOMNode *node; + HTMLElement *element; nsresult nsres; HRESULT hres; @@ -2020,13 +2020,12 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I return S_OK; } - hres = get_node((nsIDOMNode *)nselem, TRUE, &node); + hres = get_element(nselem, &element); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); + *p = &element->IHTMLElement_iface; return hres; }

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 62335569c4d6318b54c087ca71e96dde1949eee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62335569c4d6318b54c087ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:25:06 2018 +0100 mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 +++++++++--------- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 8 ++++---- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmltable.c | 4 ++-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ec4771d..3bf3419 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -354,7 +354,7 @@ static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElemen } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -386,7 +386,7 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -418,7 +418,7 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -450,7 +450,7 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -482,7 +482,7 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -567,7 +567,7 @@ static HRESULT WINAPI HTMLDocument_get_scripts(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -2377,7 +2377,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST return E_FAIL; } - *ppelColl = create_collection_from_nodelist(This->doc_node, node_list); + *ppelColl = create_collection_from_nodelist(node_list, This->doc_node->document_mode); nsIDOMNodeList_Release(node_list); return S_OK; } @@ -2452,7 +2452,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, } - *pelColl = create_collection_from_nodelist(This->doc_node, nslist); + *pelColl = create_collection_from_nodelist(nslist, This->doc_node->document_mode); nsIDOMNodeList_Release(nslist); return S_OK; @@ -3368,7 +3368,7 @@ static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface } - *pel = create_collection_from_nodelist(This->doc_node, nslist); + *pel = create_collection_from_nodelist(nslist, This->doc_node->document_mode); nsIDOMNodeList_Release(nslist); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ca935d3..28dd716 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1998,7 +1998,7 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return E_FAIL; } - *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, nsnode_list); + *p = (IDispatch*)create_collection_from_nodelist(nsnode_list, This->node.doc->document_mode); nsIDOMNodeList_Release(nsnode_list); return S_OK; @@ -3185,7 +3185,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); if(!This->dom_element) { - *pelColl = create_collection_from_htmlcol(This->node.doc, NULL); + *pelColl = create_collection_from_htmlcol(NULL, This->node.doc->document_mode); return S_OK; } @@ -3197,7 +3197,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS return E_FAIL; } - *pelColl = create_collection_from_htmlcol(This->node.doc, nscol); + *pelColl = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; } @@ -4263,7 +4263,7 @@ static HRESULT WINAPI HTMLElement6_getElementsByClassName(IHTMLElement6 *iface, } } - *pel = create_collection_from_htmlcol(This->node.doc, nscol); + *pel = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 6671434..6398942 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -683,7 +683,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro dispex_compat_mode(&node->event_target.dispex)); } -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList *nslist, compat_mode_t compat_mode) { UINT32 length = 0, i; HTMLDOMNode *node; @@ -715,10 +715,10 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n buf.buf = NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); + return HTMLElementCollection_Create(buf.buf, buf.len, compat_mode); } -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) +IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection *nscol, compat_mode_t compat_mode) { UINT32 length = 0, i; elem_vector_t buf; @@ -751,7 +751,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); + return HTMLElementCollection_Create(buf.buf, buf.len, compat_mode); } HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index acf2eba..27a82fa 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis return E_FAIL; } - *p = (IDispatch*)create_collection_from_htmlcol(This->element.node.doc, elements); + *p = (IDispatch*)create_collection_from_htmlcol(elements, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(elements); return S_OK; } diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 455826e..983e81d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -478,7 +478,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; @@ -605,7 +605,7 @@ static HRESULT WINAPI HTMLTable_get_tBodies(IHTMLTable *iface, IHTMLElementColle return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 61bdbd4..0097e58 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -299,7 +299,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c9c6682..c720ef4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1087,8 +1087,8 @@ HRESULT handle_link_click_event(HTMLElement*,nsAString*,nsAString*,nsIDOMEvent*, HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList*,compat_mode_t) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection*,compat_mode_t) DECLSPEC_HIDDEN; IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLDocument2:: elementFromPoint implementation.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 567f911fcf95993d0fb1d6e8cf1f3d4d163ae3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=567f911fcf95993d0fb1d6e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:24:51 2018 +0100 mshtml: Use get_element helper in IHTMLDocument2::elementFromPoint implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0fc96a5..ec4771d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1594,11 +1594,11 @@ static HRESULT WINAPI HTMLDocument_get_onselectstart(IHTMLDocument2 *iface, VARI } static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG x, LONG y, - IHTMLElement **elementHit) + IHTMLElement **elementHit) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMElement *nselem; - HTMLDOMNode *node; + HTMLElement *element; nsresult nsres; HRESULT hres; @@ -1615,14 +1615,13 @@ static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG return S_OK; } - hres = get_node((nsIDOMNode*)nselem, TRUE, &node); + hres = get_element(nselem, &element); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)elementHit); - node_release(node); - return hres; + *elementHit = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTMLWindow2 **p)

1 0

Hans Leidekker : wldap32: Use the global memory allocation helpers.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 7de7f9af9fca72498f2be379b812644a1558d878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de7f9af9fca72498f2be379… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:10 2018 +0100 wldap32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 3 +- dlls/wldap32/init.c | 19 +++--- dlls/wldap32/page.c | 8 +-- dlls/wldap32/value.c | 10 ++- dlls/wldap32/wldap32.h | 175 ++++++++++++++++++------------------------------- 5 files changed, 81 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7de7f9af9fca72498f2b…

1 0

Hans Leidekker : fusion: Use the global memory allocation helpers.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: e76066bedaf14e8a6d9ca405cbb08e45f4a92163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76066bedaf14e8a6d9ca405… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:08 2018 +0100 fusion: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmcache.c | 50 +++++++++++++++++++++--------------------------- dlls/fusion/asmenum.c | 17 +++++++--------- dlls/fusion/asmname.c | 34 ++++++++++++++++---------------- dlls/fusion/assembly.c | 39 +++++++++++++++---------------------- dlls/fusion/fusionpriv.h | 4 ++-- 5 files changed, 62 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e76066bedaf14e8a6d9c…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
81
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 February 2018