January 2019 - Wine-Commits

Nikolay Sivov : dwrite: Remove special case for vertical variants.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 27aef423d834b5f93c16a821e03db6d4a0973008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27aef423d834b5f93c16a821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:39 2019 +0300 dwrite: Remove special case for vertical variants. This should be implemented as a part of shaping pass. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 69e6b11..a1d9f25 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1161,9 +1161,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, DWRITE_NUMBER_SUBSTITUTION_METHOD method; struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; - BOOL update_cluster, need_vertical; WCHAR digits[NATIVE_DIGITS_LEN]; - IDWriteFontFace1 *fontface1; + BOOL update_cluster; WCHAR *string; UINT32 i, g; HRESULT hr = S_OK; @@ -1225,12 +1224,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, glyph_props[i].reserved = 0; } - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - if (FAILED(hr)) - WARN("failed to get IDWriteFontFace1\n"); - - need_vertical = is_sideways && fontface1 && IDWriteFontFace1_HasVerticalGlyphVariants(fontface1); - for (i = 0, g = 0, update_cluster = FALSE; i < length; i++) { UINT32 codepoint; @@ -1245,14 +1238,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (FAILED(hr)) goto done; - if (need_vertical) { - UINT16 vertical; - - hr = IDWriteFontFace1_GetVerticalGlyphVariants(fontface1, 1, &glyph_indices[g], &vertical); - if (hr == S_OK) - glyph_indices[g] = vertical; - } - g++; } else { @@ -1294,8 +1279,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: - if (fontface1) - IDWriteFontFace1_Release(fontface1); release_scriptshaping_cache(cache); heap_free(string);

1 0

Matteo Bruni : d3dx9: Improve D3DXMatrixTransformation2D().
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: dba1304bdde9639b01fa7b1e93cce1a298999b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba1304bdde9639b01fa7b1e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:01 2019 +0100 d3dx9: Improve D3DXMatrixTransformation2D(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 98 +++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 62 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 02e917d..08e51b7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -810,79 +810,53 @@ D3DXMATRIX * WINAPI D3DXMatrixTransformation(D3DXMATRIX *out, const D3DXVECTOR3 return out; } -D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, const D3DXVECTOR2 *pscaling, const D3DXVECTOR2 *protationcenter, FLOAT rotation, const D3DXVECTOR2 *ptranslation) +static void vec3_from_vec2(D3DXVECTOR3 *v3, const D3DXVECTOR2 *v2) { - D3DXQUATERNION rot, sca_rot; - D3DXVECTOR3 rot_center, sca, sca_center, trans; + if (!v2) + return; - TRACE("pout %p, pscalingcenter %p, scalingrotation %f, pscaling %p, protztioncenter %p, rotation %f, ptranslation %p\n", - pout, pscalingcenter, scalingrotation, pscaling, protationcenter, rotation, ptranslation); + v3->x = v2->x; + v3->y = v2->y; + v3->z = 0.0f; +} - if ( pscalingcenter ) - { - sca_center.x=pscalingcenter->x; - sca_center.y=pscalingcenter->y; - sca_center.z=0.0f; - } - else - { - sca_center.x=0.0f; - sca_center.y=0.0f; - sca_center.z=0.0f; - } +D3DXMATRIX * WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *out, const D3DXVECTOR2 *scaling_center, + float scaling_rotation, const D3DXVECTOR2 *scaling, const D3DXVECTOR2 *rotation_center, + float rotation, const D3DXVECTOR2 *translation) +{ + D3DXVECTOR3 r_c, s, s_c, t; + D3DXQUATERNION r, s_r; - if ( pscaling ) - { - sca.x=pscaling->x; - sca.y=pscaling->y; - sca.z=1.0f; - } - else - { - sca.x=1.0f; - sca.y=1.0f; - sca.z=1.0f; - } + TRACE("out %p, scaling_center %p, scaling_rotation %.8e, scaling %p, rotation_center %p, " + "rotation %.8e, translation %p.\n", + out, scaling_center, scaling_rotation, scaling, rotation_center, rotation, translation); - if ( protationcenter ) - { - rot_center.x=protationcenter->x; - rot_center.y=protationcenter->y; - rot_center.z=0.0f; - } - else - { - rot_center.x=0.0f; - rot_center.y=0.0f; - rot_center.z=0.0f; - } + vec3_from_vec2(&s_c, scaling_center); + vec3_from_vec2(&s, scaling); + if (scaling) + s.z = 1.0f; + vec3_from_vec2(&r_c, rotation_center); + vec3_from_vec2(&t, translation); - if ( ptranslation ) + if (rotation) { - trans.x=ptranslation->x; - trans.y=ptranslation->y; - trans.z=0.0f; + r.w = cosf(rotation / 2.0f); + r.x = 0.0f; + r.y = 0.0f; + r.z = sinf(rotation / 2.0f); } - else + + if (scaling_rotation) { - trans.x=0.0f; - trans.y=0.0f; - trans.z=0.0f; + s_r.w = cosf(scaling_rotation / 2.0f); + s_r.x = 0.0f; + s_r.y = 0.0f; + s_r.z = sinf(scaling_rotation / 2.0f); } - rot.w=cosf(rotation/2.0f); - rot.x=0.0f; - rot.y=0.0f; - rot.z=sinf(rotation/2.0f); - - sca_rot.w=cosf(scalingrotation/2.0f); - sca_rot.x=0.0f; - sca_rot.y=0.0f; - sca_rot.z=sinf(scalingrotation/2.0f); - - D3DXMatrixTransformation(pout, &sca_center, &sca_rot, &sca, &rot_center, &rot, &trans); - - return pout; + return D3DXMatrixTransformation(out, scaling_center ? &s_c : NULL, + scaling_rotation ? &s_r : NULL, scaling ? &s : NULL, rotation_center ? &r_c: NULL, + rotation ? &r : NULL, translation ? &t : NULL); } D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z)

