September 2018 - Wine-Commits

Henri Verbeet : wined3d: Reorder the formats in debug_d3dformat() to match the enum order.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 2e34d2e4578cf49ad6332221611a76639d45e7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e34d2e4578cf49ad6332221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:19 2018 +0430 wined3d: Reorder the formats in debug_d3dformat() to match the enum order. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ffce6c..9d0a64b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4141,18 +4141,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM); FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM); - FMT_TO_STR(WINED3DFMT_UYVY); - FMT_TO_STR(WINED3DFMT_YUY2); - FMT_TO_STR(WINED3DFMT_YV12); - FMT_TO_STR(WINED3DFMT_NV12); - FMT_TO_STR(WINED3DFMT_DXT1); - FMT_TO_STR(WINED3DFMT_DXT2); - FMT_TO_STR(WINED3DFMT_DXT3); - FMT_TO_STR(WINED3DFMT_DXT4); - FMT_TO_STR(WINED3DFMT_DXT5); - FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8); - FMT_TO_STR(WINED3DFMT_G8R8_G8B8); - FMT_TO_STR(WINED3DFMT_R8G8_B8G8); FMT_TO_STR(WINED3DFMT_D16_LOCKABLE); FMT_TO_STR(WINED3DFMT_D32_UNORM); FMT_TO_STR(WINED3DFMT_S1_UINT_D15_UNORM); @@ -4161,12 +4149,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); - FMT_TO_STR(WINED3DFMT_ATI1N); - FMT_TO_STR(WINED3DFMT_ATI2N); - FMT_TO_STR(WINED3DFMT_INST); - FMT_TO_STR(WINED3DFMT_NVDB); - FMT_TO_STR(WINED3DFMT_NVHU); - FMT_TO_STR(WINED3DFMT_NVHS); FMT_TO_STR(WINED3DFMT_R32G32B32A32_TYPELESS); FMT_TO_STR(WINED3DFMT_R32G32B32A32_FLOAT); FMT_TO_STR(WINED3DFMT_R32G32B32A32_UINT); @@ -4267,11 +4249,29 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); FMT_TO_STR(WINED3DFMT_BC7_UNORM); FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_UYVY); + FMT_TO_STR(WINED3DFMT_YUY2); + FMT_TO_STR(WINED3DFMT_YV12); + FMT_TO_STR(WINED3DFMT_DXT1); + FMT_TO_STR(WINED3DFMT_DXT2); + FMT_TO_STR(WINED3DFMT_DXT3); + FMT_TO_STR(WINED3DFMT_DXT4); + FMT_TO_STR(WINED3DFMT_DXT5); + FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8); + FMT_TO_STR(WINED3DFMT_G8R8_G8B8); + FMT_TO_STR(WINED3DFMT_R8G8_B8G8); + FMT_TO_STR(WINED3DFMT_ATI1N); + FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_INST); + FMT_TO_STR(WINED3DFMT_NVDB); + FMT_TO_STR(WINED3DFMT_NVHU); + FMT_TO_STR(WINED3DFMT_NVHS); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); + FMT_TO_STR(WINED3DFMT_NV12); #undef FMT_TO_STR default: {

1 0

