May 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Don't run tests for disabled dlls.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 7715a1aaef26cd9779cf509a685d94de74a6692f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7715a1aaef26cd9779cf509a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 28 21:42:02 2018 +0200 makefiles: Don't run tests for disabled dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f8a82b0..4fcc99e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3247,6 +3247,7 @@ static void output_test_module( struct makefile *make ) char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0 ); + int parent_disabled = 0; add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); @@ -3321,16 +3322,19 @@ static void output_test_module( struct makefile *make ) } } - output_filenames_obj_dir( make, make->ok_files ); - output( ": %s%s ../%s%s\n", testmodule, dll_ext, make->testdll, dll_ext ); - if (!make->disabled) + if (strendswith( make->base_dir, "/tests" )) { - output( "check test:" ); - output_filenames_obj_dir( make, make->ok_files ); - output( "\n" ); - strarray_add( &make->phony_targets, "check" ); - strarray_add( &make->phony_targets, "test" ); + char *dir = xstrdup( make->base_dir ); + dir[strlen( dir ) - 6] = 0; + parent_disabled = strarray_exists( &disabled_dirs, dir ); } + output_filenames_obj_dir( make, make->ok_files ); + output( ": %s%s ../%s%s\n", testmodule, dll_ext, make->testdll, dll_ext ); + output( "check test:" ); + if (!make->disabled && !parent_disabled) output_filenames_obj_dir( make, make->ok_files ); + output( "\n" ); + strarray_add( &make->phony_targets, "check" ); + strarray_add( &make->phony_targets, "test" ); output( "testclean::\n" ); output( "\trm -f" ); output_filenames_obj_dir( make, make->ok_files );

1 0

Alex Henrie : include: Add wmemchr to wchar.h.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: e1bfd4b4cb9c05039e29ae769d1582b63ed6fe46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bfd4b4cb9c05039e29ae76… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 27 21:05:52 2018 -0600 include: Add wmemchr to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index a679724..4618c60 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -476,6 +476,14 @@ size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); +static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) +{ + const wchar_t *end; + for (end = s + n; s < end; s++) + if (*s == c) return (wchar_t*)s; + return NULL; +} + #ifdef __cplusplus } #endif

1 0

Alex Henrie : include: Add wmemcmp to wchar.h.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 0d5648b46383319a0a3c18c0d96755d13eadf003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5648b46383319a0a3c18c0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 27 21:05:53 2018 -0600 include: Add wmemcmp to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 4618c60..984bd31 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -484,6 +484,17 @@ static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) return NULL; } +static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) +{ + size_t i; + for (i = 0; i < n; i++) + { + if (s1[i] > s2[i]) return 1; + if (s1[i] < s2[i]) return -1; + } + return 0; +} + #ifdef __cplusplus } #endif

1 0

Józef Kucia : d3d10core/tests: Add test for clearing 1D render target views.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 7096136137b2a6dde0c80a39698e4f39b2231d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096136137b2a6dde0c80a39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:14 2018 +0200 d3d10core/tests: Add test for clearing 1D render target views. 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/device.c | 123 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 819285e..99a375e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -570,6 +570,49 @@ static void get_buffer_readback(ID3D10Buffer *buffer, struct resource_readback * ID3D10Device_Release(device); } +static void get_texture1d_readback(ID3D10Texture1D *texture, unsigned int sub_resource_idx, + struct resource_readback *rb) +{ + D3D10_TEXTURE1D_DESC texture_desc; + unsigned int miplevel; + ID3D10Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + rb->dimension = D3D10_RESOURCE_DIMENSION_TEXTURE1D; + + ID3D10Texture1D_GetDevice(texture, &device); + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, (ID3D10Texture1D **)&rb->resource))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D10Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = 1; + rb->sub_resource_idx = sub_resource_idx; + + ID3D10Device_CopyResource(device, rb->resource, (ID3D10Resource *)texture); + if (FAILED(hr = ID3D10Texture1D_Map((ID3D10Texture1D *)rb->resource, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->map_desc.pData))) + { + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); + ID3D10Resource_Release(rb->resource); + rb->resource = NULL; + } + rb->map_desc.RowPitch = 0; + + ID3D10Device_Release(device); +} + static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, struct resource_readback *rb) { @@ -644,6 +687,9 @@ static void release_resource_readback(struct resource_readback *rb) case D3D10_RESOURCE_DIMENSION_BUFFER: ID3D10Buffer_Unmap((ID3D10Buffer *)rb->resource); break; + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + ID3D10Texture1D_Unmap((ID3D10Texture1D *)rb->resource, rb->sub_resource_idx); + break; case D3D10_RESOURCE_DIMENSION_TEXTURE2D: ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, rb->sub_resource_idx); break; @@ -724,6 +770,30 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } +#define check_texture1d_sub_resource_color(a, b, c, d, e) check_texture1d_sub_resource_color_(__LINE__, a, b, c, d, e) +static void check_texture1d_sub_resource_color_(unsigned int line, ID3D10Texture1D *texture, + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) +{ + struct resource_readback rb; + + get_texture1d_readback(texture, sub_resource_idx, &rb); + check_readback_data_color_(line, &rb, rect, expected_color, max_diff); + release_resource_readback(&rb); +} + +#define check_texture1d_color(t, c, d) check_texture1d_color_(__LINE__, t, c, d) +static void check_texture1d_color_(unsigned int line, ID3D10Texture1D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE1D_DESC texture_desc; + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture1d_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); +} + #define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) @@ -10182,7 +10252,49 @@ static void test_swapchain_flip(void) DestroyWindow(window); } -static void test_clear_render_target_view(void) +static void test_clear_render_target_view_1d(void) +{ + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture1D *texture; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture1d_color(texture, 0xbf4c7f19, 1); + + ID3D10Device_ClearRenderTargetView(device, rtv, green); + check_texture1d_color(texture, 0x8000ff00, 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture1D_Release(texture); + release_test_context(&test_context); +} + +static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; @@ -10215,11 +10327,11 @@ static void test_clear_render_target_view(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); @@ -10253,7 +10365,7 @@ static void test_clear_render_target_view(void) texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; @@ -16964,7 +17076,8 @@ START_TEST(device) test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip(); - test_clear_render_target_view(); + test_clear_render_target_view_1d(); + test_clear_render_target_view_2d(); test_clear_depth_stencil_view(); test_initial_depth_stencil_state(); test_draw_depth_only();

