wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Michael Stefaniuc : quartz: Remove some unused assignments (PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 33136293baca8f82535ed13386b2a9112ffc4727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33136293baca8f82535ed1338… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:34 2015 +0100 quartz: Remove some unused assignments (PVS-Studio). --- dlls/quartz/avisplit.c | 5 ++--- dlls/quartz/mpegsplit.c | 3 +-- dlls/quartz/pin.c | 1 - dlls/quartz/waveparser.c | 6 +++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ee03e08..ccb4cec 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -260,8 +260,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (rtSampleStart != rtSampleStop) { - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) @@ -338,7 +337,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, } rtstart = (double)(start - pin->pin.pin.tStart) / pin->pin.pin.dRate; rtstop = (double)(stop - pin->pin.pin.tStart) / pin->pin.pin.dRate; - hr = IMediaSample_SetMediaTime(sample, &start, &stop); + IMediaSample_SetMediaTime(sample, &start, &stop); IMediaSample_SetTime(sample, &rtstart, &rtstop); IMediaSample_SetMediaTime(sample, &start, &stop); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 6f09822..1ed352b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -708,8 +708,7 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 73b6306..78b6fa2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -75,7 +75,6 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info ); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 113a461..2ceb0fd 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -117,7 +117,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; @@ -290,7 +290,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, amt.cbFormat = chunk.cb; amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); + IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); amt.subtype = MEDIATYPE_Audio; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; @@ -376,7 +376,7 @@ static HRESULT WAVEParser_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop;

1 0

Michael Stefaniuc : qedit: Remove an unused and wrong assignment ( PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 552037c92599d0212875410b33811effe0a4255d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552037c92599d0212875410b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:05 2015 +0100 qedit: Remove an unused and wrong assignment (PVS-Studio). --- dlls/qedit/mediadet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3d79107..9098223 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -658,7 +658,6 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->cur_pin = NULL; obj->num_streams = -1; obj->cur_stream = 0; - *ppv = obj; if (pUnkOuter) obj->outer_unk = pUnkOuter;

1 0

Michael Stefaniuc : oleaut32: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 54aaa16d8ffe0ca37b37be291a3c496f2885fa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54aaa16d8ffe0ca37b37be291… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 11:59:34 2015 +0100 oleaut32: Remove an unused assignment (PVS-Studio). --- dlls/oleaut32/tmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b812215..89dc894 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -198,8 +198,6 @@ _marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) { return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } - hres = E_FAIL; - TRACE("...%s...\n",debugstr_guid(riid)); hres = CreateStreamOnHGlobal(0,TRUE,&pStm);

1 0

Jacek Caban : winegecko.php: Added Wine Gecko 2.36-beta1 release.
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: tools Branch: master Commit: 72c348695b85eab57eb35eaaea5eadacb2b5195b URL: http://source.winehq.org/git/tools.git/?a=commit;h=72c348695b85eab57eb35eaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 21 15:55:20 2015 +0100 winegecko.php: Added Wine Gecko 2.36-beta1 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index eaa1f22..b2135a6 100644 --- a/winegecko.php +++ b/winegecko.php @@ -84,7 +84,9 @@ $aFileSizes = array( '2.34-beta2-x86'=>28270080, '2.34-beta2-x86_64'=>29807616, '2.34-x86'=>28269568, - '2.34-x86_64'=>29802496 + '2.34-x86_64'=>29802496, + '2.36-beta1-x86'=>29698560, + '2.36-beta1-x86_64'=>31211008 ); // Exact size of the file:

1 0

Nikolay Sivov : msxml3: Remove child node in one place in node_insert_before().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: fd925d0e5b477f8b99260596b88b33a85770cf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd925d0e5b477f8b99260596b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 17 20:22:48 2015 +0300 msxml3: Remove child node in one place in node_insert_before(). --- dlls/msxml3/node.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 47d3159..92063be 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -477,15 +477,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlnode *before_node_obj = get_node_obj(before); IXMLDOMNode_Release(before); if(!before_node_obj) return E_FAIL; + } - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } + /* unlink from current parent first */ + if(node_obj->parent) + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; - doc = node_obj->node->doc; + if(before) + { + xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ if (doc != before_node_obj->node->doc) @@ -498,14 +502,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT } else { - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } - doc = node_obj->node->doc; - if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj);

1 0

