wine-devel November 2020

wine-devel@winehq.org

73 participants
650 discussions

[v2 PATCH 1/3] mf/session: Shutdown and release presentation clock on session shutdown.
by Nikolay Sivov 20 Nov '20

20 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 +++ dlls/mf/tests/mf.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index dffd5113ff9..4821ed5c90a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1792,6 +1792,9 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFMediaEventQueue_Shutdown(session->event_queue); if (session->quality_manager) IMFQualityManager_Shutdown(session->quality_manager); + MFShutdownObject((IUnknown *)session->clock); + IMFPresentationClock_Release(session->clock); + session->clock = NULL; } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a671225a11..27e859fa82d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1188,13 +1188,14 @@ static void test_media_session(void) IMFAttributes *attributes; IMFMediaSession *session; IMFTopology *topology; + IMFShutdown *shutdown; PROPVARIANT propvar; + DWORD status, caps; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; - DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1275,9 +1276,24 @@ todo_wine hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status); + + IMFShutdown_Release(shutdown); + hr = IMFMediaSession_ClearTopologies(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.29.2

1 2

[PATCH] mshtml: Fix spelling of fuchsia.
by Michael Stefaniuc 20 Nov '20

20 Nov '20

Spotted by Rafał Mużyło. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlbody.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fddc4c6da0e..4209fd2cc2e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -52,7 +52,7 @@ static const struct { {L"aqua", 0x00ffff}, {L"black", 0x000000}, {L"blue", 0x0000ff}, - {L"fushsia", 0xff00ff}, + {L"fuchsia", 0xff00ff}, {L"gray", 0x808080}, {L"green", 0x008000}, {L"lime", 0x00ff00}, -- 2.26.2

2 1

[PATCH 1/3] mf/session: Shutdown and release presentation clock on session shutdown.
by Nikolay Sivov 20 Nov '20

20 Nov '20

1 2

[PATCH 2/2] msado15: Implement ADORecordsetConstruction get/put Rowset
by Alistair Leslie-Hughes 20 Nov '20

20 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 31 ++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 8 ++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 79679e455af..17200d73790 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "objbase.h" #include "msado15_backcompat.h" +#include "oledb.h" #include "wine/debug.h" #include "wine/heap.h" @@ -46,6 +47,7 @@ struct recordset VARIANT *data; CursorLocationEnum cursor_location; CursorTypeEnum cursor_type; + IRowset *row_set; }; struct fields @@ -757,6 +759,8 @@ static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + if (!recordset->fields) return; col_count = get_column_count( recordset ); @@ -1611,15 +1615,31 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + + TRACE( "%p, %p\n", recordset, row_set ); + + hr = IRowset_QueryInterface(recordset->row_set, &IID_IUnknown, (void**)row_set); + if ( FAILED(hr) ) return E_FAIL; + + return S_OK; } -static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *unk) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + IRowset *rowset; + + TRACE( "%p, %p\n", recordset, unk ); + + hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); + if ( FAILED(hr) ) return E_FAIL; + + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + recordset->row_set = rowset; + + return S_OK; } static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) @@ -1679,6 +1699,7 @@ HRESULT Recordset_create( void **obj ) recordset->index = -1; recordset->cursor_location = adUseServer; recordset->cursor_type = adOpenForwardOnly; + recordset->row_set = NULL; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 288e579f10c..cafb73d64e4 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -582,17 +582,17 @@ static void test_ADORecordsetConstruction(void) ref = get_refcount( rowset ); ok( ref == 1, "got %d\n", ref ); hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); ok( fields != NULL, "NULL value\n"); ref = get_refcount( rowset ); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); Fields_Release(fields); -- 2.29.2

2 1

[PATCH 1/2] msado15: Support ADORecordsetConstruction in _Recordset
by Alistair Leslie-Hughes 20 Nov '20

20 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 123 +++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 10 +-- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e3dd83a4309..79679e455af 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -35,6 +35,7 @@ struct fields; struct recordset { _Recordset Recordset_iface; + ADORecordsetConstruction ADORecordsetConstruction_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG refs; LONG state; @@ -739,6 +740,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ADORecordsetConstruction( ADORecordsetConstruction *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ADORecordsetConstruction_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -798,6 +804,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_ADORecordsetConstruction )) + { + *obj = &recordset->ADORecordsetConstruction_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -1545,6 +1555,118 @@ static const ISupportErrorInfoVtbl recordset_supporterrorinfo_vtbl = recordset_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI rsconstruction_QueryInterface(ADORecordsetConstruction *iface, + REFIID riid, void **obj) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI rsconstruction_AddRef(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI rsconstruction_Release(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI rsconstruction_GetTypeInfoCount(ADORecordsetConstruction *iface, UINT *pctinfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + TRACE( "%p, %p\n", recordset, pctinfo ); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %d\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_RowPosition(ADORecordsetConstruction *iface, IUnknown **row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_RowPosition(ADORecordsetConstruction *iface, IUnknown *row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static const ADORecordsetConstructionVtbl rsconstruction_vtbl = +{ + rsconstruction_QueryInterface, + rsconstruction_AddRef, + rsconstruction_Release, + rsconstruction_GetTypeInfoCount, + rsconstruction_GetTypeInfo, + rsconstruction_GetIDsOfNames, + rsconstruction_Invoke, + rsconstruction_get_Rowset, + rsconstruction_put_Rowset, + rsconstruction_get_Chapter, + rsconstruction_put_Chapter, + rsconstruction_get_RowPosition, + rsconstruction_put_RowPosition +}; + HRESULT Recordset_create( void **obj ) { struct recordset *recordset; @@ -1552,6 +1674,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; + recordset->ADORecordsetConstruction_iface.lpVtbl = &rsconstruction_vtbl; recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 70c2db7a62d..288e579f10c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -566,7 +566,7 @@ static void test_ADORecordsetConstruction(void) ok( hr == S_OK, "got %08x\n", hr ); hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); if (FAILED(hr)) { goto done; @@ -585,18 +585,18 @@ static void test_ADORecordsetConstruction(void) todo_wine ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); ok( fields != NULL, "NULL value\n"); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 1, "got %d\n", count ); + todo_wine ok( count == 1, "got %d\n", count ); if (count > 0) { VARIANT index; @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); Fields_Release(fields); -- 2.29.2

2 1

[PATCH] gdi32: fix PatBlt() drawing with negative width/height
by Damjan Jovanovic 20 Nov '20

20 Nov '20

In a (x, y, w, h) rectangle passed to PatBlt(), a negative w results in the rectangle drawn being (x+w, y, -w, h), and negative h results in (x, y+h, w, -h). Wine instead does (x+w+1, y, -w, h) and (x, y+h+1, w, -h), so the rectangle drawn is shifted 1 pixel row too far down and/or 1 pixel column too far right. This patch recalculates the rectangle dimensions correctly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27584 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdi32/bitblt.c | 11 +++++++++++ dlls/gdi32/tests/bitmap.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)

2 1

[PATCH] ntdll: Fix SMT CPU flag reporting.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c8d0340f76f..dc6f4d27a8b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -538,8 +538,9 @@ static DWORD count_bits(ULONG_PTR mask) DWORD count = 0; while (mask > 0) { + if (mask & 1) + ++count; mask >>= 1; - count++; } return count; } -- 2.28.0

1 0

[PATCH 1/4] gdi32: Ignore Type 1 fonts in fontconfig enumeration.
by Rémi Bernon 20 Nov '20

20 Nov '20

Instead of loading the font with FreeType to discard it right away. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series brings another ~350ms prefix startup time improvement, with "wine cmd /c exit" execution time going from ~1.25s to ~0.9s on average. dlls/gdi32/freetype.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61397e8b542..7ea96af0a59 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1393,6 +1393,7 @@ static void load_fontconfig_fonts(void) { FcPattern *pat; FcFontSet *fontset; + const char *format; int i, len; char *file; const char *ext; @@ -1428,6 +1429,18 @@ static void load_fontconfig_fonts(void) continue; } + if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); + continue; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); + continue; + } + aa_flags = parse_aa_pattern( fontset->fonts[i] ); TRACE("fontconfig: %s aa %x\n", file, aa_flags); -- 2.29.2

2 5

[PATCH v2 4/4] gdi32: Lazily create and cache fontconfig patterns.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7d8bc5f5b05..993110e6fe0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1343,21 +1343,22 @@ static UINT parse_aa_pattern( FcPattern *pattern ) return aa_flags; } -static FcPattern *create_family_pattern( const char *name ) +static FcPattern *create_family_pattern( const char *name, FcPattern **cached ) { - FcPattern *ret, *pattern = pFcPatternCreate(); + FcPattern *ret = NULL, *tmp, *pattern = pFcPatternCreate(); FcResult result; - + if (*cached) return *cached; pFcPatternAddString( pattern, FC_FAMILY, (const FcChar8 *)name ); pFcPatternAddString( pattern, FC_NAMELANG, (const FcChar8 *)"en-us" ); pFcPatternAddString( pattern, FC_PRGNAME, (const FcChar8 *)"wine" ); pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); pFcDefaultSubstitute( pattern ); - ret = pFcFontMatch( NULL, pattern, &result ); + tmp = pFcFontMatch( NULL, pattern, &result ); pFcPatternDestroy( pattern ); - if (ret && result == FcResultMatch) return ret; - pFcPatternDestroy( ret ); - return NULL; + if (result != FcResultMatch) pFcPatternDestroy( tmp ); + else if ((ret = InterlockedCompareExchangePointer( (void **)cached, tmp, NULL ))) pFcPatternDestroy( tmp ); + else ret = tmp; + return ret; } static void fontconfig_add_font( FcPattern *pattern, DWORD flags ) @@ -1458,9 +1459,6 @@ static void init_fontconfig(void) default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); } - pattern_serif = create_family_pattern( "serif" ); - pattern_fixed = create_family_pattern( "monospace" ); - pattern_sans = create_family_pattern( "sans" ); TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; @@ -2213,9 +2211,9 @@ static BOOL CDECL fontconfig_enum_family_fallbacks( DWORD pitch_and_family, int char *str; DWORD len; - if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0xf0) == FF_MODERN) pat = pattern_fixed; - else if ((pitch_and_family & 0xf0) == FF_ROMAN) pat = pattern_serif; - else pat = pattern_sans; + if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0xf0) == FF_MODERN) pat = create_family_pattern( "monospace", &pattern_fixed ); + else if ((pitch_and_family & 0xf0) == FF_ROMAN) pat = create_family_pattern( "serif", &pattern_serif ); + else pat = create_family_pattern( "sans", &pattern_sans ); if (!pat) return FALSE; if (pFcPatternGetString( pat, FC_FAMILY, index, (FcChar8 **)&str ) != FcResultMatch) return FALSE; -- 2.23.0

