November 2020 - Wine-Commits

Hans Leidekker : jscript: Fix allocation size in BindFunction_call.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: d39e3d8762dcce81434114aef02142866ad5ddb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39e3d8762dcce81434114ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 11:31:40 2020 +0100 jscript: Fix allocation size in BindFunction_call. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e43d19464bb..6361eefc677 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -836,7 +836,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDis call_argc = function->argc + argc; if(call_argc) { - call_args = heap_alloc(function->argc * sizeof(*function->args)); + call_args = heap_alloc(call_argc * sizeof(*call_args)); if(!call_args) return E_OUTOFMEMORY;

1 0

Anton Baskanov : amstream: Handle AMMSF_NOCLOCK flag in AMMultiMediaStream::OpenFile.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 7cdfafe0bcc3fa52f6cf7640cdd4480e14649241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cdfafe0bcc3fa52f6cf7640… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 29 11:40:57 2020 +0700 amstream: Handle AMMSF_NOCLOCK flag in AMMultiMediaStream::OpenFile. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 11 ++++++++++ dlls/amstream/tests/amstream.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 967baacb747..f927cd106a0 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -472,6 +472,17 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, } } + if (SUCCEEDED(ret) && (flags & AMMSF_NOCLOCK)) + { + IMediaFilter *media_filter; + + if (SUCCEEDED(ret = IGraphBuilder_QueryInterface(This->graph, &IID_IMediaFilter, (void **)&media_filter))) + { + ret = IMediaFilter_SetSyncSource(media_filter, NULL); + IMediaFilter_Release(media_filter); + } + } + IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); if (SUCCEEDED(ret) && (flags & AMMSF_RUN)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index bd4f94f7327..fbfd899fe29 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -418,6 +418,8 @@ static void test_openfile(const WCHAR *test_avi_path) IAMMultiMediaStream *mmstream = create_ammultimediastream(); IMediaControl *media_control; IMediaStreamFilter *filter; + IMediaFilter *media_filter; + IReferenceClock *clock; IGraphBuilder *graph; OAFilterState state; HRESULT hr; @@ -475,6 +477,11 @@ static void test_openfile(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -485,10 +492,25 @@ static void test_openfile(const WCHAR *test_avi_path) check_interface(filter, &IID_IMediaSeeking, TRUE); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock = NULL; + IMediaFilter_GetSyncSource(media_filter, &clock); + ok(!!clock, "Expected non-NULL clock.\n"); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IMediaStreamFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IReferenceClock_Release(clock); + ok(!ref, "Got outstanding refcount %d.\n", ref); mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); @@ -512,6 +534,34 @@ static void test_openfile(const WCHAR *test_avi_path) IMediaControl_Release(media_control); ref = IGraphBuilder_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NOCLOCK); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock = (IReferenceClock *)0xdeadbeef; + IMediaFilter_GetSyncSource(media_filter, &clock); + ok(!clock, "Got clock %p.\n", clock); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_mmstream_get_duration(const WCHAR *test_avi_path)

1 0

Austin English : dx8vb: Add version resource.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 3ff1686c442935a101aec4e34aae9ae99c58676e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff1686c442935a101aec4e3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:44 2020 -0500 dx8vb: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 ++ dlls/dx8vb/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index c11eb9ef428..727265c6983 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -7,3 +7,5 @@ C_SRCS = \ main.c IDL_SRCS = dx8vb.idl + +RC_SRCS = version.rc diff --git a/dlls/dx8vb/version.rc b/dlls/dx8vb/version.rc new file mode 100644 index 00000000000..b87d8f8ad96 --- /dev/null +++ b/dlls/dx8vb/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dx8vb" +#define WINE_FILENAME_STR "dx8vb.dll" +#define WINE_FILEVERSION 5,3,1,902 +#define WINE_FILEVERSION_STR "5.3.1.902" +#define WINE_PRODUCTVERSION 5,3,1,902 +#define WINE_PRODUCTVERSION_STR "5.3.1.902" + +#include "wine/wine_common_ver.rc"

1 0