Henri Verbeet : wined3d: Get rid of the "format_count" field from struct wined3d_adapter.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: d76c027ef773f0ae10971b79f988836743e6c351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76c027ef773f0ae10971b79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:17 2018 +0430 wined3d: Get rid of the "format_count" field from struct wined3d_adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 - dlls/wined3d/utils.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab6a452..3600506 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2513,7 +2513,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->luid.HighPart, adapter->luid.LowPart, adapter); adapter->formats = NULL; - adapter->format_count = 0; if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index db27270..9ffce6c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1993,8 +1993,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) struct wined3d_format *format; unsigned int i, j; - adapter->format_count = WINED3D_FORMAT_COUNT; - if (!(adapter->formats = heap_calloc(adapter->format_count + if (!(adapter->formats = heap_calloc(WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*adapter->formats)))) { ERR("Failed to allocate memory.\n"); @@ -2728,7 +2727,7 @@ static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { BOOL fallback_fmt_used = FALSE, regular_fmt_used = FALSE; struct wined3d_format *format = &adapter->formats[i]; @@ -2842,7 +2841,7 @@ static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); } - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3621,7 +3620,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format_set_flag(format, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3756,7 +3755,7 @@ static void init_format_gen_mipmap_info(const struct wined3d_adapter *adapter, if (!gl_info->fbo_ops.glGenerateMipmap) return; - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3913,7 +3912,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; unsigned int i; - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b96d3a5..69eda3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2665,7 +2665,6 @@ struct wined3d_adapter LUID luid; struct wined3d_format *formats; - unsigned int format_count; const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe;

1 0

Józef Kucia : d3d11/tests: Add a few more tests for texture formats.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: d1bc257ad81203b9ba925e1d98d964f316383484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1bc257ad81203b9ba925e1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:05:59 2018 +0200 d3d11/tests: Add a few more tests for texture formats. 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 94e7a8e..3ab2642 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7219,6 +7219,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const WORD r8g8_data[] = + { + 0x0000, 0xffff, 0x0000, 0x7fff, + 0x0203, 0xff10, 0x0b0c, 0x8000, + 0xc4de, 0xfff0, 0xfdfe, 0x5a6f, + 0xff00, 0xffc8, 0x00aa, 0xdd5b, + }; static const BYTE a8_data[] = { 0x00, 0x10, 0x20, 0x30, @@ -7346,10 +7353,14 @@ static void test_texture(void) {blue_data, 5 * sizeof(*blue_data)}, } }; + static const struct texture r32f_float = {4, 4, 1, 1, DXGI_FORMAT_R32_FLOAT, + {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32f_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r8g8_snorm = {4, 4, 1, 1, DXGI_FORMAT_R8G8_SNORM, + {{r8g8_data, 4 * sizeof(*r8g8_data)}}}; static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = @@ -7436,6 +7447,13 @@ static void test_texture(void) 0x7e7e7e7e, 0x7e7e7e7e, 0x7e7e7e7e, 0x7e808080, 0x7e7e7e7e, 0x7e7f7f7f, 0x7e7f7f7f, 0x7e7f7f7f, }; + static const DWORD snorm_colors[] = + { + 0xff000000, 0xff000000, 0xff000000, 0xff00ff00, + 0xff000406, 0xff000020, 0xff001618, 0xff000000, + 0xff000000, 0xff000000, 0xff000000, 0xff00b5df, + 0xff000000, 0xff000000, 0xff000000, 0xff0000b7, + }; static const DWORD r32f_colors[] = { 0xff000000, 0xff0000ff, 0xff00007f, 0xff00007f, @@ -7605,6 +7623,7 @@ static void test_texture(void) #define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB #define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define R8G8_SNORM DXGI_FORMAT_R8G8_SNORM #define R32_FLOAT DXGI_FORMAT_R32_FLOAT #define R32_UINT DXGI_FORMAT_R32_UINT #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN @@ -7617,6 +7636,8 @@ static void test_texture(void) {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, {&ps_sample, &r32f_typeless, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, + {&ps_sample, &r32f_float, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, + {&ps_sample, &r8g8_snorm, {R8G8_SNORM, TEX_2D, 0, 1}, 0.0f, snorm_colors}, {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, @@ -7632,6 +7653,7 @@ static void test_texture(void) #undef BC3_UNORM_SRGB #undef R8G8B8A8_UNORM_SRGB #undef R8G8B8A8_UNORM +#undef R8G8_SNORM #undef R32_FLOAT #undef R32_UINT #undef FMT_UNKNOWN

1 0

Nikolay Sivov : d2d1: Implement newer CreateBitmapBrush() variant.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 0b6c1bf5b1b6c7e8c223bea09e907118c62062ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6c1bf5b1b6c7e8c223bea0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 18 13:17:48 2018 +0300 d2d1: Implement newer CreateBitmapBrush() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 5 +++-- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 20 ++++++++++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index fa4488e..b03af89 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1092,8 +1092,9 @@ static const struct ID2D1BitmapBrush1Vtbl d2d_bitmap_brush_vtbl = d2d_bitmap_brush_GetInterpolationMode1, }; -HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) +HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, + const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + struct d2d_brush **brush) { if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c8515ea..d7989f9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -295,7 +295,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, - const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 041cb33..d779fb0 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -401,14 +401,15 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapBrush(ID2D1Devic ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, brush_desc, brush); - if (SUCCEEDED(hr = d2d_bitmap_brush_create(render_target->factory, bitmap, bitmap_brush_desc, brush_desc, &object))) + if (SUCCEEDED(hr = d2d_bitmap_brush_create(context->factory, bitmap, (const D2D1_BITMAP_BRUSH_PROPERTIES1 *)bitmap_brush_desc, + brush_desc, &object))) *brush = (ID2D1BitmapBrush *)&object->ID2D1Brush_iface; return hr; @@ -1863,12 +1864,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush1 **bitmap_brush) + const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush1 **brush) { - FIXME("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, bitmap_brush %p stub!\n", iface, bitmap, - bitmap_brush_desc, brush_desc, bitmap_brush); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_brush *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, + brush_desc, brush); + + if (SUCCEEDED(hr = d2d_bitmap_brush_create(context->factory, bitmap, bitmap_brush_desc, brush_desc, &object))) + *brush = (ID2D1BitmapBrush1 *)&object->ID2D1Brush_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCommandList(ID2D1DeviceContext *iface,

1 0

Józef Kucia : dxgi: Factor out dxgi_validate_swapchain_desc().
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: e36af9284fa457f808f7bdf0d924cff97cc6a88a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36af9284fa457f808f7bdf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:00 2018 +0200 dxgi: Factor out dxgi_validate_swapchain_desc(). 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/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 30 +----------------------------- dlls/dxgi/swapchain.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 4967bd4..f74514f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -182,6 +182,8 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; +BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) DECLSPEC_HIDDEN; + /* IDXGISurface */ struct dxgi_surface { diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index cc9075a..a4577ae 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -251,7 +251,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa IDXGIOutput *output, IDXGISwapChain1 **swapchain) { ID3D12CommandQueue *command_queue; - unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; @@ -270,35 +269,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_UNSUPPORTED; } - switch (desc->SwapEffect) - { - case DXGI_SWAP_EFFECT_DISCARD: - case DXGI_SWAP_EFFECT_SEQUENTIAL: - min_buffer_count = 1; - break; - - case DXGI_SWAP_EFFECT_FLIP_DISCARD: - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - min_buffer_count = 2; - - if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) - { - WARN("Invalid sample desc %u, %u for swap effect %#x.\n", - desc->SampleDesc.Count, desc->SampleDesc.Quality, desc->SwapEffect); - return DXGI_ERROR_INVALID_CALL; - } - break; - - default: - WARN("Invalid swap effect %u used.\n", desc->SwapEffect); - return DXGI_ERROR_INVALID_CALL; - } - - if (desc->BufferCount < min_buffer_count || desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) - { - WARN("BufferCount is %u.\n", desc->BufferCount); + if (!dxgi_validate_swapchain_desc(desc)) return DXGI_ERROR_INVALID_CALL; - } if (output) FIXME("Ignoring output %p.\n", output); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f8e4f80..57d6b24 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -55,6 +55,43 @@ static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect s } } +BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) +{ + unsigned int min_buffer_count; + + switch (desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + case DXGI_SWAP_EFFECT_SEQUENTIAL: + min_buffer_count = 1; + break; + + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + min_buffer_count = 2; + + if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) + { + WARN("Invalid sample desc %u, %u for swap effect %#x.\n", + desc->SampleDesc.Count, desc->SampleDesc.Quality, desc->SwapEffect); + return FALSE; + } + break; + + default: + WARN("Invalid swap effect %u used.\n", desc->SwapEffect); + return FALSE; + } + + if (desc->BufferCount < min_buffer_count || desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) + { + WARN("BufferCount is %u.\n", desc->BufferCount); + return FALSE; + } + + return TRUE; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface);

