December 2020 - Wine-Commits

Nikolay Sivov : mf/topoloader: Set MF_TOPONODE_DECODER for the decoders.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: a343a31710148d2a1f7cdff93e0584e29e0ad980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a343a31710148d2a1f7cdff9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:25 2020 +0300 mf/topoloader: Set MF_TOPONODE_DECODER for the decoders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++++++++-- dlls/mf/topology.c | 27 ++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 20e3e8713c6..d7d7fdfa60e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1740,7 +1740,6 @@ static void test_topology_loader(void) { /* PCM -> PCM, different bps. */ &MFMediaType_Audio, - /* Source type */ { { { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, @@ -1751,7 +1750,6 @@ static void test_topology_loader(void) { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, } }, - /* Sink type */ { { { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, @@ -2039,6 +2037,14 @@ todo_wine { hr = IMFTopologyNode_GetObject(mft_node, &node_object); ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + if (test->flags & LOADER_EXPECTED_DECODER) + { + value = 0; + hr = IMFTopologyNode_GetUINT32(mft_node, &MF_TOPONODE_DECODER, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == 1, "Unexpected value.\n"); + } + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); IUnknown_Release(node_object); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 7001a33f088..efa28e9f457 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1996,6 +1996,7 @@ struct transform_output_type { IMFMediaType *type; IMFTransform *transform; + const GUID *category; }; struct connect_context @@ -2053,6 +2054,7 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM unsigned int output_count = 0; output_type.transform = transform; + output_type.category = category; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, output_count++, &output_type.type))) { hr = connect_func(&output_type, context); @@ -2073,6 +2075,24 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM return hr; } +static HRESULT topology_loader_create_transform(const struct transform_output_type *output_type, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, node))) + return hr; + + IMFTopologyNode_SetObject(*node, (IUnknown *)output_type->transform); + if (IsEqualGUID(output_type->category, &MFT_CATEGORY_AUDIO_DECODER) || + IsEqualGUID(output_type->category, &MFT_CATEGORY_VIDEO_DECODER)) + { + IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_DECODER, 1); + } + + return hr; +} + static HRESULT connect_to_sink(struct transform_output_type *output_type, struct connect_context *context) { IMFTopologyNode *node; @@ -2081,10 +2101,9 @@ static HRESULT connect_to_sink(struct transform_output_type *output_type, struct if (FAILED(IMFMediaTypeHandler_IsMediaTypeSupported(context->sink_handler, output_type->type, NULL))) return MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION; - if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + if (FAILED(hr = topology_loader_create_transform(output_type, &node))) return hr; - IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); IMFTopology_AddNode(context->context->output_topology, node); IMFTopologyNode_ConnectOutput(context->upstream_node, 0, node, 0); IMFTopologyNode_ConnectOutput(node, 0, context->sink, 0); @@ -2107,11 +2126,9 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s if (SUCCEEDED(connect_to_sink(output_type, context))) return S_OK; - if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + if (FAILED(hr = topology_loader_create_transform(output_type, &node))) return hr; - IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); - sink_ctx = *context; sink_ctx.upstream_node = node;

1 0