Nikolay Sivov : hnetcfg: Release typeinfos and typelib on dll unload.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 4782be7e31c1a605d5dc5ea619a06ddcec75e26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4782be7e31c1a605d5dc5ea61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 13:39:22 2015 +0300 hnetcfg: Release typeinfos and typelib on dll unload. --- dlls/hnetcfg/apps.c | 12 ++++++++++++ dlls/hnetcfg/hnetcfg.c | 8 ++++++-- dlls/hnetcfg/hnetcfg_private.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index a0530e1..d21ed98 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -148,6 +148,18 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +void release_typelib(void) +{ + unsigned i; + + for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + if (typeinfo[i]) + ITypeInfo_Release(typeinfo[i]); + + if (typelib) + ITypeLib_Release(typelib); +} + static HRESULT WINAPI fw_app_GetTypeInfo( INetFwAuthorizedApplication *iface, UINT iTInfo, diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 809b540..fadd367 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -114,9 +114,9 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_WINE_PREATTACH: @@ -125,6 +125,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE; } diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 1045347..6fe69d5 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -28,6 +28,7 @@ enum type_id }; HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; +void release_typelib(void) DECLSPEC_HIDDEN; HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite/tests: Additional test for Draw().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: aef50786fb5df36002cf06426ed53fb29208916f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef50786fb5df36002cf06426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 08:13:12 2015 +0300 dwrite/tests: Additional test for Draw(). --- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1a1cfd9..760c34f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,7 +785,17 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_LAST_KIND } }; -static void test_draw_sequence(void) +static const struct drawcall_entry draw_seq2[] = { + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_LAST_KIND } +}; + +static void test_Draw(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; @@ -831,9 +841,20 @@ static void test_draw_sequence(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); + IDWriteTextLayout_Release(layout); + + /* with reduced width DrawGlyphRun() is called for every line */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 5.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); - IDWriteTextFormat_Release(format); IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); } static void test_typography(void) @@ -1010,7 +1031,7 @@ START_TEST(layout) test_CreateEllipsisTrimmingSign(); test_fontweight(); test_SetInlineObject(); - test_draw_sequence(); + test_Draw(); test_typography(); test_GetClusterMetrics(); test_SetLocaleName();

1 0

Nikolay Sivov : dwrite: Implement GetClusterMetrics().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: e292385fcd80c897ebff3f17f3a85400c4a6a149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292385fcd80c897ebff3f17f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 13:56:27 2015 +0300 dwrite: Implement GetClusterMetrics(). --- dlls/dwrite/layout.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 785ded8..88a83cc 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1704,13 +1704,17 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); HRESULT hr; - FIXME("(%p)->(%p %u %p): stub\n", This, metrics, max_count, count); + TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); hr = layout_compute(This); if (FAILED(hr)) return hr; - return E_NOTIMPL; + if (metrics) + memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + + *count = This->clusters_count; + return max_count < This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width)

1 0

