wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Nikolay Sivov : dwrite: Allow underscores in script names.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: dae9096c2ee265d3fca0895a3ee89bb680751e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae9096c2ee265d3fca0895a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 25 11:56:08 2014 +0400 dwrite: Allow underscores in script names. --- dlls/dwrite/scripts.c | 924 ++++++++++++++++++++++++-------------------------- dlls/dwrite/scripts.h | 162 ++++----- tools/make_unicode | 4 +- 3 files changed, 524 insertions(+), 566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dae9096c2ee265d3fca08…

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextAnalyzer2.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: d58f519c08da13aaf6677371a314e24b031a04f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58f519c08da13aaf6677371a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 25 11:25:52 2014 +0400 dwrite: Update to IDWriteTextAnalyzer2. --- dlls/dwrite/analyzer.c | 149 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/main.c | 1 + 2 files changed, 135 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d58f519c08da13aaf6677…

1 0

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

25 Sep '14

Module: wine Branch: master Commit: b472a1f3f427e4c60fbd4a5d8c44ff86e92a3154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b472a1f3f427e4c60fbd4a5d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:59 2014 +0200 mshtml: Don't share nsobject reference with nsnode. --- dlls/mshtml/htmlobject.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 34c42d5..2a8ccfa 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -704,6 +704,26 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } +static void HTMLObjectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsobject) + note_cc_edge((nsISupports*)This->nsobject, "This->nsobject", cb); +} + +static void HTMLObjectElement_unlink(HTMLDOMNode *iface) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsobject) { + nsIDOMHTMLObjectElement *nsobject = This->nsobject; + + This->nsobject = NULL; + nsIDOMHTMLObjectElement_Release(nsobject); + } +} + static const NodeImplVtbl HTMLObjectElementImplVtbl = { HTMLObjectElement_QI, HTMLObjectElement_destructor, @@ -718,7 +738,10 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { NULL, HTMLObjectElement_get_readystate, HTMLObjectElement_get_dispid, - HTMLObjectElement_invoke + HTMLObjectElement_invoke, + NULL, + HTMLObjectElement_traverse, + HTMLObjectElement_unlink }; static const tid_t HTMLObjectElement_iface_tids[] = { @@ -750,10 +773,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); - - /* Share nsobject reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsobject == ret->plugin_container.element.node.nsnode); - nsIDOMNode_Release(ret->plugin_container.element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->plugin_container.element; return S_OK;

1 0

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

25 Sep '14

Module: wine Branch: master Commit: d2a97e73eb9c05feebe0c0becc67f3c771f3285c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a97e73eb9c05feebe0c0bec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:52 2014 +0200 mshtml: Don't share nscell reference with nsnode. --- dlls/mshtml/htmltablecell.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 4bcde18..3d3fdb2 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -398,13 +398,44 @@ static void HTMLTableCell_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static void HTMLTableCell_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableCell *This = impl_from_HTMLDOMNode(iface); + + if(This->nscell) + note_cc_edge((nsISupports*)This->nscell, "This->nstablecell", cb); +} + +static void HTMLTableCell_unlink(HTMLDOMNode *iface) +{ + HTMLTableCell *This = impl_from_HTMLDOMNode(iface); + + if(This->nscell) { + nsIDOMHTMLTableCellElement *nscell = This->nscell; + + This->nscell = NULL; + nsIDOMHTMLTableCellElement_Release(nscell); + } +} + static const NodeImplVtbl HTMLTableCellImplVtbl = { HTMLTableCell_QI, HTMLTableCell_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, + HTMLTableCell_traverse, + HTMLTableCell_unlink }; static const tid_t HTMLTableCell_iface_tids[] = { @@ -435,10 +466,7 @@ HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, H HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableCell_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableCellElement, (void**)&ret->nscell); - - /* Share nscell reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nscell == 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 nstable reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: e5e0fc30190f31d7bfa00b8160cf042ab78d83cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e0fc30190f31d7bfa00b816… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:42 2014 +0200 mshtml: Don't share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index d938699..8e64efa 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -993,6 +993,26 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLTable_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) + note_cc_edge((nsISupports*)This->nstable, "This->nstable", cb); +} + +static void HTMLTable_unlink(HTMLDOMNode *iface) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) { + nsIDOMHTMLTableElement *nstable = This->nstable; + + This->nstable = NULL; + nsIDOMHTMLTableElement_Release(nstable); + } +} + static const cpc_entry_t HTMLTable_cpc[] = { {&DIID_HTMLTableEvents}, HTMLELEMENT_CPC, @@ -1005,7 +1025,18 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTable_traverse, + HTMLTable_unlink }; static const tid_t HTMLTable_iface_tids[] = { @@ -1040,10 +1071,7 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - - /* Share the reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == 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 nstextarea reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 556b2ad0c5b3504727dd11e3292d0b986367bcf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556b2ad0c5b3504727dd11e32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:32 2014 +0200 mshtml: Don't share nstextarea reference with nsnode. --- dlls/mshtml/htmltextarea.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index e11cb8d..9fb8453 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -411,6 +411,26 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ return IHTMLTextAreaElement_get_disabled(&This->IHTMLTextAreaElement_iface, p); } +static void HTMLTextAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nstextarea) + note_cc_edge((nsISupports*)This->nstextarea, "This->nstextarea", cb); +} + +static void HTMLTextAreaElement_unlink(HTMLDOMNode *iface) +{ + HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nstextarea) { + nsIDOMHTMLTextAreaElement *nstextarea = This->nstextarea; + + This->nstextarea = NULL; + nsIDOMHTMLTextAreaElement_Release(nstextarea); + } +} + static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, HTMLElement_destructor, @@ -421,7 +441,14 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { NULL, NULL, HTMLTextAreaElementImpl_put_disabled, - HTMLTextAreaElementImpl_get_disabled + HTMLTextAreaElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTextAreaElement_traverse, + HTMLTextAreaElement_unlink }; static const tid_t HTMLTextAreaElement_iface_tids[] = { @@ -451,12 +478,8 @@ HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nse HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); - nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, - (void**)&ret->nstextarea); - - /* Share nstextarea reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nstextarea == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, (void**)&ret->nstextarea); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

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

25 Sep '14

Module: wine Branch: master Commit: 01e09bbb47b1779f1d5024da34a5c2b6da3c6407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e09bbb47b1779f1d5024da3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:19 2014 +0200 mshtml: Don't share nsoption reference with nsnode. --- dlls/mshtml/htmloption.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 4738eb5..b5c8b7d 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -311,13 +311,44 @@ static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLOptionElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLOptionElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsoption) + note_cc_edge((nsISupports*)This->nsoption, "This->nsoption", cb); +} + +static void HTMLOptionElement_unlink(HTMLDOMNode *iface) +{ + HTMLOptionElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsoption) { + nsIDOMHTMLOptionElement *nsoption = This->nsoption; + + This->nsoption = NULL; + nsIDOMHTMLOptionElement_Release(nsoption); + } +} + static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLOptionElement_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, + HTMLOptionElement_traverse, + HTMLOptionElement_unlink }; static const tid_t HTMLOptionElement_iface_tids[] = { @@ -347,10 +378,7 @@ HRESULT HTMLOptionElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption); - - /* Share nsoption reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsoption == 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

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

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

← Newer
1
2
3
4
5
6
7
8
9
...
31
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 September 2014