1 0

Jacek Caban : rpcrt4: Fix context handle return value marshaling.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: b6c48de699a11097b9557d045c0aa78758d615a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c48de699a11097b9557d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:16 2019 +0100 rpcrt4: Fix context handle return value marshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c2f260c..813d7e8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1232,6 +1232,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, { NDR_SCONTEXT ctxt = NdrContextHandleInitialize(pStubMsg, pTypeFormat); *(void **)pArg = NDRSContextValue(ctxt); + if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)NDRSContextValue(ctxt); } else { @@ -1243,6 +1244,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, } } } + if (!retval_ptr && params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; break; case STUBLESS_UNMARSHAL: if (params[i].attr.ServerAllocSize) @@ -1260,9 +1262,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); - - /* make a note of the address of the return value parameter for later */ - if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; } return retval_ptr; }

1 0

Jacek Caban : rpcrt4: Fix context handle return value unmarshaling.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 464ba54b4cc99e1c1903a189f31845352a9faeba URL: https://source.winehq.org/git/wine.git/?a=commit;h=464ba54b4cc99e1c1903a189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:23 2019 +0100 rpcrt4: Fix context handle return value unmarshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 77bbf98..d71d2fa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7031,10 +7031,15 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( if (pStubMsg->IsClient) { + NDR_CCONTEXT *ccontext; + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + ccontext = *(NDR_CCONTEXT **)ppMemory; + else + ccontext = (NDR_CCONTEXT *)ppMemory; /* [out]-only or [ret] param */ if ((pFormat[1] & (HANDLE_PARAM_IS_IN|HANDLE_PARAM_IS_OUT)) == HANDLE_PARAM_IS_OUT) - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + *ccontext = NULL; + NdrClientContextUnmarshall(pStubMsg, ccontext, pStubMsg->RpcMsg->Handle); } else {

1 0

