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

[PATCH v5 2/5] windowscodecs: In find_decoder(), get rid of nested if by using goto, and use IWICWineDecoder_Initialize() to initialize decoders.
by Ziqing Hui 15 Jul '20

15 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- If we keep the nested if in find_decoder(), after code for calling IWICWineDecoder_Initialize() is added, the nested blocks will become too deep, which makes the code really hard to read. So here I use goto to get rid of them. v5: It's a new patch in this patch set. dlls/windowscodecs/imgfactory.c | 101 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 51 deletions(-)

2 1

[PATCH] InlineIsEqualGUID makes use of undefined ULONG type
by Puetz Kevin A 15 Jul '20

15 Jul '20

This breaks stand-alone inclusion of <guiddef.h> (without first including <basetsd.h>), which is supposed to be OK. According to <basetsd.h> wine supports ILP32, LP64 or P64, so `unsigned long` isn't safe - `long` might be a 64-bit type. But `unsigned int` should be 32-bit for any of those models This is a type-punning cast regardless; REFGUID is not actually ULONG[4] either Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- E.g. https://docs.microsoft.com/en-us/windows/win32/api/guiddef/nf-guiddef-isequ… says > Header: guiddef.h (include GuidDef.h, Objbase.h) Rather than the common "(include Windows.h)"; this header is meant to be usable stand-alone --- include/guiddef.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 664f74fac3..a25b3a7107 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -156,18 +156,18 @@ typedef GUID FMTID,*LPFMTID; #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { - return (((ULONG *)&rguid1)[0] == ((ULONG *)&rguid2)[0] && - ((ULONG *)&rguid1)[1] == ((ULONG *)&rguid2)[1] && - ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && - ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); + return (((unsigned int *)&rguid1)[0] == ((unsigned int *)&rguid2)[0] && + ((unsigned int *)&rguid1)[1] == ((unsigned int *)&rguid2)[1] && + ((unsigned int *)&rguid1)[2] == ((unsigned int *)&rguid2)[2] && + ((unsigned int *)&rguid1)[3] == ((unsigned int *)&rguid2)[3]); } #else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ - (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ - ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ - ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ - ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) + (((unsigned int *)rguid1)[0] == ((unsigned int *)rguid2)[0] && \ + ((unsigned int *)rguid1)[1] == ((unsigned int *)rguid2)[1] && \ + ((unsigned int *)rguid1)[2] == ((unsigned int *)rguid2)[2] && \ + ((unsigned int *)rguid1)[3] == ((unsigned int *)rguid2)[3]) #endif #ifdef __cplusplus

1 0

[PATCH 1/3] mf/topoloader: Switch to public interface for initial topology validation.
by Nikolay Sivov 15 Jul '20

15 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/topology.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index abe66c45fd4..fdb2944676a 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; + IUnknown *object; HRESULT hr; - size_t i; 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))) -- 2.27.0

1 2

[PATCH 14/14] msvcrt: Don't use isxdigitW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 13/14] msvcrt: Don't use isupperW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 12/14] msvcrt: Don't use ispunctW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 11/14] msvcrt: Don't use isprintW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

1 0

[PATCH 10/14] msvcrt: Don't use islowerW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 09/14] msvcrt: Don't use isgraphW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 08/14] msvcrt: Don't use isdigitW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0