Nikolay Sivov : mf/topoloader: Make sure MF_TOPONODE_STREAMID is set for all outputs.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 902af3d17aee9d4d27d337b7562f7b8a9646a27d URL: https://source.winehq.org/git/wine.git/?a=commit;h=902af3d17aee9d4d27d337b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:27 2020 +0300 mf/topoloader: Make sure MF_TOPONODE_STREAMID is set for all outputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/topology.c | 29 ++++++++++++ 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4d4c6283be8..c36a76d83bb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1622,8 +1622,11 @@ static void init_source_node(IMFMediaType *mediatype, IMFMediaSource *source, IM hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); - hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_SOURCE, (IUnknown *)source); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (source) + { + hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } IMFStreamDescriptor_Release(sd); } @@ -2121,6 +2124,129 @@ todo_wine { ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void test_topology_loader_evr(void) +{ + IMFTopologyNode *node, *source_node, *evr_node; + IMFTopology *topology, *full_topology; + IMFMediaTypeHandler *handler; + unsigned int i, count, value; + IMFStreamSink *stream_sink; + IMFMediaType *media_type; + IMFActivate *activate; + IMFTopoLoader *loader; + IMFMediaSink *sink; + WORD node_count; + HWND window; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = MFCreateTopoLoader(&loader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Source node. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &source_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + init_source_node(media_type, NULL, source_node); + + /* EVR sink node. */ + window = create_window(); + + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &evr_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(evr_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaTypeHandler_Release(handler); + + IMFStreamSink_Release(stream_sink); + IMFMediaSink_Release(sink); + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, source_node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, evr_node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyNode_ConnectOutput(source_node, 0, evr_node, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(evr_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_DIRECT); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_GetCount(evr_node, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %u.\n", node_count); + + for (i = 0; i < node_count; ++i) + { + MF_TOPOLOGY_TYPE node_type; + + hr = IMFTopology_GetNode(full_topology, i, &node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_GetNodeType(node, &node_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + { + value = 1; + hr = IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_STREAMID, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value, "Unexpected stream id %u.\n", value); + } + } + + IMFTopology_Release(full_topology); + + IMFTopoLoader_Release(loader); + + IMFTopologyNode_Release(source_node); + IMFTopologyNode_Release(evr_node); + IMFTopology_Release(topology); + IMFMediaType_Release(media_type); + DestroyWindow(window); + + CoUninitialize(); +} + static HRESULT WINAPI testshutdown_QueryInterface(IMFShutdown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFShutdown) || @@ -4859,6 +4985,7 @@ START_TEST(mf) test_topology(); test_topology_tee_node(); test_topology_loader(); + test_topology_loader_evr(); test_MFGetService(); test_sequencer_source(); test_media_session(); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 77baa1128c4..6f73bb859cd 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2364,6 +2364,32 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, return hr; } +static void topology_loader_resolve_complete(struct topoloader_context *context) +{ + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + WORD i, node_count; + + IMFTopology_GetNodeCount(context->output_topology, &node_count); + + for (i = 0; i < node_count; ++i) + { + if (SUCCEEDED(IMFTopology_GetNode(context->output_topology, i, &node))) + { + IMFTopologyNode_GetNodeType(node, &node_type); + + if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + { + /* Make sure MF_TOPONODE_STREAMID is set for all outputs. */ + if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); + } + + IMFTopologyNode_Release(node); + } + } +} + static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **ret_topology, IMFTopology *current_topology) { @@ -2451,6 +2477,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } + if (SUCCEEDED(hr)) + topology_loader_resolve_complete(&context); + *ret_topology = output_topology; return hr;

1 0

Nikolay Sivov : dwrite: Use font data access helpers when reading metrics tables.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: b3c27c4792a64e7b8665b4b53fb658afb2e21988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c27c4792a64e7b8665b4b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:03 2020 +0300 dwrite: Use font data access helpers when reading metrics tables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 200 ++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c27c4792a64e7b8665…

1 0

Nikolay Sivov : dwrite/gdiinterop: Use consistent traces for the interop object.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 40d30cf4542a425e6d8e2ee4a7aa9c91ba75dc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d30cf4542a425e6d8e2ee4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:01 2020 +0300 dwrite/gdiinterop: Use consistent traces for the interop object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 47924011fd3..81cfc3a586b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -637,9 +637,7 @@ static HRESULT create_rendertarget(IDWriteFactory7 *factory, HDC hdc, UINT32 wid static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop1 *iface, REFIID riid, void **obj) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteGdiInterop1) || IsEqualIID(riid, &IID_IDWriteGdiInterop) || @@ -686,9 +684,7 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop1 *iface) static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFont **font) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, logfont, font); + TRACE("%p, %p, %p.\n", iface, logfont, font); return IDWriteGdiInterop1_CreateFontFromLOGFONT(iface, logfont, NULL, font); } @@ -696,12 +692,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); IDWriteFontCollection *collection; IDWriteFontFamily *family; HRESULT hr; - TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); + TRACE("%p, %p, %p, %p.\n", iface, font, logfont, is_systemfont); *is_systemfont = FALSE; @@ -732,9 +727,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, logfont); + TRACE("%p, %p, %p.\n", iface, fontface, logfont); memset(logfont, 0, sizeof(*logfont)); @@ -841,9 +834,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop1 *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget(This->factory, hdc, width, height, target); + struct gdiinterop *interop = impl_from_IDWriteGdiInterop1(iface); + + TRACE("%p, %p, %u, %u, %p.\n", iface, hdc, width, height, target); + + return create_rendertarget(interop->factory, hdc, width, height, target); } static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, @@ -897,9 +892,7 @@ done: static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, FONTSIGNATURE *fontsig) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, fontsig); + TRACE("%p, %p, %p.\n", iface, fontface, fontsig); return get_fontsig_from_fontface(fontface, fontsig); } @@ -919,9 +912,7 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, ID static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFontSet *fontset, IDWriteFontSet **subset) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - FIXME("(%p)->(%p %p %p): stub\n", This, logfont, fontset, subset); + FIXME("%p, %p, %p, %p: stub.\n", iface, logfont, fontset, subset); return E_NOTIMPL; }