Nikolay Sivov : dwrite: Initial support of cluster metrics computation.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 0ee49eb4c882552a0a2ab17e24bd8efe8086d610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee49eb4c882552a0a2ab17e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 00:03:31 2015 +0300 dwrite: Initial support of cluster metrics computation. --- dlls/dwrite/layout.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index beb97b3..785ded8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -134,6 +134,9 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; + DWRITE_CLUSTER_METRICS *clusters; + UINT32 clusters_count; + /* gdi-compatible layout specifics */ BOOL gdicompatible; FLOAT pixels_per_dip; @@ -206,6 +209,12 @@ static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypog return CONTAINING_RECORD(iface, struct dwrite_typography, IDWriteTypography_iface); } +static inline const char *debugstr_run(const struct layout_run *run) +{ + return wine_dbg_sprintf("[%u,%u]", run->descr.textPosition, run->descr.textPosition + + run->descr.stringLength); +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -254,7 +263,7 @@ static void free_layout_runs(struct dwrite_textlayout *layout) } } -/* should only be called for ranges with inline objects */ +/* Used to resolve break condition by forcing stronger condition over weaker. */ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDITION existingbreak, DWRITE_BREAK_CONDITION newbreak) { switch (existingbreak) { @@ -273,6 +282,7 @@ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDI return existingbreak; } +/* Actual breakpoint data gets updated with break condition required by inline object set for range 'cur'. */ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, const struct layout_range *cur) { DWRITE_BREAK_CONDITION before, after; @@ -320,14 +330,75 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); +static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_METRICS *metrics) +{ + metrics->width = 0.0; + metrics->length = 1; + metrics->canWrapLineAfter = FALSE; + metrics->isWhitespace = FALSE; + metrics->isNewline = FALSE; + metrics->isSoftHyphen = FALSE; + metrics->isRightToLeft = run->run.bidiLevel & 1; + metrics->padding = 0; +} + +/* + + All clusters in a 'run' will be added to 'layout' data, starting at index pointed to by 'cluster'. + On return 'cluster' is updated to point to next metrics struct to be filled in on next call. + +*/ +static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *run, UINT32 *cluster) +{ + DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; + UINT16 glyph; + UINT32 i; + + glyph = run->descr.clusterMap[0]; + init_cluster_metrics(run, metrics); + + for (i = 0; i < run->descr.stringLength; i++) { + BOOL newcluster = glyph != run->descr.clusterMap[i]; + + /* add new cluster on starting glyph change or simply when run is over */ + if (newcluster || i == run->descr.stringLength - 1) { + UINT8 breakcondition; + UINT16 j; + + for (j = glyph; j < run->descr.clusterMap[i]; j++) + metrics->width += run->run.glyphAdvances[j]; + + /* FIXME: also set isWhitespace, isNewline and isSoftHyphen */ + breakcondition = newcluster ? layout->nominal_breakpoints[i].breakConditionBefore : + layout->nominal_breakpoints[i].breakConditionAfter; + metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || + breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + + /* advance to next cluster */ + glyph = run->descr.clusterMap[i]; + *cluster += 1; + metrics++; + init_cluster_metrics(run, metrics); + } + else + metrics->length++; + } +} + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; struct layout_range *range; struct layout_run *run; + UINT32 cluster = 0; HRESULT hr; free_layout_runs(layout); + heap_free(layout->clusters); + layout->clusters_count = 0; + layout->clusters = heap_alloc(layout->len*sizeof(DWRITE_CLUSTER_METRICS)); + if (!layout->clusters) + return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); if (FAILED(hr)) @@ -368,8 +439,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); if (FAILED(hr) || !exists) { - WARN("[%u,%u]: family %s not found in collection %p\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, - debugstr_w(range->fontfamily), range->collection); + WARN("%s: family %s not found in collection %p\n", debugstr_run(run), debugstr_w(range->fontfamily), range->collection); continue; } @@ -380,7 +450,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); IDWriteFontFamily_Release(family); if (FAILED(hr)) { - WARN("[%u,%u]: failed to get a matching font\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength); + WARN("%s: failed to get a matching font\n", debugstr_run(run)); continue; } @@ -428,7 +498,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) { heap_free(text_props); heap_free(glyph_props); - WARN("[%u,%u]: shaping failed 0x%08x\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, hr); + WARN("%s: shaping failed 0x%08x\n", debugstr_run(run), hr); continue; } @@ -456,12 +526,14 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) heap_free(text_props); heap_free(glyph_props); if (FAILED(hr)) - WARN("[%u,%u]: failed to get glyph placement info, 0x%08x\n", run->descr.textPosition, - run->descr.textPosition+run->descr.stringLength, hr); + WARN("%s: failed to get glyph placement info, 0x%08x\n", debugstr_run(run), hr); run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; + /* now set cluster metrics */ + layout_set_cluster_metrics(layout, run, &cluster); + continue; memerr: @@ -478,6 +550,9 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } + if (hr == S_OK) + layout->clusters_count = cluster + 1; + IDWriteTextAnalyzer_Release(analyzer); return hr; } @@ -1006,6 +1081,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) release_format_data(&This->format); heap_free(This->nominal_breakpoints); heap_free(This->actual_breakpoints); + heap_free(This->clusters); heap_free(This->str); heap_free(This); } @@ -2127,6 +2203,8 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->recompute = TRUE; layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; + layout->clusters_count = 0; + layout->clusters = NULL; list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); @@ -2147,8 +2225,10 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * goto fail; range = alloc_layout_range(layout, &r); - if (!range) - return E_OUTOFMEMORY; + if (!range) { + hr = E_OUTOFMEMORY; + goto fail; + } list_add_head(&layout->ranges, &range->entry); return S_OK;

1 0

Aric Stewart : gdi32: Do not install fonts with a family name that is too long.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: ecbda5686dfc0bae156fd3cb489369f79ba8fff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbda5686dfc0bae156fd3cb4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 19 08:11:51 2015 -0600 gdi32: Do not install fonts with a family name that is too long. --- dlls/gdi32/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 62e19a5..5122fb5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2024,6 +2024,14 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); + if (strlenW(family->FamilyName) >= LF_FACESIZE) + { + ERR("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); + release_face( face ); + release_family( family ); + return; + } + if (insert_face_in_family_list( face, family )) { if (flags & ADDFONT_ADD_TO_CACHE)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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 January 2015