wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Nikolay Sivov : mf/evr: Pass incoming samples to the mixer.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 41fe1ac058756611b1215d2b60871272f6d143f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fe1ac058756611b1215d2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:46 2020 +0300 mf/evr: Pass incoming samples to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4dca8515c94..618bbf8924f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -335,19 +335,36 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + LONGLONG timestamp; + HRESULT hr = S_OK; - FIXME("%p, %p.\n", iface, sample); + TRACE("%p, %p.\n", iface, sample); EnterCriticalSection(&stream->cs); - if (stream->flags & EVR_STREAM_PREROLLING) + + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (!stream->parent->clock) + hr = MF_E_NO_CLOCK; + else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp))) + { + WARN("No sample timestamp, hr %#x.\n", hr); + } + else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); - stream->flags &= ~EVR_STREAM_PREROLLING; - stream->flags |= EVR_STREAM_PREROLLED; + IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } } + LeaveCriticalSection(&stream->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type,

1 0

Nikolay Sivov : mf/copier: Move sample copier to its own file.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: f64d046117903b25a5545f0683aec4b8a3ed7a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64d046117903b25a5545f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:45 2020 +0300 mf/copier: Move sample copier to its own file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/copier.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 565 ------------------------------------------------- 3 files changed, 594 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f64d046117903b25a554…

1 0

Nikolay Sivov : evr/presenter: Set mixer output type on type negotiation.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 30727decff4bdd1a97a6f545e98254f5175031c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30727decff4bdd1a97a6f545… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:44 2020 +0300 evr/presenter: Set mixer output type on type negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 96eaa4426fc..54ad9fee994 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -157,9 +157,31 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { + IMFMediaType *media_type; + unsigned int idx = 0; + HRESULT hr; + video_presenter_get_native_video_size(presenter); - return S_OK; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &media_type))) + { + /* FIXME: check that d3d device supports this format */ + + /* FIXME: potentially adjust frame size */ + + if (SUCCEEDED(IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) + { + /* FIXME: should keep a copy internally too */ + + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); + break; + } + + IMFMediaType_Release(media_type); + } + + return hr; } static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : evr: Add MFCreateDXSurfaceBuffer() forward.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 13aa1e12e0304108a366378eee6c285148a2158f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aa1e12e0304108a366378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:43 2020 +0300 evr: Add MFCreateDXSurfaceBuffer() forward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index dcf062cf5aa..67eee3122cf 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -7,7 +7,7 @@ @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array @ stdcall -import MFCopyImage(ptr long ptr long long long) -@ stub MFCreateDXSurfaceBuffer +@ stdcall -import MFCreateDXSurfaceBuffer(ptr ptr long ptr) @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr)

1 0

Nikolay Sivov : evr/allocator: Use different buffer implementation for surface buffers.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 959279413ee363293ceb270dc115835893fb7f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959279413ee363293ceb270d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:42 2020 +0300 evr/allocator: Use different buffer implementation for surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 31 ++++++++++++++++--------------- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index b65cc45a662..39520cb6020 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -306,27 +306,28 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + IMFMediaBuffer *buffer; - if (service) + if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, 0, format, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + if (service) { - hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - IDirect3DSurface9_Release(surface); + if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, + 0, format, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + { + hr = MFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)surface, FALSE, &buffer); + IDirect3DSurface9_Release(surface); + } + } + else + { + hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer); } - } - else - { - IMFMediaBuffer *buffer; - if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) + if (SUCCEEDED(hr)) { - if (SUCCEEDED(hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer))) - { - hr = IMFSample_AddBuffer(sample, buffer); - IMFMediaBuffer_Release(buffer); - } + hr = IMFSample_AddBuffer(sample, buffer); + IMFMediaBuffer_Release(buffer); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e4f45396ae8..a711be7ad21 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1468,17 +1468,13 @@ todo_wine IDirect3DSurface9_Release(surface); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample);

1 0

Nikolay Sivov : mfplat: Implement MFCreateDXSurfaceBuffer().
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 23a656a083df15aeb7d4656b700e3ea9fed6b390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a656a083df15aeb7d4656b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:41 2020 +0300 mfplat: Implement MFCreateDXSurfaceBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 11 +- 3 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23a656a083df15aeb7d4…

1 0

