September 2018 - Wine-Commits

Józef Kucia : tests: Add test for clearing 2D array DSVs.
by Alexandre Julliard Sept. 28, 2018

Sept. 28, 2018

Module: vkd3d Branch: master Commit: 3b9657cd6a9ba014c6e72247bdbacc945658ca9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b9657cd6a9ba014c6e7224… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:38 2018 +0200 tests: Add test for clearing 2D array DSVs. 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> --- tests/d3d12.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8301067..0528ceb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1058,9 +1058,9 @@ struct depth_stencil_resource D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle; }; -#define init_depth_stencil(a, b, c, d, e, f, g) init_depth_stencil_(__LINE__, a, b, c, d, e, f, g) +#define init_depth_stencil(a, b, c, d, e, f, g, h) init_depth_stencil_(__LINE__, a, b, c, d, e, f, g, h) static void init_depth_stencil_(unsigned int line, struct depth_stencil_resource *ds, - ID3D12Device *device, unsigned int width, unsigned int height, + ID3D12Device *device, unsigned int width, unsigned int height, unsigned int array_size, DXGI_FORMAT format, DXGI_FORMAT view_format, const D3D12_CLEAR_VALUE *clear_value) { D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc, *view_desc; @@ -1078,7 +1078,7 @@ static void init_depth_stencil_(unsigned int line, struct depth_stencil_resource resource_desc.Alignment = 0; resource_desc.Width = width; resource_desc.Height = height; - resource_desc.DepthOrArraySize = 1; + resource_desc.DepthOrArraySize = array_size; resource_desc.MipLevels = 1; resource_desc.Format = format; resource_desc.SampleDesc.Count = 1; @@ -3289,7 +3289,9 @@ static void test_multithread_fence_wait(void) static void test_clear_depth_stencil_view(void) { + static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f}; ID3D12GraphicsCommandList *command_list; + D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; struct depth_stencil_resource ds; unsigned int dsv_increment_size; D3D12_CLEAR_VALUE clear_value; @@ -3297,6 +3299,7 @@ static void test_clear_depth_stencil_view(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; + unsigned int i; memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; @@ -3314,13 +3317,45 @@ static void test_clear_depth_stencil_view(void) clear_value.Format = DXGI_FORMAT_D32_FLOAT; clear_value.DepthStencil.Depth = 0.5f; clear_value.DepthStencil.Stencil = 0x3; - init_depth_stencil(&ds, device, 32, 32, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); + init_depth_stencil(&ds, device, 32, 32, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.75f, 0x7, 0, NULL); transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(ds.texture, 0, queue, command_list, 0x3f400000, 0); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.75f, 1); + + destroy_depth_stencil(&ds); + reset_command_list(command_list, context.allocator); + init_depth_stencil(&ds, device, 32, 32, 6, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[0], 0, 0, NULL); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; + dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY; + dsv_desc.Texture2DArray.FirstArraySlice = 1; + dsv_desc.Texture2DArray.ArraySize = 2; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[1], 0, 0, NULL); + dsv_desc.Texture2DArray.FirstArraySlice = 3; + dsv_desc.Texture2DArray.ArraySize = 1; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[3], 0, 0, NULL); + dsv_desc.Texture2DArray.FirstArraySlice = 4; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + check_sub_resource_float(ds.texture, i, queue, command_list, expected_values[i], 1); + reset_command_list(command_list, context.allocator); + } destroy_depth_stencil(&ds); destroy_test_context(&context); @@ -4546,7 +4581,7 @@ static void test_draw_depth_only(void) command_list = context.list; queue = context.queue; - init_depth_stencil(&ds, context.device, 640, 480, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); set_rect(&context.scissor_rect, 0, 0, 640, 480); @@ -12156,7 +12191,7 @@ static void test_copy_descriptors(void) transition_resource_state(command_list, t[5], D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - init_depth_stencil(&ds, device, 32, 32, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); + init_depth_stencil(&ds, device, 32, 32, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); t[6] = ds.texture; ID3D12Resource_AddRef(t[6]); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, @@ -13509,7 +13544,7 @@ static void test_depth_stencil_sampling(void) reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, tests[i].typeless_format, + context.render_target_desc.Height, 1, tests[i].typeless_format, tests[i].dsv_format, NULL); texture = ds.texture; dsv_handle = ds.dsv_handle; @@ -13722,7 +13757,7 @@ static void test_depth_load(void) heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_R32_TYPELESS, + context.render_target_desc.Height, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); memset(&srv_desc, 0, sizeof(srv_desc)); srv_desc.Format = DXGI_FORMAT_R32_FLOAT; @@ -13854,7 +13889,7 @@ static void test_depth_read_only_view(void) clear_value.DepthStencil.Depth = 0.5f; clear_value.DepthStencil.Stencil = 0; init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_R32_TYPELESS, + context.render_target_desc.Height, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, &clear_value); memset(&dsv_desc, 0, sizeof(dsv_desc)); dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; @@ -16705,7 +16740,7 @@ static void test_query_occlusion(void) command_list = context.list; queue = context.queue; - init_depth_stencil(&ds, context.device, 640, 480, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); set_rect(&context.scissor_rect, 0, 0, 640, 480); @@ -17632,7 +17667,7 @@ static void test_copy_texture_region(void) for (i = 0; i < ARRAY_SIZE(depth_values); ++i) { init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_D32_FLOAT, + context.render_target_desc.Height, 1, DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_D32_FLOAT, NULL); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL);