Jacek Caban : mshtml: Expose IDOMCustomEvent to scripts.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 7c2ec67d1eea4f5c4bcb71320c89eba940b4c42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c2ec67d1eea4f5c4bcb7132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:29 2019 +0100 mshtml: Expose IDOMCustomEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/tests/events.js | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1403542..c0171c8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2211,6 +2211,18 @@ static dispex_static_data_t DOMKeyboardEvent_dispex = { DOMKeyboardEvent_iface_tids }; +static const tid_t DOMCustomEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMCustomEvent_tid, + 0 +}; + +static dispex_static_data_t DOMCustomEvent_dispex = { + NULL, + DispDOMCustomEvent_tid, + DOMCustomEvent_iface_tids +}; + static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) { nsISupports *iface; @@ -2243,6 +2255,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) custom_event->event.query_interface = DOMCustomEvent_query_interface; custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; + dispex_data = &DOMCustomEvent_dispex; }else if(!event) { event = heap_alloc_zero(sizeof(*event)); if(!event) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index dc9ce5a..46077b2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -769,6 +769,20 @@ function test_keyboard_event() { next_test(); } +function test_custom_event() { + var e = document.createEvent("CustomEvent"); + + ok(e.detail === undefined, "detail = " + e.detail); + + e.initCustomEvent("test", true, false, 123); + ok(e.type === "test", "type = " + e.type); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.cancelable === false, "cancelable = " + e.cancelable); + ok(e.detail === 123, "detail = " + e.detail); + + next_test(); +} + function test_error_event() { document.body.innerHTML = '<div><img></img></div>'; var div = document.body.firstChild; @@ -822,6 +836,7 @@ var tests = [ test_ui_event, test_mouse_event, test_keyboard_event, + test_custom_event, test_error_event, test_detached_img_error_event, test_time_stamp,

1 0

Nikolay Sivov : dwrite: Use array for script tags.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 17e9560e361d4077a7a9c38fd4193715126fe3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e9560e361d4077a7a9c38f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:37 2019 +0300 dwrite: Use array for script tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 293 +++++++++++++++++++++++++------------------------ 1 file changed, 147 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17e9560e361d4077a7a9…

1 0

Nikolay Sivov : dwrite: Use helper to trace 4 byte tags.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 95a83bc942cee73772a8e74d44931b886d222d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a83bc942cee73772a8e74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:38 2019 +0300 dwrite: Use helper to trace 4 byte tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 15 +++++++-------- dlls/dwrite/dwrite_private.h | 5 +++++ dlls/dwrite/font.c | 5 ----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c6bcdfa..69e6b11 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -192,8 +192,7 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last const char *debugstr_sa_script(UINT16 script) { - return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): - "undefined"; + return script < Script_LastId ? debugstr_tag(dwritescripts_properties[script].props.isoScriptCode) : "undefined"; } /* system font falback configuration */ @@ -1054,7 +1053,7 @@ done: static UINT32 get_opentype_language(const WCHAR *locale) { - UINT32 language = DWRITE_FONT_FEATURE_TAG_DEFAULT; + UINT32 language = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); if (locale) { WCHAR tag[5]; @@ -1145,7 +1144,7 @@ static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **feat for (i = 0, start = 0; i < feature_ranges; start += feature_range_lengths[i++]) { TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); for (j = 0; j < features[i]->featureCount; j++) - TRACE("feature %s, parameter %u\n", debugstr_an((char *)&features[i]->features[j].nameTag, 4), + TRACE("feature %s, parameter %u\n", debugstr_tag(features[i]->features[j].nameTag), features[i]->features[j].parameter); } } @@ -1836,11 +1835,11 @@ static HRESULT WINAPI dwritetextanalyzer2_GetTypographicFeatures(IDWriteTextAnal }; static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAnalyzer2 *iface, - IDWriteFontFace *face, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *localeName, - DWRITE_FONT_FEATURE_TAG feature, UINT32 glyph_count, const UINT16 *indices, UINT8 *feature_applies) + IDWriteFontFace *face, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *locale, DWRITE_FONT_FEATURE_TAG feature, + UINT32 glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) { - FIXME("(%p %u %s %x %u %p %p): stub\n", face, sa.script, debugstr_w(localeName), feature, glyph_count, indices, - feature_applies); + FIXME("(%p %u %s %s %u %p %p): stub\n", face, sa.script, debugstr_w(locale), debugstr_tag(feature), glyph_count, + glyphs, feature_applies); return E_NOTIMPL; } diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a19380a..b8fb250 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -76,6 +76,11 @@ static inline const char *debugstr_matrix(const DWRITE_MATRIX *m) m->dx, m->dy); } +static inline const char *debugstr_tag(DWORD tag) +{ + return debugstr_an((char *)&tag, 4); +} + const char *debugstr_sa_script(UINT16) DECLSPEC_HIDDEN; static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 97b99f9..c657eeb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -320,11 +320,6 @@ static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReferenc return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference_iface); } -static inline const char *debugstr_tag(UINT32 tag) -{ - return debugstr_an((char*)&tag, 4); -} - static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { static const DWRITE_GLYPH_METRICS nil;

1 0

Nikolay Sivov : dwrite/layout: Improve overhangs metrics computation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: d933afc4a495add700c17678f23d0615ed9a79de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d933afc4a495add700c17678… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:40 2019 +0300 dwrite/layout: Improve overhangs metrics computation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 9 ++++---- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 4 ++-- dlls/dwrite/layout.c | 51 ++++++++++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index b8fb250..6ee59cf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -252,13 +252,14 @@ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLS extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; /* FreeType integration */ -struct dwrite_glyphbitmap { +struct dwrite_glyphbitmap +{ IDWriteFontFace4 *fontface; DWORD simulations; - FLOAT emsize; + float emsize; BOOL nohint; BOOL aliased; - UINT16 index; + UINT16 glyph; INT pitch; RECT bbox; BYTE *buf; @@ -276,7 +277,7 @@ extern UINT16 freetype_get_glyphcount(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern void freetype_get_glyphs(IDWriteFontFace4*,INT,UINT32 const*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace4*,UINT16,UINT16) DECLSPEC_HIDDEN; -extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; +extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap_desc) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; extern INT freetype_get_charmap_index(IDWriteFontFace4*,BOOL*) DECLSPEC_HIDDEN; extern INT32 freetype_get_glyph_advance(IDWriteFontFace4*,FLOAT,UINT16,DWRITE_MEASURING_MODE,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c657eeb..b10096d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5060,7 +5060,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a RECT *bbox = &glyph_bitmap.bbox; UINT32 bitmap_size; - glyph_bitmap.index = analysis->run.glyphIndices[i]; + glyph_bitmap.glyph = analysis->run.glyphIndices[i]; freetype_get_glyph_bbox(&glyph_bitmap); bitmap_size = get_glyph_bitmap_pitch(analysis->rendering_mode, bbox->right - bbox->left) * @@ -5161,7 +5161,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) int x, y, width, height; BOOL is_1bpp; - glyph_bitmap.index = analysis->run.glyphIndices[i]; + glyph_bitmap.glyph = analysis->run.glyphIndices[i]; freetype_get_glyph_bbox(&glyph_bitmap); if (IsRectEmpty(bbox)) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index ffdd8a8..d303653 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -686,7 +686,7 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) imagetype.height = bitmap->emsize; imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; - if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->index, &glyph, NULL) == 0) { + if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->glyph, &glyph, NULL) == 0) { if (needs_transform) { FT_Glyph glyph_copy; @@ -844,7 +844,7 @@ BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) imagetype.height = bitmap->emsize; imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; - if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->index, &glyph, NULL) == 0) { + if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->glyph, &glyph, NULL) == 0) { FT_Glyph glyph_copy; if (needs_transform) { diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a562927..f27fe9f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3604,16 +3604,6 @@ static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout3 *iface, DWR return hr; } -static void scale_glyph_bbox(RECT *bbox, FLOAT emSize, UINT16 units_per_em, D2D1_RECT_F *ret) -{ -#define SCALE(x) ((FLOAT)x * emSize / (FLOAT)units_per_em) - ret->left = SCALE(bbox->left); - ret->right = SCALE(bbox->right); - ret->top = SCALE(bbox->top); - ret->bottom = SCALE(bbox->bottom); -#undef SCALE -} - static void d2d_rect_offset(D2D1_RECT_F *rect, FLOAT x, FLOAT y) { rect->left += x; @@ -3652,27 +3642,46 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout const struct regular_layout_run *regular = &run->run->u.regular; UINT32 start_glyph = regular->clustermap[run->start]; const DWRITE_GLYPH_RUN *glyph_run = &regular->run; - DWRITE_FONT_METRICS font_metrics; D2D1_POINT_2F origin = { 0 }; + float rtl_factor; UINT32 i; - if (run->bbox.top == run->bbox.bottom) { - IDWriteFontFace_GetMetrics(glyph_run->fontFace, &font_metrics); + if (run->bbox.top == run->bbox.bottom) + { + struct dwrite_glyphbitmap glyph_bitmap; + RECT *bbox; + + memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); + glyph_bitmap.fontface = (IDWriteFontFace4 *)glyph_run->fontFace; + glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run->fontFace); + glyph_bitmap.emsize = glyph_run->fontEmSize; + glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL; + + bbox = &glyph_bitmap.bbox; + rtl_factor = glyph_run->bidiLevel & 1 ? -1.0f : 1.0f; for (i = 0; i < run->glyphcount; i++) { D2D1_RECT_F glyph_bbox; - RECT design_bbox; - freetype_get_design_glyph_bbox((IDWriteFontFace4 *)glyph_run->fontFace, font_metrics.designUnitsPerEm, - glyph_run->glyphIndices[i + start_glyph], &design_bbox); + /* FIXME: take care of vertical/rtl */ + if (glyph_run->bidiLevel & 1) + origin.x -= glyph_run->glyphAdvances[i + start_glyph]; + + glyph_bitmap.glyph = glyph_run->glyphIndices[i + start_glyph]; + freetype_get_glyph_bbox(&glyph_bitmap); + + glyph_bbox.left = bbox->left; + glyph_bbox.top = bbox->top; + glyph_bbox.right = bbox->right; + glyph_bbox.bottom = bbox->bottom; + + d2d_rect_offset(&glyph_bbox, origin.x + rtl_factor * glyph_run->glyphOffsets[i + start_glyph].advanceOffset, + origin.y - glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); - scale_glyph_bbox(&design_bbox, glyph_run->fontEmSize, font_metrics.designUnitsPerEm, &glyph_bbox); - d2d_rect_offset(&glyph_bbox, origin.x + glyph_run->glyphOffsets[i + start_glyph].advanceOffset, - origin.y + glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); d2d_rect_union(&run->bbox, &glyph_bbox); - /* FIXME: take care of vertical/rtl */ - origin.x += glyph_run->glyphAdvances[i + start_glyph]; + if (!(glyph_run->bidiLevel & 1)) + origin.x += glyph_run->glyphAdvances[i + start_glyph]; } }

1 0

Gijs Vermeulen : msvcp: Set target to null on error in _Open_dir.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: b51cee00a7bfdfb44d88f500eceb9d1c5fd8193a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51cee00a7bfdfb44d88f500… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jan 25 17:51:41 2019 +0100 msvcp: Set target to null on error in _Open_dir. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp140/tests/msvcp140.c | 8 ++++---- dlls/msvcp90/ios.c | 6 ++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6d72f9f..534c015 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1792,7 +1792,7 @@ static void test_tr2_sys__dir_operation(void) while(lstrlenA(longer_path) < MAX_PATH-1) strcat(longer_path, "s"); ok(lstrlenA(longer_path) == MAX_PATH-1, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", lstrlenA(longer_path)); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_tr2_sys__Open_dir(first_file_name, longer_path, &err, &type); @@ -1801,7 +1801,7 @@ static void test_tr2_sys__dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); memset(dest, 0, MAX_PATH); err = type = 0xdeadbeef; result_handle = NULL; @@ -1832,7 +1832,7 @@ static void test_tr2_sys__dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); @@ -1842,7 +1842,7 @@ static void test_tr2_sys__dir_operation(void) ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); CreateDirectoryA("empty_dir", NULL); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1bae2b9..b2bdafa 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -938,7 +938,7 @@ static void test_dir_operation(void) wcscat(longer_path, backslashW); while(lstrlenW(longer_path) < MAX_PATH-1) wcscat(longer_path, sW); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_Open_dir(first_file_name, longer_path, &err, &type); @@ -947,7 +947,7 @@ static void test_dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); memset(dest, 0, sizeof(dest)); err = type = 0xdeadbeef; result_handle = NULL; @@ -978,7 +978,7 @@ static void test_dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); @@ -988,7 +988,7 @@ static void test_dir_operation(void) ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); CreateDirectoryW(empty_dirW, NULL); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, empty_dirW, &err, &type); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 32bd2e7..743e4ca 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14976,6 +14976,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } wcscpy(temppath, dest); @@ -14984,12 +14985,14 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; + *target = '\0'; FindClose(handle); return NULL; } @@ -15023,8 +15026,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); - if (handle) - WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); return handle; }

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoAcquireCancelSpinLock().
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 834db731213f669416191cead9632f958275c2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=834db731213f669416191cea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:22 2019 -0600 ntoskrnl.exe: Implement IoAcquireCancelSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2a061f3..994cd90 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -776,15 +776,6 @@ void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) FIXME("(%p): stub\n", FastMutex); } - -/*********************************************************************** - * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) -{ - FIXME("(%p): stub\n", irql); -} - /*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 36282fe..c46d7f5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -417,6 +417,15 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) static KSPIN_LOCK cancel_lock; /*********************************************************************** + * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoAcquireCancelSpinLock( KIRQL *irql ) +{ + TRACE("irql %p.\n", irql); + KeAcquireSpinLock( &cancel_lock, irql ); +} + +/*********************************************************************** * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) */ void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1c12c1e..a9bdd3d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1388,6 +1388,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN);

1 0