Alexandre Julliard : gdi32: Make the family replacement point to the family object.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 74ea8d8c427e1885d00a9e3c68f402b3748a87e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ea8d8c427e1885d00a9e3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:39:07 2020 +0100 gdi32: Make the family replacement point to the family object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 6 ++---- dlls/gdi32/gdi_private.h | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 806ff0d1d91..c49186efb94 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -517,7 +517,7 @@ struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_na } else family->second_name[0] = 0; list_init( &family->faces ); - family->replacement = &family->faces; + family->replacement = NULL; list_add_tail( &font_list, &family->entry ); return family; } @@ -527,6 +527,7 @@ void release_family( struct gdi_font_family *family ) if (--family->refcount) return; assert( list_empty( &family->faces )); list_remove( &family->entry ); + if (family->replacement) release_family( family->replacement ); HeapFree( GetProcessHeap(), 0, family ); } @@ -564,7 +565,8 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace } if (!(new_family = create_family( new_name, NULL ))) return FALSE; - new_family->replacement = &family->faces; + new_family->replacement = family; + family->refcount++; TRACE( "mapping %s to %s\n", debugstr_w(replace), debugstr_w(new_name) ); /* also add replacement for vertical font if necessary */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index afc9add629c..d4e593b1211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -662,10 +662,8 @@ static BOOL is_subpixel_rendering_enabled( void ) static const struct list *get_face_list_from_family(const Family *family) { - if (!list_empty(&family->faces)) - return &family->faces; - else - return family->replacement; + if (family->replacement) return &family->replacement->faces; + return &family->faces; } static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 63e76e4df69..ab1b66b591c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -307,12 +307,12 @@ struct glyph_metrics; struct gdi_font_family { - struct list entry; - unsigned int refcount; - WCHAR family_name[LF_FACESIZE]; - WCHAR second_name[LF_FACESIZE]; - struct list faces; - struct list *replacement; + struct list entry; + unsigned int refcount; + WCHAR family_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; + struct list faces; + struct gdi_font_family *replacement; }; struct bitmap_font_size

1 0

