November 2019 - Wine-commits

Alexandre Julliard : kernel32: Get the initial locales from ntdll.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: ed09f37ceffdb7bbccb594d7ff4b7011dd04e23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed09f37ceffdb7bbccb594d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 20:00:29 2019 +0100 kernel32: Get the initial locales from ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 652 ++----------------------------------------------- 1 file changed, 16 insertions(+), 636 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed09f37ceffdb7bbccb5…

1 0

Alexandre Julliard : kernel32: Move the locale registry setup to kernelbase.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 35ea9cd99ac06b9b8711840c4ae704a3ec7eb91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ea9cd99ac06b9b8711840c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 22:46:44 2019 +0100 kernel32: Move the locale registry setup to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 1 - dlls/kernel32/locale.c | 147 ---------------------------------------- dlls/kernelbase/kernelbase.h | 2 +- dlls/kernelbase/locale.c | 149 +++++++++++++++++++++++++++++++++++------ dlls/kernelbase/main.c | 3 +- 6 files changed, 130 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35ea9cd99ac06b9b8711…

1 0

Matteo Bruni : ddraw/tests: Fix a few typos.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 39961536d41e6da051a3970d469330196c7c5c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39961536d41e6da051a3970d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 18 17:35:19 2019 +0100 ddraw/tests: Fix a few typos. Signed-off-by: Matteo Bruni <mbruni(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 | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 64c03c87d0..fa65d0e722 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5083,7 +5083,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 77c8e32e6b..541362c748 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6094,7 +6094,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df20ccb09d..e61d67d723 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7624,7 +7624,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); @@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ }, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c46f33cb7..c1db7b2df6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7496,7 +7496,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); @@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ },

1 0