1 0

Rémi Bernon : gdi32: Load registry fonts after system fonts.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 3c0137f81e35c3868ad543f1433f034c03809884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0137f81e35c3868ad543f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:01 2020 +0100 gdi32: Load registry fonts after system fonts. This fixes an issue when, if an external font path was modified in the Windows key, it was then not considered as external anymore, but still present in the external key, and then dropped from both on update. This now forcefully updates the font path in both keys if needed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index db87a283b13..28179aec54a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7958,8 +7958,8 @@ void font_init(void) HKEY key = load_external_font_keys(); load_system_bitmap_fonts(); load_file_system_fonts(); - load_registry_fonts(); font_funcs->load_fonts(); + load_registry_fonts(); update_external_font_keys( key ); RegCloseKey( key ); }

1 0

Austin English : dcomp: Add stub dll.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 0f29186a23c2639eb14a805569b8b5e9a848428f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f29186a23c2639eb14a8055… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 30 02:27:56 2020 -0600 dcomp: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50206 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dcomp/Makefile.in | 8 ++++++++ dlls/dcomp/dcomp.spec | 27 +++++++++++++++++++++++++++ dlls/dcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dcomp/version.rc | 26 ++++++++++++++++++++++++++ 6 files changed, 108 insertions(+) diff --git a/configure b/configure index 9ee3ffdc947..d025c38934c 100755 --- a/configure +++ b/configure @@ -1244,6 +1244,7 @@ enable_davclnt enable_dbgeng enable_dbghelp enable_dciman32 +enable_dcomp enable_ddraw enable_ddrawex enable_devenum @@ -20214,6 +20215,7 @@ wine_fn_config_makefile dlls/dbgeng/tests enable_tests wine_fn_config_makefile dlls/dbghelp enable_dbghelp wine_fn_config_makefile dlls/dbghelp/tests enable_tests wine_fn_config_makefile dlls/dciman32 enable_dciman32 +wine_fn_config_makefile dlls/dcomp enable_dcomp wine_fn_config_makefile dlls/ddeml.dll16 enable_win16 wine_fn_config_makefile dlls/ddraw enable_ddraw wine_fn_config_makefile dlls/ddraw/tests enable_tests diff --git a/configure.ac b/configure.ac index 92b555bb3b8..e823543f1cd 100644 --- a/configure.ac +++ b/configure.ac @@ -3145,6 +3145,7 @@ WINE_CONFIG_MAKEFILE(dlls/dbgeng/tests) WINE_CONFIG_MAKEFILE(dlls/dbghelp) WINE_CONFIG_MAKEFILE(dlls/dbghelp/tests) WINE_CONFIG_MAKEFILE(dlls/dciman32) +WINE_CONFIG_MAKEFILE(dlls/dcomp) WINE_CONFIG_MAKEFILE(dlls/ddeml.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/ddraw) WINE_CONFIG_MAKEFILE(dlls/ddraw/tests) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in new file mode 100644 index 00000000000..6d75a87980f --- /dev/null +++ b/dlls/dcomp/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dcomp.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec new file mode 100644 index 00000000000..03801ebba6f --- /dev/null +++ b/dlls/dcomp/dcomp.spec @@ -0,0 +1,27 @@ +1017 stub @ +1019 stub @ +1028 stub @ +1031 stub @ +1033 stub @ +1038 stub @ +1039 stub @ +1040 stub @ +1041 stub @ +1042 stub @ + +@ stub CompileEffectDescription +@ stub CreateEffectDescription +@ stub DCompositionAttachMouseDragToHwnd +@ stub DCompositionAttachMouseWheelToHwnd +@ stub DCompositionCreateDevice2 +@ stub DCompositionCreateDevice3 +@ stub DCompositionCreateDevice +@ stub DCompositionCreateSurfaceHandle +@ stub DeserializeEffectDescription +@ stub DllCanUnloadNow +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub DwmEnableMMCSS +@ stub DwmFlush +@ stub DwmpEnableDDASupport +@ stub SerializeEffectDescription diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c new file mode 100644 index 00000000000..b0b911a9bf5 --- /dev/null +++ b/dlls/dcomp/main.c @@ -0,0 +1,44 @@ +/* + * DirectComposition Library + * + * 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 + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/dcomp/version.rc b/dlls/dcomp/version.rc new file mode 100644 index 00000000000..a76f2675829 --- /dev/null +++ b/dlls/dcomp/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 dcomp" +#define WINE_FILENAME_STR "dcomp.dll" +#define WINE_FILEVERSION 10,0,14393,0 +#define WINE_FILEVERSION_STR "10.0.14393.0" +#define WINE_PRODUCTVERSION 10,0,14393,0 +#define WINE_PRODUCTVERSION_STR "10.0.14393.0" + +#include "wine/wine_common_ver.rc"

1 0

Rémi Bernon : gdi32: Only request registry font path when necessary.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: cae74aa7d9f96f57d044e5b7f0b491ff7b3b02df URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae74aa7d9f96f57d044e5b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:04 2020 +0100 gdi32: Only request registry font path when necessary. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d3202d83a15..4cc072bd785 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7910,7 +7910,7 @@ static void load_registry_fonts(void) vlen = ARRAY_SIZE(value); dlen = sizeof(data); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen )) + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, NULL, NULL )) { if (type != REG_SZ) goto next; dlen /= sizeof(WCHAR); @@ -7918,6 +7918,13 @@ static void load_registry_fonts(void) if (find_face_from_full_name( value )) goto next; if (tmp && !*tmp) *tmp = ' '; + if (RegQueryValueExW( hkey, value, NULL, NULL, (LPBYTE)data, &dlen )) + { + WARN( "Unable to get face path %s\n", debugstr_w(value) ); + goto next; + } + + dlen /= sizeof(WCHAR); if (data[0] && data[1] == ':') add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" ))

1 0

Rémi Bernon : gdi32: Only use the registry cache for application fonts.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 63de94839cad9bd7845d79c27aff599d97104f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63de94839cad9bd7845d79c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:05 2020 +0100 gdi32: Only use the registry cache for application fonts. And load system fonts outside of the global font mutex. We now only use the mutex to protect the registry fonts initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 26 ++++++++++++++++---------- dlls/gdi32/freetype.c | 6 +++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4cc072bd785..9fa0f45ec4b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7758,7 +7758,7 @@ static void load_system_bitmap_fonts(void) { dlen = sizeof(data); if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); } RegCloseKey( hkey ); } @@ -7789,11 +7789,11 @@ static void load_file_system_fonts(void) /* Windows directory */ get_fonts_win_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + load_directory_fonts( path, 0 ); /* Wine data directory */ get_fonts_data_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); /* custom paths */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ @@ -7805,7 +7805,7 @@ static void load_file_system_fonts(void) if (next && next - ptr < 2) continue; lstrcpynW( path, ptr, MAX_PATH - 2 ); lstrcatW( path, L"\\*" ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); } } } @@ -7926,9 +7926,9 @@ static void load_registry_fonts(void) dlen /= sizeof(WCHAR); if (data[0] && data[1] == ':') - add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_font_resource( data, ADDFONT_ALLOW_BITMAP ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" )) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); next: vlen = ARRAY_SIZE(value); dlen = sizeof(data); @@ -7954,6 +7954,10 @@ void font_init(void) update_codepage(); if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; + load_system_bitmap_fonts(); + load_file_system_fonts(); + font_funcs->load_fonts(); + if (!(mutex = CreateMutexW( NULL, FALSE, L"__WINE_FONT_MUTEX__" ))) return; WaitForSingleObject( mutex, INFINITE ); @@ -7962,16 +7966,18 @@ void font_init(void) if (disposition == REG_CREATED_NEW_KEY) { - load_system_bitmap_fonts(); - load_file_system_fonts(); - font_funcs->load_fonts(); load_registry_fonts(); update_external_font_keys(); } - else load_font_list_from_cache(); ReleaseMutex( mutex ); + if (disposition != REG_CREATED_NEW_KEY) + { + load_registry_fonts(); + load_font_list_from_cache(); + } + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e7684728c9c..1ee02795bed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1303,7 +1303,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) ReadFontDir(path, external_fonts); else { - DWORD addfont_flags = ADDFONT_ADD_TO_CACHE; + DWORD addfont_flags = 0; if(external_fonts) addfont_flags |= ADDFONT_EXTERNAL_FONT; AddFontToList(NULL, path, NULL, 0, addfont_flags); } @@ -1523,7 +1523,7 @@ static void load_fontconfig_fonts( void ) if (!(done_set = pFcStrSetCreate())) goto done; if (!(dir_list = pFcConfigGetFontDirs( config ))) goto done; - fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE ); + fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT ); done: if (dir_list) pFcStrListDone( dir_list ); @@ -1543,7 +1543,7 @@ static void load_mac_font_callback(const void *value, void *context) if (path && CFStringGetFileSystemRepresentation(pathStr, path, len)) { TRACE("font file %s\n", path); - AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT); } RtlFreeHeap(GetProcessHeap(), 0, path); }

1 0

Rémi Bernon : include: Emit assembly function size when compiling without MinGW.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 4130bbf48fdc7d54ec01102de4cb03ccfb105ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4130bbf48fdc7d54ec01102d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 30 10:30:19 2020 +0100 include: Emit assembly function size when compiling without MinGW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b4b6fb50eb8..b5e6c6efd3d 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -65,6 +65,14 @@ # define __ASM_FUNC_TYPE(name) ".type " name ",@function" #endif +#ifdef _WIN32 +# define __ASM_FUNC_SIZE(name) "" +#elif defined(__APPLE__) +# define __ASM_FUNC_SIZE(name) "" +#else +# define __ASM_FUNC_SIZE(name) "\n\t.size " name ",.-" name +#endif + #if !defined(__GNUC__) && !defined(__clang__) # define __ASM_BLOCK_BEGIN(name) void __asm_dummy_##name(void) { # define __ASM_BLOCK_END } @@ -76,7 +84,7 @@ #define __ASM_DEFINE_FUNC(name,code) \ __ASM_BLOCK_BEGIN(__LINE__) \ asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") __ASM_FUNC_SIZE(name)); \ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code)

1 0

Rémi Bernon : gdi32: Update the external keys after all fonts are loaded.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: a0b7a0da401ad27905feca8c0de06d39155dfe4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b7a0da401ad27905feca8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:03 2020 +0100 gdi32: Update the external keys after all fonts are loaded. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 98 ++++++++++++++++-------------------------------- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 33 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7338d5fbb03..d3202d83a15 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7812,70 +7812,57 @@ static void load_file_system_fonts(void) struct external_key { - struct wine_rb_entry entry; - BOOL found; - WCHAR value[LF_FULLFACESIZE + 12]; - WCHAR path[1]; + struct list entry; + WCHAR value[LF_FULLFACESIZE + 12]; }; -static int compare_external_key( const void *key, const struct wine_rb_entry *entry ) +static void update_external_font_keys(void) { - return facename_compare( key, WINE_RB_ENTRY_VALUE( entry, struct external_key, entry )->value, -1 ); -} + struct list external_keys = LIST_INIT(external_keys); + HKEY winnt_key = 0, win9x_key = 0; + struct gdi_font_family *family; + struct external_key *key, *next; + struct gdi_font_face *face; + DWORD len, i = 0, type, dlen, vlen; + WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH], *tmp; + WCHAR *file; + HKEY hkey; -static struct wine_rb_tree external_keys = { compare_external_key }; + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL ); -static HKEY load_external_font_keys(void) -{ - WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH]; - DWORD i = 0, type, dlen, vlen; - struct external_key *key; - HKEY hkey; + /* enumerate the fonts and add external ones to the two keys */ - if (RegCreateKeyW( wine_fonts_key, L"External Fonts", &hkey )) return 0; + if (RegCreateKeyW( wine_fonts_key, L"External Fonts", &hkey )) return; vlen = ARRAY_SIZE(value); dlen = sizeof(path); while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)path, &dlen )) { if (type != REG_SZ) goto next; - dlen /= sizeof(WCHAR); - if (!(key = HeapAlloc( GetProcessHeap(), 0, offsetof(struct external_key, path[dlen]) ))) break; - key->found = FALSE; + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; + if ((face = find_face_from_full_name( value ))) + { + if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND; + goto next; + } + if (tmp && !*tmp) *tmp = ' '; + if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) break; lstrcpyW( key->value, value ); - lstrcpyW( key->path, path ); - wine_rb_put( &external_keys, value, &key->entry ); + list_add_tail( &external_keys, &key->entry ); next: vlen = ARRAY_SIZE(value); dlen = sizeof(path); } - return hkey; -} - -static void update_external_font_keys( HKEY hkey ) -{ - HKEY winnt_key = 0, win9x_key = 0; - struct gdi_font_family *family; - struct gdi_font_face *face; - struct wine_rb_entry *entry; - struct external_key *key, *next; - DWORD len; - BOOL skip; - WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH]; - WCHAR *file; - - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL ); - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL ); - - /* enumerate the fonts and add external ones to the two keys */ WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) { if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; + if ((face->flags & ADDFONT_EXTERNAL_FOUND)) continue; lstrcpyW( value, face->full_name ); if (face->scalable) lstrcatW( value, L" (TrueType)" ); @@ -7887,38 +7874,29 @@ static void update_external_font_keys( HKEY hkey ) else file = face->file; - skip = FALSE; - if ((entry = wine_rb_get( &external_keys, value ))) - { - struct external_key *key = WINE_RB_ENTRY_VALUE( entry, struct external_key, entry ); - skip = key->found && !wcsicmp( key->path, file ); - wine_rb_remove_key( &external_keys, value ); - HeapFree( GetProcessHeap(), 0, key ); - } - if (skip) continue; len = (lstrlenW(file) + 1) * sizeof(WCHAR); RegSetValueExW( winnt_key, value, 0, REG_SZ, (BYTE *)file, len ); RegSetValueExW( win9x_key, value, 0, REG_SZ, (BYTE *)file, len ); RegSetValueExW( hkey, value, 0, REG_SZ, (BYTE *)file, len ); } } - WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( key, next, &external_keys, struct external_key, entry ) + LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) { RegDeleteValueW( win9x_key, key->value ); RegDeleteValueW( winnt_key, key->value ); RegDeleteValueW( hkey, key->value ); - wine_rb_remove_key( &external_keys, key->value ); + list_remove( &key->entry ); HeapFree( GetProcessHeap(), 0, key ); } RegCloseKey( win9x_key ); RegCloseKey( winnt_key ); + RegCloseKey( hkey ); } static void load_registry_fonts(void) { WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH], *tmp; DWORD i = 0, type, dlen, vlen; - struct wine_rb_entry *entry; HKEY hkey; /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts @@ -7936,16 +7914,6 @@ static void load_registry_fonts(void) { if (type != REG_SZ) goto next; dlen /= sizeof(WCHAR); - if ((entry = wine_rb_get( &external_keys, value ))) - { - struct external_key *key = WINE_RB_ENTRY_VALUE( entry, struct external_key, entry ); - if (!wcsicmp( key->path, data )) - { - key->found = TRUE; - goto next; - } - } - if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; if (find_face_from_full_name( value )) goto next; if (tmp && !*tmp) *tmp = ' '; @@ -7987,13 +7955,11 @@ void font_init(void) if (disposition == REG_CREATED_NEW_KEY) { - HKEY key = load_external_font_keys(); load_system_bitmap_fonts(); load_file_system_fonts(); font_funcs->load_fonts(); load_registry_fonts(); - update_external_font_keys( key ); - RegCloseKey( key ); + update_external_font_keys(); } else load_font_list_from_cache(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 163152fe839..b9a06415538 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -376,6 +376,7 @@ struct gdi_font #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ #define ADDFONT_VERTICAL_FONT 0x10 +#define ADDFONT_EXTERNAL_FOUND 0x20 #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) struct font_backend_funcs

1 0