Alexandre Julliard : gdi32: Move the loading of font replacements out of freetype.c.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: d27a9d77ee2e21dc071b9cb09af6df78ca5c0c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d27a9d77ee2e21dc071b9cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:38:02 2020 +0100 gdi32: Move the loading of font replacements out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 79 ++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 116 +---------------------------------------------- dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 83 insertions(+), 115 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 62f9f927ccd..806ff0d1d91 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -551,6 +551,85 @@ struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) return NULL; } +static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace ) +{ + struct gdi_font_family *new_family, *family; + struct gdi_font_face *face; + WCHAR new_name_vert[LF_FACESIZE], replace_vert[LF_FACESIZE]; + + if (!(family = find_family_from_any_name( replace ))) + { + TRACE( "%s is not available. Skip this replacement.\n", debugstr_w(replace) ); + return FALSE; + } + + if (!(new_family = create_family( new_name, NULL ))) return FALSE; + new_family->replacement = &family->faces; + TRACE( "mapping %s to %s\n", debugstr_w(replace), debugstr_w(new_name) ); + + /* also add replacement for vertical font if necessary */ + if (replace[0] == '@') return TRUE; + if (list_empty( &family->faces )) return TRUE; + face = LIST_ENTRY( list_head(&family->faces), struct gdi_font_face, entry ); + if (!(face->fs.fsCsb[0] & FS_DBCS_MASK)) return TRUE; + + new_name_vert[0] = '@'; + lstrcpynW( new_name_vert + 1, new_name, LF_FACESIZE - 1 ); + if (find_family_from_any_name( new_name_vert )) return TRUE; /* already exists */ + + replace_vert[0] = '@'; + lstrcpynW( replace_vert + 1, replace, LF_FACESIZE - 1 ); + add_family_replacement( new_name_vert, replace_vert ); + return TRUE; +} + +/* + * The replacement list is a way to map an entire font + * family onto another family. For example adding + * + * [HKCU\Software\Wine\Fonts\Replacements] + * "Wingdings"="Winedings" + * + * would enumerate the Winedings font both as Winedings and + * Wingdings. However if a real Wingdings font is present the + * replacement does not take place. + */ +void load_gdi_font_replacements(void) +{ + HKEY hkey; + DWORD i = 0, type, dlen, vlen; + WCHAR value[LF_FACESIZE], data[1024]; + + /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ + if (RegOpenKeyA( wine_fonts_key, "Replacements", &hkey )) return; + + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + { + /* "NewName"="Oldname" */ + if (!find_family_from_any_name( value )) + { + if (type == REG_MULTI_SZ) + { + WCHAR *replace = data; + while (*replace) + { + if (add_family_replacement( value, replace )) break; + replace += strlenW(replace) + 1; + } + } + else if (type == REG_SZ) add_family_replacement( value, data ); + } + else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); + + /* reset dlen and vlen */ + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + } + RegCloseKey( hkey ); +} + struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 147d65d130d..afc9add629c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -235,8 +235,6 @@ typedef struct { typedef struct gdi_font_face Face; -#define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) - typedef struct gdi_font_family Family; typedef struct { @@ -365,7 +363,6 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl); static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ); static BOOL CDECL freetype_set_bitmap_text_metrics( struct gdi_font *font ); static void remove_face_from_cache( Face *face ); @@ -1735,117 +1732,6 @@ static void DumpFontList(void) } } -static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const Family *family) -{ - Face *face; - BOOL ret = FALSE; - WCHAR *at_orig, *at_repl = NULL; - - face = LIST_ENTRY(list_head(&family->faces), Face, entry); - if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) - return FALSE; - - at_orig = get_vertical_name( strdupW( orig ) ); - if (at_orig && !find_family_from_any_name(at_orig)) - { - at_repl = get_vertical_name( strdupW( repl ) ); - if (at_repl) - ret = map_font_family(at_orig, at_repl); - } - - HeapFree(GetProcessHeap(), 0, at_orig); - HeapFree(GetProcessHeap(), 0, at_repl); - - return ret; -} - -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) -{ - Family *family = find_family_from_any_name(repl); - if (family != NULL) - { - Family *new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); - if (new_family != NULL) - { - TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); - lstrcpynW( new_family->family_name, orig, LF_FACESIZE ); - new_family->second_name[0] = 0; - list_init(&new_family->faces); - new_family->replacement = &family->faces; - list_add_tail(&font_list, &new_family->entry); - - if (repl[0] != '@') - map_vertical_font_family(orig, repl, family); - - return TRUE; - } - } - TRACE("%s is not available. Skip this replacement.\n", debugstr_w(repl)); - return FALSE; -} - -/*********************************************************** - * The replacement list is a way to map an entire font - * family onto another family. For example adding - * - * [HKCU\Software\Wine\Fonts\Replacements] - * "Wingdings"="Winedings" - * - * would enumerate the Winedings font both as Winedings and - * Wingdings. However if a real Wingdings font is present the - * replacement does not take place. - * - */ -static void LoadReplaceList(void) -{ - HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPWSTR value; - LPVOID data; - - /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey) == ERROR_SUCCESS) - { - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - value = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen); - - dlen = datalen; - vlen = valuelen; - while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) - { - /* "NewName"="Oldname" */ - if(!find_family_from_any_name(value)) - { - if (type == REG_MULTI_SZ) - { - WCHAR *replace = data; - while(*replace) - { - if (map_font_family(value, replace)) - break; - replace += strlenW(replace) + 1; - } - } - else if (type == REG_SZ) - map_font_family(value, data); - } - else - TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value); - RegCloseKey(hkey); - } -} - static const WCHAR *font_links_list[] = { Lucida_Sans_Unicode, @@ -2780,7 +2666,7 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) DumpFontList(); load_gdi_font_subst(); - LoadReplaceList(); + load_gdi_font_replacements(); if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 812b3f33abf..63e76e4df69 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -405,6 +405,8 @@ struct gdi_font #define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') +#define FS_DBCS_MASK (FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD | FS_JOHAB) + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -449,6 +451,7 @@ extern struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_name( const WCHAR *name ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; +extern void load_gdi_font_replacements(void) DECLSPEC_HIDDEN; extern struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the face data structure out of freetype.c.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 5537f38e97e21f4e689680ef0895e0261a6ea5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5537f38e97e21f4e689680ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:31:13 2020 +0100 gdi32: Move the face data structure out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 20 +++++ dlls/gdi32/freetype.c | 189 +++++++++++++---------------------------------- dlls/gdi32/gdi_private.h | 39 ++++++++++ 3 files changed, 111 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5537f38e97e21f4e6896…

1 0

Alexandre Julliard : gdi32: Move the font family list out of freetype.c.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 6a1cdd98fa9805baa321d0941c79170362bac040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1cdd98fa9805baa321d094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:22:51 2020 +0100 gdi32: Move the font family list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 53 +++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 66 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 17 ++++++++++++- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b48491b4ab0..8c567351c19 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -443,7 +443,7 @@ const WCHAR *get_gdi_font_subst( const WCHAR *from_name, int from_charset, int * return NULL; } -BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) +static BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) { struct gdi_font_subst *subst; int len = strlenW( from_name ) + strlenW( to_name ) + 2; @@ -500,6 +500,57 @@ void load_gdi_font_subst(void) RegCloseKey( hkey ); } +/* font families */ + +struct list font_list = LIST_INIT(font_list); + +struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) +{ + struct gdi_font_family *family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + + family->refcount = 1; + lstrcpynW( family->family_name, name, LF_FACESIZE ); + if (second_name && second_name[0]) + { + lstrcpynW( family->second_name, second_name, LF_FACESIZE ); + add_gdi_font_subst( second_name, -1, name, -1 ); + } + else family->second_name[0] = 0; + list_init( &family->faces ); + family->replacement = &family->faces; + list_add_tail( &font_list, &family->entry ); + return family; +} + +void release_family( struct gdi_font_family *family ) +{ + if (--family->refcount) return; + assert( list_empty( &family->faces )); + list_remove( &family->entry ); + HeapFree( GetProcessHeap(), 0, family ); +} + +struct gdi_font_family *find_family_from_name( const WCHAR *name ) +{ + struct gdi_font_family *family; + + LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; + return NULL; +} + +struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) +{ + struct gdi_font_family *family; + + LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + { + if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; + if (!strncmpiW( family->second_name, name, LF_FACESIZE - 1 )) return family; + } + return NULL; +} + /* realized font objects */ #define FIRST_FONT_HANDLE 1 diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 20ada389631..8b9b223b964 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -265,21 +265,14 @@ typedef struct tagFace { BOOL scalable; Bitmap_Size size; /* set if face is a bitmap */ DWORD flags; /* ADDFONT flags */ - struct tagFamily *family; + struct gdi_font_family *family; /* Cached data for Enum */ struct enum_data *cached_enum_data; } Face; #define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) -typedef struct tagFamily { - struct list entry; - unsigned int refcount; - WCHAR family_name[LF_FACESIZE]; - WCHAR second_name[LF_FACESIZE]; - struct list faces; - struct list *replacement; -} Family; +typedef struct gdi_font_family Family; typedef struct { struct list entry; @@ -317,8 +310,6 @@ struct enum_charset_list { static struct list system_links = LIST_INIT(system_links); -static struct list font_list = LIST_INIT(font_list); - static const struct font_backend_funcs font_funcs; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', @@ -745,29 +736,6 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n return NULL; } -static Family *find_family_from_name(const WCHAR *name) -{ - Family *family; - - LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; - - return NULL; -} - -static Family *find_family_from_any_name(const WCHAR *name) -{ - Family *family; - - LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) - { - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; - if (!strncmpiW( family->second_name, name, LF_FACESIZE - 1 )) return family; - } - - return NULL; -} - static LPWSTR strdupW(LPCWSTR p) { LPWSTR ret; @@ -1076,14 +1044,6 @@ static inline BOOL faces_equal( const Face *f1, const Face *f2 ) return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); } -static void release_family( Family *family ) -{ - if (--family->refcount) return; - assert( list_empty( &family->faces )); - list_remove( &family->entry ); - HeapFree( GetProcessHeap(), 0, family ); -} - static void release_face( Face *face ) { if (--face->refcount) return; @@ -1168,28 +1128,6 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) return TRUE; } -/**************************************************************** - * NB This function stores the ptrs to the strings to save copying. - * Don't free them after calling. - */ -static Family *create_family( WCHAR *family_name, WCHAR *second_name ) -{ - Family * const family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); - family->refcount = 1; - lstrcpynW( family->family_name, family_name, LF_FACESIZE ); - if (second_name) - { - lstrcpynW( family->second_name, second_name, LF_FACESIZE ); - add_gdi_font_subst( second_name, -1, family_name, -1 ); - } - else family->second_name[0] = 0; - list_init( &family->faces ); - family->replacement = &family->faces; - list_add_tail( &font_list, &family->entry ); - - return family; -} - struct cached_face { DWORD index; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7adfb2ade40..ecad4f09357 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -305,6 +305,16 @@ typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; struct glyph_metrics; +struct gdi_font_family +{ + struct list entry; + unsigned int refcount; + WCHAR family_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; + struct list faces; + struct list *replacement; +}; + struct gdi_font { struct list entry; @@ -396,9 +406,14 @@ extern void load_file_system_fonts(void) DECLSPEC_HIDDEN; extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern const WCHAR *get_gdi_font_subst( const WCHAR *from_name, int from_charset, int *to_charset ) DECLSPEC_HIDDEN; -extern BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) DECLSPEC_HIDDEN; extern void load_gdi_font_subst(void) DECLSPEC_HIDDEN; +extern struct list font_list DECLSPEC_HIDDEN; +extern struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) DECLSPEC_HIDDEN; +extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; +extern struct gdi_font_family *find_family_from_name( const WCHAR *name ) DECLSPEC_HIDDEN; +extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; + extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

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 October 2020