1 0

Józef Kucia : dxgi: Validate swapchain desc in d3d12_swapchain_ResizeBuffers().
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: a53681829becdea71376b94e0964950546ac9595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53681829becdea71376b94e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:06:01 2018 +0200 dxgi: Validate swapchain desc in d3d12_swapchain_ResizeBuffers(). 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/swapchain.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57d6b24..5d2cb4a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1786,7 +1786,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - DXGI_SWAP_CHAIN_DESC1 *desc; + DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; HRESULT hr; @@ -1808,9 +1808,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * } desc = &swapchain->desc; + new_desc = swapchain->desc; - if (!buffer_count) - buffer_count = desc->BufferCount; + if (buffer_count) + new_desc.BufferCount = buffer_count; if (!width || !height) { RECT client_rect; @@ -1826,20 +1827,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * if (!height) height = client_rect.bottom; } - if (!format) - format = desc->Format; + new_desc.Width = width; + new_desc.Height = height; - if (desc->Width == width && desc->Height == height - && desc->Format == format && desc->BufferCount == buffer_count) - return S_OK; + if (format) + new_desc.Format = format; - d3d12_swapchain_destroy_buffers(swapchain); + if (!dxgi_validate_swapchain_desc(&new_desc)) + return DXGI_ERROR_INVALID_CALL; - desc->Width = width; - desc->Height = height; - desc->Format = format; - desc->BufferCount = buffer_count; + if (desc->Width == new_desc.Width && desc->Height == new_desc.Height + && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) + return S_OK; + d3d12_swapchain_destroy_buffers(swapchain); + swapchain->desc = new_desc; if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) { ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : msi: Fix a typo.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 09e4240f33425eda3ea05eb2a98adaec184b7ba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e4240f33425eda3ea05eb2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:59:35 2018 +0800 msi: Fix a typo. Should fix the regression introduced by baea371c3d4153bc4a718c07f46971d4d39aa9f3. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 3374964..8e9ae6d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1742,7 +1742,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) { __TRY { - handle = remote_GetActiveDatabase(hInstall); + handle = remote_GetActiveDatabase(remote); handle = alloc_msi_remote_handle(handle); } __EXCEPT(rpc_filter)

1 0

Józef Kucia : wined3d: Apply legacy format swizzles only when requested.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: e1dc8a6d641f4aae7f6d2d4dd36ac6a94026b9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1dc8a6d641f4aae7f6d2d4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:05:58 2018 +0200 wined3d: Apply legacy format swizzles only when requested. We do not want to apply legacy format swizzles for D3D10+. 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/utils.c | 77 ++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9d0a64b..d190c89 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3443,69 +3443,76 @@ static struct color_fixup_desc create_color_fixup_desc_from_string(const char *s static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; struct wined3d_format *format; + BOOL use_legacy_fixups; unsigned int i; static const struct { enum wined3d_format_id id; const char *fixup; + BOOL legacy; enum wined3d_gl_extension extension; } fixups[] = { - {WINED3DFMT_R16_FLOAT, "X11W", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R32_FLOAT, "X11W", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_UNORM, "XY1W", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_FLOAT, "XY1W", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R32G32_FLOAT, "XY1W", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16_FLOAT, "X11W", TRUE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R32_FLOAT, "X11W", TRUE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_UNORM, "XY1W", TRUE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_FLOAT, "XY1W", TRUE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R32G32_FLOAT, "XY1W", TRUE, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R8G8_SNORM, "xy11", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R8G8_SNORM, "XY11", NV_TEXTURE_SHADER}, - {WINED3DFMT_R8G8_SNORM, "XY11", EXT_TEXTURE_SNORM}, + {WINED3DFMT_R8G8_SNORM, "xy11", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8_SNORM, "XY11", TRUE, NV_TEXTURE_SHADER}, + {WINED3DFMT_R8G8_SNORM, "XY11", TRUE, EXT_TEXTURE_SNORM}, - {WINED3DFMT_R16G16_SNORM, "xy11", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_SNORM, "XY11", NV_TEXTURE_SHADER}, - {WINED3DFMT_R16G16_SNORM, "XY11", EXT_TEXTURE_SNORM}, + {WINED3DFMT_R16G16_SNORM, "xy11", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_SNORM, "XY11", TRUE, NV_TEXTURE_SHADER}, + {WINED3DFMT_R16G16_SNORM, "XY11", TRUE, EXT_TEXTURE_SNORM}, - {WINED3DFMT_R8G8B8A8_SNORM, "xyzw", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", NV_TEXTURE_SHADER}, - {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", EXT_TEXTURE_SNORM}, + {WINED3DFMT_R8G8B8A8_SNORM, "xyzw", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", FALSE, NV_TEXTURE_SHADER}, + {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", FALSE, EXT_TEXTURE_SNORM}, - {WINED3DFMT_R5G5_SNORM_L6_UNORM, "xzY1", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", NV_TEXTURE_SHADER}, - {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", EXT_TEXTURE_SNORM}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "xzY1", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", FALSE, NV_TEXTURE_SHADER}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", FALSE, EXT_TEXTURE_SNORM}, - {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "xyZW", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "XYZW", NV_TEXTURE_SHADER}, + {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "xyZW", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "XYZW", FALSE, NV_TEXTURE_SHADER}, - {WINED3DFMT_ATI1N, "XXXX", EXT_TEXTURE_COMPRESSION_RGTC}, - {WINED3DFMT_ATI1N, "XXXX", ARB_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI1N, "XXXX", FALSE, EXT_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI1N, "XXXX", FALSE, ARB_TEXTURE_COMPRESSION_RGTC}, - {WINED3DFMT_ATI2N, "XW11", ATI_TEXTURE_COMPRESSION_3DC}, - {WINED3DFMT_ATI2N, "YX11", EXT_TEXTURE_COMPRESSION_RGTC}, - {WINED3DFMT_ATI2N, "YX11", ARB_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI2N, "XW11", FALSE, ATI_TEXTURE_COMPRESSION_3DC}, + {WINED3DFMT_ATI2N, "YX11", FALSE, EXT_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI2N, "YX11", FALSE, ARB_TEXTURE_COMPRESSION_RGTC}, - {WINED3DFMT_A8_UNORM, "000X", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_A8_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + {WINED3DFMT_A8_UNORM, "000X", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_A8_UNORM, "XYZW", FALSE, WINED3D_GL_LEGACY_CONTEXT}, - {WINED3DFMT_L8A8_UNORM, "XXXY", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_L8A8_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + {WINED3DFMT_L8A8_UNORM, "XXXY", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L8A8_UNORM, "XYZW", FALSE, WINED3D_GL_LEGACY_CONTEXT}, - {WINED3DFMT_L4A4_UNORM, "XXXY", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_L4A4_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + {WINED3DFMT_L4A4_UNORM, "XXXY", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L4A4_UNORM, "XYZW", FALSE, WINED3D_GL_LEGACY_CONTEXT}, - {WINED3DFMT_L16_UNORM, "XXX1", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_L16_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + {WINED3DFMT_L16_UNORM, "XXX1", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L16_UNORM, "XYZW", FALSE, WINED3D_GL_LEGACY_CONTEXT}, - {WINED3DFMT_INTZ, "XXXX", WINED3D_GL_EXT_NONE}, - {WINED3DFMT_INTZ, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + {WINED3DFMT_INTZ, "XXXX", FALSE, WINED3D_GL_EXT_NONE}, + {WINED3DFMT_INTZ, "XYZW", FALSE, WINED3D_GL_LEGACY_CONTEXT}, - {WINED3DFMT_L8_UNORM, "XXX1", ARB_TEXTURE_RG}, + {WINED3DFMT_L8_UNORM, "XXX1", FALSE, ARB_TEXTURE_RG}, }; + use_legacy_fixups = d3d_info->wined3d_creation_flags & WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; for (i = 0; i < ARRAY_SIZE(fixups); ++i) { + if (fixups[i].legacy && !use_legacy_fixups) + continue; + if (!gl_info->supported[fixups[i].extension]) continue;

1 0

Józef Kucia : wined3d: Implement vCoverage register.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: a4bcee5dcca4583bb13782cc2f77e7d066453c96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4bcee5dcca4583bb13782cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 18 16:05:57 2018 +0200 wined3d: Implement vCoverage register. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45848 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/glsl_shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 64c8b77..5234808 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3280,6 +3280,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * string_buffer_sprintf(register_name, "vpc[%u]", reg->idx[0].offset); break; + case WINED3DSPR_COVERAGE: + string_buffer_sprintf(register_name, "gl_SampleMaskIn[0]"); + break; + case WINED3DSPR_SAMPLEMASK: string_buffer_sprintf(register_name, "sample_mask"); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 239873b..89cf44b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4154,6 +4154,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ + case WINED3DSPR_COVERAGE: /* vCoverage */ case WINED3DSPR_SAMPLEMASK: /* oMask */ return TRUE;

1 0

Alexandre Julliard : server: Avoid potential size overflow for empty object attributes.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: aec7befb5115d866724149bbc5576c7259fef820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec7befb5115d866724149bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 20:17:54 2018 +0200 server: Avoid potential size overflow for empty object attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/server/request.c b/server/request.c index 6120bc5..77f4f71 100644 --- a/server/request.c +++ b/server/request.c @@ -166,12 +166,13 @@ void *set_reply_data_size( data_size_t size ) return current->reply_data; } +static const struct object_attributes empty_attributes; + /* return object attributes from the current request */ const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name, struct object **root ) { - static const struct object_attributes empty_attributes; const struct object_attributes *attr = get_req_data(); data_size_t size = get_req_data_size(); @@ -213,8 +214,14 @@ const struct object_attributes *get_req_object_attributes( const struct security /* return a pointer to the request data following an object attributes structure */ const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ) { - const void *ptr = (const WCHAR *)((const struct object_attributes *)get_req_data() + 1) + - attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); + const void *ptr; + + if (attr == &empty_attributes) + { + *len = 0; + return NULL; + } + ptr = (const WCHAR *)(attr + 1) + attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); *len = get_req_data_size() - ((const char *)ptr - (const char *)get_req_data()); return ptr; }

1 0