1 0

Józef Kucia : wined3d: Fix condition for FIXME() about unsupported depth slices.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: cd92d5d0d29c3796196d769896f9a08572a4bd53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd92d5d0d29c3796196d7698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:15 2018 +0200 wined3d: Fix condition for FIXME() about unsupported depth slices. 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/wined3d/view.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c98ebfb..d9d6618 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -169,8 +169,8 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) { + unsigned int level_idx, layer_idx, layer_count; const struct wined3d_gl_info *gl_info; - unsigned int layer_idx, layer_count; struct wined3d_context *context; GLuint texture_name; @@ -189,20 +189,21 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_texture_prepare_texture(texture, context, FALSE); texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); + level_idx = desc->u.texture.level_idx; layer_idx = desc->u.texture.layer_idx; layer_count = desc->u.texture.layer_count; - if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1)) + if (view_target == GL_TEXTURE_3D) { - FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); + if (layer_idx || layer_count != wined3d_texture_get_level_depth(texture, level_idx)) + FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); layer_idx = 0; layer_count = 1; } gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); GL_EXTCALL(glTextureView(view->name, view->target, texture_name, view_format->glInternal, - desc->u.texture.level_idx, desc->u.texture.level_count, - layer_idx, layer_count)); - checkGLcall("Create texture view"); + level_idx, desc->u.texture.level_count, layer_idx, layer_count)); + checkGLcall("create texture view"); if (is_stencil_view_format(view_format)) { @@ -218,7 +219,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_bind_texture(context, view->target, view->name); gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); - checkGLcall("Initialize stencil view"); + checkGLcall("initialize stencil view"); context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);

1 0

Józef Kucia : wined3d: Implement clears for 3D render target views.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 82155cbc77455c3f7578b738d23ec222d2e6cded URL: https://source.winehq.org/git/wine.git/?a=commit;h=82155cbc77455c3f7578b738… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:16 2018 +0200 wined3d: Implement clears for 3D render target views. 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/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f590c4..ec77a56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4418,13 +4418,13 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3D_OK; resource = view->resource; - if (resource->type != WINED3D_RTYPE_TEXTURE_1D && resource->type != WINED3D_RTYPE_TEXTURE_2D) + if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return WINED3DERR_INVALIDCALL; } - if (view->layer_count > 1) + if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx)) { FIXME("Layered clears not implemented.\n"); return WINED3DERR_INVALIDCALL;

1 0

Józef Kucia : d3d11/tests: Add test for clearing 3D render target views.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: faec0676074aa8dd7791f329116155f63c2af516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faec0676074aa8dd7791f329… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:17 2018 +0200 d3d11/tests: Add test for clearing 3D render target views. 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/d3d11/tests/d3d11.c | 315 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 223 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faec0676074aa8dd7791…

1 0

Józef Kucia : d3d11/tests: Check return value of CheckMultisampleQualityLevels() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: f2c9e04c49d4fafa78a9994d50bb4b15d47ccaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c9e04c49d4fafa78a9994d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:18 2018 +0200 d3d11/tests: Check return value of CheckMultisampleQualityLevels() (Coverity). 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/d3d11/tests/d3d11.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index aa48365..1043722 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2381,7 +2381,8 @@ static void test_create_texture2d(void) check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D11Texture2D_Release(texture); - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); desc.ArraySize = 1; desc.SampleDesc.Count = 2; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); @@ -12298,7 +12299,8 @@ static void test_check_multisample_quality_levels(void) return; } - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + 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");

1 0

Józef Kucia : d3d10core/tests: Check return value of CheckMultisampleQualityLevels() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 47dea5ba8fad532580cb47f93f4dc2510a01c5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=47dea5ba8fad532580cb47f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:19 2018 +0200 d3d10core/tests: Check return value of CheckMultisampleQualityLevels() (Coverity). 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/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 99a375e..2687ec5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1844,7 +1844,8 @@ static void test_create_texture2d(void) check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D10Texture2D_Release(texture); - ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); desc.ArraySize = 1; desc.SampleDesc.Count = 2; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); @@ -9578,7 +9579,8 @@ static void test_check_multisample_quality_levels(void) return; } - ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + 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");

1 0

Józef Kucia : dxgi: Rename dxgi_swapchain to d3d11_swapchain.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: eae33d5595ad525b335aa5cb5229b0a8ae854bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae33d5595ad525b335aa5cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:25 2018 +0200 dxgi: Rename dxgi_swapchain to d3d11_swapchain. We will have more than one implementation of IDXGISwapChain. 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/dxgi/device.c | 8 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/swapchain.c | 186 +++++++++++++++++++++++------------------------ 3 files changed, 99 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eae33d5595ad525b335a…

1 0