Zebediah Figura : d3d9: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 064d830fb7c92f89f59852651382aa3b633bffc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064d830fb7c92f89f5985265… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 19:08:00 2019 -0600 d3d9: Track the viewport and scissor rect in 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5ef0c9cdf6..76fddc59f1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -522,6 +522,17 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d } } +static void device_reset_viewport_state(struct d3d9_device *device) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(device->state, &vp); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(device->state, &rect); +} + static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -1011,6 +1022,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); + device_reset_viewport_state(device); } if (FAILED(hr = d3d9_device_get_swapchains(device))) @@ -1902,7 +1914,11 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); d3d9_surface_release_rendertarget_view(surface_impl, rtv); if (SUCCEEDED(hr)) + { + if (!idx) + device_reset_viewport_state(device); device->render_targets[idx] = surface_impl; + } wined3d_mutex_unlock(); return hr; @@ -4636,6 +4652,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); + device_reset_viewport_state(device); if (FAILED(hr = d3d9_device_get_swapchains(device))) {

1 0

Zebediah Figura : d3d8: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 9d4eb5ef8c296265c3b552011e886635da52f532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4eb5ef8c296265c3b55201… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 19:08:01 2019 -0600 d3d8: Track the viewport and scissor rect in 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/d3d8/device.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 17d8a726c7..e85fd72d02 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -530,6 +530,17 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d return entry->object; } +static void device_reset_viewport_state(struct d3d8_device *device) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(device->state, &vp); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(device->state, &rect); +} + static HRESULT WINAPI d3d8_device_QueryInterface(IDirect3DDevice8 *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", @@ -928,6 +939,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); + device_reset_viewport_state(device); device->device_state = D3D8_DEVICE_STATE_OK; } else @@ -1473,8 +1485,13 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, if (SUCCEEDED(hr)) { rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; - if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + if (render_target) + { + if (SUCCEEDED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + device_reset_viewport_state(device); + else + wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + } d3d8_surface_release_rendertarget_view(rt_impl, rtv); } @@ -3719,6 +3736,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + device_reset_viewport_state(device); wined3d_mutex_unlock(); present_parameters_from_wined3d_swapchain_desc(parameters,

1 0

Paul Gofman : wined3d: Handle degenerate viewport Z ranges.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 8eab6d45020701b61cf2773305977b7b99b22e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eab6d45020701b61cf27733… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 19 11:27:09 2019 +0300 wined3d: Handle degenerate viewport Z ranges. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48104 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++++++++------------ dlls/wined3d/device.c | 7 +- dlls/wined3d/state.c | 15 ++-- dlls/wined3d/wined3d_private.h | 8 ++ 4 files changed, 159 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8eab6d45020701b61cf2…

1 0

Paul Gofman : d3d9/tests: Test degenerate viewport Z ranges.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: dfb6fc64a0f8b2cf46b85b1ddac19fc63ba14deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb6fc64a0f8b2cf46b85b1d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 19 11:27:10 2019 +0300 d3d9/tests: Test degenerate viewport Z ranges. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 86 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dfb9ea3cce..4f063d21fb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4931,7 +4931,8 @@ done: DestroyWindow(window); } -static void check_rect(struct surface_readback *rb, RECT r, const char *message) +#define check_rect(a, b, c) check_rect_(__LINE__, a, b, c) +static void check_rect_(unsigned int line, struct surface_readback *rb, RECT r, const char *message) { LONG x_coords[2][2] = { @@ -4965,7 +4966,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) if (!all_match) break; } - ok(all_match, "%s: pixel (%d, %d) has color %08x.\n", message, x, y, color); + ok_(__FILE__, line)(all_match, "%s: pixel (%d, %d) has color %08x.\n", message, x, y, color); return; } @@ -4984,7 +4985,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) if (x < 0 || x >= 640 || y < 0 || y >= 480) continue; color = get_readback_color(rb, x, y); - ok(color == expected, "%s: pixel (%d, %d) has color %08x, expected %08x.\n", + ok_(__FILE__, line)(color == expected, "%s: pixel (%d, %d) has color %08x, expected %08x.\n", message, x, y, color, expected); } } @@ -14358,28 +14359,32 @@ static void test_viewport(void) static const struct { D3DVIEWPORT9 vp; + float expected_z; RECT expected_rect; const char *message; } tests[] = { - {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, - {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, - {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, - {{ 0, 0, 2000, 1600}, { 0, 400, 639, 479}, "Viewport (0, 0) - (2000, 1600)"}, - {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, - {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, + {{ 0, 0, 640, 480}, 0.001f, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, + {{ 0, 0, 640, 480, 0.5f, 0.0f}, 0.501f, + { 0, 120, 479, 359}, "Viewport (0, 0, 0.5) - (640, 480, 0.0)"}, + {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + {{ 0, 0, 1280, 960}, 0.001f, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, + {{ 0, 0, 2000, 1600}, 0.001f, { 0, 400, 639, 479}, "Viewport (0, 0) - (2000, 1600)"}, + {{100, 100, 640, 480}, 0.001f, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, + {{ 0, 0, 8192, 8192}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, /* AMD HD 2600 on XP draws nothing visible for this one. */ /* {{ 0, 0, 8192, 480}, {-10, -10, -1, -1}, "(0, 0) - (8192, 480) viewport"}, */ }; static const struct vec3 quad[] = { - {-1.5f, -0.5f, 0.1f}, - {-1.5f, 0.5f, 0.1f}, - { 0.5f, -0.5f, 0.1f}, - { 0.5f, 0.5f, 0.1f}, + {-1.5f, -0.5f, 1.0f}, + {-1.5f, 0.5f, 1.0f}, + { 0.5f, -0.5f, 1.0f}, + { 0.5f, 0.5f, 1.0f}, }; IDirect3DSurface9 *backbuffer; + const float z_eps = 0.0001; struct surface_readback rb; IDirect3DDevice9 *device; BOOL draw_succeeded; @@ -14399,13 +14404,15 @@ static void test_viewport(void) } hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* This crashes on Windows. */ if (0) @@ -14413,26 +14420,47 @@ static void test_viewport(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, + tests[i].expected_z - z_eps, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetViewport(device, &tests[i].vp); - ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_GREATER); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); - ok(SUCCEEDED(hr) || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); - draw_succeeded = SUCCEEDED(hr); + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + draw_succeeded = hr == D3D_OK; hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (draw_succeeded) - { - get_rt_readback(backbuffer, &rb); - check_rect(&rb, tests[i].expected_rect, tests[i].message); - release_surface_readback(&rb); - } + if (!draw_succeeded) + continue; + + get_rt_readback(backbuffer, &rb); + check_rect(&rb, tests[i].expected_rect, tests[i].message); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, + tests[i].expected_z + z_eps, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(backbuffer, &rb); + check_rect(&rb, tests[i].expected_rect, tests[i].message); + release_surface_readback(&rb); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : wincodecs: Remove unused function.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 544fd5b94299cb848db290ed6c1b37bf60fa4bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=544fd5b94299cb848db290ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 10:42:57 2019 +0300 wincodecs: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index b517603456..3d7d775b34 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -80,11 +80,6 @@ static inline BitmapImpl *impl_from_IMILUnknown1(IMILUnknown1 *iface) return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown1_iface); } -static inline BitmapImpl *impl_from_IMILUnknown2(IMILUnknown2 *iface) -{ - return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown2_iface); -} - static inline BitmapLockImpl *impl_from_IWICBitmapLock(IWICBitmapLock *iface) { return CONTAINING_RECORD(iface, BitmapLockImpl, IWICBitmapLock_iface);

1 0

Alistair Leslie-Hughes : dmloader: ScanDirectory doesn't specify the full path.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 9da70c07584be4dd7bf7a38ebd5140312234cdb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da70c07584be4dd7bf7a38e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 20 02:50:07 2019 +0000 dmloader: ScanDirectory doesn't specify the full path. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 9120abec53..0da8323e7e 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -608,7 +608,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * do { DMUS_OBJECTDESC Desc; DM_STRUCT_INIT(&Desc); - Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_DATE; + Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_DATE; Desc.guidClass = *rguidClass; lstrcpyW (Desc.wszFileName, FileData.cFileName); FileTimeToLocalFileTime (&FileData.ftCreationTime, &Desc.ftDate);

1 0

Paul Gofman : d3dx9: Implement recording parameters to parameter block.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 7d512a1e0ef58fad25e53af5316d445cb0cfc5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d512a1e0ef58fad25e53af5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 20 17:50:11 2019 +0100 d3dx9: Implement recording parameters to parameter block. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 241 +++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/effect.c | 38 +++++-- 2 files changed, 204 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d512a1e0ef58fad25e5…

1 0