1 0

[PATCH v2 3/4] gdi32: Load font list directly from fontconfig cache.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Instead of going through the -slow- font matching. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 169 +++++++++++++++++++++++++++++++----------- 1 file changed, 125 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 45b5e94d341..7d8bc5f5b05 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -190,6 +190,20 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +MAKE_FUNCPTR(FcConfigGetFontDirs); +MAKE_FUNCPTR(FcConfigGetCurrent); +MAKE_FUNCPTR(FcCacheCopySet); +MAKE_FUNCPTR(FcCacheNumSubdir); +MAKE_FUNCPTR(FcCacheSubdir); +MAKE_FUNCPTR(FcDirCacheRead); +MAKE_FUNCPTR(FcDirCacheUnload); +MAKE_FUNCPTR(FcStrListCreate); +MAKE_FUNCPTR(FcStrListDone); +MAKE_FUNCPTR(FcStrListNext); +MAKE_FUNCPTR(FcStrSetAdd); +MAKE_FUNCPTR(FcStrSetCreate); +MAKE_FUNCPTR(FcStrSetDestroy); +MAKE_FUNCPTR(FcStrSetMember); #ifndef FC_NAMELANG #define FC_NAMELANG "namelang" #endif @@ -1346,6 +1360,51 @@ static FcPattern *create_family_pattern( const char *name ) return NULL; } +static void fontconfig_add_font( FcPattern *pattern, DWORD flags ) +{ + const char *unix_name, *format; + WCHAR *dos_name; + FcBool scalable; + DWORD aa_flags; + int face_index; + + TRACE( "(%p %#x)\n", pattern, flags ); + + if (pFcPatternGetString( pattern, FC_FILE, 0, (FcChar8 **)&unix_name ) != FcResultMatch) + return; + + if (pFcPatternGetBool( pattern, FC_SCALABLE, 0, &scalable ) != FcResultMatch) + scalable = FALSE; + + if (pFcPatternGetString( pattern, FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(unix_name) ); + return; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(unix_name) ); + return; + } + + if (!scalable && !(flags & ADDFONT_ALLOW_BITMAP)) + { + TRACE( "ignoring non-scalable font %s\n", debugstr_a(unix_name) ); + return; + } + + if (!(aa_flags = parse_aa_pattern( pattern ))) aa_flags = default_aa_flags; + flags |= ADDFONT_AA_FLAGS(aa_flags); + + if (pFcPatternGetInteger( pattern, FC_INDEX, 0, &face_index ) != FcResultMatch) + face_index = 0; + + dos_name = get_dos_file_name( unix_name ); + add_unix_face( unix_name, dos_name, NULL, 0, face_index, flags, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, dos_name ); +} + static void init_fontconfig(void) { void *fc_handle = dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW); @@ -1369,6 +1428,20 @@ static void init_fontconfig(void) LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); + LOAD_FUNCPTR(FcConfigGetFontDirs); + LOAD_FUNCPTR(FcConfigGetCurrent); + LOAD_FUNCPTR(FcCacheCopySet); + LOAD_FUNCPTR(FcCacheNumSubdir); + LOAD_FUNCPTR(FcCacheSubdir); + LOAD_FUNCPTR(FcDirCacheRead); + LOAD_FUNCPTR(FcDirCacheUnload); + LOAD_FUNCPTR(FcStrListCreate); + LOAD_FUNCPTR(FcStrListDone); + LOAD_FUNCPTR(FcStrListNext); + LOAD_FUNCPTR(FcStrSetAdd); + LOAD_FUNCPTR(FcStrSetCreate); + LOAD_FUNCPTR(FcStrSetDestroy); + LOAD_FUNCPTR(FcStrSetMember); #undef LOAD_FUNCPTR if (pFcInit()) @@ -1394,61 +1467,69 @@ static void init_fontconfig(void) } } -static void load_fontconfig_fonts(void) +static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir_list, FcStrSet *done_set, DWORD flags ) { - FcPattern *pat; - FcFontSet *fontset; - const char *format; + const FcChar8 *dir; + FcFontSet *font_set; + FcStrList *subdir_list = NULL; + FcStrSet *subdir_set = NULL; + FcCache *cache = NULL; int i; - char *file; - if (!fontconfig_enabled) return; - - pat = pFcPatternCreate(); - if (!pat) return; + TRACE( "(%p %p %p %#x)\n", config, dir_list, done_set, flags ); - fontset = pFcFontList(NULL, pat, NULL); - if (!fontset) + while ((dir = pFcStrListNext( dir_list ))) { - pFcPatternDestroy(pat); - return; + if (pFcStrSetMember( done_set, dir )) continue; + + TRACE( "adding fonts from %s\n", dir ); + if (!(cache = pFcDirCacheRead( dir, FcFalse, config ))) continue; + + if (!(font_set = pFcCacheCopySet( cache ))) goto done; + for (i = 0; i < font_set->nfont; i++) + fontconfig_add_font( font_set->fonts[i], flags ); + pFcFontSetDestroy( font_set ); + font_set = NULL; + + if (!(subdir_set = pFcStrSetCreate())) goto done; + for (i = 0; i < pFcCacheNumSubdir( cache ); i++) + pFcStrSetAdd( subdir_set, pFcCacheSubdir( cache, i ) ); + pFcDirCacheUnload( cache ); + cache = NULL; + + if (!(subdir_list = pFcStrListCreate( subdir_set ))) goto done; + pFcStrSetDestroy( subdir_set ); + subdir_set = NULL; + + pFcStrSetAdd( done_set, dir ); + fontconfig_add_fonts_from_dir_list( config, subdir_list, done_set, flags ); + pFcStrListDone( subdir_list ); + subdir_list = NULL; } - for(i = 0; i < fontset->nfont; i++) { - FcBool scalable; - DWORD aa_flags; - - if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) - continue; - - pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); - - if(pFcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable) == FcResultMatch && !scalable) - { - TRACE("not scalable\n"); - continue; - } +done: + if (font_set) pFcFontSetDestroy( font_set ); + if (subdir_list) pFcStrListDone( subdir_list ); + if (subdir_set) pFcStrSetDestroy( subdir_set ); + if (cache) pFcDirCacheUnload( cache ); +} - if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) - { - TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); - continue; - } +static void load_fontconfig_fonts( void ) +{ + FcStrList *dir_list = NULL; + FcStrSet *done_set = NULL; + FcConfig *config; - if (!strcmp( format, "Type 1" )) - { - TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); - continue; - } + if (!fontconfig_enabled) return; + if (!(config = pFcConfigGetCurrent())) goto done; + if (!(done_set = pFcStrSetCreate())) goto done; + if (!(dir_list = pFcConfigGetFontDirs( config ))) goto done; - aa_flags = parse_aa_pattern( fontset->fonts[i] ); - TRACE("fontconfig: %s aa %x\n", file, aa_flags); + fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE ); - AddFontToList( NULL, file, NULL, 0, - ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); - } - pFcFontSetDestroy(fontset); - pFcPatternDestroy(pat); +done: + if (dir_list) pFcStrListDone( dir_list ); + if (done_set) pFcStrSetDestroy( done_set ); } #elif defined(HAVE_CARBON_CARBON_H) -- 2.23.0

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
65
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-devel November 2020