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

[PATCH v2 1/3] ntdll/tests: Add more tests for printf format specifiers.
by Zebediah Figura 31 Jan '20

31 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/string.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 12027e88999..72428fca919 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1349,7 +1349,28 @@ static void test__snprintf(void) memset(buffer, 0x7c, sizeof(buffer)); res = p__snprintf(buffer, 3, "test"); ok(res == -1, "res = %d\n", res); - } + + res = p__snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + + res = p__snprintf(buffer, sizeof(buffer), "%I32x %d", 0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + + if (sizeof(void *) == 8) + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + } + else + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + } +} static void test__snprintf_s(void) { -- 2.25.0

1 2

[PATCH 1/4] ntdll/tests: Add more tests for printf format specifiers.
by Zebediah Figura 31 Jan '20

31 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/string.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 12027e88999..d771b0f1932 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1349,7 +1349,32 @@ static void test__snprintf(void) memset(buffer, 0x7c, sizeof(buffer)); res = p__snprintf(buffer, 3, "test"); ok(res == -1, "res = %d\n", res); - } + + res = p__snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + + res = p__snprintf(buffer, sizeof(buffer), "%I32x %d", 0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + + if (sizeof(void *) == 8) + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + } + else + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + } + + res = p__snprintf(buffer, sizeof(buffer), "%llx %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); +} static void test__snprintf_s(void) { -- 2.25.0

2 6

[PATCH 1/6] strmbase: Fix printing negative values in debugstr_time().
by Zebediah Figura 31 Jan '20

31 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/strmbase_private.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index b03258bc416..4b0468d7c47 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -34,15 +34,17 @@ static inline const char *debugstr_time(REFERENCE_TIME time) { + ULONGLONG abstime = llabs(time); unsigned int i = 0, j = 0; - char buffer[22], rev[22]; + char buffer[23], rev[23]; - while (time || i <= 8) + while (abstime || i <= 8) { - buffer[i++] = '0' + (time % 10); - time /= 10; + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; if (i == 7) buffer[i++] = '.'; } + if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; rev[j] = 0; -- 2.25.0

1 5

Help to understand Bézier outline shader in d2d1
by Giovanni Mascellani 30 Jan '20

30 Jan '20

Hi, I am trying to understand how the vertex shader for the Bézier curve outline works in d2d1. The relevant code is the bytecode in vs_code_bezier_outline[] in dlls/d2d1/device.c. In particular, I have problems with this snippet: > if (abs(dot(mul(rt, p1), v_p)) < 1.0f) > { > o.b.xzw = float3(0.0f, 0.0f, 0.0f); > o.b.y = dot(mul(rt, p), v_p); > } > else > { > o.b.zw = sign(dot(mul(rt, p1), v_p)) * v_p; > v_p = -float2(-p.y, p.x) / dot(float2(-p1.y, p1.x), p2); > o.b.x = dot(v_p, p1 - 0.5f * p2); > o.b.y = dot(v_p, p1); > } The idea as I understand is that o.b.xy should contain the u and v coordinates over which the implicit curve u^2-v is evaluated. They are defined to be (0, 0), (1/2, 0) and (1,1) on the vertices of the "original" Bézier triangle, as in the filling case. Since now the original triangle has to be enlarged by a stroke width, the u and v coordinates should be extended by linearity, I believe. However, I don't see why this is what is happening here. To extend by linearity one should invert the 2x2 matrix given by p1-p0 and p2-p0 or something similar. And I see no reason to have an "if" branch. Also, I completely do not understand what the coordinates o.b.zw are for. On the other hand, I understand (or at least I think I do) the screen-space derivative trick used to stroke a line of the right width. It is probably a rather rough approximation, but it is clever! If someone (probably Henri Verbeet, I think) can help to understand the missing bits I would be very thankful! Giovanni. -- Giovanni Mascellani <g.mascellani(a)gmail.com> Postdoc researcher - Université Libre de Bruxelles

1 0

[PATCH 3/3] mshtml/tests: Get rid of strcmp_wa from style.c.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/style.c | 325 ++++++++++++++++++-------------------- 1 file changed, 158 insertions(+), 167 deletions(-)

1 0

[PATCH 2/3] mshtml/tests: Get rid of wstr_contains.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/style.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[PATCH 1/3] mshtml/tests: Get rid of a2bstr from style.c.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/style.c | 380 ++++++++++++++++++-------------------- 1 file changed, 184 insertions(+), 196 deletions(-)

1 0

[PATCH] rpcrt4: Use MustFree for all non-base types in get_param_pointer_info.
by Jacek Caban 30 Jan '20

30 Jan '20

Fixes a leak for VT_VARIANT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_typelib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH 2/2] vbscript: Allow any call expression to be used in set statement.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 17 +++++------------ dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 9 insertions(+), 12 deletions(-)

1 0

[PATCH 1/2] vbscript: Allow assignment left expression to be member expression.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 28 +++++++++++++++++++++------- dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 11 ++--------- 3 files changed, 24 insertions(+), 17 deletions(-)

1 0