October 2020 - Wine-commits

Zhiyi Zhang : d3d8/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: e166f6d07e436e4d769c80bd2aaf821961c9c9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e166f6d07e436e4d769c80bd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:31 2020 +0800 d3d8/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/d3d8/tests/device.c | 408 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 398 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e166f6d07e436e4d769c…

1 0

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

30 Oct '20

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

Zhiyi Zhang : dxgi/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: ef81152c8cd17f1bfb2950753428a95a81728c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81152c8cd17f1bfb295075… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:49:00 2020 +0800 dxgi/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/dxgi/tests/dxgi.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef81152c8cd17f1bfb29…

1 0

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

30 Oct '20

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

Derek Lesho : winegstreamer: Implement IMFMediaSource::Start.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 12f1afbffed35cf9dcc18f5dbf33633aa9a7d2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1afbffed35cf9dcc18f5d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 10:58:14 2020 -0500 winegstreamer: Implement IMFMediaSource::Start. 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/mfplat/tests/mfplat.c | 8 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 307 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 130 ++++++++++++++++ 4 files changed, 438 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1afbffed35cf9dcc1…

1 0

Derek Lesho : winegstreamer: Implement IMFMediaStream::RequestSample.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 03eaa2cc93e5e2ea4c36495870c268797aea3ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03eaa2cc93e5e2ea4c364958… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 13:57:19 2020 -0500 winegstreamer: Implement IMFMediaStream::RequestSample. 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/mfplat/tests/mfplat.c | 19 +++++--- dlls/mfreadwrite/tests/mfplat.c | 16 ++++++- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 94 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++ 5 files changed, 191 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03eaa2cc93e5e2ea4c36…

1 0

Daniel Lehman : tzres: Add Magallanes Standard Time Zone.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: af5c7c33567812c1f0037ff011ec9c63efdb9d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5c7c33567812c1f0037ff0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 22:40:24 2020 -0700 tzres: Add Magallanes 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 | 21 ++++++ po/ar.po | 210 +++++++++++++++++++++++++++------------------------ po/ast.po | 210 +++++++++++++++++++++++++++------------------------ po/bg.po | 206 ++++++++++++++++++++++++++------------------------ po/ca.po | 210 +++++++++++++++++++++++++++------------------------ po/cs.po | 210 +++++++++++++++++++++++++++------------------------ po/da.po | 210 +++++++++++++++++++++++++++------------------------ po/de.po | 210 +++++++++++++++++++++++++++------------------------ po/el.po | 206 ++++++++++++++++++++++++++------------------------ po/en.po | 206 ++++++++++++++++++++++++++------------------------ po/en_US.po | 206 ++++++++++++++++++++++++++------------------------ po/eo.po | 210 +++++++++++++++++++++++++++------------------------ po/es.po | 210 +++++++++++++++++++++++++++------------------------ po/fa.po | 208 ++++++++++++++++++++++++++------------------------ po/fi.po | 210 +++++++++++++++++++++++++++------------------------ po/fr.po | 210 +++++++++++++++++++++++++++------------------------ po/he.po | 210 +++++++++++++++++++++++++++------------------------ po/hi.po | 206 ++++++++++++++++++++++++++------------------------ po/hr.po | 210 +++++++++++++++++++++++++++------------------------ po/hu.po | 210 +++++++++++++++++++++++++++------------------------ po/it.po | 210 +++++++++++++++++++++++++++------------------------ po/ja.po | 210 +++++++++++++++++++++++++++------------------------ po/ko.po | 210 +++++++++++++++++++++++++++------------------------ po/lt.po | 210 +++++++++++++++++++++++++++------------------------ po/ml.po | 206 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 210 +++++++++++++++++++++++++++------------------------ po/nl.po | 210 +++++++++++++++++++++++++++------------------------ po/or.po | 206 ++++++++++++++++++++++++++------------------------ po/pa.po | 206 ++++++++++++++++++++++++++------------------------ po/pl.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 210 +++++++++++++++++++++++++++------------------------ po/rm.po | 206 ++++++++++++++++++++++++++------------------------ po/ro.po | 210 +++++++++++++++++++++++++++------------------------ po/ru.po | 206 ++++++++++++++++++++++++++------------------------ po/si.po | 210 +++++++++++++++++++++++++++------------------------ po/sk.po | 210 +++++++++++++++++++++++++++------------------------ po/sl.po | 210 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 208 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 208 ++++++++++++++++++++++++++------------------------ po/sv.po | 210 +++++++++++++++++++++++++++------------------------ po/ta.po | 206 ++++++++++++++++++++++++++------------------------ po/te.po | 206 ++++++++++++++++++++++++++------------------------ po/th.po | 208 ++++++++++++++++++++++++++------------------------ po/tr.po | 210 +++++++++++++++++++++++++++------------------------ po/uk.po | 206 ++++++++++++++++++++++++++------------------------ po/wa.po | 208 ++++++++++++++++++++++++++------------------------ po/wine.pot | 206 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 210 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 210 +++++++++++++++++++++++++++------------------------ 51 files changed, 5396 insertions(+), 4851 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af5c7c33567812c1f003…

1 0

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

30 Oct '20

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 font substitution list out of freetype.c.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 7e51cc8308bd828d8d8a90aea35170c68d4b1bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e51cc8308bd828d8d8a90ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:15:34 2020 +0100 gdi32: Move the font substitution list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 105 +++++++++++++++++++ dlls/gdi32/freetype.c | 265 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 4 + 3 files changed, 156 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e51cc8308bd828d8d8a…

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