September 2014 - Wine-commits

Jacek Caban : mshtml: Don't share nsscript reference with nsnode.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: e391dfc8aeaf8629e3f70f773778acfd96d4fe72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e391dfc8aeaf8629e3f70f773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:33 2014 +0200 mshtml: Don't share nsscript reference with nsnode. --- dlls/mshtml/htmlscript.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 5dc3138..dcab32f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -391,6 +391,26 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLScriptElement_get_readyState(&This->IHTMLScriptElement_iface, p); } +static void HTMLScriptElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsscript) + note_cc_edge((nsISupports*)This->nsscript, "This->nsscript", cb); +} + +static void HTMLScriptElement_unlink(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsscript) { + nsIDOMHTMLScriptElement *nsscript = This->nsscript; + + This->nsscript = NULL; + nsIDOMHTMLScriptElement_Release(nsscript); + } +} + static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, HTMLElement_destructor, @@ -403,7 +423,12 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { NULL, NULL, NULL, - HTMLScriptElement_get_readystate + HTMLScriptElement_get_readystate, + NULL, + NULL, + NULL, + HTMLScriptElement_traverse, + HTMLScriptElement_unlink }; HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) @@ -448,10 +473,7 @@ HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); - - /* Share nsscript reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsscript == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsrow reference with nsnode.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 1e9f33924b3b7c10a02871e522126caca2de3e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9f33924b3b7c10a02871e52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:40 2014 +0200 mshtml: Don't share nsrow reference with nsnode. --- dlls/mshtml/htmltablerow.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 589a38f..a5da29f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -402,13 +402,44 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLTableRow_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableRow *This = impl_from_HTMLDOMNode(iface); + + if(This->nsrow) + note_cc_edge((nsISupports*)This->nsrow, "This->nstablerow", cb); +} + +static void HTMLTableRow_unlink(HTMLDOMNode *iface) +{ + HTMLTableRow *This = impl_from_HTMLDOMNode(iface); + + if(This->nsrow) { + nsIDOMHTMLTableRowElement *nsrow = This->nsrow; + + This->nsrow = NULL; + nsIDOMHTMLTableRowElement_Release(nsrow); + } +} + static const NodeImplVtbl HTMLTableRowImplVtbl = { HTMLTableRow_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTableRow_traverse, + HTMLTableRow_unlink }; static const tid_t HTMLTableRow_iface_tids[] = { @@ -439,10 +470,7 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow); - - /* Share nsrow reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsrow == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsbutton reference with nsnode.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: cf8eacf1c137f2b51f008da253b98b538f7df04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8eacf1c137f2b51f008da25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:48 2014 +0200 mshtml: Don't share nsbutton reference with nsnode. --- dlls/mshtml/htmlinput.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 62eff21..e568f4b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1759,6 +1759,26 @@ static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); } +static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + + if(This->nsbutton) + note_cc_edge((nsISupports*)This->nsbutton, "This->nsbutton", cb); +} + +static void HTMLButtonElement_unlink(HTMLDOMNode *iface) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + + if(This->nsbutton) { + nsIDOMHTMLButtonElement *nsbutton = This->nsbutton; + + This->nsbutton = NULL; + nsIDOMHTMLButtonElement_Release(nsbutton); + } +} + static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLButtonElement_QI, HTMLElement_destructor, @@ -1769,7 +1789,14 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { NULL, NULL, HTMLButtonElementImpl_put_disabled, - HTMLButtonElementImpl_get_disabled + HTMLButtonElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLButtonElement_traverse, + HTMLButtonElement_unlink }; static const tid_t HTMLButtonElement_iface_tids[] = { @@ -1800,10 +1827,7 @@ HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton); - - /* Share nsbutton reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsbutton == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Use UTF-8 encoding in NewURI by default.
by Alexandre Julliard 26 Sep '14

26 Sep '14

Module: wine Branch: master Commit: 857a35e2a7628058d46489918dc2c4eb529ea61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=857a35e2a7628058d46489918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:38:59 2014 +0200 mshtml: Use UTF-8 encoding in NewURI by default. --- dlls/mshtml/nsio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9335428..b5c766c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3343,7 +3343,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } - MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8")) + FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset)); + + MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);

1 0

Hans Leidekker : wininet: Protect the request headers array with a critical section.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 462f56d468984d2d2a3bf3ae21771b64c206eec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462f56d468984d2d2a3bf3ae2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 14:21:37 2014 +0200 wininet: Protect the request headers array with a critical section. --- dlls/wininet/http.c | 181 ++++++++++++++++++++++++++++++++++++++-------- dlls/wininet/internet.h | 3 + dlls/wininet/tests/http.c | 50 +++++++++++++ 3 files changed, 205 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=462f56d468984d2d2a3bf…

1 0

Alexandre Julliard : secur32/tests: Update test for the new certificate on winehq.org.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 0ff2fb8a4f93e4860df839ac9a4873858c85bceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff2fb8a4f93e4860df839ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 25 16:08:05 2014 +0200 secur32/tests: Update test for the new certificate on winehq.org. --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2b68c3d..e868b13 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -517,7 +517,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Stefan Dösinger : d3d8: Return the correct value in CreateAdditionalSwapChain.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 92bcb7476821c0911d9868a4939b069ed11728cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bcb7476821c0911d9868a49… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 25 14:24:17 2014 +0200 d3d8: Return the correct value in CreateAdditionalSwapChain. --- dlls/d3d8/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2e74a41..8ddb0cb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -557,16 +557,17 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; + HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); - if (SUCCEEDED(d3d8_swapchain_create(device, &desc, &object))) + if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); - return D3D_OK; + return hr; } static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource)

1 0

Nikolay Sivov : include: Update dwrite headers to match SDK 8.1.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 59d9a2e16b61d8512f389b34ca63c1a3efae1d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d9a2e16b61d8512f389b34c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 25 10:31:38 2014 +0400 include: Update dwrite headers to match SDK 8.1. --- include/dwrite.idl | 52 +++++++++++++++++++++++++++++++--------------------- include/winerror.h | 14 ++++++++++++++ 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index 04c523c..bc530fc 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -63,7 +63,8 @@ typedef enum DWRITE_FONT_FACE_TYPE DWRITE_FONT_FACE_TYPE_TYPE1, DWRITE_FONT_FACE_TYPE_VECTOR, DWRITE_FONT_FACE_TYPE_BITMAP, - DWRITE_FONT_FACE_TYPE_UNKNOWN + DWRITE_FONT_FACE_TYPE_UNKNOWN, + DWRITE_FONT_FACE_TYPE_RAW_CFF } DWRITE_FONT_FACE_TYPE; typedef enum DWRITE_FONT_WEIGHT @@ -125,14 +126,17 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT + DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT, + DWRITE_INFORMATIONAL_STRING_FULL_NAME, + DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, + DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS { - DWRITE_FONT_SIMULATIONS_NONE = 0x0000, - DWRITE_FONT_SIMULATIONS_BOLD = 0x0001, - DWRITE_FONT_SIMULATIONS_OBLIQUE = 0x0002 + DWRITE_FONT_SIMULATIONS_NONE, + DWRITE_FONT_SIMULATIONS_BOLD, + DWRITE_FONT_SIMULATIONS_OBLIQUE } DWRITE_FONT_SIMULATIONS; typedef enum DWRITE_PIXEL_GEOMETRY @@ -146,11 +150,15 @@ typedef enum DWRITE_RENDERING_MODE { DWRITE_RENDERING_MODE_DEFAULT, DWRITE_RENDERING_MODE_ALIASED, - DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC, - DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL, - DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL, - DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC, - DWRITE_RENDERING_MODE_OUTLINE + DWRITE_RENDERING_MODE_GDI_CLASSIC, + DWRITE_RENDERING_MODE_GDI_NATURAL, + DWRITE_RENDERING_MODE_NATURAL, + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, + DWRITE_RENDERING_MODE_OUTLINE, + DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC = DWRITE_RENDERING_MODE_GDI_CLASSIC, + DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL = DWRITE_RENDERING_MODE_GDI_NATURAL, + DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL = DWRITE_RENDERING_MODE_NATURAL, + DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC = DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC } DWRITE_RENDERING_MODE; typedef enum DWRITE_TEXT_ALIGNMENT @@ -171,18 +179,26 @@ typedef enum DWRITE_PARAGRAPH_ALIGNMENT typedef enum DWRITE_WORD_WRAPPING { DWRITE_WORD_WRAPPING_WRAP, - DWRITE_WORD_WRAPPING_NO_WRAP + DWRITE_WORD_WRAPPING_NO_WRAP, + DWRITE_WORD_WRAPPING_EMERGENCY_BREAK, + DWRITE_WORD_WRAPPING_WHOLE_WORD, + DWRITE_WORD_WRAPPING_CHARACTER } DWRITE_WORD_WRAPPING; typedef enum DWRITE_READING_DIRECTION { DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, - DWRITE_READING_DIRECTION_RIGHT_TO_LEFT + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + DWRITE_READING_DIRECTION_TOP_TO_BOTTOM, + DWRITE_READING_DIRECTION_BOTTOM_TO_TOP } DWRITE_READING_DIRECTION; typedef enum DWRITE_FLOW_DIRECTION { - DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM + DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM, + DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP, + DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT, + DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT } DWRITE_FLOW_DIRECTION; typedef enum DWRITE_TRIMMING_GRANULARITY @@ -286,6 +302,8 @@ typedef enum DWRITE_FONT_FEATURE_TAG DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS = 0x64617274, /* 'trad' */ DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS = 0x64697774, /* 'twid' */ DWRITE_FONT_FEATURE_TAG_UNICASE = 0x63696e75, /* 'unic' */ + DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING = 0x74726576, /* 'vert' */ + DWRITE_FONT_FEATURE_TAG_VERTICAL_ALTERNATES_AND_ROTATION= 0x32747276, /* 'vrt2' */ DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO = 0x6f72657a, /* 'zero' */ } DWRITE_FONT_FEATURE_TAG; @@ -1413,11 +1431,3 @@ cpp_quote("#define FACILITY_DWRITE 0x898") cpp_quote("#define DWRITE_ERR_BASE 0x5000") cpp_quote("#define MAKE_DWRITE_HR(severity, code) MAKE_HRESULT(severity, FACILITY_DWRITE, (DWRITE_ERR_BASE + code))") cpp_quote("#define MAKE_DWRITE_HR_ERR(code) MAKE_DWRITE_HR(SEVERITY_ERROR, code)") - -cpp_quote("#define DWRITE_E_FILEFORMAT MAKE_DWRITE_HR_ERR(0x0)") -cpp_quote("#define DWRITE_E_UNEXPECTED MAKE_DWRITE_HR_ERR(0x1)") -cpp_quote("#define DWRITE_E_NOFONT MAKE_DWRITE_HR_ERR(0x2)") -cpp_quote("#define DWRITE_E_FILENOTFOUND MAKE_DWRITE_HR_ERR(0x3)") -cpp_quote("#define DWRITE_E_FILEACCESS MAKE_DWRITE_HR_ERR(0x4)") -cpp_quote("#define DWRITE_E_FONTCOLLECTIONOBSOLETE MAKE_DWRITE_HR_ERR(0x5)") -cpp_quote("#define DWRITE_E_ALREADYREGISTERED MAKE_DWRITE_HR_ERR(0x6)") diff --git a/include/winerror.h b/include/winerror.h index 3c3a53b..2958cbd 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2995,6 +2995,20 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000) +#define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001) +#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002) +#define DWRITE_E_FILENOTFOUND _HRESULT_TYPEDEF_(0x88985003) +#define DWRITE_E_FILEACCESS _HRESULT_TYPEDEF_(0x88985004) +#define DWRITE_E_FONTCOLLECTIONOBSOLETE _HRESULT_TYPEDEF_(0x88985005) +#define DWRITE_E_ALREADYREGISTERED _HRESULT_TYPEDEF_(0x88985006) +#define DWRITE_E_CACHEFORMAT _HRESULT_TYPEDEF_(0x88985007) +#define DWRITE_E_CACHEVERSION _HRESULT_TYPEDEF_(0x88985008) +#define DWRITE_E_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88985009) +#define DWRITE_E_TEXTRENDERERINCOMPATIBLE _HRESULT_TYPEDEF_(0x8898500A) +#define DWRITE_E_FLOWDIRECTIONCONFLICTS _HRESULT_TYPEDEF_(0x8898500B) +#define DWRITE_E_NOCOLOR _HRESULT_TYPEDEF_(0x8898500C) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002)

