October 2020 - Wine-Commits

Zhiyi Zhang : ddraw/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 1a4f2e23c00eaed3e9a4a5d77941b89f972cda89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4f2e23c00eaed3e9a4a5d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:26 2020 +0800 ddraw/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 397 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1581 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a4f2e23c00eaed3e9a4…

1 0

Zhiyi Zhang : d3d9/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ddf1967fd030e66c8a842c109a5a00387168016f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf1967fd030e66c8a842c10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:15 2020 +0800 d3d9/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 53a83ad887b..2efb6ddc2e5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4435,6 +4435,8 @@ done: CloseHandle(thread_params.test_finished); CloseHandle(thread_params.window_created); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Zhiyi Zhang : d3d9/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: df90c0ef7ea053606e684901073b26368f34ac26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df90c0ef7ea053606e684901… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:45 2020 +0800 d3d9/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 411 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 400 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df90c0ef7ea053606e68…

1 0

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

Oct. 30, 2020

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 Oct. 30, 2020

Oct. 30, 2020

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

Derek Lesho : mfreadwrite: Abort ReadSample when unable to request any samples.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 9d7f98ee7f3b078df8fafaa3b3b7b59b81492d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f98ee7f3b078df8fafaa3… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 18:18:27 2020 +0300 mfreadwrite: Abort ReadSample when unable to request any samples. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 13 ++++++++++--- dlls/mfreadwrite/tests/mfplat.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 96a82b798ab..cc1b29a2b6a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -439,7 +439,8 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM } if (reader->streams[i].requests) - source_reader_request_sample(reader, &reader->streams[i]); + if (FAILED(source_reader_request_sample(reader, &reader->streams[i]))) + WakeAllConditionVariable(&reader->sample_event); } break; } @@ -1780,10 +1781,16 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind stream->requests++; if (FAILED(hr = source_reader_request_sample(reader, stream))) WARN("Failed to request a sample, hr %#x.\n", hr); + if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) + { + *stream_flags = MF_SOURCE_READERF_ERROR; + *timestamp = 0; + break; + } SleepConditionVariableCS(&reader->sample_event, &reader->cs, INFINITE); } - - source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + if (SUCCEEDED(hr)) + source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, timestamp, sample); } } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index cfe68cb6736..0e5053f905f 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -158,6 +158,8 @@ static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *ifac return S_OK; } +static BOOL fail_request_sample; + static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token) { struct test_media_stream *stream = impl_from_IMFMediaStream(iface); @@ -165,6 +167,9 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn IMFSample *sample; HRESULT hr; + if (fail_request_sample) + return E_NOTIMPL; + hr = MFCreateSample(&sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); hr = IMFSample_SetSampleTime(sample, 123); @@ -977,6 +982,27 @@ static void test_source_reader_from_media_source(void) ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + /* RequestSample failure. */ + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + fail_request_sample = TRUE; + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + fail_request_sample = FALSE; } START_TEST(mfplat)

1 0

Alexandre Julliard : gdi32: Make the family replacement point to the family object.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

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

Daniel Lehman : tzres: Add Saint Pierre Standard Time Zone.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: b5d39469b84b3efcf63be0fcbab4119438e6e952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d39469b84b3efcf63be0fc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 22:57:44 2020 -0700 tzres: Add Saint Pierre Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 10 +++++ po/ar.po | 106 ++++++++++++++++++++++++++++----------------------- po/ast.po | 106 ++++++++++++++++++++++++++++----------------------- po/bg.po | 102 ++++++++++++++++++++++++++----------------------- po/ca.po | 106 ++++++++++++++++++++++++++++----------------------- po/cs.po | 106 ++++++++++++++++++++++++++++----------------------- po/da.po | 106 ++++++++++++++++++++++++++++----------------------- po/de.po | 106 ++++++++++++++++++++++++++++----------------------- po/el.po | 102 ++++++++++++++++++++++++++----------------------- po/en.po | 102 ++++++++++++++++++++++++++----------------------- po/en_US.po | 102 ++++++++++++++++++++++++++----------------------- po/eo.po | 106 ++++++++++++++++++++++++++++----------------------- po/es.po | 106 ++++++++++++++++++++++++++++----------------------- po/fa.po | 104 +++++++++++++++++++++++++++----------------------- po/fi.po | 106 ++++++++++++++++++++++++++++----------------------- po/fr.po | 106 ++++++++++++++++++++++++++++----------------------- po/he.po | 106 ++++++++++++++++++++++++++++----------------------- po/hi.po | 102 ++++++++++++++++++++++++++----------------------- po/hr.po | 106 ++++++++++++++++++++++++++++----------------------- po/hu.po | 106 ++++++++++++++++++++++++++++----------------------- po/it.po | 106 ++++++++++++++++++++++++++++----------------------- po/ja.po | 106 ++++++++++++++++++++++++++++----------------------- po/ko.po | 106 ++++++++++++++++++++++++++++----------------------- po/lt.po | 106 ++++++++++++++++++++++++++++----------------------- po/ml.po | 102 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 106 ++++++++++++++++++++++++++++----------------------- po/nl.po | 106 ++++++++++++++++++++++++++++----------------------- po/or.po | 102 ++++++++++++++++++++++++++----------------------- po/pa.po | 102 ++++++++++++++++++++++++++----------------------- po/pl.po | 106 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 106 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 106 ++++++++++++++++++++++++++++----------------------- po/rm.po | 102 ++++++++++++++++++++++++++----------------------- po/ro.po | 106 ++++++++++++++++++++++++++++----------------------- po/ru.po | 102 ++++++++++++++++++++++++++----------------------- po/si.po | 106 ++++++++++++++++++++++++++++----------------------- po/sk.po | 106 ++++++++++++++++++++++++++++----------------------- po/sl.po | 106 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 104 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 104 +++++++++++++++++++++++++++----------------------- po/sv.po | 106 ++++++++++++++++++++++++++++----------------------- po/ta.po | 102 ++++++++++++++++++++++++++----------------------- po/te.po | 102 ++++++++++++++++++++++++++----------------------- po/th.po | 104 +++++++++++++++++++++++++++----------------------- po/tr.po | 106 ++++++++++++++++++++++++++++----------------------- po/uk.po | 102 ++++++++++++++++++++++++++----------------------- po/wa.po | 104 +++++++++++++++++++++++++++----------------------- po/wine.pot | 102 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 106 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 106 ++++++++++++++++++++++++++++----------------------- 51 files changed, 2837 insertions(+), 2303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5d39469b84b3efcf63b…

1 0

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

Oct. 30, 2020

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 Oct. 30, 2020

Oct. 30, 2020

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