1 0

Józef Kucia : vkd3d-shader: Use TRACE() for skipped DXBC chunks.
by Alexandre Julliard Sept. 28, 2018

Sept. 28, 2018

Module: vkd3d Branch: master Commit: d11b9618e03df0c50f6b44af83ad214af9c4f795 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d11b9618e03df0c50f6b44a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:36 2018 +0200 vkd3d-shader: Use TRACE() for skipped DXBC chunks. 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> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 3be3ca9..5daf07a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2040,7 +2040,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont break; default: - FIXME("Unhandled chunk %#x.\n", tag); + TRACE("Skipping chunk %#x.\n", tag); break; }

1 0

Józef Kucia : vkd3d: Fix potential memory leak in vkd3d_create_vk_device().
by Alexandre Julliard Sept. 28, 2018

Sept. 28, 2018

Module: vkd3d Branch: master Commit: f1c967ab38e621de35136c457fd642aed8cee1c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1c967ab38e621de35136c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:43 2018 +0200 vkd3d: Fix potential memory leak in vkd3d_create_vk_device(). 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> --- libs/vkd3d/device.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 69b6a30..673c54a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1025,7 +1025,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) { hr = E_OUTOFMEMORY; - goto fail; + goto done; } direct_queue_family_index = ~0u; @@ -1062,13 +1062,13 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { FIXME("Could not find a suitable queue family for a direct command queue.\n"); hr = E_FAIL; - goto fail; + goto done; } if (copy_queue_family_index == ~0u) { FIXME("Could not find a suitable queue family for a copy command queue.\n"); hr = E_FAIL; - goto fail; + goto done; } if (compute_queue_family_index == ~0u) { @@ -1085,12 +1085,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); device->vk_physical_device = physical_device; if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) - goto fail; + goto done; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { hr = E_OUTOFMEMORY; - goto fail; + goto done; } /* Create device */ @@ -1114,7 +1114,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (vr < 0) { ERR("Failed to create Vulkan device, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = hresult_from_vk_result(vr); + goto done; } if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) @@ -1122,7 +1123,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, ERR("Failed to load device procs, hr %#x.\n", hr); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto fail; + goto done; } device->vk_device = vk_device; @@ -1132,12 +1133,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { ERR("Failed to create queues, hr %#x.\n", hr); device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto fail; + goto done; } TRACE("Created Vulkan device %p.\n", vk_device); -fail: +done: if (queue_properties) vkd3d_free(queue_properties); if (queue_info)

1 0

Józef Kucia : include: Synchronize d3d12.idl with Wine.
by Alexandre Julliard Sept. 28, 2018

Sept. 28, 2018

Module: vkd3d Branch: master Commit: 1cf49c2e0eec44a98d3ad208c94bea0a6eb03c7d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1cf49c2e0eec44a98d3ad20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:41 2018 +0200 include: Synchronize d3d12.idl with Wine. 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> --- include/vkd3d_d3d12.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 4b967d4..d647b48 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2213,7 +2213,12 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); + [local] HRESULT __stdcall D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); +typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); + [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug);

1 0

Francois Gouget : testbot/Build: Only rebuild impacted test executables.
by Alexandre Julliard Sept. 28, 2018

Sept. 28, 2018

Module: tools Branch: master Commit: 13b353545365275866245e10865b32a96ff9762c URL: https://source.winehq.org/git/tools.git/?a=commit;h=13b353545365275866245e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 28 02:47:45 2018 +0200 testbot/Build: Only rebuild impacted test executables. If a patch impacts a module but not its tests, don't try to rebuild the corresponding test executable. This fixes build failures when the module does not have tests in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 1287f6d..54b1aea 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -78,6 +78,7 @@ sub BuildTestExecutables($$$) my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) { + next if (!$TestInfo->{UnitCount}); push @BuildDirs, $TestInfo->{Path}; my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; push @TestExes, $TestExe;

1 0

Zhiyi Zhang : comctl32/pager: Support date time picker notification conversion.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: d8f3f1b71726b793f2f9a86225a73a7d286e62b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f3f1b71726b793f2f9a862… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 24 15:12:02 2018 +0800 comctl32/pager: Support date time picker notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 65 ++++++++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f3f1b71726b793f2f9…