Daniel Lehman : msvcr110: Add _Context::_CurrentContext.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: a29f606e08d702ffe0cf6487105427b1dec02bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29f606e08d702ffe0cf6487… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 2 20:12:08 2020 -0800 msvcr110: Add _Context::_CurrentContext. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 39 +++++++++++++++++++++++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/scheduler.c | 14 +++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 9a8ef13aaeb..ea8a3e00dc5 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -327,7 +327,7 @@ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ @ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ -@ stub ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ +@ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() msvcr120.?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=i386 ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAEXXZ @ stub -arch=win64 ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EEAAXXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 425bdfdc21a..54196f63690 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -513,7 +513,7 @@ @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z -@ stub ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ +@ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ(ptr) _Context__CurrentContext @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_DeregisterCallback(a)_CancellationTokenState@details(a)Concurrency@@QAAXPAV_CancellationTokenRegistration(a)23@@Z @ stub -arch=i386 ?_DeregisterCallback(a)_CancellationTokenState@details(a)Concurrency@@QAEXPAV_CancellationTokenRegistration(a)23@@Z diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 364dd26aa82..f88e3122ac9 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -31,6 +31,16 @@ #include <locale.h> +typedef void (*vtable_ptr)(void); + +typedef struct { + const vtable_ptr *vtable; +} Context; + +typedef struct { + Context *ctx; +} _Context; + static char* (CDECL *p_setlocale)(int category, const char* locale); static size_t (CDECL *p___strncnt)(const char *str, size_t count); @@ -39,6 +49,9 @@ static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(v static unsigned int (CDECL *p_CurrentScheduler_Id)(void); static unsigned int (CDECL *p__CurrentScheduler__Id)(void); +static Context* (__cdecl *p_Context_CurrentContext)(void); +static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -60,6 +73,17 @@ static BOOL init(void) SET(p_CurrentScheduler_Id, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); SET(p__CurrentScheduler__Id, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + SET(p__Context__CurrentContext, "?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ"); + + if(sizeof(void*) == 8) + { + SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ"); + } + else + { + SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); + } + return TRUE; } @@ -146,10 +170,25 @@ static void test___strncnt(void) } } +static void test_CurrentContext(void) +{ + _Context _ctx, *ret; + Context *ctx; + + ctx = p_Context_CurrentContext(); + ok(!!ctx, "got NULL\n"); + + memset(&_ctx, 0xcc, sizeof(_ctx)); + ret = p__Context__CurrentContext(&_ctx); + ok(_ctx.ctx == ctx, "expected %p, got %p\n", ctx, _ctx.ctx); + ok(ret == &_ctx, "expected %p, got %p\n", &_ctx, ret); +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); test___strncnt(); + test_CurrentContext(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 368f376939d..f1e6fe210a7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -509,7 +509,7 @@ @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z -@ stub ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ +@ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() _Context__CurrentContext @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAAXXZ @ stub -arch=i386 ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAEXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 54a02bb0a90..87a55210951 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -505,7 +505,7 @@ @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z -@ stub ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ +@ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() msvcr120.?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAAXXZ @ stub -arch=i386 ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAEXXZ diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 59e177b5aec..0701839a9dc 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -68,6 +68,10 @@ typedef struct { #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags)) +typedef struct { + Context *context; +} _Context; + union allocator_cache_entry { struct _free { int depth; @@ -278,6 +282,16 @@ unsigned int __cdecl Context_VirtualProcessorId(void) return ctx ? call_Context_GetVirtualProcessorId(ctx) : -1; } +#if _MSVCR_VER > 100 +/* ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ */ +_Context *__cdecl _Context__CurrentContext(_Context *ret) +{ + TRACE("(%p)\n", ret); + ret->context = Context_CurrentContext(); + return ret; +} +#endif + DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetId, 4) unsigned int __thiscall ExternalContextBase_GetId(const ExternalContextBase *this) {

1 0

Alexandre Julliard : gdi32: Move the default AA flags handling out of freetype.c.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: de63a647d5813be38d61af7159d2fdf20372f319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de63a647d5813be38d61af71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:25:30 2020 +0100 gdi32: Move the default AA flags handling out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 ++ dlls/gdi32/font.c | 209 +++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 94 ++++++++------------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 140 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de63a647d5813be38d61…

