February 2020 - Wine-commits

Francois Gouget : testbot: Take into account multiple WineTest reports.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: tools Branch: master Commit: da678a9ebfe3862378543e80b03cd7c5496334cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=da678a9ebfe3862378543e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 18 17:33:09 2020 +0100 testbot: Take into account multiple WineTest reports. Instead of keeping only the latest WineTest results, keep all of them and only consider an error new if it does not appears in one of the WineTest results. This minimizes the risk of tagging a failure as new when it happens intermitently. However it also means the number of reference WineTest results can grow without bounds so purge them after $JobPurgeDays. Since all reference reports end up in the latest/ directory this also makes it unnecessary to go fishing for them in the jobs/ directory when running UpdateTaskLogs on a specific job. Also filtering reference reports to only use those older than the task can be done based on the reference report mtime instead of having to keep trust the jobid order. Note: UpdateTaskLog can optionally be run to update the new/old status in the errors cache files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47998 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 9 +-- testbot/bin/UpdateTaskLogs | 107 +++++++++++++--------------------- testbot/bin/WineRunTask.pl | 5 ++ testbot/bin/WineRunWineTest.pl | 5 ++ testbot/lib/WineTestBot/LogUtils.pm | 113 ++++++++++++++++++++---------------- testbot/lib/WineTestBot/Tasks.pm | 25 +++++++- 6 files changed, 140 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=da678a9ebfe38623785…

1 0

