wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Joshua Ashton : include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: d21691a26ac3416914c409ae2eaa5bf4e2ecdd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21691a26ac3416914c409ae… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:00 2019 +0330 include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/d3d9.h b/include/d3d9.h index 08f4555..ef3ea2a9 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -1617,7 +1617,8 @@ DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9) STDMETHOD_(UINT, GetAdapterModeCountEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter) PURE; STDMETHOD(EnumAdapterModesEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) PURE; - STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation); + STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) PURE; STDMETHOD(CreateDeviceEx)(THIS_ UINT adapter_idx, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, struct IDirect3DDevice9Ex **device) PURE; STDMETHOD(GetAdapterLUID)(THIS_ UINT adapter_idx, LUID *luid) PURE;

1 0

Zhiyi Zhang : user32: Check for null handle in GetRawInputData().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: bd730a5f412c1e3b8a05b3b297ca0642e23fb92b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd730a5f412c1e3b8a05b3b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:27:09 2019 +0800 user32: Check for null handle in GetRawInputData(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a..4bfccdf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8..ffdd4b7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Józef Kucia : d3d10core/tests: Avoid "skipping tests" in skip() messages.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: d32ac5f49f16a4fd77d58b463de40b259e92b088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d32ac5f49f16a4fd77d58b46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:26 2019 +0100 d3d10core/tests: Avoid "skipping tests" in skip() messages. skip() prints "Tests skipped:". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7b0d2fb..5b8e7e1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1500,7 +1500,7 @@ static void test_feature_level(void) if (!(d3d10_device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1689,7 +1689,7 @@ static void test_texture1d_interfaces(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1709,7 +1709,7 @@ static void test_texture1d_interfaces(void) ID3D10Texture1D_Release(texture); if (FAILED(hr)) { - win_skip("1D textures do not implement ID3D11Texture1D, skipping tests.\n"); + win_skip("1D textures do not implement ID3D11Texture1D.\n"); ID3D10Device_Release(device); return; } @@ -1880,7 +1880,7 @@ static void test_create_texture2d(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2024,7 +2024,7 @@ static void test_texture2d_interfaces(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2047,7 +2047,7 @@ static void test_texture2d_interfaces(void) ID3D10Texture2D_Release(texture); if (FAILED(hr)) { - win_skip("D3D11 is not available, skipping tests.\n"); + win_skip("D3D11 is not available.\n"); ID3D10Device_Release(device); return; } @@ -2157,7 +2157,7 @@ static void test_create_texture3d(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3733,7 +3733,7 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3859,7 +3859,7 @@ static void test_create_sampler_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4222,7 +4222,7 @@ static void test_create_depthstencil_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4326,7 +4326,7 @@ static void test_create_rasterizer_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4873,7 +4873,7 @@ static void test_device_removed_reason(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -5083,7 +5083,7 @@ float4 main(float4 color : COLOR) : SV_TARGET if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -5981,7 +5981,7 @@ static void test_blend(void) /* DXGI_FORMAT_B8G8R8X8_UNORM is not supported on all implementations. */ if (FAILED(ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &offscreen))) { - skip("DXGI_FORMAT_B8G8R8X8_UNORM not supported, skipping tests.\n"); + skip("DXGI_FORMAT_B8G8R8X8_UNORM not supported.\n"); goto done; } @@ -8434,7 +8434,7 @@ static void test_private_data(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -10265,7 +10265,7 @@ static void test_check_multisample_quality_levels(void) ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); if (!quality_levels) { - skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n"); + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM.\n"); goto done; } @@ -10791,7 +10791,7 @@ static void test_swapchain_flip(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } SetRect(&rect, 0, 0, 640, 480); @@ -15875,7 +15875,7 @@ static void test_format_compatibility(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); if (FAILED(hr) && test_data[i].dst_format == DXGI_FORMAT_B8G8R8A8_UNORM) { - skip("B8G8R8A8_UNORM not supported, skipping test.\n"); + skip("B8G8R8A8_UNORM not supported.\n"); ID3D10Texture2D_Release(src_texture); continue; }

1 0

Józef Kucia : d3d10core/tests: Fix crashes with debug layer enabled.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: a3af3e872264f462ee8664820ee38d4760d6c164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3af3e872264f462ee866482… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:25 2019 +0100 d3d10core/tests: Fix crashes with debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 74 +++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 06b9a16..7b0d2fb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2825,8 +2825,11 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; - hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); @@ -5173,6 +5176,7 @@ float4 main(float4 color : COLOR) : SV_TARGET } ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); + count = 0; ID3D10Device_RSGetScissorRects(device, &count, NULL); ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); @@ -8567,16 +8571,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -10271,23 +10278,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -11022,15 +11033,11 @@ static void test_clear_render_target_view_2d(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearRenderTargetView(device, NULL, green); check_texture_color(texture, expected_color, 1); } - else - { - win_skip("D3D11 is not available.\n"); - } ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); @@ -11140,13 +11147,11 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); check_texture_color(depth_texture, 0x00000000, 0); } - else - win_skip("D3D11 is not available, skipping test.\n"); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); @@ -14335,10 +14340,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D10RenderTargetView *)0xdeadbeef; ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); - ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + } rtv = NULL; ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); @@ -17385,7 +17393,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D10Device_RSSetViewports(device, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D10Device_RSGetViewports(device, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -17467,6 +17475,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D10Device_RSSetViewports(device, 1, vp); @@ -17488,6 +17499,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D10RasterizerState_Release(rasterizer_state); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d10core/tests: Add option to enable debug layer.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 446dc11aa4e695ca3905aac8c8c33417337d5b75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446dc11aa4e695ca3905aac8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:24 2019 +0100 d3d10core/tests: Add option to enable debug layer. Some tests crash with the debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 54edf50..06b9a16 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -34,6 +34,7 @@ #define BITS_1_0 0x3f800000 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1093,20 +1094,24 @@ static IDXGIAdapter *create_adapter(void) static ID3D10Device *create_device(void) { + unsigned int flags = 0; IDXGIAdapter *adapter; ID3D10Device *device; HRESULT hr; + if (enable_debug_layer) + flags |= D3D10_CREATE_DEVICE_DEBUG; + adapter = create_adapter(); - hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device); + hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, flags, D3D10_SDK_VERSION, &device); if (adapter) IDXGIAdapter_Release(adapter); if (SUCCEEDED(hr)) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, flags, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, flags, D3D10_SDK_VERSION, &device))) return device; return NULL; @@ -17878,7 +17883,9 @@ START_TEST(d3d10core) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]);

1 0

Józef Kucia : d3d10core/tests: Add test for sample_c_lz instruction.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: e4069767e7338b593ba96381fe8367f707682f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4069767e7338b593ba96381… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:23 2019 +0100 d3d10core/tests: Add test for sample_c_lz instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 224 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4069767e7338b593ba9…

1 0

Józef Kucia : d3d9: Validate surface parameter in d3d9_device_ColorFill().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: ac36e446c3b38e3092821087d64ef8629ab5e141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac36e446c3b38e3092821087… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:22 2019 +0100 d3d9: Validate surface parameter in d3d9_device_ColorFill(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46482 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a26d943..067ea2b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1757,6 +1757,9 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); + if (!surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1f28fe1..c06acb7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1529,6 +1529,9 @@ static void color_fill_test(void) goto done; } + hr = IDirect3DDevice9_ColorFill(device, NULL, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* Test ColorFill on a the backbuffer (should pass) */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr);

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 6bb73652de78577161b98a3e1f92da7799455b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bb73652de78577161b98a3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:53 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer(). 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/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c799a57..4f61eba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2247,15 +2247,14 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return; } - prev = device->update_state->cb[type][idx]; + prev = device->state.cb[type][idx]; if (buffer == prev) return; if (buffer) wined3d_buffer_incref(buffer); - device->update_state->cb[type][idx] = buffer; - if (!device->recording) - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + device->state.cb[type][idx] = buffer; + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_stream_output().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 8973c22a485df5858971118f2ec70e1d8a53d435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8973c22a485df5858971118f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:52 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_stream_output(). 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/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c466e0c..c799a57 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1329,15 +1329,14 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - stream = &device->update_state->stream_output[idx]; + stream = &device->state.stream_output[idx]; prev_buffer = stream->buffer; if (buffer) wined3d_buffer_incref(buffer); stream->buffer = buffer; stream->offset = offset; - if (!device->recording) - wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_pipeline_unordered_access_view ().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 6f721eede58b57dbf1a444795a9bd54d5a35578b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f721eede58b57dbf1a44479… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:51 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_pipeline_unordered_access_view(). 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/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c910e83..c466e0c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2950,15 +2950,14 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev return; } - prev = device->update_state->unordered_access_view[pipeline][idx]; + prev = device->state.unordered_access_view[pipeline][idx]; if (uav == prev && initial_count == ~0u) return; if (uav) wined3d_unordered_access_view_incref(uav); - device->update_state->unordered_access_view[pipeline][idx] = uav; - if (!device->recording) - wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); + device->state.unordered_access_view[pipeline][idx] = uav; + wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019