1 0

Alexandre Julliard : gdi32: Update the Windows font registry keys only when they have changed.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 000e32f18362d2c0cb17c04cf1c79d3789dccf7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=000e32f18362d2c0cb17c04c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:28:20 2020 +0100 gdi32: Update the Windows font registry keys only when they have changed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 217 ++++++++++++++++++++++++++++++++++++++--------- dlls/gdi32/freetype.c | 191 ----------------------------------------- dlls/gdi32/gdi_private.h | 4 - 3 files changed, 176 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=000e32f18362d2c0cb17…

1 0

Alexandre Julliard : gdi32: Add a helper function to create a face.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: a6f0349e8483ad388b28f239b3e397842b9bdc8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f0349e8483ad388b28f239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:27:21 2020 +0100 gdi32: Add a helper function to create a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 142 ++++++++++++++++++++++++++++++++++------------- dlls/gdi32/freetype.c | 115 ++++++++------------------------------ dlls/gdi32/gdi_private.h | 12 ++-- 3 files changed, 132 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6f0349e8483ad388b28…

1 0

Paul Gofman : kernel32: Add string for E_FAIL error.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

1 0

Alexandre Julliard : gdi32: Move the font list reordering out of freetype.c.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: fc44dcdd03b0ec88f38b988849f4830b92b93879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc44dcdd03b0ec88f38b9888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:25:47 2020 +0100 gdi32: Move the font list reordering out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 75 ------------------------------------------------ dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 62 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cf27f6063ee..26f183e4864 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -225,6 +225,42 @@ static const WCHAR Gulim[] = {'G','u','l','i','m',0}; static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; +static const WCHAR arial[] = {'A','r','i','a','l',0}; +static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; +static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; +static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; +static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; +static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; +static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; +static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; + +static const WCHAR * const default_serif_list[] = +{ + times_new_roman, + liberation_serif, + bitstream_vera_serif, + NULL +}; +static const WCHAR * const default_fixed_list[] = +{ + courier_new, + liberation_mono, + bitstream_vera_sans_mono, + NULL +}; +static const WCHAR * const default_sans_list[] = +{ + arial, + liberation_sans, + bitstream_vera_sans, + NULL +}; + +const WCHAR *default_serif = times_new_roman; +const WCHAR *default_fixed = courier_new; +const WCHAR *default_sans = arial; + static const struct nls_update_font_list { UINT ansi_cp, oem_cp; @@ -691,6 +727,28 @@ static void dump_gdi_font_list(void) } } +static const WCHAR *set_default_family( const WCHAR * const *name_list ) +{ + struct gdi_font_family *family; + const WCHAR * const *entry; + + for (entry = name_list; *entry; entry++) + { + if (!(family = find_family_from_name( *entry ))) continue; + list_remove( &family->entry ); + list_add_head( &font_list, &family->entry ); + return *entry; + } + return *name_list; +} + +static void reorder_font_list(void) +{ + default_serif = set_default_family( default_serif_list ); + default_fixed = set_default_family( default_fixed_list ); + default_sans = set_default_family( default_sans_list ); +} + 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 ) @@ -3187,6 +3245,7 @@ void font_init(void) init_font_options(); update_codepage(); WineEngInit( &font_funcs ); + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); load_system_links(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ea76e90a7f8..50df968226b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -263,46 +263,8 @@ static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\', static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; -/* Interesting and well-known (frequently-assumed!) font names */ -static const WCHAR arial[] = {'A','r','i','a','l',0}; -static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; -static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; -static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; -static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; -static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; -static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; -static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; -static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; static const WCHAR SymbolW[] = {'S','y','m','b','o','l','\0'}; -static const WCHAR *default_serif_list[] = -{ - times_new_roman, - liberation_serif, - bitstream_vera_serif, - NULL -}; - -static const WCHAR *default_fixed_list[] = -{ - courier_new, - liberation_mono, - bitstream_vera_sans_mono, - NULL -}; - -static const WCHAR *default_sans_list[] = -{ - arial, - liberation_sans, - bitstream_vera_sans, - NULL -}; - -static const WCHAR *default_serif = times_new_roman; -static const WCHAR *default_fixed = courier_new; -static const WCHAR *default_sans = arial; - /* Registry font cache key and value names */ static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s',0}; @@ -2205,41 +2167,6 @@ static void init_font_list(void) #endif } -static BOOL move_to_front(const WCHAR *name) -{ - Family *family, *cursor2; - LIST_FOR_EACH_ENTRY_SAFE(family, cursor2, &font_list, Family, entry) - { - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) - { - list_remove(&family->entry); - list_add_head(&font_list, &family->entry); - return TRUE; - } - } - return FALSE; -} - -static const WCHAR *set_default(const WCHAR **name_list) -{ - const WCHAR **entry = name_list; - - while (*entry) - { - if (move_to_front(*entry)) return *entry; - entry++; - } - - return *name_list; -} - -static void reorder_font_list(void) -{ - default_serif = set_default( default_serif_list ); - default_fixed = set_default( default_fixed_list ); - default_sans = set_default( default_sans_list ); -} - /************************************************************* * WineEngInit * @@ -2272,8 +2199,6 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) else load_font_list_from_cache(hkey_font_cache); - reorder_font_list(); - if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2d1d74e902b..4350be34851 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -479,6 +479,9 @@ extern struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const const LOGFONTW *lf ) DECLSPEC_HIDDEN; extern void *get_GSUB_vert_feature( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; +extern const WCHAR *default_serif DECLSPEC_HIDDEN; +extern const WCHAR *default_fixed DECLSPEC_HIDDEN; +extern const WCHAR *default_sans DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Add a separate backend function to load the font list.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: a84c60ed2ad79cc3cc6e57cfd4989b701e9be5d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a84c60ed2ad79cc3cc6e57cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:26:12 2020 +0100 gdi32: Add a separate backend function to load the font list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 11 ++++++++++- dlls/gdi32/freetype.c | 41 ++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 26f183e4864..7bb0f513ca7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3238,13 +3238,22 @@ static void init_font_options(void) */ void font_init(void) { + static const WCHAR mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_',0}; + HANDLE mutex; + if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Wine\\Fonts", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) return; init_font_options(); update_codepage(); - WineEngInit( &font_funcs ); + if (!WineEngInit( &font_funcs )) return; + + if (!(mutex = CreateMutexW( NULL, FALSE, mutex_nameW ))) return; + WaitForSingleObject( mutex, INFINITE ); + font_funcs->load_fonts(); + ReleaseMutex( mutex ); + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 50df968226b..dea032b7185 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -286,8 +286,6 @@ static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; static HKEY hkey_font_cache; -static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; - 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 ); @@ -2168,29 +2166,11 @@ static void init_font_list(void) } /************************************************************* - * WineEngInit - * - * Initialize FreeType library and create a list of available faces + * freetype_load_fonts */ -BOOL WineEngInit( const struct font_backend_funcs **funcs ) +static void CDECL freetype_load_fonts(void) { DWORD disposition; - HANDLE font_mutex; - - if(!init_freetype()) return FALSE; - -#ifdef SONAME_LIBFONTCONFIG - init_fontconfig(); -#endif - - *funcs = &font_funcs; - - if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) - { - ERR("Failed to create font mutex\n"); - return FALSE; - } - WaitForSingleObject(font_mutex, INFINITE); create_font_cache_key(&hkey_font_cache, &disposition); @@ -2201,8 +2181,22 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); +} + +/************************************************************* + * WineEngInit + * + * Initialize FreeType library and create a list of available faces + */ +BOOL WineEngInit( const struct font_backend_funcs **funcs ) +{ + if(!init_freetype()) return FALSE; + +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif - ReleaseMutex(font_mutex); + *funcs = &font_funcs; return TRUE; } @@ -5020,6 +5014,7 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI static const struct font_backend_funcs font_funcs = { freetype_SelectFont, + freetype_load_fonts, freetype_add_font, freetype_add_mem_font, freetype_remove_font, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4350be34851..f77ed4ec345 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -427,6 +427,7 @@ struct font_backend_funcs { struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont ); + void (CDECL *load_fonts)(void); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags );

1 0