Zebediah Figura : d3d9: Retrieve clip planes from the primary stateblock.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 08bce2a64897528a5d72bc4dcc148cd5e3fc8a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08bce2a64897528a5d72bc4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:03 2020 -0600 d3d9: Retrieve clip planes from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8a79585f37..a681e220c5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2297,17 +2297,16 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD index, float *plane) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); index = min(index, device->max_user_clip_planes - 1); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_plane(device->wined3d_device, index, (struct wined3d_vec4 *)plane); + memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[index], sizeof(struct wined3d_vec4)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static void resolve_depth_buffer(struct d3d9_device *device)

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetClipPlane().
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 99732f85f5a151560dc8411b368c13be734546b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99732f85f5a151560dc8411b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:04 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetClipPlane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a681e220c5..447aa26844 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2287,8 +2287,6 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD wined3d_mutex_lock(); hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Stefan Dösinger : ddraw/tests: Clear the DXT3 destination surface manually.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 36012feb6d60ae787e103fd0b45bce75150b4706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36012feb6d60ae787e103fd0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 15 17:24:34 2020 +0300 ddraw/tests: Clear the DXT3 destination surface manually. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 51223e62ac..8ccfbd4cd8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17141,6 +17141,23 @@ static void test_compressed_surface_stretch(void) hr = IDirectDraw7_CreateSurface(ddraw, &dst_surface_desc, &dst_surf, NULL); ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + + /* r200 does not init vidmem DXT3 surfaces to 0 correctly. Do it manually. + * We can't use DDBLT_COLORFILL on compressed surfaces, so we need memset. + * + * Locking alone is not enough, so this isn't an accidental workaround that + * forces a different codepath because the destination is currently in sysmem. */ + if (test_formats[l].fmt.dwFourCC == MAKEFOURCC('D', 'X', 'T', '3')) + { + hr = IDirectDrawSurface7_Lock(dst_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(lock.lpSurface, 0, U1(lock).dwLinearSize); + hr = IDirectDrawSurface7_Unlock(dst_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirectDrawSurface7_Blt(dst_surf, &dst_rect, src_surf, &src_rect, DDBLT_WAIT, NULL); todo_wine_if(test_formats[l].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_dst) ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr);

1 0

Stefan Dösinger : ddraw/tests: WARP returns SURFACELOST when flipping a surface in normal mode.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 843e8e07263223ca423ddaad9862d688fb03502c URL: https://source.winehq.org/git/wine.git/?a=commit;h=843e8e07263223ca423ddaad… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 15 17:24:36 2020 +0300 ddraw/tests: WARP returns SURFACELOST when flipping a surface in normal mode. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ca64d3e6c8..98b8333412 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7314,7 +7314,8 @@ static void test_lost_device(void) hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); - ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOEXCLUSIVEMODE || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), + "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */

1 0

Stefan Dösinger : ddraw/tests: P8 -> RGB blits are broken on WARP 1709 and newer.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 885f5bf04fb21ff22c9f957cf3386089c264fe93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=885f5bf04fb21ff22c9f957c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 15 17:24:35 2020 +0300 ddraw/tests: P8 -> RGB blits are broken on WARP 1709 and newer. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 14 ++++++++++---- dlls/ddraw/tests/ddraw2.c | 14 ++++++++++---- dlls/ddraw/tests/ddraw4.c | 14 ++++++++++---- dlls/ddraw/tests/ddraw7.c | 14 ++++++++++---- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 61f0adcd7e..ca64d3e6c8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5869,6 +5869,11 @@ static void test_p8_blit(void) hr = IDirectDrawSurface_Unlock(dst_p8, NULL); ok(SUCCEEDED(hr), "Failed to unlock destination surface, hr %#x.\n", hr); + fx.dwSize = sizeof(fx); + fx.dwFillColor = 0xdeadbeef; + hr = IDirectDrawSurface_Blt(dst, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); + ok(SUCCEEDED(hr), "Failed to color fill %#x.\n", hr); + hr = IDirectDrawSurface_SetPalette(src, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); hr = IDirectDrawSurface_Blt(dst, NULL, src, NULL, DDBLT_WAIT, NULL); @@ -5882,14 +5887,15 @@ static void test_p8_blit(void) for (x = 0; x < ARRAY_SIZE(expected); x++) { color = get_surface_color(dst, x, 0); - todo_wine ok(compare_color(color, expected[x], 0), + /* WARP on 1709 and newer write zeroes on non-colorkeyed P8 -> RGB blits. For ckey + * blits see below. */ + todo_wine ok(compare_color(color, expected[x], 0) + || broken(is_warp && compare_color(color, 0x00000000, 0)), "Pixel %u: Got color %#x, expected %#x.\n", x, color, expected[x]); } } - memset(&fx, 0, sizeof(fx)); - fx.dwSize = sizeof(fx); fx.ddckSrcColorkey.dwColorSpaceHighValue = 0x2; fx.ddckSrcColorkey.dwColorSpaceLowValue = 0x2; hr = IDirectDrawSurface_Blt(dst_p8, NULL, src, NULL, DDBLT_WAIT | DDBLT_KEYSRCOVERRIDE, &fx); @@ -5898,7 +5904,7 @@ static void test_p8_blit(void) hr = IDirectDrawSurface_Lock(dst_p8, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock destination surface, hr %#x.\n", hr); /* A color keyed P8 blit doesn't do anything on WARP - it just leaves the data in the destination - * surface untouched. P8 blits without color keys work. Error checking (DDBLT_KEYSRC without a key + * surface untouched. Error checking (DDBLT_KEYSRC without a key * for example) also works as expected. * * Using DDBLT_KEYSRC instead of DDBLT_KEYSRCOVERRIDE doesn't change this. Doing this blit with diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6e35bfd534..7dfb35d2d3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6824,6 +6824,11 @@ static void test_p8_blit(void) hr = IDirectDrawSurface_Unlock(dst_p8, NULL); ok(SUCCEEDED(hr), "Failed to unlock destination surface, hr %#x.\n", hr); + fx.dwSize = sizeof(fx); + fx.dwFillColor = 0xdeadbeef; + hr = IDirectDrawSurface_Blt(dst, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); + ok(SUCCEEDED(hr), "Failed to color fill %#x.\n", hr); + hr = IDirectDrawSurface_SetPalette(src, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); hr = IDirectDrawSurface_Blt(dst, NULL, src, NULL, DDBLT_WAIT, NULL); @@ -6837,14 +6842,15 @@ static void test_p8_blit(void) for (x = 0; x < ARRAY_SIZE(expected); x++) { color = get_surface_color(dst, x, 0); - todo_wine ok(compare_color(color, expected[x], 0), + /* WARP on 1709 and newer write zeroes on non-colorkeyed P8 -> RGB blits. For ckey + * blits see below. */ + todo_wine ok(compare_color(color, expected[x], 0) + || broken(is_warp && compare_color(color, 0x00000000, 0)), "Pixel %u: Got color %#x, expected %#x.\n", x, color, expected[x]); } } - memset(&fx, 0, sizeof(fx)); - fx.dwSize = sizeof(fx); fx.ddckSrcColorkey.dwColorSpaceHighValue = 0x2; fx.ddckSrcColorkey.dwColorSpaceLowValue = 0x2; hr = IDirectDrawSurface7_Blt(dst_p8, NULL, src, NULL, DDBLT_WAIT | DDBLT_KEYSRCOVERRIDE, &fx); @@ -6853,7 +6859,7 @@ static void test_p8_blit(void) hr = IDirectDrawSurface_Lock(dst_p8, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock destination surface, hr %#x.\n", hr); /* A color keyed P8 blit doesn't do anything on WARP - it just leaves the data in the destination - * surface untouched. P8 blits without color keys work. Error checking (DDBLT_KEYSRC without a key + * surface untouched. Error checking (DDBLT_KEYSRC without a key * for example) also works as expected. * * Using DDBLT_KEYSRC instead of DDBLT_KEYSRCOVERRIDE doesn't change this. Doing this blit with diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b53c0c2160..e1d5bac18b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -8650,6 +8650,11 @@ static void test_p8_blit(void) hr = IDirectDrawSurface4_Unlock(dst_p8, NULL); ok(SUCCEEDED(hr), "Failed to unlock destination surface, hr %#x.\n", hr); + fx.dwSize = sizeof(fx); + fx.dwFillColor = 0xdeadbeef; + hr = IDirectDrawSurface4_Blt(dst, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); + ok(SUCCEEDED(hr), "Failed to color fill %#x.\n", hr); + hr = IDirectDrawSurface4_SetPalette(src, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); hr = IDirectDrawSurface4_Blt(dst, NULL, src, NULL, DDBLT_WAIT, NULL); @@ -8663,14 +8668,15 @@ static void test_p8_blit(void) for (x = 0; x < ARRAY_SIZE(expected); x++) { color = get_surface_color(dst, x, 0); - todo_wine ok(compare_color(color, expected[x], 0), + /* WARP on 1709 and newer write zeroes on non-colorkeyed P8 -> RGB blits. For ckey + * blits see below. */ + todo_wine ok(compare_color(color, expected[x], 0) + || broken(is_warp && compare_color(color, 0x00000000, 0)), "Pixel %u: Got color %#x, expected %#x.\n", x, color, expected[x]); } } - memset(&fx, 0, sizeof(fx)); - fx.dwSize = sizeof(fx); fx.ddckSrcColorkey.dwColorSpaceHighValue = 0x2; fx.ddckSrcColorkey.dwColorSpaceLowValue = 0x2; hr = IDirectDrawSurface4_Blt(dst_p8, NULL, src, NULL, DDBLT_WAIT | DDBLT_KEYSRCOVERRIDE, &fx); @@ -8679,7 +8685,7 @@ static void test_p8_blit(void) hr = IDirectDrawSurface4_Lock(dst_p8, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock destination surface, hr %#x.\n", hr); /* A color keyed P8 blit doesn't do anything on WARP - it just leaves the data in the destination - * surface untouched. P8 blits without color keys work. Error checking (DDBLT_KEYSRC without a key + * surface untouched. Error checking (DDBLT_KEYSRC without a key * for example) also works as expected. * * Using DDBLT_KEYSRC instead of DDBLT_KEYSRCOVERRIDE doesn't change this. Doing this blit with diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8ccfbd4cd8..3ad4499186 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8509,6 +8509,11 @@ static void test_p8_blit(void) hr = IDirectDrawSurface7_Unlock(dst_p8, NULL); ok(SUCCEEDED(hr), "Failed to unlock destination surface, hr %#x.\n", hr); + fx.dwSize = sizeof(fx); + fx.dwFillColor = 0xdeadbeef; + hr = IDirectDrawSurface7_Blt(dst, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); + ok(SUCCEEDED(hr), "Failed to color fill %#x.\n", hr); + hr = IDirectDrawSurface7_SetPalette(src, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); hr = IDirectDrawSurface7_Blt(dst, NULL, src, NULL, DDBLT_WAIT, NULL); @@ -8522,14 +8527,15 @@ static void test_p8_blit(void) for (x = 0; x < ARRAY_SIZE(expected); ++x) { color = get_surface_color(dst, x, 0); - todo_wine ok(compare_color(color, expected[x], 0), + /* WARP on 1709 and newer write zeroes on non-colorkeyed P8 -> RGB blits. For ckey + * blits see below. */ + todo_wine ok(compare_color(color, expected[x], 0) + || broken(is_warp && compare_color(color, 0x00000000, 0)), "Pixel %u: Got color %#x, expected %#x.\n", x, color, expected[x]); } } - memset(&fx, 0, sizeof(fx)); - fx.dwSize = sizeof(fx); fx.ddckSrcColorkey.dwColorSpaceHighValue = 0x2; fx.ddckSrcColorkey.dwColorSpaceLowValue = 0x2; hr = IDirectDrawSurface7_Blt(dst_p8, NULL, src, NULL, DDBLT_WAIT | DDBLT_KEYSRCOVERRIDE, &fx); @@ -8538,7 +8544,7 @@ static void test_p8_blit(void) hr = IDirectDrawSurface7_Lock(dst_p8, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock destination surface, hr %#x.\n", hr); /* A color keyed P8 blit doesn't do anything on WARP - it just leaves the data in the destination - * surface untouched. P8 blits without color keys work. Error checking (DDBLT_KEYSRC without a key + * surface untouched. Error checking (DDBLT_KEYSRC without a key * for example) also works as expected. * * Using DDBLT_KEYSRC instead of DDBLT_KEYSRCOVERRIDE doesn't change this. Doing this blit with

1 0

Jeff Smith : gdiplus: Each pen dash array element must be greater than zero.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: ffd4bb25206abd6fc65db903f3cf6a0ba8efadd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd4bb25206abd6fc65db903… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Feb 15 15:51:37 2020 -0600 gdiplus: Each pen dash array element must be greater than zero. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 5 +---- dlls/gdiplus/tests/pen.c | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 8bcb91819a..156f90a19d 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, for(i = 0; i < count; i++){ sum += dash[i]; - if(dash[i] < 0.0) + if(dash[i] <= 0.0) return InvalidParameter; } - if(sum == 0.0 && count) - return InvalidParameter; - heap_free(pen->dashes); pen->dashes = NULL; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ceab92acff..28caf29acb 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -175,7 +175,7 @@ static void test_dasharray(void) dashes[4] = 14.0; dashes[5] = -100.0; dashes[6] = -100.0; - dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 0.0; + dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 1.0; /* setting the array sets the type to custom */ GdipGetPenDashStyle(pen, &style); @@ -218,10 +218,13 @@ static void test_dasharray(void) /* Some invalid array values. */ status = GdipSetPenDashArray(pen, &dashes[7], 5); - expect(InvalidParameter, status); + expect(Ok, status); dashes[9] = -1.0; status = GdipSetPenDashArray(pen, &dashes[7], 5); expect(InvalidParameter, status); + dashes[9] = 0.0; + status = GdipSetPenDashArray(pen, &dashes[7], 5); + expect(InvalidParameter, status); /* Try to set with count = 0. */ GdipSetPenDashStyle(pen, DashStyleDot);

1 0

Rémi Bernon : dinput: Increase device buffer size to 1024.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 50440e28bb1611377df841ee267c0fa7bef515cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=50440e28bb1611377df841ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 14 11:01:39 2020 +0100 dinput: Increase device buffer size to 1024. The buffer size was previously limited to 20 in: 8d052561724f9c8d9e7770964bfaebdd01e98e60 Testing shows that it is somewhere around 1024 on Windows, and using a smaller buffer causes some input data to be lost with high polling rate mouses. It can be spotted in Wolfenstein II: New Colossus menus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b778f6b3ea..8c5aa31883 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1398,7 +1398,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( EnterCriticalSection(&This->crit); This->buffersize = pd->dwData; - This->queue_len = min(This->buffersize, 20); + This->queue_len = min(This->buffersize, 1024); HeapFree(GetProcessHeap(), 0, This->data_queue); This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0,

1 0

Dirk Niggemann : toolhelp: Return correct handle, address, flag and lock values in LocalNext() for moveable blocks.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 22173f708e2a6b8be851cc69e4aabbadd387732b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22173f708e2a6b8be851cc69… Author: Dirk Niggemann <dirk.niggemann(a)gmail.com> Date: Thu Feb 13 19:32:14 2020 +0000 toolhelp: Return correct handle, address, flag and lock values in LocalNext() for moveable blocks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48523 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/toolhelp.c | 44 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index f2b520b6a1..578d1ae7fa 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -90,6 +90,22 @@ typedef struct #define LOCAL_ARENA_HEADER( handle) ((handle) - LOCAL_ARENA_HEADER_SIZE) #define LOCAL_ARENA_PTR(ptr,arena) ((LOCALARENA *)((char *)(ptr)+(arena))) +#define MOVEABLE_PREFIX sizeof(HLOCAL16) + +/* Layout of a handle entry table + * + * WORD count of entries + * LOCALHANDLEENTRY[count] entries + * WORD near ptr to next table + */ +typedef struct +{ + WORD addr; /* Address of the MOVEABLE block */ + BYTE flags; /* Flags for this block */ + BYTE lock; /* Lock count */ +} LOCALHANDLEENTRY; + + typedef struct { WORD null; /* Always 0 */ @@ -349,15 +365,35 @@ BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry ) WORD ds = GlobalHandleToSel16( pLocalEntry->hHeap ); char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALARENA *pArena; + WORD table, lhandle; + LOCALHEAPINFO *pInfo = get_local_heap( ds ); - if (!get_local_heap( ds )) return FALSE; + if (!pInfo) return FALSE; if (!pLocalEntry->wNext) return FALSE; + table = pInfo->htable; pArena = LOCAL_ARENA_PTR( ptr, pLocalEntry->wNext ); - - pLocalEntry->hHandle = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; - pLocalEntry->wAddress = pLocalEntry->hHandle; + pLocalEntry->wAddress = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; pLocalEntry->wFlags = (pArena->prev & 3) + 1; pLocalEntry->wcLock = 0; + /* Find the address in the entry tables */ + lhandle = pLocalEntry->wAddress; + while (table) + { + WORD count = *(WORD *)(ptr + table); + LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY*)(ptr+table+sizeof(WORD)); + for (; count > 0; count--, pEntry++) + if (pEntry->addr == lhandle + MOVEABLE_PREFIX) + { + lhandle = (HLOCAL16)((char *)pEntry - ptr); + table = 0; + pLocalEntry->wAddress = pEntry->addr; + pLocalEntry->wFlags = pEntry->flags; + pLocalEntry->wcLock = pEntry->lock; + break; + } + if (table) table = *(WORD *)pEntry; + } + pLocalEntry->hHandle = lhandle; pLocalEntry->wType = LT_NORMAL; if (pArena->next != pLocalEntry->wNext) /* last one? */ pLocalEntry->wNext = pArena->next;

1 0

Paul Gofman : ntdll: Fill NumberOfPhysicalPages field in user shared data area.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 9689d0774027bffec13cd77d10baa7bbda8f3d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9689d0774027bffec13cd77d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 13 14:11:24 2020 +0300 ntdll: Fill NumberOfPhysicalPages field in user shared data area. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48387 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 14 +++++++++++++- dlls/ntdll/thread.c | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 31eb66c143..683a5e7bdf 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winternl.h" #include "wine/test.h" +#include "ddk/wdm.h" static unsigned int page_size; @@ -33,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static const BOOL is_win64 = sizeof(void*) != sizeof(int); +static SYSTEM_BASIC_INFORMATION sbi; + static HANDLE create_target_process(const char *arg) { char **argv; @@ -513,9 +516,17 @@ static void test_NtMapViewOfSection(void) CloseHandle(process); } +static void test_user_shared_data(void) +{ + const KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + + ok(user_shared_data->NumberOfPhysicalPages == sbi.MmNumberOfPhysicalPages, + "Got number of physical pages %#x, expected %#x.\n", + user_shared_data->NumberOfPhysicalPages, sbi.MmNumberOfPhysicalPages); +} + START_TEST(virtual) { - SYSTEM_BASIC_INFORMATION sbi; HMODULE mod; int argc; @@ -546,4 +557,5 @@ START_TEST(virtual) test_NtAllocateVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); + test_user_shared_data(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f993dd314c..9c9e5f6055 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -222,6 +222,7 @@ static void set_process_name( int argc, char *argv[] ) */ TEB *thread_init(void) { + SYSTEM_BASIC_INFORMATION sbi; TEB *teb; void *addr; SIZE_T size; @@ -310,6 +311,9 @@ TEB *thread_init(void) user_shared_data->TickCountMultiplier = 1 << 24; fill_cpu_info(); + virtual_get_system_info( &sbi ); + user_shared_data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + return teb; }

1 0