[PATCH 1/2] d2d1: Silence SetSegmentFlags FIXME when setting default value

List overview All Threads

newer

older

[PATCH] programs/cmd/test: don't...

[PATCH] Fix the widl extension...

Stefan Brüns

6 Jan 2022 6 Jan '22

9:32 p.m.

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed for the current segment, which still reports a FIXME).

Signed-off-by: Stefan Brüns stefan.bruens@rwth-aachen.de --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..ac5f1019f3f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,6 +2773,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i

static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { + if (flags == D2D1_PATH_SEGMENT_NONE) + return; FIXME("iface %p, flags %#x stub!\n", iface, flags); }

-- 2.34.1

Show replies by date

Stefan Brüns

6 Jan 6 Jan

9:32 p.m.

New subject: [PATCH 2/2] d2d1: Remove idempotent SetSegmentFlags(NONE) when flattening cubics

As recursion can only be left with an AddLines call, the current/next segment flags already is D2D1_PATH_SEGMENT_NONE. --- dlls/d2d1/geometry.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ac5f1019f3f..127aaa65fa4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3741,7 +3741,6 @@ static void d2d_geometry_flatten_cubic(ID2D1SimplifiedGeometrySink *sink, const d2d_geometry_flatten_cubic(sink, p0, &b0, tolerance); ID2D1SimplifiedGeometrySink_SetSegmentFlags(sink, D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN); d2d_geometry_flatten_cubic(sink, &b0.point3, &b1, tolerance); - ID2D1SimplifiedGeometrySink_SetSegmentFlags(sink, D2D1_PATH_SEGMENT_NONE); }

static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *iface,

-- 2.34.1

Marvin

7 Jan 7 Jan

9:05 a.m.

New subject: [PATCH 2/2] d2d1: Remove idempotent SetSegmentFlags(NONE) when flattening cubics

Hi,

While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=104980

Your paranoid android.

=== debian11 (32 bit report) ===

d2d1: d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0.

=== debian11 (32 bit Chinese:China report) ===

d2d1: d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:6664: Test failed: d2d1.c:9776: Test marked todo: Test 3: Got unexpected hr 0x88990029.

=== debian11 (32 bit WoW report) ===

d2d1: d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3616: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 0, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 1, segment 6 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 8 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 2, segment 12 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 0 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 2 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 4 flags 0x2, expected 0. d2d1.c:3719: Test failed: Got unexpected figure 3, segment 6 flags 0x2, expected 0.

=== debian11 (64 bit WoW report) ===

Henri Verbeet

5:09 p.m.

New subject: [PATCH 2/2] d2d1: Remove idempotent SetSegmentFlags(NONE) when flattening cubics

On Fri, 7 Jan 2022 at 09:00, Stefan Brüns stefan.bruens@rwth-aachen.de wrote:

...

As recursion can only be left with an AddLines call, the current/next segment flags already is D2D1_PATH_SEGMENT_NONE.

The test results seem to disagree...

Marvin

8:54 a.m.

Hi,

While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=104978

Your paranoid android.

=== debian11 (64 bit WoW report) ===

d2d1: d2d1.c:6688: Test failed: d2d1.c:10121: Test marked todo: Test 0: Got unexpected output bounds {-1.00000000e+000, -1.00000000e+000, -1.00000000e+000, -1.00000000e+000}, expected {0.00000000e+000, 0.00000000e+000, 8.00000000e+000, 8.00000000e+000}.

Henri Verbeet

5:09 p.m.

On Fri, 7 Jan 2022 at 09:00, Stefan Brüns stefan.bruens@rwth-aachen.de wrote:

...

static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) {
if (flags == D2D1_PATH_SEGMENT_NONE)
  return;
FIXME("iface %p, flags %#x stub!\n", iface, flags);
}

Not printing the FIXME in this case is fine, but we do want to print a TRACE instead in that case.

1080

Age (days ago)

1081

Last active (days ago)

wine-devel@winehq.org

5 comments

3 participants

tags (0)

participants (3)

Henri Verbeet
Marvin
Stefan Brüns