1 0

Jacek Caban : mshtml: Don't share nsanchor reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 29205426a7aeef6d5826ea86a68b9a1fb1d36dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29205426a7aeef6d5826ea86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:10:55 2014 +0200 mshtml: Don't share nsanchor reference with nsnode. --- dlls/mshtml/htmlanchor.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 0de0585..3057f35 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -737,13 +737,44 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } +static void HTMLAnchorElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsanchor) + note_cc_edge((nsISupports*)This->nsanchor, "This->nsanchor", cb); +} + +static void HTMLAnchorElement_unlink(HTMLDOMNode *iface) +{ + HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsanchor) { + nsIDOMHTMLAnchorElement *nsanchor = This->nsanchor; + + This->nsanchor = NULL; + nsIDOMHTMLAnchorElement_Release(nsanchor); + } +} + static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLAnchorElement_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLAnchorElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLAnchorElement_traverse, + HTMLAnchorElement_unlink }; static const tid_t HTMLAnchorElement_iface_tids[] = { @@ -775,10 +806,7 @@ HRESULT HTMLAnchorElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLAnchorElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLAnchorElement, (void**)&ret->nsanchor); - - /* Shere the reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsanchor == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsselect reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: cac39acbe3c66bb5319aab6e31e043af6e811b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac39acbe3c66bb5319aab6e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:06 2014 +0200 mshtml: Don't share nsselect reference with nsnode. --- dlls/mshtml/htmlselect.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 08a374a..3cdf496 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -615,6 +615,26 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return S_OK; } +static void HTMLSelectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsselect) + note_cc_edge((nsISupports*)This->nsselect, "This->nsselect", cb); +} + +static void HTMLSelectElement_unlink(HTMLDOMNode *iface) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsselect) { + nsIDOMHTMLSelectElement *nsselect = This->nsselect; + + This->nsselect = NULL; + nsIDOMHTMLSelectElement_Release(nsselect); + } +} + static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, HTMLElement_destructor, @@ -629,7 +649,10 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { NULL, NULL, HTMLSelectElement_get_dispid, - HTMLSelectElement_invoke + HTMLSelectElement_invoke, + NULL, + HTMLSelectElement_traverse, + HTMLSelectElement_unlink }; static const tid_t HTMLSelectElement_tids[] = { @@ -661,10 +684,7 @@ HRESULT HTMLSelectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLSelectElement, (void**)&ret->nsselect); - - /* Share nsselect reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsselect == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0