July 2020 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don't use isgraphW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 9254edc30d668e59eac487fe3b2b829092c4eb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9254edc30d668e59eac487fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:00 2020 +0200 msvcrt: Don't use isgraphW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index af09d38af4..3f6b56dab8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1993,19 +1993,19 @@ INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswgraph (MSVCRT.@) + * _iswgraph_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isgraphW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale ); } /********************************************************************* - * _iswgraph_l (MSVCRT.@) + * iswgraph (MSVCRT.@) */ -int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) { - return isgraphW( wc ); + return MSVCRT__iswgraph_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use islowerW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: badc282cf7dcff01690f4081cdf867ef1a083d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badc282cf7dcff01690f4081… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:06 2020 +0200 msvcrt: Don't use islowerW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3f6b56dab8..2e3a624d3c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2009,19 +2009,19 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswlower (MSVCRT.@) + * _iswlower_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswlower_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return islowerW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__LOWER, locale ); } /********************************************************************* - * _iswlower_l (MSVCRT.@) + * iswlower (MSVCRT.@) */ -int CDECL MSVCRT__iswlower_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) { - return islowerW( wc ); + return MSVCRT__iswlower_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isprintW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: f6576c76d99be5ad857e7894455a939476e2d590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6576c76d99be5ad857e7894… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:10 2020 +0200 msvcrt: Don't use isprintW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2e3a624d3c..82ee5c9ef8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2025,19 +2025,20 @@ INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswprint (MSVCRT.@) + * _iswprint_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isprintW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__BLANK | + MSVCRT__DIGIT | MSVCRT__PUNCT, locale ); } /********************************************************************* - * _iswprint_l (MSVCRT.@) + * iswprint (MSVCRT.@) */ -int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) { - return isprintW( wc ); + return MSVCRT__iswprint_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use ispunctW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: ab678ee097134927bf140ee79b3537f3c506258b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab678ee097134927bf140ee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:22 2020 +0200 msvcrt: Don't use ispunctW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 82ee5c9ef8..f3dac854d8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2046,7 +2046,7 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) */ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return ispunctW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__PUNCT, locale ); } /********************************************************************* @@ -2054,7 +2054,7 @@ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) */ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc ) { - return ispunctW( wc ); + return MSVCRT__iswpunct_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isupperW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: da164d19e84034c9947726bb192216bfe300f898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da164d19e84034c9947726bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:29 2020 +0200 msvcrt: Don't use isupperW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f3dac854d8..fb494ebe39 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2074,19 +2074,19 @@ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswupper (MSVCRT.@) + * _iswupper_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isupperW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__UPPER, locale ); } /********************************************************************* - * _iswupper_l (MSVCRT.@) + * iswupper (MSVCRT.@) */ -int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) { - return isupperW( wc ); + return MSVCRT__iswupper_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isxdigitW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: a2a3537200436802f832ba6bd77766180173012c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a3537200436802f832ba6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:34 2020 +0200 msvcrt: Don't use isxdigitW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fb494ebe39..29cad7c44e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2090,19 +2090,19 @@ INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswxdigit (MSVCRT.@) + * _iswxdigit_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isxdigitW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__HEX, locale ); } /********************************************************************* - * _iswxdigit_l (MSVCRT.@) + * iswxdigit (MSVCRT.@) */ -int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) { - return isxdigitW( wc ); + return MSVCRT__iswxdigit_l( wc, NULL ); } /*********************************************************************

1 0

Shawn M. Chapla : gdiplus/tests: Add additional logfont size tests.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: bfc8404041edc39292eb68b911df814c998055fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc8404041edc39292eb68b9… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jul 14 21:24:56 2020 -0400 gdiplus/tests: Add additional logfont size tests. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codewevers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 10d1f3bd5a..74cf451e36 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -300,6 +300,56 @@ static void test_logfont(void) GdipDeleteFontFamily(family); GdipDeleteFont(font); + font = NULL; + + /* The next test must be done with a font where tmHeight - + tmInternalLeading != tmAscent. Times New Roman is such a font, + so make sure we really have it before continuing. */ + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + memset(&lfa2, 0, sizeof(lfa2)); + stat = GdipGetLogFontA(font, graphics, &lfa2); + expect(Ok, stat); + + GdipDeleteFont(font); + font = NULL; + + if (!lstrlenA(lfa.lfFaceName) || lstrcmpA(lfa.lfFaceName, lfa2.lfFaceName)) + { + skip("Times New Roman not installed\n"); + } + else + { + static const struct + { + INT input; + REAL expected; + } test_sizes[] = {{12, 9.0}, {36, 32.0}, {48, 42.0}, {72, 63.0}, {144, 127.0}}; + + UINT i; + + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + for (i = 0; i < sizeof(test_sizes)/sizeof(test_sizes[0]); ++i) + { + lfa.lfHeight = test_sizes[i].input; + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + todo_wine expectf(test_sizes[i].expected, rval); + + GdipDeleteFont(font); + font = NULL; + } + } GdipDeleteGraphics(graphics); ReleaseDC(0, hdc);

1 0

Shawn M. Chapla : gdiplus: Set font emSize to height minus internal leading.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 04d536267e35cc7f3d30667971e1c6dbd5a298f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d536267e35cc7f3d306679… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jul 14 21:24:57 2020 -0400 gdiplus: Set font emSize to height minus internal leading. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codewevers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a7719a9458..eb0b6c0836 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -219,7 +219,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, if (!*font) return OutOfMemory; (*font)->unit = UnitWorld; - (*font)->emSize = otm.otmTextMetrics.tmAscent; + (*font)->emSize = otm.otmTextMetrics.tmHeight - otm.otmTextMetrics.tmInternalLeading; (*font)->otm = otm; stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 74cf451e36..b762f7c45f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -344,7 +344,7 @@ static void test_logfont(void) stat = GdipGetFontSize(font, &rval); expect(Ok, stat); - todo_wine expectf(test_sizes[i].expected, rval); + expectf(test_sizes[i].expected, rval); GdipDeleteFont(font); font = NULL;

1 0

Nikolay Sivov : mf/topoloader: Switch to public interface for initial topology validation.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 8e343024b577892bd4908304ded34b758579698d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e343024b577892bd4908304… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 15:55:45 2020 +0300 mf/topoloader: Switch to public interface for initial topology validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index abe66c45fd..8522f56969 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1936,38 +1936,50 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **output_topology, IMFTopology *current_topology) { - struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + unsigned short i = 0; IMFStreamSink *sink; - HRESULT hr; - size_t i; + IUnknown *object; + HRESULT hr = E_FAIL; FIXME("%p, %p, %p, %p.\n", iface, input_topology, output_topology, current_topology); if (current_topology) FIXME("Current topology instance is ignored.\n"); - for (i = 0; i < topology->nodes.count; ++i) + /* Basic sanity checks for input topology: + + - source nodes must have stream descriptor set; + - sink nodes must be resolved to stream sink objects; + */ + while (SUCCEEDED(IMFTopology_GetNode(input_topology, i++, &node))) { - struct topology_node *node = topology->nodes.nodes[i]; + IMFTopologyNode_GetNodeType(node, &node_type); - switch (node->node_type) + switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (node->object) + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) - return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFStreamSink_Release(sink); + if (FAILED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&sink))) + hr = MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; + else if (sink) + IMFStreamSink_Release(sink); + IUnknown_Release(object); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (FAILED(hr = IMFAttributes_GetItem(node->attributes, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL))) - return hr; + hr = IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL); break; default: ; } + + IMFTopologyNode_Release(node); + if (FAILED(hr)) + return hr; } if (FAILED(hr = MFCreateTopology(output_topology)))