1 0

Henri Verbeet : ddraw: Check for DDRAW_NO3D before checking for a video memory surface in d3d_device_create ().
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 156572888eedb6eb6c753d6c33f379d2cf11ed6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=156572888eedb6eb6c753d6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 27 19:18:35 2018 +0330 ddraw: Check for DDRAW_NO3D before checking for a video memory surface in d3d_device_create(). While slightly odd, this matches what the tests expect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5db0b81..7866c28 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6986,18 +6986,18 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_NOPALETTEATTACHED; } - if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) - { - WARN("Surface %p is not in video memory.\n", target); - return D3DERR_SURFACENOTINVIDMEM; - } - if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, " "but the current DirectDrawRenderer does not support this.\n"); - return DDERR_NO3D; + return DDERR_OUTOFMEMORY; + } + + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; } if (ddraw->d3ddevice)

1 0

Henri Verbeet : ddraw: Only do asynchronous clears when the application asked for them.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: fbcdf8c6984066c4a0d09af054ca8342eecb3359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbcdf8c6984066c4a0d09af0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 27 19:18:34 2018 +0330 ddraw: Only do asynchronous clears when the application asked for them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 12 ++++++++++-- dlls/wined3d/cs.c | 2 ++ include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fc120e3..d201d9d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1458,24 +1458,32 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * if (flags & DDBLT_COLORFILL) { + wined3d_flags = WINED3DCLEAR_TARGET; + if (!(flags & DDBLT_ASYNC)) + wined3d_flags |= WINED3DCLEAR_SYNCHRONOUS; + if (!wined3d_colour_from_ddraw_colour(&dst_surface->surface_desc.u4.ddpfPixelFormat, dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), - dst_rect, WINED3DCLEAR_TARGET, &colour, 0.0f, 0); + dst_rect, wined3d_flags, &colour, 0.0f, 0); } if (flags & DDBLT_DEPTHFILL) { + wined3d_flags = WINED3DCLEAR_ZBUFFER; + if (!(flags & DDBLT_ASYNC)) + wined3d_flags |= WINED3DCLEAR_SYNCHRONOUS; + if (!wined3d_colour_from_ddraw_colour(&dst_surface->surface_desc.u4.ddpfPixelFormat, dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), - dst_rect, WINED3DCLEAR_ZBUFFER, NULL, colour.r, 0); + dst_rect, wined3d_flags, NULL, colour.r, 0); } wined3d_flags = flags & ~DDBLT_ASYNC; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ecfce41..ff4d562 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -671,6 +671,8 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + if (flags & WINED3DCLEAR_SYNCHRONOUS) + cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dc613ff..e2e6a72 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1015,6 +1015,7 @@ enum wined3d_shader_type #define WINED3DCLEAR_TARGET 0x00000001 #define WINED3DCLEAR_ZBUFFER 0x00000002 #define WINED3DCLEAR_STENCIL 0x00000004 +#define WINED3DCLEAR_SYNCHRONOUS 0x80000000 /* Stream source flags */ #define WINED3DSTREAMSOURCE_INDEXEDDATA (1u << 30)

1 0

Hans Leidekker : msi: Add support for ARPNOMODIFY, APRNOREMOVE and ARPNOREPAIR.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 78af6e341fcdf1030bb5b0a4bed4b32e5caf09a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78af6e341fcdf1030bb5b0a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 27 15:00:31 2018 +0200 msi: Add support for ARPNOMODIFY, APRNOREMOVE and ARPNOREPAIR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 66 ++++++++++++++++++++++++++++++++++++------------- dlls/msi/tests/action.c | 51 +++++++++++++++++++++++--------------- 2 files changed, 80 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78af6e341fcdf1030bb5…

1 0

Hans Leidekker : msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 1be65cbb46bf792773a5aabc550851ed51f727cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be65cbb46bf792773a5aabc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 27 15:00:30 2018 +0200 msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index cd6cb0c..c7ce4d2 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1424,9 +1424,10 @@ UINT WINAPI odbc_present(MSIHANDLE hinst) WORD len; BOOL r; + buffer[0] = 0; + len = sizeof(buffer); r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); - ok(hinst, len < sizeof(buffer), "buffer too small\n"); - ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n"); for (p = buffer; *p; p += strlen(p) + 1) { if (!strcmp(p, "ODBC test driver")) @@ -1446,9 +1447,10 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst) WORD len; BOOL r; + buffer[0] = 0; + len = sizeof(buffer); r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); - ok(hinst, len < sizeof(buffer), "buffer too small\n"); - ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n"); for (p = buffer; *p; p += strlen(p) + 1) { if (!strcmp(p, "ODBC test driver"))

1 0