November 2019 - Wine-Commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_LightEnable().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 1edad8a5248df48c895eb3c5f471058a294c7029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1edad8a5248df48c895eb3c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 09:46:51 2019 -0600 d3d9: Handle stateblocks in d3d9_device_LightEnable(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c865f3056..ec1800a649 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2222,7 +2222,9 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i TRACE("iface %p, index %u, enable %#x.\n", iface, index, enable); wined3d_mutex_lock(); - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Also reset the device state to the default in wined3d_device_uninit_3d().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 7b1581a7841a94bb4f4aa27bfa6125d749afa433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b1581a7841a94bb4f4aa27b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 10:20:34 2019 -0600 wined3d: Also reset the device state to the default in wined3d_device_uninit_3d(). Fixes a regression introduced by 96547e622b04f403bc0c78d649275d1f844ed40e. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48072 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/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- dlls/wined3d/device.c | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index cc48c2ae35..77c8e32e6b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1012,7 +1012,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5cdc74e50f..df20ccb09d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1197,7 +1197,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5f4d1a166d..7c46f33cb7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1099,7 +1099,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice7_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(rt); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2a4d377848..baf9f25e98 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1142,6 +1142,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + memset(&device->state, 0, sizeof(device->state)); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_LightEnable().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 0e9bda4fb4dc59382eba359951d09defe6242ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9bda4fb4dc59382eba3599… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 09:46:53 2019 -0600 ddraw: Handle stateblocks in d3d_device7_LightEnable(). 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/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 55a9c6b6a1..cdb2e9c2ba 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6431,7 +6431,9 @@ static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx, TRACE("iface %p, light_idx %u, enabled %#x.\n", iface, light_idx, enabled); wined3d_mutex_lock(); - hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled); + hr = wined3d_stateblock_set_light_enable(device->update_state, light_idx, enabled); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_LightEnable().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 21d331e3c4b2cbe2152265e4e856b015433c82c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d331e3c4b2cbe2152265e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 09:46:52 2019 -0600 d3d8: Handle stateblocks in d3d8_device_LightEnable(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a7a08b3f80..92b67b9274 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1781,7 +1781,9 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind TRACE("iface %p, index %u, enable %#x.\n", iface, index, enable); wined3d_mutex_lock(); - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_light_enable().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 7daea10cca0d98bee91faf34f5c7e416c47d0b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7daea10cca0d98bee91faf34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 09:46:50 2019 -0600 wined3d: Introduce wined3d_stateblock_set_light_enable(). 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/wined3d/stateblock.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bf1e577f85..898a4bc93d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1679,6 +1679,24 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock return wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, light, &object); } +HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *stateblock, UINT light_idx, BOOL enable) +{ + struct wined3d_light_info *light_info; + HRESULT hr; + + TRACE("stateblock %p, light_idx %u, enable %#x.\n", stateblock, light_idx, enable); + + if (!(light_info = wined3d_light_state_get_light(&stateblock->stateblock_state.light_state, light_idx))) + { + if (FAILED(hr = wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, + &WINED3D_default_light, &light_info))) + return hr; + } + wined3d_light_state_enable_light(&stateblock->stateblock_state.light_state, + &stateblock->device->adapter->d3d_info, light_info, enable); + return S_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8591aa5164..ea04c85d38 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,6 +268,7 @@ @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) @ cdecl wined3d_stateblock_set_light(ptr long ptr) +@ cdecl wined3d_stateblock_set_light_enable(ptr long long) @ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 33f668f934..fac9eef5be 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2677,6 +2677,7 @@ void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stat struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, UINT light_idx, const struct wined3d_light *light); +HRESULT __cdecl wined3d_stateblock_set_light_enable(struct wined3d_stateblock *stateblock, UINT light_idx, BOOL enable); void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock,

1 0

Vijay Kiran Kamuju : include: Add missing FOLDERID's to knownfolders.h.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 236b033c39a5007a99f5d11cd9b9abd5f1ebb5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236b033c39a5007a99f5d11c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 15 17:12:22 2019 +0100 include: Add missing FOLDERID's to knownfolders.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/knownfolders.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=236b033c39a5007a99f5…

1 0

Tag wine-4.20 : Alexandre Julliard : Release 4.20
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: refs/tags/wine-4.20 Tag: bb2fa185badcbe1acd3d7e90e32405fd29136544 URL: https://source.winehq.org/git/wine.git/?a=tag;h=bb2fa185badcbe1acd3d7e90e32… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 23:53:45 2019 +0100 Release 4.20

1 0

Alexandre Julliard : Release 4.20.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: 60626d0df8f310c4aa2f8d1dd4122f864fb4e3c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60626d0df8f310c4aa2f8d1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 23:53:45 2019 +0100 Release 4.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 875 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 466 insertions(+), 431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60626d0df8f310c4aa2f…

1 0

Zebediah Figura : ddraw/tests: Expand test_coop_level_d3d_state().
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: wine Branch: master Commit: bfb901c60c37afa10c8f444dd341cdccafdc8fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb901c60c37afa10c8f444d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 15 10:20:33 2019 -0600 ddraw/tests: Expand test_coop_level_d3d_state(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48072 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/ddraw/tests/ddraw2.c | 26 +++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 32 +++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bf0cfef0b1..cc48c2ae35 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -929,6 +929,14 @@ static void test_coop_level_d3d_state(void) HWND window; HRESULT hr; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0x800000ff}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0x800000ff}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0x800000ff}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0x800000ff}}, + }; + window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -944,6 +952,11 @@ static void test_coop_level_d3d_state(void) viewport = create_viewport(device, 0, 0, 640, 480); viewport_set_background(device, viewport, background); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); @@ -984,12 +997,23 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); - hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + destroy_viewport(device, viewport); destroy_material(background); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e3146ca45d..5cdc74e50f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1117,6 +1117,19 @@ static void test_coop_level_d3d_state(void) HWND window; HRESULT hr; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{-1.0f, 1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0x800000ff}, + }; + window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) { @@ -1127,6 +1140,11 @@ static void test_coop_level_d3d_state(void) viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); @@ -1164,11 +1182,23 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); - hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2cd3b516f1..5f4d1a166d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1002,6 +1002,19 @@ static void test_coop_level_d3d_state(void) HWND window; HRESULT hr; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x800000ff}, + {{-1.0f, 1.0f, 0.1f}, 0x800000ff}, + {{ 1.0f, -1.0f, 0.1f}, 0x800000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0x800000ff}, + }; + window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) { @@ -1010,6 +1023,13 @@ static void test_coop_level_d3d_state(void) return; } + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); @@ -1066,11 +1086,21 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); - hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(rt); IDirect3DDevice7_Release(device);

1 0

Henri Verbeet : vkd3d: Properly check for program_invocation_name.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: vkd3d Branch: master Commit: da68980fdc0e549174ce0a9c1f7859f2f388a907 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da68980fdc0e549174ce0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 03:05:57 2019 +0330 vkd3d: Properly check for program_invocation_name. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 ++ libs/vkd3d/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 819e768..355aaab 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V # include "vulkan/spirv.h" #endif]) +AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 1fc0e9d..cf0448d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } -#ifdef _GNU_SOURCE +#if HAVE_DECL_PROGRAM_INVOCATION_NAME bool vkd3d_get_program_name(char program_name[PATH_MAX]) { @@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) return false; } -#endif /* _GNU_SOURCE */ +#endif /* HAVE_DECL_PROGRAM_INVOCATION_NAME */ static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag)

1 0