1 0

Nikolay Sivov : mf/topoloader: Clone source nodes as a first layer of resulting topology.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 16d44b61d15193905ef40661bc1547cb45e7b019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d44b61d15193905ef40661… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 15:55:46 2020 +0300 mf/topoloader: Clone source nodes as a first layer of resulting topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8522f56969..840f1bd25f 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1933,9 +1933,40 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) return refcount; } +struct topoloader_context +{ + IMFTopology *output_topology; + GUID key; +}; + +static HRESULT topology_loader_clone_node(struct topoloader_context *context, IMFTopologyNode *node, + unsigned int marker) +{ + IMFTopologyNode *cloned_node; + MF_TOPOLOGY_TYPE node_type; + HRESULT hr; + + IMFTopologyNode_GetNodeType(node, &node_type); + + if (FAILED(hr = MFCreateTopologyNode(node_type, &cloned_node))) + return hr; + + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(cloned_node, node))) + hr = IMFTopologyNode_SetUINT32(cloned_node, &context->key, marker); + + if (SUCCEEDED(hr)) + hr = IMFTopology_AddNode(context->output_topology, cloned_node); + + IMFTopologyNode_Release(cloned_node); + + return hr; +} + static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, - IMFTopology **output_topology, IMFTopology *current_topology) + IMFTopology **ret_topology, IMFTopology *current_topology) { + struct topoloader_context context = { 0 }; + IMFTopology *output_topology; MF_TOPOLOGY_TYPE node_type; IMFTopologyNode *node; unsigned short i = 0; @@ -1943,7 +1974,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IUnknown *object; HRESULT hr = E_FAIL; - FIXME("%p, %p, %p, %p.\n", iface, input_topology, output_topology, current_topology); + FIXME("%p, %p, %p, %p.\n", iface, input_topology, ret_topology, current_topology); if (current_topology) FIXME("Current topology instance is ignored.\n"); @@ -1982,10 +2013,32 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in return hr; } - if (FAILED(hr = MFCreateTopology(output_topology))) + if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; - return IMFTopology_CloneFrom(*output_topology, input_topology); + context.output_topology = output_topology; + memset(&context.key, 0xff, sizeof(context.key)); + + /* Clone source nodes, use initial marker value. */ + i = 0; + while (SUCCEEDED(IMFTopology_GetNode(input_topology, i++, &node))) + { + IMFTopologyNode_GetNodeType(node, &node_type); + + if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + if (FAILED(hr = topology_loader_clone_node(&context, node, 0))) + WARN("Failed to clone source node, hr %#x.\n", hr); + } + + IMFTopologyNode_Release(node); + } + + /* For now return original topology. */ + + *ret_topology = output_topology; + + return IMFTopology_CloneFrom(output_topology, input_topology); } static const IMFTopoLoaderVtbl topologyloadervtbl =

1 0